api_client_bulk_loader 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79cd3536b6e86590d71001608bc335a6dbe84eda
-  data.tar.gz: eb1ed8fd002f4d76c72f0b6b4837595ed65cd472
+  metadata.gz: fe9cc6ce883ae5a1ef9158539058ebed422ab9d4
+  data.tar.gz: 5164ee12c815c6edfb379b6d6dc0754e86d19c3a
 SHA512:
-  metadata.gz: 2ada0ec42894766e71866a9421bc344c44efe48c46f7cf93abbd5e24b57e38ac306055ac6ae9af33ccf2c4eca836056e454e4511140df9c623aaf475b72132d8
-  data.tar.gz: 8566b7f227854e3ae0bc1d94c124b3284f6d019a0b07e688621a39f1ec489e7b809cec377dac9516ab4a3306898bd1b0c6bbfba5857ea88540924143f19db4fc
+  metadata.gz: 9dda0f8cf03dfa336336eba9a9c89767aa50919a7dd4312c6a133e8817bccf886989beb7bd6a3249e3eda21eb6e66b532b605731f4309353f0cd47d6e3794f0b
+  data.tar.gz: 3d14cf32d5248947288e1f496e4d54e12d98a3f1ad02764d4253ece6e21729db7a4a79eec678234abab56bad73c51b40ef38b3f5c9011c53725ea2992e2d163e

data/lib/api_client_bulk_loader/api_client_bulk_loader.rb

@@ -6,6 +6,7 @@ module ApiClientBulkLoader
     autoload :AssociationAdapter, 'api_client_bulk_loader/client/association_adapter'
     autoload :PolymorphicAssociationHelper, 'api_client_bulk_loader/client/polymorphic_association_helper'
     autoload :PolymorphicAssociationAdapter, 'api_client_bulk_loader/client/polymorphic_association_adapter'
+    autoload :BulkLoadAdapter, 'api_client_bulk_loader/client/bulk_load_adapter'
     autoload :BulkLoadHelper, 'api_client_bulk_loader/client/bulk_load_helper'
     autoload :Loader, 'api_client_bulk_loader/client/loader'
   end

data/lib/api_client_bulk_loader/client/association_adapter.rb

@@ -1,21 +1,12 @@
 module ApiClientBulkLoader
   module Client
     #Adapts into the bulk loader. Mainly useful for storing the details of the bulk call.
-    class AssociationAdapter
-      attr_reader :resource_model, :attribute, :autoload, :values_from, :limit
+    class AssociationAdapter < BulkLoadAdapter
+      attr_reader :resource_model
 
       def initialize(res_model, attribute = nil, values_from = nil, autoload = false, is_has_one = false, limit = nil)
         @resource_model = res_model
-        @attribute = attribute
-        @autoload = autoload
-        @values_from = values_from
-        @has_one = is_has_one
-        @limit = limit
-      end
-
-      def bulk_loader
-        RequestStore.store[:bulk_loader] ||= ApiClientBulkLoader::Client::Loader.new
-        return RequestStore.store[:bulk_loader]
+        super(attribute, values_from, autoload, is_has_one, limit)
       end
 
       #Fetch.

data/lib/api_client_bulk_loader/client/association_helper.rb

@@ -38,7 +38,7 @@ module ApiClientBulkLoader
           adapter = self.class.bulk_queued_associations[association]
           #Probably just raise an exception if it doesnt respond to the target.
           values = Array(self.send(adapter.values_from))
-          limit = limit || adapter.limit
+          limit ||= adapter.limit
 
           values = values.first(limit) if limit.present?
 

data/lib/api_client_bulk_loader/client/bulk_load_adapter.rb

@@ -0,0 +1,29 @@
+module ApiClientBulkLoader
+  module Client
+    #Adapts into the bulk loader. Mainly useful for storing the details of the bulk call.
+    class BulkLoadAdapter
+      attr_reader :attribute, :autoload, :values_from, :limit
+
+      def initialize(attribute = nil, values_from = nil, autoload = false, is_has_one = false, limit = nil)
+        @attribute = attribute
+        @autoload = autoload
+        @values_from = values_from || "#{attribute}_id"
+        @has_one = is_has_one
+        @limit = limit
+      end
+
+      def bulk_loader
+        RequestStore.store[:bulk_loader] ||= ApiClientBulkLoader::Client::Loader.new
+        return RequestStore.store[:bulk_loader]
+      end
+
+      def push
+        raise Exception.new("Child class should define push!")
+      end
+
+      def fetch
+        raise Exception.new("Child class should define fetch!")
+      end
+    end
+  end
+end

data/lib/api_client_bulk_loader/client/bulk_load_helper.rb

@@ -30,6 +30,8 @@ module ApiClientBulkLoader
         end
       end
 
+      #we need to override this, as if it is called before we actually hit a bulk-loaded assocation, it will attempt to JSON serialize a proc, which isn't good.
+      #To remedy this, we forcefully call each attribute and if it's a proc, we fire that bulk fetch.
       def as_json(options=nil)
         prepare_attributes_hash
         super(options)

data/lib/api_client_bulk_loader/client/loader.rb

@@ -50,7 +50,7 @@ module ApiClientBulkLoader
 
         values = @queued_model_store[model][attribute]
 
-        results = if attribute != :id #Index the returned results by the attribute used to query by
+        results = if attribute != :id #Index the returned results by the attribute used to query by, this is used when bulk querying by some foreign key.
 
           Array(model.find(attribute => values)).group_by{|obj| obj.send(attribute) }
 

data/lib/api_client_bulk_loader/client/polymorphic_association_adapter.rb

@@ -1,24 +1,15 @@
 module ApiClientBulkLoader
   module Client
     #Adapts into the bulk loader. Mainly useful for storing the details of the bulk call.
-    class PolymorphicAssociationAdapter
-      attr_reader :resource_translation, :attribute, :autoload, :type_from, :values_from, :limit
+    class PolymorphicAssociationAdapter < BulkLoadAdapter
+      attr_reader :resource_translation, :type_from
 
-      def initialize(resource_translation, attribute = nil, type_from = nil, values_from = nil, autoload = false, is_has_one = false, limit = nil)
+      def initialize(resource_translation, attribute = nil, type_from = nil, values_from = nil, autoload = true, is_has_one = false, limit = nil)
         @resource_translation = resource_translation
-        @attribute = attribute
-        @autoload = autoload
-        @values_from = values_from
         @type_from = type_from
-        @has_one = is_has_one
-        @limit = limit
+        super(attribute, values_from, autoload, is_has_one, limit)
       end
-
-      def bulk_loader
-        RequestStore.store[:bulk_loader] ||= ApiClientBulkLoader::Client::Loader.new
-        return RequestStore.store[:bulk_loader]
-      end
-
+      
       #Fetch.
       def fetch(values, resource_type)
         results = bulk_loader.fetch(@resource_translation[resource_type], values, @attribute)

data/lib/api_client_bulk_loader/version.rb

@@ -1,3 +1,3 @@
 module ApiClientBulkLoader
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_client_bulk_loader
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - alex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -78,6 +78,7 @@ files:
 - lib/api_client_bulk_loader/api_client_bulk_loader.rb
 - lib/api_client_bulk_loader/client/association_adapter.rb
 - lib/api_client_bulk_loader/client/association_helper.rb
+- lib/api_client_bulk_loader/client/bulk_load_adapter.rb
 - lib/api_client_bulk_loader/client/bulk_load_helper.rb
 - lib/api_client_bulk_loader/client/loader.rb
 - lib/api_client_bulk_loader/client/polymorphic_association_adapter.rb