api_client_bulk_loader 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b52e169fa4d30699f1d05bccb728bb24da39004
-  data.tar.gz: 5a7605677dd52caa27ef85a544187807bce9b2d1
+  metadata.gz: e249c8aea7f0eccdca7a4b2b441168a3ffa3904a
+  data.tar.gz: 44c3bed52a08f7e701e25953eaf0226fa1c08df9
 SHA512:
-  metadata.gz: 5b91c1a5b5648d0724356c39c1ca130576c723af4c44acb607680849c743022f3255c6c9db3be6c5429c3bf6c79e63da323aaaa47917a545b9955f066fa80828
-  data.tar.gz: 9665e5686d9b9bf1aebdfa1b7d98f36da80ad7c60c13ca60c174d11616eb7dfbdb9d91b07c9dfc49134349d97263fa68bbd92c4e898713cd60a58950619cca16
+  metadata.gz: e0343efed332cda6989fa59a5e0fead211d1c15ceaafe558c0a648754f23580d924288ad77e0ca93faab7a9c82eacd583c4060be932d07e606bc56cb4c49a687
+  data.tar.gz: 0514541ac5680eaa55cec183da5850384a4592d24feb36711955cd9e2cf7f07cb4c55218a271d8f710f603119b7869ec717e522e0cb30e12dc5d64616b920b5c

data/lib/api_client_bulk_loader/client/association_helper.rb

@@ -27,8 +27,6 @@ module ApiClientBulkLoader
         def self.bulk_load(association, api_client_model, attribute: :id, autoload: false, from: :id, is_has_one: false, limit: nil)
           @bulk_queued_associations ||= {}
           @bulk_queued_associations[association] = ApiClientBulkLoader::Client::AssociationAdapter.new(api_client_model, attribute, from, autoload, is_has_one, limit)
-
-          define_bulk_method(association)
         end
 
         #Shorthand to the above, but automatically sets 'is_has_one' to true.
@@ -47,9 +45,9 @@ module ApiClientBulkLoader
 
           if !values.nil?
             adapter.push(values)
-            self.instance_variable_set("@#{association}", ->{
+            attributes[association] = ->{
               adapter.fetch(values)
-            })
+            }
           end
         end
 

data/lib/api_client_bulk_loader/client/bulk_load_helper.rb

@@ -14,18 +14,6 @@ module ApiClientBulkLoader
           @bulk_queued_associations
         end
 
-        def self.define_bulk_method(association)
-          #define new getter for assoc that uses the proc
-          define_method association.to_s do 
-            ivar = self.instance_variable_get("@#{association}")
-            if (ivar.is_a? Proc)
-              self.instance_variable_set("@#{association}", ivar.call)
-            else
-              ivar
-            end
-          end
-        end
-
         def initialize(*args)
           super(*args)
           #Skip em unless we got em
@@ -41,6 +29,42 @@ module ApiClientBulkLoader
           return self
         end
       end
+
+      def as_json(options=nil)
+        prepare_attributes_hash
+        super(options)
+      end
+
+      protected
+
+      def method_missing(method, *args, &block)
+        if method.to_s =~ /^(.*)=$/
+          set_attribute($1, args.first)
+        elsif has_attribute?(method)
+          read_attribute(method)
+        else
+          super
+        end
+      end
+
+      def read_attribute(name)
+        value = attributes.fetch(name, nil)
+        if(value.is_a? Proc)
+          attributes[name] = attributes[name].call
+          value = attributes[name]
+        end
+
+        return value
+      end
+
+      def prepare_attributes_hash
+        return unless self.class.bulk_queued_associations.present?
+        self.class.bulk_queued_associations.keys.each do |assoc|
+          if(attributes[assoc].is_a? Proc)
+            attributes[assoc] = attributes[assoc].call
+          end
+        end
+      end
     end
   end
 end

data/lib/api_client_bulk_loader/client/polymorphic_association_helper.rb

@@ -30,8 +30,6 @@ module ApiClientBulkLoader
         def self.bulk_load_poly(association, type_model_hash, attribute: :id, autoload: false, type_from: :document_type, from: :document_id, is_has_one: false, limit: nil)
           @bulk_queued_associations ||= {}
           @bulk_queued_associations[association] = ApiClientBulkLoader::Client::PolymorphicAssociationAdapter.new(type_model_hash, attribute,type_from, from, autoload, is_has_one, limit)
-
-          define_bulk_method(association)
         end
 
         def self.bulk_load_poly_has_one(*args, **kwargs)
@@ -50,9 +48,9 @@ module ApiClientBulkLoader
 
           if !values.nil?
             adapter.push(values, resource_type)
-            self.instance_variable_set("@#{association}", ->{
+            attributes[association] = ->{
               adapter.fetch(values, resource_type)
-            })
+            }
           end
         end
 

data/lib/api_client_bulk_loader/version.rb

@@ -1,3 +1,3 @@
 module ApiClientBulkLoader
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/test/test_helper.rb

@@ -16,11 +16,3 @@ if ActiveSupport::TestCase.method_defined?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
 end
 
-def variants_for_test
-  [:medium, :small]
-end
-
-#How many time we should expect to see the item rendered in index.
-def expected_render_count
-  VariantObject.count * 3
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_client_bulk_loader
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - alex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -74,14 +74,8 @@ files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/variant_objects_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/variant_object.rb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/variant_objects/_variant_object.html.erb
-- test/dummy/app/views/variant_objects/_variant_object_medium.html.erb
-- test/dummy/app/views/variant_objects/_variant_object_small.html.erb
-- test/dummy/app/views/variant_objects/index.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
 - test/dummy/bin/rake
@@ -112,8 +106,6 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/test/fixtures/variant_objects.yml
-- test/integration/variant_object_controller_test.rb
 - test/test_helper.rb
 homepage: http://github.com/alexanderross/api_client_bulk_loader
 licenses: []
@@ -142,14 +134,8 @@ test_files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/variant_objects_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/variant_object.rb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/variant_objects/_variant_object.html.erb
-- test/dummy/app/views/variant_objects/_variant_object_medium.html.erb
-- test/dummy/app/views/variant_objects/_variant_object_small.html.erb
-- test/dummy/app/views/variant_objects/index.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
 - test/dummy/bin/rake
@@ -182,7 +168,5 @@ test_files:
 - test/dummy/public/favicon.ico
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
-- test/dummy/test/fixtures/variant_objects.yml
-- test/integration/variant_object_controller_test.rb
 - test/test_helper.rb
 has_rdoc: 

data/test/dummy/app/controllers/variant_objects_controller.rb

@@ -1,10 +0,0 @@
-class VariantObjectsController < ApplicationController
-
-  def index
-    @variant_objects = VariantObject.all
-
-    if(params[:variant])
-      @variant = params[:variant]
-    end
-  end
-end

data/test/dummy/app/models/variant_object.rb

@@ -1,2 +0,0 @@
-class VariantObject < ActiveRecord::Base
-end

data/test/dummy/app/views/variant_objects/_variant_object.html.erb

@@ -1 +0,0 @@
-<h1 class="default_template"><%= variant_object.name %></h1>

data/test/dummy/app/views/variant_objects/_variant_object_medium.html.erb

@@ -1 +0,0 @@
-<h2 class="medium_template"><%= variant_object.name %></h2>

data/test/dummy/app/views/variant_objects/_variant_object_small.html.erb

@@ -1 +0,0 @@
-<h3 class="small_template"><%= variant_object.name %></h3>

data/test/dummy/app/views/variant_objects/index.html.erb

@@ -1,24 +0,0 @@
-<div id="test_disp_container">
-	<% if @variant %>
-
-		<%= render @variant_objects, :variant => @variant %>
-		<hr/>
-		<% @variant_objects.each do |variant_object| %>
-			<%= render :partial=> variant_object, :variant => @variant  %>
-			<br/>
-			<%= render variant_object, :variant => @variant  %>
-		<% end %>
-
-	<% else %>
-		<%= render @variant_objects %>
-		<hr/>
-		<% @variant_objects.each do |variant_object| %>
-			<%= render :partial=> variant_object %>
-			<br/>
-			<%= render variant_object %>
-		<% end %>
-	<% end %>
-	<% if params[:test_nil_path] %>
-		<%= render  %>
-	<% end %>
-</div>

data/test/dummy/test/fixtures/variant_objects.yml

@@ -1,14 +0,0 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-# This model initially had no columns defined.  If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
-# below each fixture, per the syntax in the comments below
-#
-one:
-  name: "Test1"
-  desc: "test1 description"
-# column: value
-#
-two:
-  name: "Test2"
-  desc: "test2 description"

data/test/integration/variant_object_controller_test.rb

@@ -1,25 +0,0 @@
-require 'test_helper'
-
-class VariantObjectControllerTest < ActionDispatch::IntegrationTest
-  fixtures :all
-
-  #instead of loading individual partials, attempt to render the entire collection with and without variants
-  test "renders without variant" do
-    get variant_objects_path
-    assert_response :success
-    assert_select ".default_template", :count=> expected_render_count
-  end
-
-  test "renders with variant" do
-    variants_for_test.each do |name|
-      get variant_objects_path(:variant => name)
-      assert_response :success
-      assert_select ".#{name}_template", :count=> expected_render_count
-    end
-  end
-
-  test 'doesnt break with nil path' do
-    
-
-  end
-end