local_model 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f853000f33467ac6f85e87035eecfcd676640fc6bbaf05457a61637604c9f005
-  data.tar.gz: f33774550c04178eb2083f9a1c008b1d6e548454a9134077a345a822c274fb27
+  metadata.gz: 1e2e9ec418cbe408265a42042295c4bc6a7a48aa3235529bb0f4e8f3ab2a32d1
+  data.tar.gz: 61b515ff1fcb5794737a67fff0c13d70f6062cc8a952167920e828e61d2ce70e
 SHA512:
-  metadata.gz: 7a66632adc5f6c61c0f4d2f9153df4af34427e03cb3dccdcef59c6f4f6fabcdada61e7071ec0b3f4a85679830f57f48f120863677d0077826cf1961ddd55d847
-  data.tar.gz: 0e38bf60d7b826a97b4b7f7db53740ad3b532cb054dc843eb58f1e4f770cd57b73c915f4ab252d7aeac5b2784192f3d3d32aabd34bce2e6b570ccd09ced43714
+  metadata.gz: e1960d07ccc9f2ce66f394279449985c446a4d4faf613aac69b5be56dfad9ecabc9e1c857508e52d87e4b5d756c2317eab46fbf551a81de69756b60cbd18fd39
+  data.tar.gz: e5c4ea1b2c503f5a2e5ffcb9cce1976a388df2d57eb56606a550704891e8a53035929ff71654aebf07a6bd070436dd92ac8e946d6d211a32dd3e864dd01db97e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    local_model (0.1.4)
+    local_model (0.1.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/local_model/model.rb

@@ -13,7 +13,6 @@ class LocalModel::Model
     else
       association_class_name = namespace_classname(class_name)
     end
-    association_class = Object.const_get(association_class_name)
 
     if foreign_key.nil?
       keyname = "#{association}_id"
@@ -22,6 +21,7 @@ class LocalModel::Model
     end
 
     define_method association do
+      association_class = Object.const_get(association_class_name)
       id = self.send(keyname)
       association_class.find(id)
     end
@@ -38,37 +38,47 @@ class LocalModel::Model
       association_classname = namespace_classname(class_name)
     end
 
-    current_class_id_methodname = foreign_key || "#{LocalModel::Functions.camel_to_snake(denamespace_classname(self))}_id"
-    belongs_to_id_sym = current_class_id_methodname.to_sym
 
     if through.nil?
+      current_class_id_methodname = foreign_key || "#{LocalModel::Functions.camel_to_snake(denamespace_classname(self))}_id"
+      belongs_to_id_sym = current_class_id_methodname.to_sym
       define_method association do
         association_class = Object.const_get(association_classname)
         association_class.where(belongs_to_id_sym => self.id)
       end
     else
-      through_classname = namespace_classname(get_classname_from_association(through))
+      current_class_id_methodname = foreign_key || "#{LocalModel::Functions.camel_to_snake(LocalModel::Functions.singularize(association))}_id"
+      belongs_to_id_sym = current_class_id_methodname.to_sym
       define_method association do 
-        through_class = Object.const_get(through_classname)
-        through_class.where(belongs_to_id_sym => self.id).map{|obj| obj.send(LocalModel::Functions.singularize(association))}
+        association_class = Object.const_get(association_classname)
+        self.send(through).map{|through_obj| association_class.find(through_obj.send(belongs_to_id_sym))}
       end
     end
   end
 
-  def self.has_one(association, class_name: nil, foreign_key: nil)
+  def self.has_one(association, through: nil, class_name: nil, foreign_key: nil)
     if class_name.nil?
       association_classname = LocalModel::Functions.snake_to_camel(association)
       association_classname[0] = association_classname[0].upcase
       association_classname = namespace_classname(association_classname)
     else
-      association_classname = class_name
+      association_classname = namespace_classname(class_name)
     end
-    current_class_id_methodname = foreign_key || "#{LocalModel::Functions.camel_to_snake(denamespace_classname(self))}_id"
-    belongs_to_id_sym = current_class_id_methodname.to_sym
 
-    define_method association do 
-      association_class = Object.const_get(association_classname)
-      association_class.where(belongs_to_id_sym => self.id).first
+    if through.nil?
+      current_class_id_methodname = foreign_key || "#{LocalModel::Functions.camel_to_snake(denamespace_classname(self))}_id"
+      belongs_to_id_sym = current_class_id_methodname.to_sym
+      define_method association do 
+        association_class = Object.const_get(association_classname)
+        association_class.where(belongs_to_id_sym => self.id).first
+      end
+    else
+      current_class_id_methodname = foreign_key || "#{LocalModel::Functions.camel_to_snake(association)}_id"
+      belongs_to_id_sym = current_class_id_methodname.to_sym
+      define_method association do 
+        association_class = Object.const_get(association_classname)
+        association_class.where(id: self.send(through)&.send(belongs_to_id_sym)).first
+      end
     end
   end
 

data/lib/local_model/version.rb

@@ -1,3 +1,3 @@
 module LocalModel
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local_model
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Micah Shute