tint 0.0.4 → 0.0.5.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b243827913ffe5dd0696d1a4c43c4279f2cbe35
-  data.tar.gz: c112cffa3c4b79cbb6f540c7c41e4e5d998f70d2
+  metadata.gz: cd0ed750b6e6c9ad99e7bccd4bd2581bed714ff4
+  data.tar.gz: f5f07e5ddb68ce731449dcba1b1d608768912cb8
 SHA512:
-  metadata.gz: 13aa4b8db03c71954930d71dfe6ce16401c6cce0f4b41df22728a2c2f231ff8e955982ab3e8b62e0e9affc09dec07a606d11d843ea625b0afe2d7216c235f63a
-  data.tar.gz: 920ae9f4d9cbd7bee7afe69e2d83772a2de9174fc7b693ccbe47a51777402f8fbbe855ed7e9d03e9eccdc40e51594748934516018f71b8a889968e5963b61b2c
+  metadata.gz: 030e7bb630e095ad2432da014b3d74e66f11b3e648cb2df9145016cd479c9612476cf65030c9b95bd4c0eb67ce021b8af6ecb500b15e4d912a4b25a8c98b52ea
+  data.tar.gz: 98908fd1d9909ffcd72e618cb91770ec4f8969dd94d02cb1263b3d975c2bbdf54d40b92b5a2e6507d292b5aeecd9b2462307e0708ae0609bc2f673904c1b1aab

data/lib/tint/decorated_association.rb

@@ -0,0 +1,16 @@
+module Tint
+  class DecoratedAssociation < Draper::DecoratedAssociation
+    def decorate
+      association_chain = @association
+      association_chain = Array.wrap(association_chain) unless association_chain.kind_of?(Array)
+
+      associated = association_chain.inject(owner.object) do |memo, method_name|
+        memo.send(method_name)
+      end
+
+      associated = associated.sent(scope) if scope
+
+      @decorated = factory.decorate(associated, context_args: owner.context)
+    end
+  end
+end

data/lib/tint/decorator.rb

@@ -2,6 +2,8 @@ require 'draper'
 require 'deep_merge/rails_compat'
 require_relative 'json_conversion.rb'
 
+require 'tint/decorated_association'
+
 module Tint
   class Decorator < Draper::Decorator
     include JsonConversion
@@ -20,23 +22,6 @@ 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
 
@@ -69,51 +54,24 @@ module Tint
       end
 
       def eager_load(*schema)
-        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)
+        self.eager_loads = self.eager_loads.deeper_merge(expand_schema(schema))
       end
 
-      def decorates_association(association_name, options = {})
-        options[:with] ||= (association_name.to_s.camelize.singularize + 'Decorator').constantize
+      def decorates_association(*args)
+        options = args.extract_options!
+        association_chain = args
 
-        association_alias = options.delete(:as) || association_name
+        association_tail = association_chain.last
 
-        options.assert_valid_keys(:with, :scope, :context)
+        options[:with] ||= (association_tail.to_s.camelize.singularize + 'Decorator').constantize
 
-        define_method(association_alias) do
-          context_with_association = context.merge({
-              parent_decorator: self,
-              parent_association: association_name
-          })
+        association_alias = options.delete(:as) || association_tail
 
-          decorated_associations[association_alias] ||= Draper::DecoratedAssociation.new(
-              self,
-              association_name,
-              options.merge(context: context_with_association)
-          )
-
-          decorated_associations[association_alias].call
-        end
-
-        attributes(association_alias)
+        options.assert_valid_keys(:with, :scope, :context)
 
-        association_eager_loads = options[:with].eager_loads
+        define_association_method(association_alias, association_chain, options)
 
-        if association_eager_loads.present?
-          eager_load({ association_name => association_eager_loads})
-        else
-          eager_load(association_name)
-        end
+        eager_load_association(association_chain, options)
       end
 
       def decorates_associations(*arguments)
@@ -147,7 +105,7 @@ module Tint
         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)
+                object_class.includes(eager_loads).find(object.id)
               else
                 object
               end
@@ -157,7 +115,15 @@ module Tint
       end
 
       def parent_eager_loads_include_own?(context = {})
-        !!(context && context[:parent_decorator] && context[:parent_decorator].class.eager_loads[context[:parent_association]])
+        if context && context[:parent_decorator]
+          if (parent_eager_loads = context[:parent_decorator].class.eager_loads)
+            context[:parent_association].inject(parent_eager_loads) do |memo, chain_link|
+              memo[chain_link] if memo
+            end
+          end
+        else
+          false
+        end
       end
 
       def already_eager_loaded_associations?(object)
@@ -201,6 +167,60 @@ module Tint
           end
         end
       end
+
+      private
+
+      def expand_schema(schema)
+        if schema.kind_of?(Hash)
+          schema.inject({}) do |memo, (schema_key, schema_value)|
+            memo[schema_key] = expand_schema(schema_value)
+            memo
+          end
+        elsif schema.kind_of?(Array)
+          schema.inject({}) do |memo, schema_item|
+            memo.merge(expand_schema(schema_item))
+          end
+        else
+          { schema => {} }
+        end
+      end
+
+      def define_association_method(association_alias, association_chain, options)
+        define_method(association_alias) do
+          context_with_association = context.merge({
+                                                       parent_decorator: self,
+                                                       parent_association: association_chain
+                                                   })
+
+          decorated_associations[association_alias] ||= Tint::DecoratedAssociation.new(
+              self,
+              association_chain,
+              options.merge(context: context_with_association)
+          )
+
+          decorated_associations[association_alias].call
+        end
+
+        attributes(association_alias)
+      end
+
+      def eager_load_association(association_chain, options)
+        association_eager_loads = options[:with].eager_loads
+        schema = association_schema(association_chain, association_eager_loads)
+
+        eager_load(schema)
+      end
+
+      def association_schema(association_chain, eager_loads = {})
+        association_chain.reverse.reduce({}) do |memo, chain_link|
+
+          if chain_link == association_chain.last
+            { chain_link => eager_loads }
+          else
+            { chain_link => memo }
+          end
+        end
+      end
     end
 
   end

data/lib/tint/version.rb

@@ -1,3 +1,3 @@
 module Tint
-  VERSION = "0.0.4"
+  VERSION = "0.0.5.pre1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tint
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5.pre1
 platform: ruby
 authors:
 - Aleck Greenham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: draper
@@ -95,6 +95,7 @@ files:
 - README.md
 - Rakefile
 - lib/tint.rb
+- lib/tint/decorated_association.rb
 - lib/tint/decorator.rb
 - lib/tint/json_conversion.rb
 - lib/tint/version.rb
@@ -117,9 +118,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2