upholsterer 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 303c16ed302b3ead74cc67760762121b90c0fade
-  data.tar.gz: a8bf3c053972fbdffb70ecedeb3952d6d5687401
+  metadata.gz: c5a932e7f68ef2b1c1dd064ab0089f870a200217
+  data.tar.gz: b34e461cbec54c4bf1f9fcd04f981eae508a8093
 SHA512:
-  metadata.gz: db657d479bf90b4f3681c57354b91791552020bc7f728cc896204651e486bb503a68cfcae8aa8a4c4fe7b4f8563beca9910a0ef4b4ff4285c6b82d8662b293aa
-  data.tar.gz: 03ec4859c46b7de076fcd733061a0058dbfc0294947b092f0369f25f269995a2e0dd2b8e31f88cd87ada83e904a0abf56adf75c3e085c9f050be1c5b04d46aea
+  metadata.gz: 7a8d9bea31d652f5caec931a57b8d341f1291772aa0a8dabafe0064b4cfedd8a4a73b0fd579ae86c85f94bc921c7c94e88b3344e7004579f568a6fbf0d2853ff
+  data.tar.gz: 8736fd3c961be81ec5c891a898a19b4564b7baa31a95834a8207257349a7dd25a1f4c912a7e20aeb34f0aabfb53412ffeb5742e821e59390948b03eed64df308

data/Gemfile.lock

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

data/lib/upholsterer/base.rb

@@ -131,8 +131,6 @@ module Upholsterer
             instance_variable_set(wrapper_instance_variable, wrapper)
           end
 
-
-
           value = instance_variable_get(wrapper_instance_variable)
           decorate_with_presenter(value, presenter)
         end
@@ -205,10 +203,16 @@ module Upholsterer
     end
 
     private
+
     def proxy_message(subject_name, method, &block)
-      subject_name ||= self.class.subjects.first
-      subject = instance_variable_get("@#{subject_name}")
-      subject = instance_variable_get("@#{self.class.subjects.first}").__send__(subject_name) unless subject || self.class.subjects.include?(subject_name)
+      if subject_name.blank? # expose :id
+        subject = send(self.class.subjects.first)
+      elsif self.class.subjects.include?(subject_name) # expose :id, with: :user, when :user is one of subjects or custom getter
+        subject = send(subject_name)
+      else
+        subject = send(self.class.subjects.first).send(subject_name)# expose :id, with: :user
+      end
+
       subject.respond_to?(method) ? subject.__send__(method, &block) : nil
     end
 

data/lib/upholsterer/version.rb

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

data/spec/base_spec.rb

@@ -263,4 +263,26 @@ describe Upholsterer::Base do
       its(:to_json) { should be_json_with(id: 1, user: { name: 'Peter', email: 'peter@email.com'}, comment: nil) }
     end
   end
+
+  describe 'custom subject' do
+    let(:presenter) do
+      Class.new(Presenter) do
+        subjects :message, :user
+
+        expose :id
+        expose :name, with: :user
+
+        private
+
+        def user
+          message.recipient.user
+        end
+      end
+    end
+
+    subject { presenter.new(double(id: 1, recipient: double(user: double(name: 'Tom')))) }
+
+    its(:id) { should eq 1 }
+    its(:user_name) { should eq 'Tom' }
+  end
 end

metadata

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