lazy_record 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7b7636ef9cc120164c70b0699be114487c9cf44
-  data.tar.gz: 76b74ad616e38c5d308b56cd1a2bc2a43868a1cc
+  metadata.gz: 86fc7c8a4fc3d5cb68c30d8967dccc32e41a300a
+  data.tar.gz: 4a3d473eef29dda64e62689394103992a46a1750
 SHA512:
-  metadata.gz: c337338e1551509e3685e5dba1008a7c66edd0f939baa88824f06f22dea1dfd4cdd05b3dbfe2b7f35c70e5e953cbe3401416f046c0510b833dc234a6872dce3c
-  data.tar.gz: 959bd54448280106dd126ee3a3ba19d8e8523bd99061211cc4ce55bdefa4f52e1942fb644d69ce4b484fe77d815074f8682965cd9580e1ffae44e0064ace10d9
+  metadata.gz: 2192b9b391256c80b27c2bbc0e8dabe0f617793c8ad502d092c8e88f8fcd75dabbab0313c442386469c4378cead5509b4bb9b4c62b7e09a2b341792b975ebc87
+  data.tar.gz: 121c6dc8b06a5a11b7c6bc8895e380156d332c98385ddc0c8685041ed3d2c60e43f9de807ff2fadc6b6befd95e38408497665102fc2f893e46862fe97a4880ed

data/lib/lazy_record.rb

@@ -8,8 +8,10 @@ require 'lazy_record/version'
 require 'lazy_record/associations'
 require 'lazy_record/attributes'
 require 'lazy_record/callbacks'
+require 'lazy_record/collections'
 require 'lazy_record/dynamic_modules'
 require 'lazy_record/methods'
+require 'lazy_record/nesting'
 require 'lazy_record/scopes'
 require 'lazy_record/validations'
 require 'lazy_record/relation'

data/lib/lazy_record/associations.rb

@@ -1,81 +1,20 @@
 # frozen_string_literal: true
 
+require 'lazy_record/nesting'
+
 module LazyRecord
-  # Set up in-memory associations between POROs.
+  # Set up in-memory one-to-one associations between POROs.
   module Associations
-    COLLECTION_MODULE_NAME   = :Collections
-    NESTED_ATTRS_MODULE_NAME = :NestedAttributes
-
-    def define_collection_getter(collection)
-      model = find_scoped_collection_class(collection)
-      define_method(collection) do
-        if instance_variable_get("@#{collection}").nil?
-          instance_variable_set("@#{collection}", Relation.new(model: model))
-        end
-        instance_variable_get("@#{collection}")
-      end
-    end
-
-    def define_collection_setter(collection)
-      model = find_scoped_collection_class(collection)
-      define_method("#{collection}=") do |coll|
-        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 find_scoped_collection_class(collection)
-      -> { apply_nesting(collection.to_s.classify).constantize }
-    end
-
-    def define_collection_counter(collection)
-      define_method("#{collection}_count") do
-        send(collection).count
-      end
-    end
-
-    def define_collections(*collections)
-      define_method(:collections) do
-        collections
-      end
-    end
-
-    def define_collection_counts_to_s
-      define_method(:collection_counts_to_s) do
-        collections.map do |collection|
-          "#{collection}_count: #{stringify_value(send("#{collection}_count"))}"
-        end
-      end
-      private :collection_counts_to_s
-    end
+    include LazyRecord::Nesting
 
-    def apply_nesting(class_name)
-      "#{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 { add_collection_methods(collections) }
-    end
+    ASSOCIATION_MODULE_NAME = :Associations
 
     def lr_has_one(*args)
-      include mod = get_or_set_mod(COLLECTION_MODULE_NAME)
+      include mod = get_or_set_mod(ASSOCIATION_MODULE_NAME)
       mod.extend(Associations) unless mod.const_defined?('Associations')
       mod.module_eval { add_has_one_methods(args) }
     end
 
-    def add_collection_methods(collections)
-      define_collections(*collections)
-      define_collection_counts_to_s
-      collections.each do |collection|
-        define_collection_getter(collection)
-        define_collection_setter(collection)
-        define_collection_counter(collection)
-      end
-    end
-
     def add_has_one_methods(args)
       define_has_one_associations(*args)
       define_has_one_associations_to_s
@@ -117,25 +56,5 @@ module LazyRecord
     def find_scoped_association_class(association)
       -> { apply_nesting(association.to_s.camelize).constantize }
     end
