upholsterer 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11648613c825e5c1cf104ce4f6b77605b5474876
-  data.tar.gz: 1255ad6efa4bbd9c6fb33ecaec1fcd69792033ac
+  metadata.gz: 303c16ed302b3ead74cc67760762121b90c0fade
+  data.tar.gz: a8bf3c053972fbdffb70ecedeb3952d6d5687401
 SHA512:
-  metadata.gz: 1e3f4c361612f89d9eb1eb4556c13fc9670341a182fbd369c213db6ca2030374068854b68109c3c9612ecffa5744b8335ad4c13d39f11edf5ea1d017a78e8fe5
-  data.tar.gz: 5eedee0c00428232b37e33a13336fd0de020c5ff2b7d6c229e6c6a51f20d853e1456cc1e1b56e5f672dc6a4336ead0d88661a5e3e091511b7a47820916f47d24
+  metadata.gz: db657d479bf90b4f3681c57354b91791552020bc7f728cc896204651e486bb503a68cfcae8aa8a4c4fe7b4f8563beca9910a0ef4b4ff4285c6b82d8662b293aa
+  data.tar.gz: 03ec4859c46b7de076fcd733061a0058dbfc0294947b092f0369f25f269995a2e0dd2b8e31f88cd87ada83e904a0abf56adf75c3e085c9f050be1c5b04d46aea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    upholsterer (1.1.0)
+    upholsterer (1.2.0)
       activesupport
 
 GEM
@@ -59,4 +59,4 @@ DEPENDENCIES
   upholsterer!
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/README.rdoc

@@ -62,12 +62,6 @@ If you're using Rails/Bundler or something like that, remember to override the <
 
   gem "upholsterer", :require => "upholsterer/namespace"
 
-== Maintainer
-
-* Nando Vieira (http://nandovieira.com.br)
-* Aleksandr Fomin (https://github.com/llxff)
-* Gleb Sinyavsky (http://github.com/zhulik)
-
 == License
 
 (The MIT License)

data/lib/upholsterer/base.rb

@@ -48,6 +48,7 @@ module Upholsterer
       attributes.each_value do |attr_name, options|
         child.expose(attr_name, options)
       end
+      child.do_not_use_prefixes! if do_not_use_prefixes?
     end
 
     # Store all attributes and options that have been exposed.
@@ -67,6 +68,14 @@ module Upholsterer
       @attributes ||= {}
     end
 
+    def self.do_not_use_prefixes!
+      @do_not_use_prefixes = true
+    end
+
+    def self.do_not_use_prefixes?
+      @do_not_use_prefixes
+    end
+
     # This method will return a presenter for each item of collection.
     #
     #   users = UserPresenter.map(User.all)
@@ -102,7 +111,7 @@ module Upholsterer
       options ||= {}
 
       container = options.fetch(:with, nil)
-      method_prefix = container if options.fetch(:prefix, true)
+      method_prefix = container if options.fetch(:prefix, !do_not_use_prefixes?)
       presenter = options.fetch(:presenter, nil)
 
       if block_given? and container.present?
@@ -205,7 +214,11 @@ module Upholsterer
 
     def decorate_with_presenter(value, presenter)
       if value.present? and presenter
-        presenter.new(value)
+        if value.is_a? Array
+          presenter.map(value)
+        else
+          presenter.new(value)
+        end
       else
         value
       end

data/lib/upholsterer/version.rb

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

data/spec/base_spec.rb

@@ -165,6 +165,20 @@ describe Upholsterer::Base do
       its([:user_name]) { should eql([:name, {with: :user}]) }
       its([:post_title]) { should eql([:title, {with: :post}]) }
     end
+
+    context 'do_not_use_prefixes' do
+      subject { presenter }
+
+      context 'without setting' do
+        its(:do_not_use_prefixes?) { should be_false }
+      end
+
+      context 'with setting' do
+        before { CommentPresenter.do_not_use_prefixes! }
+
+        its(:do_not_use_prefixes?) { should be_true }
+      end
+    end
   end
 
   describe 'as json' do
@@ -227,11 +241,11 @@ describe Upholsterer::Base do
 
       subject { ExposeWithOtherPresenter.new(user, comment) }
 
-      its(:user_name) { should eq 'Peter' }
+      its(: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'}) }
+      its(:to_json) { should be_json_with(name: 'Peter', creator: { name: 'Steve', email: 'steve@email.com'}) }
     end
 
     context 'with one subject' do

data/spec/support/expose_with_other_presenter.rb

@@ -3,14 +3,16 @@ class SimplePresenter < Presenter
 end
 
 class ExposeWithOtherPresenter < Presenter
+  do_not_use_prefixes!
+
   subjects :user, :comment
 
   expose :name, with: :user
-  expose :user, presenter: SimplePresenter, with: :comment, as: :creator, prefix: false
+  expose :user, presenter: SimplePresenter, with: :comment, as: :creator
 end
 
 class ExposeWithOneSubjectPresenter < Presenter
   expose :id
   expose :user, presenter: SimplePresenter
   expose :comment, presenter: SimplePresenter
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upholsterer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Nando Vieira
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake