upholsterer 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a785aab5485f2ce77dab6936674769fac4826e6
-  data.tar.gz: 7078a020e6053b70e45e52a660ade06265fbdefd
+  metadata.gz: 951c39ccba5741d0f3addf2eef2352f3271733bf
+  data.tar.gz: 5c6b534c4197de44df7f0a52a426b903defa9739
 SHA512:
-  metadata.gz: 24cd41a535c28fd31a1627bd9c12e47640724558131b0b931c41b226ee2b824100ffd7455de7cd6a1c3d17f3081aa0b55d4fb100ec72a0d6c111d8a50534c529
-  data.tar.gz: 567357bb89d0b137f1f3d123e1fa57694ef3c53e2055df247300621bcf7c4a510a46d593fb83d59ef092820a8379af747128d06d6a0b7ef64b56d48397ae6316
+  metadata.gz: 9ff954b798cd7f48f522e9c55ffa85d602a067699d090d642685d6dbbcb624258ea46e8ac539761f16df1f8414bae1dd91f42f23a353fa51864e4a10e9867c14
+  data.tar.gz: 16ec28b9b63b9aa81b7a10b1fd33cc6658907b1b70e441f349b57895890192f2934c7ce53f43fce095b211ae5c99378a9777cc6ccb12135790fcf658255b0f78

data/Gemfile

@@ -1,2 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 gemspec
+
+gem 'activesupport', require: 'active_support/all'

data/Gemfile.lock

@@ -1,15 +1,25 @@
 PATH
   remote: .
   specs:
-    upholsterer (0.4.1)
+    upholsterer (0.4.2)
+      activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
     awesome_print (1.2.0)
     coderay (1.0.9)
     diff-lcs (1.2.4)
+    i18n (0.6.11)
+    json (1.8.1)
     method_source (0.8.2)
+    minitest (5.4.2)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -34,11 +44,15 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
     slop (3.4.6)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
   pry-meta
   rake
   rspec

data/lib/upholsterer/base.rb

@@ -97,25 +97,53 @@ module Upholsterer
     # The presenter above will expose the methods +body+, +created_at+, and +user_name+.
     # Additionaly, it will create an alias called +author+ to the +name+ attribute.
     #
-    def self.expose(*attrs)
+    def self.expose(*attrs, &block)
       options = attrs.pop if attrs.last.kind_of?(Hash)
       options ||= {}
 
-      attrs.each do |attr_name|
-        subject = options.fetch(:with, nil)
+      container = options.fetch(:with, nil)
+      method_prefix = container if options.fetch(:prefix, true)
+
+      if block_given? and container.present?
+        wrapper_method = "#{ attrs.join('_') }_wrapper"
+        wrapper_instance_variable = "@#{ wrapper_method }"
+
+        define_method wrapper_method do
+          unless instance_variable_defined?(wrapper_instance_variable)
+            if respond_to?(container)
+              object_container = public_send(container)
+            else
+              object_container = subject.public_send(container)
+            end
 
+            wrapper = instance_eval(&block).new(object_container)
+
+            instance_variable_set(wrapper_instance_variable, wrapper)
+          end
+
+          instance_variable_get(wrapper_instance_variable)
+        end
+
+        private wrapper_method
+      end
+
+      attrs.each do |attr_name|
         method_name = [
-          subject,
+          method_prefix,
           options.fetch(:as, attr_name)
-        ].compact.join("_")
+        ].compact.join('_')
 
         attributes[method_name.to_sym] = [attr_name, options]
 
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{method_name}(&block)                                    # def user_name(&block)
-            proxy_message(#{subject.inspect}, "#{attr_name}", &block)   #   proxy_message("user", "name")
-          end                                                           # end
-        RUBY
+        if block_given? and container.present?
+          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
+          RUBY
+        end
       end
     end
     

data/lib/upholsterer/version.rb

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

data/simple_presenter.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'pry-meta'
+  s.add_dependency 'activesupport'
 end

data/spec/base_spec.rb

@@ -178,4 +178,30 @@ describe Upholsterer::Base do
     its([:user_name]) { should eq 'John Doe'}
     its([:post_title]) { should eq 'Some post'}
   end
+
+  describe 'expose with block' do
+    let(:project) { double id: 1, description: 'description', type: 'type' }
+    subject { CollectPresenter.new(entity) }
+
+    context 'Test presenter' do
+      let(:entity) { double name: 'Test', project: project, email: 'foo@bar.com' }
+
+      its(:id) { should eq 1 }
+      its(:name) { should eq 'Test' }
+      its(:email) { should eq 'foo@bar.com' }
+      its(:type) { should eq 'test_type' }
+      its(:description) { should eq 'test_description' }
+      its(:to_json) { should eq '{"name":"Test","email":"foo@bar.com","id":1,"description":"test_description","type":"test_type"}'}
+    end
+
+    context 'Real presenter' do
+      let(:entity) { double name: 'Real', project: project, email: 'foo@bar.com' }
+
+      its(:name) { should eq 'Real' }
+      its(:email) { should eq 'foo@bar.com' }
+      its(:type) { should eq 'real_type' }
+      its(:description) { should eq 'real_description' }
+      its(:to_json) { should eq '{"name":"Real","email":"foo@bar.com","id":1,"description":"real_description","type":"real_type"}'}
+    end
+  end
 end

data/spec/support/collect_presenter.rb

@@ -0,0 +1,35 @@
+class CollectPresenter < Presenter
+  expose :name, :email
+  expose :id, with: :project, prefix: false
+  expose :description, :type, with: :project, prefix: false do
+    "#{ name }ProjectPresenter".constantize
+  end
+end
+
+class TestProjectPresenter
+  def initialize(project)
+    @project = project
+  end
+
+  def description
+    "test_#{ @project.description}"
+  end
+
+  def type
+    "test_#{ @project.type }"
+  end
+end
+
+class RealProjectPresenter
+  def initialize(project)
+    @project = project
+  end
+
+  def description
+    "real_#{ @project.description}"
+  end
+
+  def type
+    "real_#{ @project.type }"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upholsterer
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Nando Vieira
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -54,6 +54,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple presenter/facade/decorator/whatever implementation.
 email:
 - fnando.vieira@gmail.com
@@ -79,6 +93,7 @@ files:
 - spec/base_spec.rb
 - spec/spec_helper.rb
 - spec/support/alias_presenter.rb
+- spec/support/collect_presenter.rb
 - spec/support/comment.rb
 - spec/support/comment_presenter.rb
 - spec/support/iterator_presenter.rb