-
-    def define_collection_attributes_setter(collection, class_name)
-      define_method("#{collection}_attributes=") do |collection_attributes|
-        collection_attributes.values.each do |attributes|
-          send(collection) << class_name.new(attributes)
-        end
-        collection
-      end
-    end
-
-    def lr_accepts_nested_attributes_for(*collections)
-      include mod = get_or_set_mod(NESTED_ATTRS_MODULE_NAME)
-      mod.extend(Associations)
-      mod.module_eval do
-        collections.each do |collection|
-          class_name = collection.to_s.classify.constantize
-          define_collection_attributes_setter(collection, class_name)
-        end
-      end
-    end
   end
 end

data/lib/lazy_record/base_module.rb

@@ -10,6 +10,7 @@ module LazyRecord
       base.extend ClassMethods
       base.extend Scopes
       base.extend Attributes
+      base.extend Collections
       base.extend Associations
       base.extend Callbacks
       base.extend Validations

data/lib/lazy_record/collections.rb

@@ -0,0 +1,91 @@
+require 'lazy_record/nesting'
+
+module LazyRecord
+  # Set up in-memory one-to-many relationships between objects
+  module Collections
+    include LazyRecord::Nesting
+
+    COLLECTION_MODULE_NAME   = :Collections
+    NESTED_ATTRS_MODULE_NAME = :NestedAttributes
+
+    def define_collection_getter(collection)
+      model = find_scoped_collection_class(collection)
+      define_method(collection) do
+        if instance_variable_get("@#{collection}").nil?
+          instance_variable_set("@#{collection}", Relation.new(model: model))
+        end
+        instance_variable_get("@#{collection}")
+      end
+    end
+
+    def define_collection_setter(collection)
+      model = find_scoped_collection_class(collection)
+      define_method("#{collection}=") do |coll|
+        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 find_scoped_collection_class(collection)
+      -> { apply_nesting(collection.to_s.classify).constantize }
+    end
+
+    def define_collection_counter(collection)
+      define_method("#{collection}_count") do
+        send(collection).count
+      end
+    end
+
+    def define_collections(*collections)
+      define_method(:collections) do
+        collections
+      end
+    end
+
+    def define_collection_counts_to_s
+      define_method(:collection_counts_to_s) do
+        collections.map do |collection|
+          "#{collection}_count: #{stringify_value(send("#{collection}_count"))}"
+        end
+      end
+      private :collection_counts_to_s
+    end
+
+    def lr_has_many(*collections)
+      include mod = get_or_set_mod(COLLECTION_MODULE_NAME)
+      mod.extend(Collections)
+      mod.module_eval { add_collection_methods(collections) }
+    end
+
+    def add_collection_methods(collections)
+      define_collections(*collections)
+      define_collection_counts_to_s
+      collections.each do |collection|
+        define_collection_getter(collection)
+        define_collection_setter(collection)
+        define_collection_counter(collection)
+      end
+    end
+
+    def define_collection_attributes_setter(collection, class_name)
+      define_method("#{collection}_attributes=") do |collection_attributes|
+        collection_attributes.values.each do |attributes|
+          send(collection) << class_name.new(attributes)
+        end
+        collection
+      end
+    end
+
+    def lr_accepts_nested_attributes_for(*collections)
+      include mod = get_or_set_mod(NESTED_ATTRS_MODULE_NAME)
+      mod.extend(Collections)
+      mod.module_eval do
+        collections.each do |collection|
+          class_name = collection.to_s.classify.constantize
+          define_collection_attributes_setter(collection, class_name)
+        end
+      end
+    end
+  end
+end

data/lib/lazy_record/nesting.rb

@@ -0,0 +1,8 @@
+module LazyRecord
+  # Apply the same namespace nesting as self to another object.
+  module Nesting
+    def apply_nesting(class_name)
+      "#{to_s.split('::')[0..-3].join('::')}::#{class_name}"
+    end
+  end
+end

data/lib/lazy_record/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazy_record
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - M. Simon Borg
@@ -136,8 +136,10 @@ files:
 - lib/lazy_record/base.rb
 - lib/lazy_record/base_module.rb
 - lib/lazy_record/callbacks.rb
+- lib/lazy_record/collections.rb
 - lib/lazy_record/dynamic_modules.rb
 - lib/lazy_record/methods.rb
+- lib/lazy_record/nesting.rb
 - lib/lazy_record/relation.rb
 - lib/lazy_record/scopes.rb
 - lib/lazy_record/validations.rb