lazy_record 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96f4035ed9553066def5485883f2134475f18812
-  data.tar.gz: c7ef20837f4f9e8bce74d38f6b71a22c8e03dcb0
+  metadata.gz: 210e518e34f2cb7c600f99b7ec2b2158c0b36def
+  data.tar.gz: 71a6808fc5e63546a686556cfa349b1e2549fd67
 SHA512:
-  metadata.gz: cd311bb1ad1d8e87eadcadbc65c458682826a0b689e65d85a009c4b8f96d3cf63f1324382b4e7aebf70d956248f81e04bf145caa966245e1660747ec9207876f
-  data.tar.gz: c890f9790a3e25b079663f1c6cbb9945a2c82f2616a9ce1fa0cf161932b360518d0e99624a4ab02edccc5b549127e48b8d6e01d760e82d3a68cef1538829a5c4
+  metadata.gz: 0b9ce7da8a84075361166153b02c0a277845497f030126758a644e36594316b393f02a363befc2ded3cd04e2becee3184cd310828ba47e227c24335364edb8dd
+  data.tar.gz: aef1072706aeac6fb52def4cbc84efc8820448423733afa449f23fe20d88752535e2f72c9386cf75b97ea2ce4792c99c1c6cbec4641d725dac731263dc39ee1f

data/lib/lazy_record/associations.rb

@@ -40,7 +40,7 @@ module LazyRecord
     end
 
     def define_association_setter(assoc)
-      klass = lazily_get_class(assoc.to_s.camelize).call
+      klass = lazy_const_get_one_level_back(assoc.to_s.camelize).call
       define_method("#{assoc}=") do |val|
         return instance_variable_set("@#{assoc}", val) if val.is_a? klass
         raise ArgumentError, "Argument must be a #{klass}"

data/lib/lazy_record/collections.rb

@@ -11,7 +11,7 @@ module LazyRecord
     NESTED_ATTRS_MODULE_NAME = :NestedAttributes
 
     def _define_collection_getter(collection, options)
-      klass = lazily_get_class(options[:class_name]).call
+      klass = lazy_const_get_one_level_back(options[:class_name]).call
       module_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{collection}
           @#{collection} ||= Relation.new(klass: #{klass})
@@ -20,7 +20,7 @@ module LazyRecord
     end
 
     def _define_collection_setter(collection, options)
-      klass = lazily_get_class(options[:class_name]).call
+      klass = lazy_const_get_one_level_back(options[:class_name]).call
       module_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{collection}=(coll)
           @#{collection} = Relation.new(klass: #{klass}, collection: coll)
@@ -80,7 +80,9 @@ module LazyRecord
     end
 
     def define_collection_attributes_setter(collection, options)
-      class_name = lazily_get_class(options.fetch(:class_name)).call
+      class_name = lazy_const_get_one_level_back(
+        options.fetch(:class_name)
+      ).call
       module_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{collection}_attributes=(collection_attributes)
           collection_attributes.values.each do |attributes|

data/lib/lazy_record/nesting.rb

@@ -7,7 +7,11 @@ module LazyRecord
       "#{to_s.split('::')[0..-2].join('::')}::#{class_name}"
     end
 
-    def lazily_get_class(class_name)
+    def apply_nesting_one_level_back(class_name)
+      "#{to_s.split('::')[0..-3].join('::')}::#{class_name}"
+    end
+
+    def lazy_const_get(class_name)
       lambda do
         begin
           const_get(class_name)
@@ -16,5 +20,15 @@ module LazyRecord
         end
       end
     end
+
+    def lazy_const_get_one_level_back(class_name)
+      lambda do
+        begin
+          const_get(class_name)
+        rescue NameError
+          const_get apply_nesting_one_level_back(class_name)
+        end
+      end
+    end
   end
 end

data/lib/lazy_record/version.rb

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

metadata

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