tint 0.0.5.pre1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd0ed750b6e6c9ad99e7bccd4bd2581bed714ff4
-  data.tar.gz: f5f07e5ddb68ce731449dcba1b1d608768912cb8
+  metadata.gz: e0043f48824279d1625572d74b4bd9f9e7c504a4
+  data.tar.gz: c42e86959edfd7411dba82f08736cb2b0faed36d
 SHA512:
-  metadata.gz: 030e7bb630e095ad2432da014b3d74e66f11b3e648cb2df9145016cd479c9612476cf65030c9b95bd4c0eb67ce021b8af6ecb500b15e4d912a4b25a8c98b52ea
-  data.tar.gz: 98908fd1d9909ffcd72e618cb91770ec4f8969dd94d02cb1263b3d975c2bbdf54d40b92b5a2e6507d292b5aeecd9b2462307e0708ae0609bc2f673904c1b1aab
+  metadata.gz: a1d114c2f5254e27c25c41f410a9dd8d3c03b39c75d831acf6765f984a95dceadecdf8048c3f0778fbdf28585e31b67fe240ef46e40c73b3c0dff4a2038e427c
+  data.tar.gz: d47802117dbf5598db469fa102cf67ee3392909b73cdd7f47948e91ab5af67b54cef53d5839fb9acb3c0712dbc914fc7beb8b0f804c1861666ce82144ffbc26c

data/.rspec

@@ -1 +1,2 @@
 --color
+--require spec_helper

data/Guardfile

@@ -0,0 +1,29 @@
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  last_run_spec = nil
+
+  watch(%r{^lib/(.+)\.rb$}) do |match|
+    file_path =
+        if match[1] === 'lib'
+          "spec/lib/#{match[2]}_spec.rb"
+        else
+          "spec/#{match[2]}_spec.rb"
+        end
+
+    if File.exists?(file_path)
+      file_path
+    else
+      last_run_spec
+    end
+  end
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files) do |spec|
+    last_run_spec = spec[0]
+  end
+end

data/lib/tint/decorator.rb

@@ -8,9 +8,11 @@ module Tint
   class Decorator < Draper::Decorator
     include JsonConversion
 
+    attr_accessor :object_attributes
+
     def initialize(object, options = {})
       super(object, options.except(:parent_decorator, :parent_association))
-
+      @object_attributes = {}
       @context = @context.merge(options.slice(:parent_decorator, :parent_association))
     end
 
@@ -23,26 +25,20 @@ module Tint
     end
 
     class << self
-      attr_accessor :_attributes, :parent_decorator, :parent_association
+      attr_accessor :_attributes, :_override_methods, :parent_decorator, :parent_association
 
       def eager_loads
-        {}
+        @_eager_loads ||= {}
       end
 
       def eager_loads=(value)
-        singleton_class.class_eval do
-          remove_possible_method(:eager_loads)
-
-          define_method(:eager_loads){
-            value
-          }
-        end
+        @_eager_loads = value
       end
 
       def attributes(*options)
         @_attributes ||= Set.new
 
-        return unless options && options.any?
+        return if options.blank?
 
         mapped_attrs = options.extract_options!
 
@@ -102,6 +98,20 @@ module Tint
       def decorate(object, options = {})
         object_class = object.class
 
+        _object_attributes =
+            if object.present? && object.respond_to?(:attributes)
+              object.attributes
+            else
+              {}
+            end
+
+        @object_attributes =
+            if _object_attributes && _object_attributes.kind_of?(Hash)
+              _object_attributes
+            else
+              {}
+            end
+
         unless already_eager_loaded_associations?(object)
           object =
               if responds_to_methods?(object_class, :includes, :find) && eager_loads.present?
@@ -115,11 +125,16 @@ module Tint
       end
 
       def parent_eager_loads_include_own?(context = {})
+
         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
+
+            association_eager_load =
+              context[:parent_association].inject(parent_eager_loads) do |memo, chain_link|
+                memo[chain_link] if memo
+              end
+
+            !!association_eager_load
           end
         else
           false
@@ -143,27 +158,30 @@ module Tint
       end
 
       def link_delegations_to_object(delegated_attrs)
+        @_override_methods ||= {}
+
         delegated_attrs.each do |delegate_method|
           @_attributes.add(delegate_method)
 
-          unless method_defined?(delegate_method)
+          if method_defined?(delegate_method)
+            @_override_methods[delegate_method] = true
+          else
             define_method(delegate_method) do
-              if object.respond_to?(delegate_method)
-                object.send(delegate_method)
-              end
+              object.try(delegate_method)
             end
           end
         end
       end
 
       def link_mappings_to_object(mapped_attrs)
+        @_override_methods ||= {}
+
         mapped_attrs.each do |decorator_attribute, object_method|
           @_attributes.add(decorator_attribute)
+          @_override_methods[decorator_attribute] = true
 
           define_method(decorator_attribute) do
-            if object.respond_to?(object_method)
-              object.send(object_method)
-            end
+            @object_attributes[object_method.to_s] || object.try(object_method)
           end
         end
       end
@@ -188,9 +206,9 @@ module Tint
       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
-                                                   })
+               parent_decorator: self,
+               parent_association: association_chain
+           })
 
           decorated_associations[association_alias] ||= Tint::DecoratedAssociation.new(
               self,

data/lib/tint/json_conversion.rb

@@ -46,6 +46,7 @@ module Tint
 
     def attributes_for_json
       attribute_list = self.class._attributes
+      override_methods = self.class._override_methods
 
       return {} if attribute_list.blank?
 
@@ -61,10 +62,18 @@ module Tint
           AttributeNameStrategy::Stringify
         end
 
+
       attribute_list.inject({}) do |memo, key_and_value|
         key, _ = key_and_value
 
-        unless (value = self.send(key)).nil?
+        value =
+          if override_methods[key]
+            self.send(key)
+          else
+            self.object_attributes[key.to_s] || self.send(key)
+          end
+
+        unless value.nil?
           memo[strategy.transform(key)] = value.respond_to?(:as_json) ? value.as_json : value
         end
 

data/lib/tint/version.rb

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

data/spec/tint/decorator_spec.rb

@@ -194,9 +194,9 @@ RSpec.describe Tint::Decorator do
 
       eager_load_schemas = [
           [:associated],
-          [ { associated1: [:associated2] } ],
-          [ { associated1: { associated2: [:associated3] } } ],
-          [ :associated1, { associated2: [:associated3] } ]
+          [ { associated1: { associated2: {} } } ],
+          [ { associated1: { associated2: { associated3: {} } } } ],
+          [ :associated1, { associated2: { associated3: {} } } ]
       ]
 
       eager_load_schemas.each do |eager_load_schema|
@@ -241,33 +241,13 @@ RSpec.describe Tint::Decorator do
       it "returns true" do
         context = {
             parent_decorator: parent_decorator_class.decorate(object_class),
-            parent_association: :associated
+            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
@@ -277,7 +257,7 @@ RSpec.describe Tint::Decorator do
             def associated
               AssociatedDecorator.decorate(object, context: {
                   parent_decorator: self,
-                  parent_association: :associated
+                  parent_association: [:associated]
               })
             end
 
@@ -301,9 +281,9 @@ RSpec.describe Tint::Decorator do
             eager_load :associated
 
             def associated
-              AssociatedDecorator.decorate(object, context: {
+              AssociatedDecorator.decorate(object.attr1, context: {
                   parent_decorator: self,
-                  parent_association: :associated
+                  parent_association: [:associated]
               })
             end
 
@@ -312,9 +292,14 @@ RSpec.describe Tint::Decorator do
         end
 
         it "returns true" do
-          decorated_class = parent_decorator_class.decorate(object_class.new('foo', 'bar'))
+          associated_object = object_class.new('foo', 'bar')
+
+          decorated_class = parent_decorator_class.decorate(
+              object_class.new(associated_object, 'bar')
+          )
+
+          context = decorated_class.associated.context
 
-          context = decorated_class.send(:associated).context
           expect(decorator_class.parent_eager_loads_include_own?(context)).to eql(true)
         end
       end

data/tint.gemspec

@@ -20,7 +20,10 @@ Gem::Specification.new do |spec|
 
   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"
+  spec.add_development_dependency "guard", "~> 2.1"
+  spec.add_development_dependency "rspec", ">= 3.5.0"
+  spec.add_development_dependency "guard-rspec", "~> 4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tint
 version: !ruby/object:Gem::Version
-  version: 0.0.5.pre1
+  version: 0.0.5
 platform: ruby
 authors:
 - Aleck Greenham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: draper
@@ -66,20 +66,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
 description: Easily define object decorators for JSON APIs using simple declarative
   syntax
 email:
@@ -91,6 +119,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -118,9 +147,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2