lazy_record 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f711b308e8306e2e5425614a25e6d8fe12377f38
-  data.tar.gz: 55ec6ec6d27afffae565d3a81723a514d07289cf
+  metadata.gz: 3bc0937314b609cac19dbd32b7a69d5833d23b1a
+  data.tar.gz: 11941dc0a6c8b0f3c15b1875606637752641ff2a
 SHA512:
-  metadata.gz: 3a45dc9392a008a3e51425616b0742627f25f9a9d8980bd0bcc44f56da7a2181709b7bbfb302c2ce7f0c7702896aa50cc889f74e4b359c129e1586d5d8251b9f
-  data.tar.gz: 77945dd63bae3e6344fd66eb72552c12579a9aced18c75fbb3e5ea994c1b8356f48c3d7a77adf94f11c6d270d7aa49bd41355cc15806ee21ee0dae2bd0b55e66
+  metadata.gz: 48345672368d7f8e32c8d216e55b78ba1a4bf2f1f29a32ac958484bea3b074bc0f66ec1d905799afbda616c185daa72611666d337fd33fc49fb09ec4e3232765
+  data.tar.gz: 12e8cce3cd65a4ae3341dbe5e7bcd1e259f38f6e878f9c525605433e7abb50ed53865b62772ed83b7beac3eeef7b1b2cf6f40833b2f7a5aa2a29662532077146

data/lib/lazy_record/associations.rb

@@ -7,28 +7,34 @@ module LazyRecord
     NESTED_ATTRS_MODULE_NAME = :NestedAttributes
 
     def define_collection_getter(collection, class_name)
+      model = apply_nesting(class_name).constantize
       define_method(collection) do
         if instance_variable_get("@#{collection}").nil?
-          instance_variable_set("@#{collection}", Relation.new(model: class_name))
+          instance_variable_set("@#{collection}", Relation.new(model: model))
         end
         instance_variable_get("@#{collection}")
       end
     end
 
     def define_collection_setter(collection, class_name)
+      model = apply_nesting(class_name).constantize
       define_method("#{collection}=") do |coll|
-        coll = Relation.new(model: class_name, array: coll) if coll.is_a?(Array)
+        coll = Relation.new(model: model, array: coll) if coll.is_a?(Array)
         return instance_variable_set("@#{collection}", coll) if coll.is_a? Relation
         raise ArgumentError, "Argument must be a collection of #{collection}"
       end
     end
 
+    def apply_nesting(class_name)
+      "#{self.to_s.split('::')[0..-3].join('::')}::#{class_name}"
+    end
+
     def lr_has_many(*collections)
       include mod = get_or_set_mod(COLLECTION_MODULE_NAME)
       mod.extend(Associations)
       mod.module_eval do
         collections.each do |collection|
-          class_name = collection.to_s.classify.constantize
+          class_name = collection.to_s.classify
           define_collection_getter(collection, class_name)
           define_collection_setter(collection, class_name)
         end

data/lib/lazy_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LazyRecord
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazy_record
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - M. Simon Borg