data_broker 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cce93d696af7204de9beab52b3bade4246b5ea5
-  data.tar.gz: 46c4714f6c40eae60a6031a33071e88474dc3e57
+  metadata.gz: 81b7c541a17b1bb3a3325c508e1e689ddb6e79aa
+  data.tar.gz: d64dc71b65f7790ea9b10e34c18069f7030d4f8b
 SHA512:
-  metadata.gz: 78ae6680a32a29baee7b0e77e3aa81225ec4c0aa731df41fdeafc254f82450b02d86a3bba3f1b03e42a6f21be2add36d8cffd9838ffaf83b3b183c0decbe06a8
-  data.tar.gz: ca967a04b7452a6c7ad3db0e3ba799a7bf25d2d9304a824f8e8e10b4e2ffe27e8668656f3d8ea74908b3c4c70269a1daa10ce719824d77a4fb176a4857ad0ea7
+  metadata.gz: da87ff39f61766cea629984b2eb7848b00ad0c2566cdd15a5c90dbbc39b6de1fb023fcd529386c9929657e63fba2b861f58d3174c6d6d9756ea36dafb40251b9
+  data.tar.gz: 3b780b253eb5ee91cc69be3cfccb94f91204913f6968363dfb9a2bacd8002a8022284d76f79792a496851e98904e0c816637f5cb51c4fa64d6266c6e66018ba5

data/data_broker.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0.0.beta1"
   spec.add_development_dependency "sqlite3", "~> 1.3"
   spec.add_development_dependency "database_cleaner", "~> 1.2"
+  spec.add_development_dependency "pry"
 end

data/lib/data_broker/mapper.rb

@@ -16,10 +16,14 @@ module DataBroker
     end
 
     module ClassMethods
-      attr_accessor :mapping, :relations
+      attr_accessor :mapping, :children, :parents
 
-      def relations
-        @relations || {}
+      def children
+        @children || {}
+      end
+
+      def parents
+        @parents || {}
       end
 
       [:record, :model].each do |attr|
@@ -34,86 +38,120 @@ module DataBroker
       end
 
       def all
-        record_to_object(self.record.all)
+        records_to_objects(self.record.all)
       end
 
       def find(id)
-        record = eager_record.find_by(:id => id)
-        record.nil? ? nil : record_to_object(record, :eager_load => true)
+        record = self.eager_record.find_by(:id => id)
+        record.nil? ? nil : records_to_objects(record, :eager_load => true).first
       end
 
       def where(conds)
         conds = Hash[conds.map { |key, value| [self.mapping[key], value] }]
-        record_to_object(
-          eager_record.where(conds), :eager_load => true
-        )
+        records_to_objects(self.eager_record.where(conds), :eager_load => true)
       end
 
       def save(model)
-        record = self.record.find_by(:id => model.id) || self.record.new
+        record = self.eager_record.find_by(:id => model.id) || self.record.new
         attributes = Hash[self.mapping.map { |key, value| [value, model[key]] }]
         attributes.delete(:id)
         record.attributes = attributes
 
         record.save!
-        record_to_object(record.reload)
+        records_to_objects(record.reload, :eager_load => true).first
       end
 
       def destroy(model)
         record = self.record.find_by(:id => model.id)
-        record.nil? ? nil : record_to_object(record.destroy)
+        record.nil? ? nil : records_to_objects(record.destroy).first
       end
 
-      def record_to_object(record, eager_load: false)
-        if record.respond_to?(:each)
-          record.compact.map { |rec| record_to_object(rec, :eager_load => eager_load) }
-        else
+      def records_to_objects(records, eager_load: false)
+        records = [*records]
+        records.compact.map do |record|
           attributes = Hash[self.mapping.map { |key, value| [key, record[value]] }]
-          self.model.new(attributes).tap do |model|
-            eager_load_relations(model, record) if eager_load
+          self.model.new(attributes).tap do |obj|
+            load_parents!(obj, record) if eager_load
           end
+        end.tap do |recs|
+          load_children!(recs)
         end
       end
 
+      def eager_record
+        self.record.includes(parents.values)
+      end
+
       private
 
