tint 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7f4999d404212c1a6af7966791b29d5563deaaa
-  data.tar.gz: b42c343d31b7ce2974679a7b37243e4337ff2971
+  metadata.gz: 9b646a5aca0a4609a2285d5add776d0b0269ce11
+  data.tar.gz: d613dd2da3a435acfa9fc7c3e2927e0da9428808
 SHA512:
-  metadata.gz: 7868f81c19bae633ad1f7f560be0d93bc9f5ef84376f4533c376fdf8b67fb5e6eb2291dc24657918d573d8658bbdf1a6b10911902c0bc94363c6e912f16f3b79
-  data.tar.gz: 7437f4f6567aaee8abbf250e40d94496eb7fdbe5ed976fb7b55ae4726fbf2a8830056a8212d60257d8cf1d3bf6508a53b2e76b17aca2e9ba68264c7e7a69a504
+  metadata.gz: d4ac9d15bc28cefbe96dd4c5b322cd4efe111878abe84c64e9dbb683b99e6ebf2eca68751e868640eed9033c982408c16c3da6f9fbda27f0edf8838f9c43f1ef
+  data.tar.gz: 6e21cdf0b19fd87cc5f381cf7e9b45344f7d58d283d9d832cd56c020ed5b5c8155f18066bdc55a261d4f3953f82512d76f097a761af267e562a73ad781e8b145

data/README.md

@@ -90,6 +90,12 @@ By default, `decorates_association` uses the name of the association to guess th
 decorates_association :product, with: SpecialProductDecorator
 ```
 
+You can decorate an association and make it available under a different name using the `as` option:
+
+```ruby
+decorates_association :product, as: :sale_item
+```
+
 Multiple associations can be defined in the same statement using `decorates_associations`. Either, using interpolation to locate the correct decorator for each:
 
 ```ruby

data/lib/tint.rb

@@ -1,4 +1,11 @@
+require "tint/version"
+require "tint/decorator"
+
 module Tint
+  class Decorator
+
+  end
+
   class << self
     attr_accessor :attribute_capitalization
 
@@ -13,6 +20,3 @@ module Tint
 
   @attribute_capitalization = :camel_case
 end
-
-require "tint/version"
-require "tint/decorator"

data/lib/tint/decorator.rb

@@ -1,4 +1,5 @@
 require 'draper'
+require 'deep_merge/rails_compat'
 require_relative 'json_conversion.rb'
 
 module Tint
@@ -18,7 +19,21 @@ module Tint
     end
 
     class << self
-      attr_accessor :_attributes, :eager_loads
+      attr_accessor :_attributes, :parent_decorator, :parent_association
+
+      def eager_loads
+        {}
+      end
+
+      def eager_loads=(value)
+        singleton_class.class_eval do
+          remove_possible_method(:eager_loads)
+
+          define_method(:eager_loads){
+            value
+          }
+        end
+      end
 
       def attributes(*options)
         @_attributes ||= Set.new
@@ -36,23 +51,56 @@ module Tint
 
       def eager_load(*schema)
         @_attributes ||= Set.new
-        @eager_loads ||= []
 
-        schema.each do |schema_item|
-          @eager_loads.push(schema_item)
-        end
-      end
+        new_eager_loads =
+          schema.inject({}) do |memo, schema_item|
+            if schema_item.kind_of?(Hash)
+              memo = memo.merge(schema_item)
+            else
+              memo[schema_item] = {}
+            end
+
+            memo
+          end
+
+        self.eager_loads = self.eager_loads.deeper_merge(new_eager_loads)
+    end
 
       def decorates_association(association_name, options = {})
         options[:with] ||= (association_name.to_s.camelize.singularize + 'Decorator').constantize
 
-        super(association_name, options)
+        association_alias = options.delete(:as)
+
+        options[:context] ||= {}
+        options[:context][:parent_decorator] = self
+        options[:context][:parent_association] = association_name
+
+        ap "association_name:"
+        ap association_name
+
+        ap "options:"
+        ap options
+
+
+        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)
+
+          attributes(association_name)
+        end
 
-        attributes(association_name)
         association_eager_loads = options[:with].eager_loads
 
         if association_eager_loads.present?
-          eager_load({ association_name =>  association_eager_loads})
+          eager_load({ association_name => association_eager_loads})
         else
           eager_load(association_name)
         end
@@ -68,12 +116,25 @@ module Tint
       end
 
       def decorate_collection(collection, options = {})
