bourgeois 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9b43bb505e57adbf599131cc6bdd4cad655630c
-  data.tar.gz: 06e720c2028ef5ba363f670106a820ea6057d2d7
+  metadata.gz: 16a4e2d690cff8618070daeeeb403f8bf16724ed
+  data.tar.gz: 3e6bc722e3ea4f211d17caf0a2d0ff144aa47323
 SHA512:
-  metadata.gz: ee3c41269548658fc037843c9c57a94edf01ce021e03a8c7d6f60b0d21b9a0b097bf1b245689f22288213a27b64e88ac7ce0ed6c15db4114b5b2c3e64f50d760
-  data.tar.gz: ce66af27e40e000b56f78b68ebf22d8c7f23ca4a23449317e78abc6c22931af644cfcaf464d08dcae6bf105076f5933e9e41a97b57735326454ae926777dc35a
+  metadata.gz: 514b62f8b51c41b6245b879e26feb8e5817d7a0a425db0882619e089e65db4bc2ea7980186e7f8ec5459d7cf83369b9b1a5c23bd8c04eb844bb6cc8b836e3b29
+  data.tar.gz: f8d20acd4122b98a70aa43469a82aaee0d974f1b1e725f802ad3a366d982907fc2ab2bbf4db0b55bc53256202457ac91f732de90ee3ca0a0367231e24f2bbb58

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Mirego
+Copyright (c) 2013-2014, Mirego
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -5,11 +5,11 @@
   <br />
   Bourgeois is a Ruby library that makes using presenters a very simple thing.
   <br /><br />
-  <a href="https://rubygems.org/gems/bourgeois"><img src="https://badge.fury.io/rb/bourgeois.png" /></a>
-  <a href="https://codeclimate.com/github/mirego/bourgeois"><img src="https://codeclimate.com/github/mirego/bourgeois.png" /></a>
-  <a href='https://coveralls.io/r/mirego/bourgeois?branch=master'><img src='https://coveralls.io/repos/mirego/bourgeois/badge.png?branch=master' /></a>
-  <a href='https://gemnasium.com/mirego/bourgeois'><img src="https://gemnasium.com/mirego/bourgeois.png" /></a>
-  <a href="https://travis-ci.org/mirego/bourgeois"><img src="https://travis-ci.org/mirego/bourgeois.png?branch=master" /></a>
+  <a href="https://rubygems.org/gems/bourgeois"><img src="http://img.shields.io/gem/v/bourgeois.svg" /></a>
+  <a href="https://codeclimate.com/github/mirego/bourgeois"><img src="http://img.shields.io/codeclimate/github/mirego/bourgeois.svg" /></a>
+  <a href='https://coveralls.io/r/mirego/bourgeois?branch=master'><img src="http://img.shields.io/coveralls/mirego/bourgeois.svg" /></a>
+  <a href='https://gemnasium.com/mirego/bourgeois'><img src="http://img.shields.io/gemnasium/mirego/bourgeois.svg" /></a>
+  <a href="https://travis-ci.org/mirego/bourgeois"><img src="http://img.shields.io/travis/mirego/bourgeois.svg" /></a>
 </p>
 
 ---
