bourgeois 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2bc10e6f30ee29a0b8bb2fd612ef97f8f67cf49
-  data.tar.gz: c31c4dba94b71fcf88b06523325523644863f633
+  metadata.gz: c9b43bb505e57adbf599131cc6bdd4cad655630c
+  data.tar.gz: 06e720c2028ef5ba363f670106a820ea6057d2d7
 SHA512:
-  metadata.gz: 8f635a2839bf1ad9d0a3a1b2825103675cd284062b080a4eb774df234fbbf9803333f2ba27d0706b1cbbaba11dc618ea2c8849c5a6c699ae7f911b75706dd8b1
-  data.tar.gz: 56923d9ed6669f71491150fb08bd65885e9363cb57e2d62f057ab9f48ba8c2dd0d736d012e840fcbcf7932dc23f414b6f02cfd67f084c4071eee460a0b0f4783
+  metadata.gz: ee3c41269548658fc037843c9c57a94edf01ce021e03a8c7d6f60b0d21b9a0b097bf1b245689f22288213a27b64e88ac7ce0ed6c15db4114b5b2c3e64f50d760
+  data.tar.gz: ce66af27e40e000b56f78b68ebf22d8c7f23ca4a23449317e78abc6c22931af644cfcaf464d08dcae6bf105076f5933e9e41a97b57735326454ae926777dc35a

data/.rubocop.yml

@@ -0,0 +1,42 @@
+AllCops:
+  Includes:
+    - Gemfile
+    - Rakefile
+
+Documentation:
+  Enabled: false
+
+Encoding:
+  Enabled: false
+
+LineLength:
+  Max: 200
+
+AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+IfUnlessModifier:
+  Enabled: false
+
+CaseIndentation:
+  IndentWhenRelativeTo: case
+  IndentOneStep: true
+
+MethodLength:
+  CountComments: false
+  Max: 20
+
+SignalException:
+  Enabled: false
+
+ColonMethodCall:
+  Enabled: false
+
+AsciiComments:
+  Enabled: false
+
+Lambda:
+  Enabled: false
+
+RegexpLiteral:
+  Enabled: false

data/.travis.yml

@@ -9,3 +9,11 @@ gemfile:
   - gemfiles/Gemfile.activemodel-3.2.x
 
 script: "echo 'DO IT' && bundle exec rake spec"
+
+notifications:
+  hipchat:
+    rooms:
+      secure: "Xo3Uv+mvgPuQjF5J5T05mGoxE8LeoTrBjBRvnFSnX2tmrKvKoBLG0LMIg0A8TpI0usohnk7xF3FbAFq4n3xTnkCsrU3KAWOIw5c7Hh0wVTM67A8qh26+RVJSE/8oSUebCJxdiC2uSQcAsz405RR23FP/z8luKLtc6xKkqNMrJSM="
+    template:
+      - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} (<a href="%{build_url}">Build</a>/<a href="%{compare_url}">Changes</a>)'
+    format: 'html'

data/README.md

@@ -98,6 +98,6 @@ Bourgeois was inspired by some code [@rafBM](https://twitter.com/rafBM) wrote fo
 
 ## About Mirego
 
-Mirego is a team of passionate people who believe that work is a place where you can innovate and have fun. We proudly build mobile applications for [iPhone](http://mirego.com/en/iphone-app-development/ "iPhone application development"), [iPad](http://mirego.com/en/ipad-app-development/ "iPad application development"), [Android](http://mirego.com/en/android-app-development/ "Android application development"), [Blackberry](http://mirego.com/en/blackberry-app-development/ "Blackberry application development"), [Windows Phone](http://mirego.com/en/windows-phone-app-development/ "Windows Phone application development") and [Windows 8](http://mirego.com/en/windows-8-app-development/ "Windows 8 application development") in beautiful Quebec City.
+[Mirego](http://mirego.com) is a team of passionate people who believe that work is a place where you can innovate and have fun. We're a team of [talented people](http://life.mirego.com) who imagine and build beautiful Web and mobile applications. We come together to share ideas and [change the world](http://mirego.org).
 
-We also love [open-source software](http://open.mirego.com/) and we try to extract as much code as possible from our projects to give back to the community.
+We also [love open-source software](http://open.mirego.com) and we try to give back to the community as much as we can.

data/bourgeois.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'rubocop'
 end

data/lib/bourgeois.rb

@@ -10,7 +10,7 @@ require 'bourgeois/view_helper'
 
 module Bourgeois
   def self.inject_into_action_view
-    @inject_into_action_view ||= Proc.new do
+    @inject_into_action_view ||= proc do
       ActionView::Base.send(:include, ViewHelper)
     end
   end

data/lib/bourgeois/presenter.rb

@@ -1,5 +1,8 @@
 module Bourgeois
   class Presenter < ::SimpleDelegator
+    # Return the original delegated object
+    attr_reader :object
+
     def initialize(object, view = nil)
       @view = view
       super(@object = object)
@@ -40,36 +43,37 @@ module Bourgeois
     #   end
     def self.helper(name, opts = {})
       define_method(name) do |&block|
-        execute = true
-
-        if opts[:if]
-          execute = execute && self.instance_exec(&opts[:if])
-        end
-
-        if opts[:unless]
-          execute = execute && !self.instance_exec(&opts[:unless])
-        end
-
-        block.call if execute
+        execute_helper(block, opts)
       end
     end
 
   private
 
     # Return the view from where the presenter was created
-    def view
-      @view
-    end
-
-    # Return the original delegated object
-    def object
-      @object
-    end
+    attr_reader :view
 
     # Return the original object class based on the presenter class name
     # We would be able to use `@object.class` but we need this in class methods
     def self.klass
-      @klass ||= self.name.split(/Presenter$/).first.constantize
+      @klass ||= name.split(/Presenter$/).first.constantize
+    end
+
+    # Execute a helper block if it matches conditions
+    def execute_helper(block, opts)
+      if_condition = execute_helper_condition(opts[:if])
+      unless_condition = !execute_helper_condition(opts[:unless], false)
+
+      block.call if if_condition && unless_condition
+    end
+
+    # Execute a block within the context of the instance and return
+    # the result. Return a default value if the passed block is blank
+    def execute_helper_condition(block, default = true)
+      if block.blank?
+        default
+      else
+        instance_exec(&block)
+      end
     end
   end
 end

data/lib/bourgeois/version.rb

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

data/lib/bourgeois/view_helper.rb

@@ -8,19 +8,13 @@ module Bourgeois
     #     puts user.name # => Remi
     #   end
     def present(object, klass = nil, &blk)
-      return object.map { |o| present(o, klass, &blk) } if object.respond_to?(:to_a)
+      return if object.nil?
+      return object.map { |o| present(o, klass, &blk) } if object.respond_to?(:to_a) && !object.is_a?(Struct)
 
-      if klass.blank?
-        if object.is_a?(Bourgeois::Presenter)
-          presenter = object
-        else
-          begin
-            klass_name = "#{object.class}Presenter"
-            klass = klass_name.constantize
-          rescue ::NameError
-            raise UnknownPresenter.new(klass_name)
-          end
-        end
+      if object.is_a?(Bourgeois::Presenter)
+        presenter = object
+      else
+        klass ||= ViewHelper.presenter_class(object)
       end
 
       presenter ||= klass.new(object, self)
@@ -28,5 +22,12 @@ module Bourgeois
 
       presenter
     end
+
+    def self.presenter_class(object)
+      klass_name = "#{object.class}Presenter"
+      klass_name.constantize
+    rescue ::NameError
+      raise UnknownPresenter, klass_name
+    end
   end
 end

data/spec/bourgeois/presenter_spec.rb

@@ -34,7 +34,7 @@ describe Bourgeois::Presenter do
         class User < OpenStruct; end
       end
 
-      it { expect{ UserPresenter.new(user) }.to_not raise_error }
+      it { expect { UserPresenter.new(user) }.to_not raise_error }
     end
 
     describe :view do

data/spec/bourgeois/view_helper_spec.rb

@@ -14,6 +14,22 @@ describe Bourgeois::ViewHelper do
       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' }
 
@@ -83,5 +99,60 @@ describe Bourgeois::ViewHelper do
       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

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-$:.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'coveralls'
 Coveralls.wear!

metadata

@@ -1,97 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: bourgeois
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Bourgeois is a Ruby library that makes using presenters a very simple
@@ -102,9 +116,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -131,17 +146,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Bourgeois is a Ruby library that makes using presenters a very simple thing.