-      def eager_load_relations(model, record)
-        self.relations.each do |model_ref, record_ref|
-          rec = record.send(record_ref)
-          if rec
-            ref_mapper = mapper_for(model_ref)
-            ref = ref_mapper.record_to_object(rec)
-            model.instance_variable_set(:"@#{model_ref}", ref)
+      def load_parents!(obj, record)
+        self.parents.each do |model_ref, record_ref|
+          parent_record = record.send(record_ref)
+          if parent_record
+            parent = load_parent(parent_record, model_ref)
+            obj.instance_variable_set(:"@#{model_ref}", parent)
+          end
+        end
+      end
+
+      def load_parent(parent_record, model)
+        @load_parent ||= {}
+        @load_parent[parent_record] ||= -> {
+          mapper = mapper_for(model)
+          mapper.records_to_objects(parent_record, :eager_load => false).first
+        }.call
+      end
+
+      def load_children!(records)
+        ids = records.map(&:id)
+        self.children.each do |model_ref, record_ref|
+          rec = record_for(model_ref)
+          rels = rec
+            .where(foreign_key => ids)
+            .pluck(foreign_key, :id)
+
+          records.each do |r|
+            r.instance_variable_set(
+              :"@#{model_ref.to_s.singularize}_ids",
+              rels.map { |id, vals| vals if id == r.id  }.compact
+            )
           end
         end
       end
 
       def mapper_for(model_ref)
-        "#{model_ref.to_s.singularize}_mapper".camelize.safe_constantize
+        @mapper_for ||= {}
+        @mapper_for[model_ref] ||= "#{model_ref.to_s.singularize}_mapper"
+          .camelize.safe_constantize
       end
 
-      def inferred_basename
-        self.to_s.underscore.sub(/_mapper$/, "").singularize.camelize
+      def record_for(model_ref)
+        @record_for ||= {}
+        @record_for[model_ref] ||= "#{model_ref.to_s.singularize}_record"
+          .camelize.safe_constantize
       end
 
-      def inferred_model
-        inferred_basename.safe_constantize
+      def foreign_key
+        @foreign_key ||= "#{inferred_basename.underscore}_id"
       end
 
-      def infer(attr)
-        if attr == :model
-          inferred_model
-        else
-          "#{inferred_basename}#{attr.to_s.camelize}".safe_constantize
-        end
+      def inferred_basename
+        @inferred_basename ||= self.to_s.underscore.sub(/_mapper$/, "")
+          .singularize.camelize
       end
 
-      def eager_record
-        self.record.includes(record_relations)
+      def inferred_model
+        @inferred_model ||= inferred_basename.safe_constantize
       end
 
-      def record_relations
-        self.relations.values
+      def infer(attr)
+        @infer ||= {}
+        @infer[attr] ||= if attr == :model
+                           inferred_model
+                         else
+                           "#{inferred_basename}#{attr.to_s.camelize}"
+                             .safe_constantize
+                         end
       end
     end
   end

data/lib/data_broker/value_object.rb

@@ -40,9 +40,12 @@ module DataBroker
 
         define_method(method) do
           ivar = "@#{method}"
-          instance_variable_get(ivar) || instance_variable_set(
-            ivar, constantize(mapper).where(via.to_sym => self.id)
-          )
+          instance_variable_get(ivar) || -> {
+            instance_variable_set("@#{ids_method}", nil)
+            instance_variable_set(
+              ivar, constantize(mapper).where(via.to_sym => self.id)
+            )
+          }.call
         end
 
         define_method(ids_method) do

data/lib/data_broker/version.rb

@@ -1,3 +1,3 @@
 module DataBroker
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/mapper_spec.rb

@@ -43,7 +43,7 @@ class ParentMapper
     :id => :id
   }
 
-  self.relations = {
+  self.children = {
     :children => :children
   }
 end
@@ -57,7 +57,7 @@ class ChildMapper
     :parent_id => :parent_id
   }
 
-  self.relations = {
+  self.parents = {
     :parent => :parent
   }
 end
@@ -122,11 +122,13 @@ describe DataBroker::Mapper do
 
     it "eager loads belongs_to relations" do
       parent_id = parent_mapper.record.create.id
-      id = mapper.record.create(:child_name => "Bobby", :parent_id => parent_id)
+      id = mapper.record.create(
+        :child_name => "Bobby", :parent_id => parent_id
+      ).id
       obj = parent_mapper.find(parent_id)
 
-      child = obj.instance_variable_get(:@children).first
-      expect(child).to eq(mapper.find(id))
+      ids = obj.instance_variable_get(:@child_ids)
+      expect(ids).to match_array([id])
     end
   end
 
@@ -176,11 +178,13 @@ describe DataBroker::Mapper do
 
     it "eager loads belongs_to relations" do
       parent_id = parent_mapper.record.create.id
-      id = mapper.record.create(:child_name => "Bobby", :parent_id => parent_id)
+      id = mapper.record.create(
+        :child_name => "Bobby", :parent_id => parent_id
+      ).id
       obj = parent_mapper.where(:id => parent_id).first
 
-      child = obj.instance_variable_get(:@children).first
-      expect(child).to eq(mapper.find(id))
+      ids = obj.instance_variable_get(:@child_ids)
+      expect(ids).to match_array([id])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_broker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simplified implementation of the data mapper pattern
 email:
 - oss@teamsnap.com