-        collection_with_eager_loads =
-            if collection.respond_to?(:includes) && eager_loads.present?
-              collection.includes(*eager_loads)
-            else
-              collection
-            end
+        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]
+
+          if collection.respond_to?(:includes) &&
+              !eager_loads.blank? &&
+              !parent_eager_loads_include_own?
+
+            # ap "decorate_collection eager_loading eager_loads:"
+            # ap eager_loads
+
+            collection_with_eager_loads = collection.includes(*eager_loads)
+          end
+        end
 
         super(collection_with_eager_loads, options)
       end
@@ -81,18 +142,40 @@ 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)
+      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)
@@ -117,7 +200,9 @@ module Tint
 
           unless method_defined?(delegate_method)
             define_method(delegate_method) do
-              object.send(delegate_method)
+              if object.respond_to?(delegate_method)
+                object.send(delegate_method)
+              end
             end
           end
         end
@@ -128,12 +213,14 @@ module Tint
           @_attributes.add(decorator_attribute)
 
           define_method(decorator_attribute) do
-            object.send(object_method)
+            if object.respond_to?(object_method)
+              object.send(object_method)
+            end
           end
         end
       end
     end
 
-
   end
+
 end

data/lib/tint/json_conversion.rb

@@ -45,6 +45,10 @@ module Tint
     end
 
     def attributes_for_json
+      attribute_list = self.class._attributes
+
+      return {} if attribute_list.blank?
+
       strategy =
         case Tint.attribute_capitalization
         when :camel_case
@@ -57,7 +61,7 @@ module Tint
           AttributeNameStrategy::Stringify
         end
 
-      self.class._attributes.inject({}) do |memo, key_and_value|
+      attribute_list.inject({}) do |memo, key_and_value|
         key, _ = key_and_value
 
         unless (value = self.send(key)).nil?

data/lib/tint/version.rb

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

data/spec/tint/decorator_spec.rb

@@ -16,17 +16,44 @@ RSpec.describe Tint::Decorator do
 
   let(:object) { object_class.new('one', 'two') }
 
+  context "when not attributes have been set" do
+    let(:decorator_class) do
+      Class.new(Tint::Decorator) do
+
+      end
+    end
+
+    it "returns an empty object", focus: true do
+      expect(subject).to eql({})
+    end
+  end
+
   describe "::attributes" do
+    context "when an broken reference is used" do
+      let(:decorator_class) do
+        Class.new(Tint::Decorator) do
+          attributes :broken_reference
+        end
+      end
+
+      it "does not include it in the object" do
+        expect(subject).to eql({})
+      end
+    end
+
     context "when only delegations are defined" do
       let(:decorator_class) do
         Class.new(Tint::Decorator) do
-          attributes :attr1, :attr2
+          attributes :attr1
         end
       end
 
       it "delegates attributes of the same name to the object" do
         expect(subject['attr1']).to eql('one')
-        expect(subject['attr2']).to eql('two')
+      end
+
+      it "does not include any attributes not mentioned" do
+        expect(subject['attr2']).to be_nil
       end
     end
 
@@ -106,7 +133,7 @@ RSpec.describe Tint::Decorator do
       end
     end
 
-    context "when a with option is provided" do
+    context "when a :with option is provided" do
       let(:explicitly_referenced_decorator) do
         Class.new(Tint::Decorator) do
           attributes decorated1: :attr1
@@ -131,6 +158,33 @@ RSpec.describe Tint::Decorator do
         Object.send(:remove_const, 'ExplicitlyReferencedDecorator')
       end
     end
+
+    context "when a :as option is provided" do
+
+      let(:associated_decorator) do
+        Class.new(Tint::Decorator) do
+          attributes :attr1
+        end
+      end
+
+      let(:decorator_class) do
+        Class.new(Tint::Decorator) do
+          decorates_association :associated, as: 'related'
+        end
+      end
+
+      before(:each) do
+        Object.const_set('AssociatedDecorator', associated_decorator)
+      end
+
+      it "uses the specified decorator" do
+        expect(subject['related']['attr1']).to eql('value')
+      end
+
+      after(:each) do
+        Object.send(:remove_const, 'AssociatedDecorator')
+      end
+    end
   end
 
   describe "::eager_load" do

data/tint.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "draper", "~> 2.1"
+  spec.add_dependency "deep_merge", "~> 1.0"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 0"
   spec.add_development_dependency "rspec", "~> 0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tint
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Aleck Greenham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: draper
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement