upholsterer 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79b625b13949006b5ee9984702f5eb5af079a88f
-  data.tar.gz: bfdb699846f9722fdc5baacf3a00cac38f6bdb9a
+  metadata.gz: 11648613c825e5c1cf104ce4f6b77605b5474876
+  data.tar.gz: 1255ad6efa4bbd9c6fb33ecaec1fcd69792033ac
 SHA512:
-  metadata.gz: 69d3ecd24a9694a4a89fd7ef9ce3407ffaacea6171f66536b284061bbbb3b37c9f82c1ed57167fb1d046e1f232e23aab81dd57b5db188b40da7d1ded505dab31
-  data.tar.gz: fe5cfa268a0a419b4bc83b7b92aa4c7b14683e4d82adb73fa49efc7d850abf07c6b6cd6c1ec9280440919bc91e9cf038700d2f452576c59ed91e82f0227bae1c
+  metadata.gz: 1e3f4c361612f89d9eb1eb4556c13fc9670341a182fbd369c213db6ca2030374068854b68109c3c9612ecffa5744b8335ad4c13d39f11edf5ea1d017a78e8fe5
+  data.tar.gz: 5eedee0c00428232b37e33a13336fd0de020c5ff2b7d6c229e6c6a51f20d853e1456cc1e1b56e5f672dc6a4336ead0d88661a5e3e091511b7a47820916f47d24

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    upholsterer (1.0.0)
+    upholsterer (1.1.0)
       activesupport
 
 GEM

data/README.rdoc

@@ -2,9 +2,9 @@
 
 Based on SimplePresenter (https://github.com/fnando/simple_presenter)
 
-{<img src="https://codeclimate.com/github/Archistart/upholsterer/badges/gpa.svg" />}[https://codeclimate.com/github/Archistart/upholsterer]
-{<img src="https://hakiri.io/github/Archistart/upholsterer/master.svg" alt="security" />}[https://hakiri.io/github/Archistart/upholsterer/master]
-{<img src="https://travis-ci.org/Archistart/upholsterer.svg" />}[https://travis-ci.org/Archistart/upholsterer]
+{<img src="https://codeclimate.com/github/llxff/upholsterer/badges/gpa.svg" />}[https://codeclimate.com/github/llxff/upholsterer]
+{<img src="https://hakiri.io/github/llxff/upholsterer/master.svg" alt="security" />}[https://hakiri.io/github/llxff/upholsterer/master]
+{<img src="https://travis-ci.org/llxff/upholsterer.svg" />}[https://travis-ci.org/llxff/upholsterer]
 
 == Installation
 

data/lib/upholsterer/base.rb

@@ -103,6 +103,7 @@ module Upholsterer
 
       container = options.fetch(:with, nil)
       method_prefix = container if options.fetch(:prefix, true)
+      presenter = options.fetch(:presenter, nil)
 
       if block_given? and container.present?
         wrapper_method = "#{ attrs.join('_') }_wrapper"
@@ -121,7 +122,10 @@ module Upholsterer
             instance_variable_set(wrapper_instance_variable, wrapper)
           end
 
-          instance_variable_get(wrapper_instance_variable)
+
+
+          value = instance_variable_get(wrapper_instance_variable)
+          decorate_with_presenter(value, presenter)
         end
 
         private wrapper_method
@@ -142,9 +146,10 @@ module Upholsterer
             delegate attr_name, to: wrapper_method, prefix: !!method_prefix
           else
             class_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def #{method_name}(&block)                                    # def user_name(&block)
-                proxy_message(#{container.inspect}, "#{attr_name}", &block)   #   proxy_message("user", "name")
-              end                                                           # end
+              def #{method_name}(&block)
+                value = proxy_message(#{container.inspect}, "#{attr_name}", &block)
+                decorate_with_presenter(value, #{ presenter.inspect })
+              end
             RUBY
           end
         end
@@ -197,5 +202,13 @@ module Upholsterer
       subject = instance_variable_get("@#{self.class.subjects.first}").__send__(subject_name) unless subject || self.class.subjects.include?(subject_name)
       subject.respond_to?(method) ? subject.__send__(method, &block) : nil
     end
+
+    def decorate_with_presenter(value, presenter)
+      if value.present? and presenter
+        presenter.new(value)
+      else
+        value
+      end
+    end
   end
 end

data/lib/upholsterer/version.rb

@@ -1,7 +1,7 @@
 module Upholsterer
   module Version
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end

data/spec/base_spec.rb

@@ -219,4 +219,34 @@ describe Upholsterer::Base do
       its(:to_json) { should be_json_with(name: 'Real', email: 'foo@bar.com', id: 1, description: 'real_description', type: 'real_type') }
     end
   end
+
+  describe 'expose with other presenter' do
+    context 'with several subjects' do
+      let(:user) { double name: 'Peter', email: 'peter@email.com' }
+      let(:comment) { double(user: double(name: 'Steve', email: 'steve@email.com')) }
+
+      subject { ExposeWithOtherPresenter.new(user, comment) }
+
+      its(:user_name) { should eq 'Peter' }
+
+      specify { expect(subject.creator.name).to eq 'Steve' }
+      specify { expect(subject.creator.email).to eq 'steve@email.com' }
+      its(:to_json) { should be_json_with(user_name: 'Peter', creator: { name: 'Steve', email: 'steve@email.com'}) }
+    end
+
+    context 'with one subject' do
+      let(:user) { double name: 'Peter', email: 'peter@email.com' }
+      let(:post) { double user: user, comment: nil, id: 1}
+
+      subject { ExposeWithOneSubjectPresenter.new(post) }
+
+      its(:id) { should eq 1 }
+      its(:comment) { should be_nil }
+
+      specify { expect(subject.user.name).to eq 'Peter' }
+      specify { expect(subject.user.email).to eq 'peter@email.com' }
+
+      its(:to_json) { should be_json_with(id: 1, user: { name: 'Peter', email: 'peter@email.com'}, comment: nil) }
+    end
+  end
 end

data/spec/support/expose_with_other_presenter.rb

@@ -0,0 +1,16 @@
+class SimplePresenter < Presenter
+  expose :name, :email
+end
+
+class ExposeWithOtherPresenter < Presenter
+  subjects :user, :comment
+
+  expose :name, with: :user
+  expose :user, presenter: SimplePresenter, with: :comment, as: :creator, prefix: false
+end
+
+class ExposeWithOneSubjectPresenter < Presenter
+  expose :id
+  expose :user, presenter: SimplePresenter
+  expose :comment, presenter: SimplePresenter
+end

data/upholsterer.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Nando Vieira', 'Aleksandr Fomin', 'Gleb Sinyavsky']
   s.email       = ['fnando.vieira@gmail.com', 'll.wg.bin@gmail.com']
-  s.homepage    = 'https://github.com/Archistart/upholsterer'
+  s.homepage    = 'https://github.com/llxff/upholsterer'
   s.summary     = 'A simple presenter/facade/decorator/whatever implementation.'
   s.description = s.summary
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upholsterer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nando Vieira
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,6 +96,7 @@ files:
 - spec/support/comment.rb
 - spec/support/comment_presenter.rb
 - spec/support/expose_all_presenter.rb
+- spec/support/expose_with_other_presenter.rb
 - spec/support/iterator_presenter.rb
 - spec/support/matchers/json_matcher.rb
 - spec/support/serializable_presenter.rb
@@ -103,7 +104,7 @@ files:
 - spec/support/user_presenter.rb
 - spec/upholsterer_spec.rb
 - upholsterer.gemspec
-homepage: https://github.com/Archistart/upholsterer
+homepage: https://github.com/llxff/upholsterer
 licenses: []
 metadata: {}
 post_install_message: