data_broker 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efa47ef957de906755498b6ae0f153e142364672
-  data.tar.gz: 3d18d6b223a291474a1a75375dca874112cf927f
+  metadata.gz: 3b0175ebf0ddbaaa2239700fd8788b63cc94e88d
+  data.tar.gz: 07e61c9c970e8973e4e7a19e3e25433f34080744
 SHA512:
-  metadata.gz: c0bd2f321438ba7e89a3b87f6f96ee23c63f347e5f186129744ec9177376b42ce6ded419f2296a2c0315194116266f3c9c514f00b28b271c0da987d11a39fbac
-  data.tar.gz: f4d8e9924a6d49cf3138b34b2c41b2a072cd8d7415154504c8aea0d72a25f00398427016e703bcab311c59c16ed5ecf3e2d2aef2dfc5e4d22b8a4a68a44f4923
+  metadata.gz: 13702b8bbb4250440aaa12ffa59ce5fc043dfeefce8bf0b296f4d1f90d798ad88bdb2f4e0cee1dce2159606fd35dee49da153e307289db1f30894181f2f3da5a
+  data.tar.gz: 5222376d572602c9b9fe73a8e71d59129c2ee91ba4993dd0e17351b3db7123142351c99ddeb14cca5be6ae5b512839333f501563d66fcb9facc672f7d1d5a4c1

data/lib/data_broker/mapper.rb

@@ -38,11 +38,13 @@ module DataBroker
       end
 
       def all(eager_load: false)
-        records_to_objects(self.record.all, :eager_load => eager_load)
+        recs = eager_record(eager_load)
+        recs = eager_load ? recs.to_a : recs.all
+        records_to_objects(recs, :eager_load => eager_load)
       end
 
       def find(id, eager_load: true)
-        record = self.eager_record.find_by(:id => id)
+        record = self.eager_record(eager_load).find_by(:id => id)
         if record.nil?
           nil
         else
@@ -53,12 +55,12 @@ module DataBroker
       def where(eager_load: true, **conds)
         conds = Hash[conds.map { |key, value| [self.mapping[key], value] }]
         records_to_objects(
-          self.eager_record.where(conds), :eager_load => eager_load
+          self.eager_record(eager_load).where(conds), :eager_load => eager_load
         )
       end
 
       def save(model, eager_load: true)
-        record = self.eager_record.find_by(:id => model.id) || self.record.new
+        record = self.eager_record(eager_load).find_by(:id => model.id) || self.record.new
         attributes = Hash[self.mapping.map { |key, value| [value, model[key]] }]
         attributes.delete(:id)
         record.attributes = attributes
@@ -68,7 +70,7 @@ module DataBroker
       end
 
       def destroy(model, eager_load: false)
-        record = self.record.find_by(:id => model.id)
+        record = self.eager_record(eager_load).find_by(:id => model.id)
         if record.nil?
           nil
         else
@@ -88,8 +90,12 @@ module DataBroker
         end
       end
 
-      def eager_record
-        self.record.includes(parents.values)
+      def eager_record(eager_load)
+        if eager_load
+          self.record.includes(parents.values)
+        else
+          self.record
+        end
       end
 
       private

data/lib/data_broker/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_broker
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Shane Emmons