Extract Associations from Fields

src/adapter/pg.cr

@@ -85,7 +85,7 @@ class Granite::Adapter::Pg < Granite::Adapter::Base
       num_subs = clause.count("?")
 
       num_subs.times do |i|
-        clause = clause.sub("?", "$#{i+1}")
+        clause = clause.sub("?", "$#{i + 1}")
       end
     end
 

src/granite_orm/associations.cr

@@ -0,0 +1,34 @@
+module Granite::ORM::Associations
+  # define getter and setter for parent relationship
+  macro belongs_to(model_name)
+    field {{model_name.id}}_id : Int64
+
+    # retrieve the parent relationship
+    def {{model_name.id}}
+      if parent = {{model_name.id.camelcase}}.find {{model_name.id}}_id
+        parent
+      else
+        {{model_name.id.camelcase}}.new
+      end
+    end
+
+    # set the parent relationship
+    def {{model_name.id}}=(parent)
+      @{{model_name.id}}_id = parent.id
+    end
+  end
+
+  # define getter for related children
+  macro has_many(children_table)
+    def {{children_table.id}}
+      {% children_class = children_table.id[0...-1].camelcase %}
+      {% name_space = @type.name.gsub(/::/, "_").downcase.id %}
+      {% table_name = SETTINGS[:table_name] || name_space + "s" %}
+      foreign_key = "{{children_table.id}}.{{table_name[0...-1]}}_id"
+      query = "JOIN {{table_name}} on {{table_name}}.id = #{foreign_key} WHERE {{table_name}}.id = ?"
+
+      return [] of {{children_class}} unless id
+      {{children_class}}.all(query, id)
+    end
+  end
+end

src/granite_orm/base.cr

@@ -1,3 +1,4 @@
+require "./associations"
 require "./callbacks"
 require "./fields"
 require "./querying"
@@ -9,9 +10,10 @@ require "./version"
 
 # Granite::ORM::Base is the base class for your model objects.
 class Granite::ORM::Base
-  include Settings
+  include Associations
   include Callbacks
   include Fields
+  include Settings
   include Table
   include Transactions
 

src/granite_orm/fields.cr

@@ -15,39 +15,6 @@ module Granite::ORM::Fields
     {% SETTINGS[:timestamps] = true %}
   end
 
-  # define getter and setter for parent relationship
-  macro belongs_to(model_name)
-    field {{model_name.id}}_id : Int64
-
-    # retrieve the parent relationship
-    def {{model_name.id}}
-      if parent = {{model_name.id.camelcase}}.find {{model_name.id}}_id
-        parent
-      else
-        {{model_name.id.camelcase}}.new
-      end
-    end
-
-    # set the parent relationship
-    def {{model_name.id}}=(parent)
-      @{{model_name.id}}_id = parent.id
-    end
-  end
-
-  # define getter for related children
-  macro has_many(children_table)
-    def {{children_table.id}}
-      {% children_class = children_table.id[0...-1].camelcase %}
-      {% name_space = @type.name.gsub(/::/, "_").downcase.id %}
-      {% table_name = SETTINGS[:table_name] || name_space + "s" %}
-      foreign_key = "{{children_table.id}}.{{table_name[0...-1]}}_id"
-      query = "JOIN {{table_name}} on {{table_name}}.id = #{foreign_key} WHERE {{table_name}}.id = ?"
-
-      return [] of {{children_class}} unless id
-      {{children_class}}.all(query, id)
-    end
-  end
-
   macro __process_fields
     # Create the properties
     {% for name, type in FIELDS %}

src/granite_orm/validators.cr

@@ -14,7 +14,7 @@ module Granite::ORM::Validators
   macro validate(field, message, block)
     @@validators << {field: {{field}}, message: {{message}}, block: {{block}}}
   end
-    
+
   def valid?
     @@validators.each do |validator|
       unless validator[:block].call(self)
@@ -24,4 +24,3 @@ module Granite::ORM::Validators
     errors.empty?
   end
 end
-