@@ -94,7 +94,7 @@ Bourgeois was inspired by some code [@rafBM](https://twitter.com/rafBM) wrote fo
 
 ## License
 
-`Bourgeois` is © 2013 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the [`LICENSE.md`](https://github.com/mirego/bourgeois/blob/master/LICENSE.md) file.
+`Bourgeois` is © 2013-2014 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the [`LICENSE.md`](https://github.com/mirego/bourgeois/blob/master/LICENSE.md) file.
 
 ## About Mirego
 

data/lib/bourgeois/presenter.rb

@@ -47,6 +47,29 @@ module Bourgeois
       end
     end
 
+    # Wrap a resource or a collection into its related presenter
+    #
+    # @example
+    #   present User.new(name: 'Remi') do |user|
+    #     puts user.inspect # => #<UserPresenter object=#<User name="Remi>>
+    #     puts user.name # => Remi
+    #   end
+    def self.present(object, klass = self, &blk)
+      return if object.nil?
+      return object.map { |o| present(o, klass, &blk) } if object.respond_to?(:to_a) && !object.is_a?(Struct)
+
+      if object.is_a?(Bourgeois::Presenter)
+        presenter = object
+      else
+        klass ||= presenter_class(object)
+      end
+
+      presenter ||= klass.new(object, self)
+      yield presenter if block_given?
+
+      presenter
+    end
+
   private
 
     # Return the view from where the presenter was created
@@ -58,6 +81,13 @@ module Bourgeois
       @klass ||= name.split(/Presenter$/).first.constantize
     end
 
+    def self.presenter_class(object)
+      klass_name = "#{object.class}Presenter"
+      klass_name.constantize
+    rescue ::NameError
+      raise UnknownPresenter, klass_name
+    end
+
     # Execute a helper block if it matches conditions
     def execute_helper(block, opts)
       if_condition = execute_helper_condition(opts[:if])

data/lib/bourgeois/version.rb

@@ -1,3 +1,3 @@
 module Bourgeois
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/bourgeois/view_helper.rb

@@ -1,33 +1,7 @@
 module Bourgeois
   module ViewHelper
-    # Wrap a resource or a collection into its related presenter
-    #
-    # @example
-    #   present User.new(name: 'Remi') do |user|
-    #     puts user.inspect # => #<UserPresenter object=#<User name="Remi>>
-    #     puts user.name # => Remi
-    #   end
     def present(object, klass = nil, &blk)
-      return if object.nil?
-      return object.map { |o| present(o, klass, &blk) } if object.respond_to?(:to_a) && !object.is_a?(Struct)
-
-      if object.is_a?(Bourgeois::Presenter)
-        presenter = object
-      else
-        klass ||= ViewHelper.presenter_class(object)
-      end
-
-      presenter ||= klass.new(object, self)
-      yield presenter if block_given?
-
-      presenter
-    end
-
-    def self.presenter_class(object)
-      klass_name = "#{object.class}Presenter"
-      klass_name.constantize
-    rescue ::NameError
-      raise UnknownPresenter, klass_name
+      Bourgeois::Presenter.present(object, klass, &blk)
     end
   end
 end

data/spec/bourgeois/presenter_spec.rb

@@ -257,5 +257,160 @@ describe Bourgeois::Presenter do
 
       it { expect(UserPresenter.human_attribute_name).to eql :foo }
     end
+
+    describe :present do
+      let(:view) { ActionView::Base.new }
+
+      before do
+        class UserPresenter < Bourgeois::Presenter
+          def formatted_name
+            "#{first_name} #{last_name}".strip
+          end
+        end
+
+        class User < OpenStruct; end
+      end
+
+      context 'on a Nil object' do
+        context 'without a block' do
+          it { expect { view.present(nil) }.not_to raise_error }
+        end
+
+        context 'with a block' do
+          before { UserPresenter.any_instance.should_receive(:formatted_name).never }
+
+          specify do
+            expect do
+              view.present(nil) { |obj| obj.formatted_name }
+            end.not_to raise_error
+          end
+        end
+      end
+
+      context 'on a single resource' do
+        let(:user) { User.new first_name: 'Patrick', last_name: 'Bourgeois' }
+
+        context 'without a block' do
+          it { expect(view.present(user).formatted_name).to eql 'Patrick Bourgeois' }
+        end
+
+        context 'with a block' do
+          specify do
+            view.present(user) do |u|
+              expect(u.formatted_name).to eql 'Patrick Bourgeois'
+            end
+          end
+        end
+      end
+
+      context 'on a single already-presented resource' do
+        let(:user) { User.new first_name: 'Patrick', last_name: 'Bourgeois' }
+        let(:presenter) { UserPresenter.new(user) }
+
+        context 'without a block' do
+          it { expect(view.present(presenter).formatted_name).to eql 'Patrick Bourgeois' }
+        end
+
+        context 'with a block' do
+          specify do
+            view.present(presenter) do |u|
+              expect(u.formatted_name).to eql 'Patrick Bourgeois'
+            end
+          end
+        end
+      end
+
+      context 'on a collection of resources' do
+        let(:user1) { User.new first_name: 'Patrick', last_name: 'Bourgeois' }
+        let(:user2) { User.new first_name: 'Francois', last_name: 'Jean' }
+        let(:user3) { User.new first_name: 'Alain', last_name: 'Lapointe' }
+        let(:users) { [user1, user2, user3] }
+
+        specify do
+          output = []
+          view.present(users) { |u| output << u.formatted_name }
+
+          expect(output).to eql ['Patrick Bourgeois', 'Francois Jean', 'Alain Lapointe']
+        end
+      end
+
+      context 'on a collection of already-presented resources' do
+        let(:user1) { User.new first_name: 'Patrick', last_name: 'Bourgeois' }
+        let(:user2) { User.new first_name: 'Francois', last_name: 'Jean' }
+        let(:user3) { User.new first_name: 'Alain', last_name: 'Lapointe' }
+        let(:users) { [UserPresenter.new(user1), UserPresenter.new(user2), UserPresenter.new(user3)] }
+
+        specify do
+          output = []
+          view.present(users) { |u| output << u.formatted_name }
+
+          expect(output).to eql ['Patrick Bourgeois', 'Francois Jean', 'Alain Lapointe']
+        end
+      end
+
+      context 'on a resource without a defined presenter class' do
+        before do
+          class Project < OpenStruct; end
+        end
+
+        let(:project) { Project.new name: 'Les B.B.' }
+        it { expect { view.present(project) }.to raise_error(Bourgeois::UnknownPresenter, 'unknown presenter class ProjectPresenter') }
+      end
+
+      context 'on a resource with a custom presenter class' do
+        before do
+          class Article < OpenStruct; end
+          class CustomArticlePresenter < Bourgeois::Presenter
+            def name
+              super.upcase
+            end
+          end
+        end
+
+        let(:article) { Article.new name: 'Les B.B.' }
+        let(:presented_article) { view.present(article, CustomArticlePresenter) }
+
+        it { expect { presented_article }.not_to raise_error }
+        it { expect(presented_article.name).to eql 'LES B.B.' }
+      end
+
+      context 'on a Struct-based resource' do
+        before do
+          class Band < Struct.new(:name)
+          end
+
+          class BandPresenter < Bourgeois::Presenter
+            def name
+              super.upcase
+            end
+          end
+        end
+
+        let(:band) { Band.new('Les B.B.') }
+        let(:presented_band) { view.present(band) }
+
+        it { expect(presented_band.name).to eql 'LES B.B.' }
+      end
+
+      context 'on a collection of resources with a custom presenter class' do
+        before do
+          class Article < OpenStruct; end
+          class CustomArticlePresenter < Bourgeois::Presenter
+            def name
+              super.upcase
+            end
+          end
+        end
+
+        let(:articles) { [Article.new(name: 'Les B.B.'), Article.new(name: 'Rock et Belles Oreilles')] }
+
+        specify do
+          output = []
+          view.present(articles, CustomArticlePresenter) { |u| output << u.name }
+
+          expect(output).to eql ['LES B.B.', 'ROCK ET BELLES OREILLES']
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bourgeois
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -134,7 +134,6 @@ files:
 - lib/bourgeois/version.rb
 - lib/bourgeois/view_helper.rb
 - spec/bourgeois/presenter_spec.rb
-- spec/bourgeois/view_helper_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mirego/bourgeois
 licenses:
@@ -162,5 +161,4 @@ specification_version: 4
 summary: Bourgeois is a Ruby library that makes using presenters a very simple thing.
 test_files:
 - spec/bourgeois/presenter_spec.rb
-- spec/bourgeois/view_helper_spec.rb
 - spec/spec_helper.rb

data/spec/bourgeois/view_helper_spec.rb

@@ -1,158 +0,0 @@
-require 'spec_helper'
-
-describe Bourgeois::ViewHelper do
-  describe :present do
-    let(:view) { ActionView::Base.new }
-
-    before do
-      class UserPresenter < Bourgeois::Presenter
-        def formatted_name
-          "#{first_name} #{last_name}".strip
-        end
-      end
-
-      class User < OpenStruct; end
-    end
-
-    context 'on a Nil object' do
-      context 'without a block' do
-        it { expect { view.present(nil) }.not_to raise_error }
-      end
-
-      context 'with a block' do
-        before { UserPresenter.any_instance.should_receive(:formatted_name).never }
-
-        specify do
-          expect do
-            view.present(nil) { |obj| obj.formatted_name }
-          end.not_to raise_error
-        end
-      end
-    end
-
-    context 'on a single resource' do
-      let(:user) { User.new first_name: 'Patrick', last_name: 'Bourgeois' }
-
-      context 'without a block' do
-        it { expect(view.present(user).formatted_name).to eql 'Patrick Bourgeois' }
-      end
-
-      context 'with a block' do
-        specify do
-          view.present(user) do |u|
-            expect(u.formatted_name).to eql 'Patrick Bourgeois'
-          end
-        end
-      end
-    end
-
-    context 'on a single already-presented resource' do
-      let(:user) { User.new first_name: 'Patrick', last_name: 'Bourgeois' }
-      let(:presenter) { UserPresenter.new(user) }
-
-      context 'without a block' do
-        it { expect(view.present(presenter).formatted_name).to eql 'Patrick Bourgeois' }
-      end
-
-      context 'with a block' do
-        specify do
-          view.present(presenter) do |u|
-            expect(u.formatted_name).to eql 'Patrick Bourgeois'
-          end
-        end
-      end
-    end
-
-    context 'on a collection of resources' do
-      let(:user1) { User.new first_name: 'Patrick', last_name: 'Bourgeois' }
-      let(:user2) { User.new first_name: 'Francois', last_name: 'Jean' }
-      let(:user3) { User.new first_name: 'Alain', last_name: 'Lapointe' }
-      let(:users) { [user1, user2, user3] }
-
-      specify do
-        output = []
-        view.present(users) { |u| output << u.formatted_name }
-
-        expect(output).to eql ['Patrick Bourgeois', 'Francois Jean', 'Alain Lapointe']
-      end
-    end
-
-    context 'on a collection of already-presented resources' do
-      let(:user1) { User.new first_name: 'Patrick', last_name: 'Bourgeois' }
-      let(:user2) { User.new first_name: 'Francois', last_name: 'Jean' }
-      let(:user3) { User.new first_name: 'Alain', last_name: 'Lapointe' }
-      let(:users) { [UserPresenter.new(user1), UserPresenter.new(user2), UserPresenter.new(user3)] }
-
-      specify do
-        output = []
-        view.present(users) { |u| output << u.formatted_name }
-
-        expect(output).to eql ['Patrick Bourgeois', 'Francois Jean', 'Alain Lapointe']
-      end
-    end
-
-    context 'on a resource without a defined presenter class' do
-      before do
-        class Project < OpenStruct; end
-      end
-
-      let(:project) { Project.new name: 'Les B.B.' }
-      it { expect { view.present(project) }.to raise_error(Bourgeois::UnknownPresenter, 'unknown presenter class ProjectPresenter') }
-    end
-
-    context 'on a resource with a custom presenter class' do
-      before do
-        class Article < OpenStruct; end
-        class CustomArticlePresenter < Bourgeois::Presenter
-          def name
-            super.upcase
-          end
-        end
-      end
-
-      let(:article) { Article.new name: 'Les B.B.' }
-      let(:presented_article) { view.present(article, CustomArticlePresenter) }
-
-      it { expect { presented_article }.not_to raise_error }
-      it { expect(presented_article.name).to eql 'LES B.B.' }
-    end
-
-    context 'on a Struct-based resource' do
-      before do
-        class Band < Struct.new(:name)
-        end
-
-        class BandPresenter < Bourgeois::Presenter
-          def name
-            super.upcase
-          end
-        end
-      end
-
-      let(:band) { Band.new('Les B.B.') }
-      let(:presented_band) { view.present(band) }
-
-      it { expect(presented_band.name).to eql 'LES B.B.' }
-    end
-
-    context 'on a collection of resources with a custom presenter class' do
-      before do
-        class Article < OpenStruct; end
-        class CustomArticlePresenter < Bourgeois::Presenter
-          def name
-            super.upcase
-          end
-        end
-      end
-
-      let(:articles) { [Article.new(name: 'Les B.B.'), Article.new(name: 'Rock et Belles Oreilles')] }
-
-      specify do
-        output = []
-        view.present(articles, CustomArticlePresenter) { |u| output << u.name }
-
-        expect(output).to eql ['LES B.B.', 'ROCK ET BELLES OREILLES']
-      end
-    end
-  end
-end