data_broker 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b0175ebf0ddbaaa2239700fd8788b63cc94e88d
-  data.tar.gz: 07e61c9c970e8973e4e7a19e3e25433f34080744
+  metadata.gz: d3e930d1eecce8f3489041add31efa05f55fe37f
+  data.tar.gz: 6498d2b77f56db76ee2e8c2877ec7fe2a00726c9
 SHA512:
-  metadata.gz: 13702b8bbb4250440aaa12ffa59ce5fc043dfeefce8bf0b296f4d1f90d798ad88bdb2f4e0cee1dce2159606fd35dee49da153e307289db1f30894181f2f3da5a
-  data.tar.gz: 5222376d572602c9b9fe73a8e71d59129c2ee91ba4993dd0e17351b3db7123142351c99ddeb14cca5be6ae5b512839333f501563d66fcb9facc672f7d1d5a4c1
+  metadata.gz: 4dbeaa7a41acd547750e23dc2bb82265c147be4910915fee5761e5b4b34010ef68c1cde031c8465118f6914504e78b630e9546549bdb44cce3199fcafeb18bc8
+  data.tar.gz: 2d762759043a9a4b27d0dd97122c99c0275ff719861dc34ad7e18febda376bd1be31791f0780da4d19fdafe42173fcc9cc04b7f78a9931da0a83f77936773a71

data/lib/data_broker/mapper.rb

@@ -13,28 +13,57 @@ module DataBroker
     def self.included(descendant)
       super
       descendant.extend(ClassMethods)
+      descendant.send(:include, InstanceMethods)
     end
 
     module ClassMethods
-      attr_accessor :mapping, :children, :parents
+      attr_accessor :mapping, :children, :parents, :record, :model
 
-      def children
-        @children || {}
+      def record
+        construct_instance.record
       end
 
-      def parents
-        @parents || {}
+      def model
+        construct_instance.model
       end
 
-      [:record, :model].each do |attr|
-        ivar = :"@#{attr}"
-        define_method(:"#{attr}=") do |value|
-          instance_variable_set(ivar, value)
-        end
+      def all(eager_load: false)
+        construct_instance.all(:eager_load => eager_load)
+      end
 
-        define_method(:"#{attr}") do
-          instance_variable_get(ivar) || infer(attr)
-        end
+      def find(id, eager_load: true)
+        construct_instance.find(id, :eager_load => eager_load)
+      end
+
+      def where(eager_load: true, **conds)
+        construct_instance.where(:eager_load => true, **conds)
+      end
+
+      def save(model, eager_load: true)
+        construct_instance.save(model, :eager_load => eager_load)
+      end
+
+      def destroy(model, eager_load: false)
+        construct_instance.destroy(model, :eager_load => eager_load)
+      end
+
+      def construct_instance
+        self.new(
+          :mapping => mapping, :parents => parents, :children => children,
+          :record => @record, :model => @model
+        )
+      end
+    end
+
+    module InstanceMethods
+      attr_reader :mapping, :parents, :children, :record, :model
+
+      def initialize(mapping:, parents:, children:, record: nil, model: nil)
+        self.mapping = mapping
+        self.parents = parents || {}
+        self.children = children || {}
+        self.record = record || infer(:record)
+        self.model = model || infer(:model)
       end
 
       def all(eager_load: false)
@@ -100,6 +129,8 @@ module DataBroker
 
       private
 
+      attr_writer :mapping, :parents, :children, :record, :model
+
       def load_parents!(obj, record)
         self.parents.each do |model_ref, record_ref|
           parent_record = record.send(record_ref)
@@ -114,7 +145,7 @@ module DataBroker
         @load_parent ||= {}
         @load_parent[parent_record] ||= -> {
           mapper = mapper_for(model)
-          mapper.records_to_objects(parent_record, :eager_load => false).first
+          mapper.construct_instance.records_to_objects(parent_record, :eager_load => false).first
         }.call
       end
 
@@ -152,7 +183,7 @@ module DataBroker
       end
 
       def inferred_basename
-        @inferred_basename ||= self.to_s.underscore.sub(/_mapper$/, "")
+        @inferred_basename ||= self.class.to_s.underscore.sub(/_mapper$/, "")
           .singularize.camelize
       end
 

data/lib/data_broker/version.rb

@@ -1,3 +1,3 @@
 module DataBroker
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/spec/mapper_spec.rb

@@ -91,8 +91,8 @@ describe DataBroker::Mapper do
 
     it "eager loads if requested" do
       3.times { mapper.record.create }
-      expect(mapper).to receive(:load_parents!).exactly(3).times
-      expect(mapper).to receive(:load_children!).once
+      expect_any_instance_of(mapper).to receive(:load_parents!).exactly(3).times
+      expect_any_instance_of(mapper).to receive(:load_children!).once
 
       mapper.all(:eager_load => true)
     end
@@ -268,7 +268,7 @@ describe DataBroker::Mapper do
     end
 
     it "eager loads if requests" do
-      expect(mapper).to receive(:load_children!).once
+      expect_any_instance_of(mapper).to receive(:load_children!).once
       model = mapper.save(mapper.model.new)
       mapper.destroy(model, :eager_load => true)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_broker
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus