tint 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b646a5aca0a4609a2285d5add776d0b0269ce11
-  data.tar.gz: d613dd2da3a435acfa9fc7c3e2927e0da9428808
+  metadata.gz: 9b243827913ffe5dd0696d1a4c43c4279f2cbe35
+  data.tar.gz: c112cffa3c4b79cbb6f540c7c41e4e5d998f70d2
 SHA512:
-  metadata.gz: d4ac9d15bc28cefbe96dd4c5b322cd4efe111878abe84c64e9dbb683b99e6ebf2eca68751e868640eed9033c982408c16c3da6f9fbda27f0edf8838f9c43f1ef
-  data.tar.gz: 6e21cdf0b19fd87cc5f381cf7e9b45344f7d58d283d9d832cd56c020ed5b5c8155f18066bdc55a261d4f3953f82512d76f097a761af267e562a73ad781e8b145
+  metadata.gz: 13aa4b8db03c71954930d71dfe6ce16401c6cce0f4b41df22728a2c2f231ff8e955982ab3e8b62e0e9affc09dec07a606d11d843ea625b0afe2d7216c235f63a
+  data.tar.gz: 920ae9f4d9cbd7bee7afe69e2d83772a2de9174fc7b693ccbe47a51777402f8fbbe855ed7e9d03e9eccdc40e51594748934516018f71b8a889968e5963b61b2c

data/lib/tint/decorator.rb

@@ -7,7 +7,9 @@ module Tint
     include JsonConversion
 
     def initialize(object, options = {})
-      super(object, options)
+      super(object, options.except(:parent_decorator, :parent_association))
+
+      @context = @context.merge(options.slice(:parent_decorator, :parent_association))
     end
 
     def column_names
@@ -18,6 +20,23 @@ module Tint
       object.persisted?
     end
 
+    def decorate_as_association(association_name, association, options = {})
+      options.assert_valid_keys(:with)
+
+      association_decorator = options[:with]
+
+      association_context = options.except(:with).merge(context: context.
+          merge(parent_decorator: self, parent_association: association_name.to_sym))
+
+      self.class.eager_load(association_name => {})
+
+      if association.respond_to?(:each)
+        association_decorator.decorate_collection(association, association_context)
+      else
+        association_decorator.decorate(association, association_context)
+      end
+    end
+
     class << self
       attr_accessor :_attributes, :parent_decorator, :parent_association
 
@@ -50,8 +69,6 @@ module Tint
       end
 
       def eager_load(*schema)
-        @_attributes ||= Set.new
-
         new_eager_loads =
           schema.inject({}) do |memo, schema_item|
             if schema_item.kind_of?(Hash)
@@ -64,39 +81,32 @@ module Tint
           end
 
         self.eager_loads = self.eager_loads.deeper_merge(new_eager_loads)
-    end
+      end
 
       def decorates_association(association_name, options = {})
         options[:with] ||= (association_name.to_s.camelize.singularize + 'Decorator').constantize
 
-        association_alias = options.delete(:as)
-
-        options[:context] ||= {}
-        options[:context][:parent_decorator] = self
-        options[:context][:parent_association] = association_name
-
-        ap "association_name:"
-        ap association_name
+        association_alias = options.delete(:as) || association_name
 
-        ap "options:"
-        ap options
+        options.assert_valid_keys(:with, :scope, :context)
 
+        define_method(association_alias) do
+          context_with_association = context.merge({
+              parent_decorator: self,
+              parent_association: association_name
+          })
 
-        if association_alias
-          options.assert_valid_keys(:with, :scope, :context)
-
-          define_method(association_alias) do
-            decorated_associations[association_alias] ||= Draper::DecoratedAssociation.new(self, association_name, options)
-            decorated_associations[association_alias].call
-          end
-
-          attributes(association_alias)
-        else
-          super(association_name, options)
+          decorated_associations[association_alias] ||= Draper::DecoratedAssociation.new(
+              self,
+              association_name,
+              options.merge(context: context_with_association)
+          )
 
-          attributes(association_name)
+          decorated_associations[association_alias].call
         end
 
+        attributes(association_alias)
+
         association_eager_loads = options[:with].eager_loads
 
         if association_eager_loads.present?
@@ -107,6 +117,7 @@ module Tint
       end
 
       def decorates_associations(*arguments)
+
         options = arguments.extract_options!
         association_list = arguments
 
@@ -116,25 +127,16 @@ module Tint
       end
 
       def decorate_collection(collection, options = {})
-        ap "options:"
-        ap options
-
-        collection_with_eager_loads = collection
-
-        if options[:context] && options[:context][:parent_decorator] && options[:context][:parent_association]
-          @parent_decorator = options[:context][:parent_decorator]
-          @parent_association = options[:context][:parent_association]
 
+        collection_with_eager_loads =
           if collection.respond_to?(:includes) &&
-              !eager_loads.blank? &&
-              !parent_eager_loads_include_own?
-
-            # ap "decorate_collection eager_loading eager_loads:"
-            # ap eager_loads
+            eager_loads.present?  &&
+             !parent_eager_loads_include_own?(options[:context])
 
-            collection_with_eager_loads = collection.includes(*eager_loads)
+            collection.includes(eager_loads)
+          else
+            collection
           end
-        end
 
         super(collection_with_eager_loads, options)
       end
@@ -142,42 +144,22 @@ module Tint
       def decorate(object, options = {})
         object_class = object.class
 
-        # unless already_eager_loaded_associations?(object)
-        #   object =
-        #       if responds_to_methods?(object_class, :includes, :find) && eager_loads.present?
-        #         object_class.includes(*eager_loads).find(object.id)
-        #       else
-        #         object
-        #       end
-        # end
+        unless already_eager_loaded_associations?(object)
+          object =
+              if responds_to_methods?(object_class, :includes, :find) && eager_loads.present?
+                object_class.includes(*eager_loads).find(object.id)
+              else
+                object
+              end
+        end
 
         super(object, options)
       end
 
-      def parent_eager_loads_include_own?(association = nil)
-        association_chain = [@parent_assocation]
-        association_chain.push(association) if association
-
-        eager_loads_include?(@parent_decorator.eager_loads, association_chain) ||
-            @parent_decorator.parent_eager_loads_include_own?(association_chain)
+      def parent_eager_loads_include_own?(context = {})
+        !!(context && context[:parent_decorator] && context[:parent_decorator].class.eager_loads[context[:parent_association]])
       end
 
-      def eager_loads_include?(hash, key_list)
-        if key_list.length > 1
-          next_key = key_list.shift
-
-          if (next_value = hash[next_key])
-            eager_loads_include?(next_value, key_list)
-          else
-            next_value
-          end
-        else
-          hash[key_list.first]
-        end
-      end
-
-      private
-
       def already_eager_loaded_associations?(object)
         if object.respond_to?(:association_cache)
           object.association_cache.any?

data/lib/tint/version.rb

@@ -1,3 +1,3 @@
 module Tint
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+RSpec.configure do |config|
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+end

data/spec/tint/decorator_spec.rb

@@ -1,6 +1,8 @@
 require 'tint'
 require_relative '../support/active_record_mock'
 
+require 'spec_helper'
+
 RSpec.describe Tint::Decorator do
   subject{ decorator_class.decorate(object).as_json }
 
@@ -23,7 +25,7 @@ RSpec.describe Tint::Decorator do
       end
     end
 
-    it "returns an empty object", focus: true do
+    it "returns an empty object" do
       expect(subject).to eql({})
     end
   end
@@ -209,4 +211,119 @@ RSpec.describe Tint::Decorator do
       end
     end
   end
+
+  describe "::parent_eager_loads_include_own?" do
+    let(:decorator_class) do
+      Class.new(Tint::Decorator) do
+        eager_load :products
+      end
+    end
+
+    before(:each) do
+      Object.const_set('AssociatedDecorator', decorator_class)
+    end
+
+    context "when the decorator has no parent" do
+      let(:parent_decorator_class) { nil }
+
+      it "returns false" do
+        expect(decorator_class.parent_eager_loads_include_own?).to eql(false)
+      end
+    end
+
+    context "when the decorator has a parent set via decorates_association" do
+      let(:parent_decorator_class) do
+        Class.new(Tint::Decorator) do
+          decorates_association :associated
+        end
+      end
+
+      it "returns true" do
+        context = {
+            parent_decorator: parent_decorator_class.decorate(object_class),
+            parent_association: :associated
+        }
+
+        expect(decorator_class.parent_eager_loads_include_own?(context)).to eql(true)
+      end
+    end
+
+    context "when a decorator has a parent set via #decorate_association" do
+      let(:parent_decorator_class) do
+        Class.new(Tint::Decorator) do
+          attributes :associated
+
+          def associated
+            decorate_as_association(:association, object, with: AssociatedDecorator)
+          end
+
+        end
+      end
+
+      it "returns true" do
+        decorated_class = parent_decorator_class.decorate(object_class.new('foo', 'bar'))
+
+        context = decorated_class.send(:associated).context
+        expect(decorator_class.parent_eager_loads_include_own?(context)).to eql(true)
+      end
+    end
+
+    context "when a decorator has a parent manually set" do
+      context "and the parent doesn't manually eager load the association" do
+        let(:parent_decorator_class) do
+          Class.new(Tint::Decorator) do
+            attributes :associated
+
+            def associated
+              AssociatedDecorator.decorate(object, context: {
+                  parent_decorator: self,
+                  parent_association: :associated
+              })
+            end
+
+          end
+
+        end
+
+        it "returns false" do
+          decorated_class = parent_decorator_class.decorate(object_class.new('foo', 'bar'))
+
+          context = decorated_class.send(:associated).context
+          expect(decorator_class.parent_eager_loads_include_own?(context)).to eql(false)
+        end
+      end
+
+      context "and the parent manually loads the eager association" do
+        let(:parent_decorator_class) do
+          Class.new(Tint::Decorator) do
+            attributes :associated
+
+            eager_load :associated
+
+            def associated
+              AssociatedDecorator.decorate(object, context: {
+                  parent_decorator: self,
+                  parent_association: :associated
+              })
+            end
+
+          end
+
+        end
+
+        it "returns true" do
+          decorated_class = parent_decorator_class.decorate(object_class.new('foo', 'bar'))
+
+          context = decorated_class.send(:associated).context
+          expect(decorator_class.parent_eager_loads_include_own?(context)).to eql(true)
+        end
+      end
+    end
+
+    after(:each) do
+      Object.send(:remove_const, 'AssociatedDecorator')
+    end
+  end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tint
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Aleck Greenham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: draper
@@ -98,6 +98,7 @@ files:
 - lib/tint/decorator.rb
 - lib/tint/json_conversion.rb
 - lib/tint/version.rb
+- spec/spec_helper.rb
 - spec/support/active_record_mock.rb
 - spec/tint/decorator_spec.rb
 - tint.gemspec
@@ -126,5 +127,6 @@ signing_key:
 specification_version: 4
 summary: Declarative object decorators for JSON APIs
 test_files:
+- spec/spec_helper.rb
 - spec/support/active_record_mock.rb
 - spec/tint/decorator_spec.rb