decent_decoration 0.0.2 → 0.0.3

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+notifications:
+  email:
+    recipients:
+      - pewniak747@gmail.com
+      - bartosz.kopinski@netguru.pl

data/README.md

@@ -1,4 +1,5 @@
 # decent_decoration
+[![Build Status](https://secure.travis-ci.org/netguru/decent_decoration.png?branch=master)](http://travis-ci.org/netguru/decent_decoration)
 
 decent_decoration allows you to use excellent [decent_exposure][decent_exposure] gem with decorators.
 

data/Rakefile

@@ -1 +1,5 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task :default  => :spec

data/decent_decoration.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-rails', '~> 2.7'
   gem.add_development_dependency 'actionpack', '~> 3.1'
   gem.add_development_dependency 'activesupport', '~> 3.1'
+  gem.add_development_dependency 'draper', '>= 1.0.0'
 end

data/lib/decent_decoration/decorate.rb

@@ -1,14 +1,21 @@
 module DecentDecoration
   module Decorate
     def expose_decorated(name, options = {}, &block)
-      decorator_class = options.delete(:decorator) || "#{name.to_s.singularize.classify}Decorator".constantize
-      decorated_name = name.to_sym
-      undecorated_name = "undecorated_#{name}".to_sym
+      options[:model] ||= name
+      original_name = name.to_s
+      plural_name = original_name.pluralize
+      singular_name = original_name.singularize
+      decorator_class = options.delete(:decorator) || "#{options[:model].to_s.classify}Decorator".constantize
+
+      if plural_name == original_name && plural_name != singular_name && decorator_class.respond_to?(:decorate_collection)
+        decorate_method = :decorate_collection
+      else
+        decorate_method = decorator_class.respond_to?(:decorate) ? :decorate : :new
+      end
 
-      options[:model] ||= decorated_name
-      decorate_method = decorator_class.respond_to?(:decorate) ? :decorate : :new
+      undecorated_name = "undecorated_#{name}".to_sym
       expose(undecorated_name, options, &block)
-      expose(decorated_name) { decorator_class.public_send(decorate_method, public_send(undecorated_name)) }
+      expose(name) { decorator_class.public_send(decorate_method, public_send(undecorated_name)) }
     end
   end
 end

data/lib/decent_decoration/version.rb

@@ -1,3 +1,3 @@
 module DecentDecoration
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/fixtures/controllers.rb

@@ -1,24 +1,23 @@
-require 'fixtures/fake_rails_application'
+class ConferencesController < ActionController::Base
+  include Rails.application.routes.url_helpers
 
-class Conference
-  attr_accessor :name, :location
-  extend ActiveModel::Naming
-  def initialize(attrs={})
-    self.attributes = attrs
-  end
-  def self.find(id)
-    new if id
+  expose_decorated(:conference)
+  expose_decorated(:other_conference, model: Conference, decorator: CoolConferenceDecorator)
+
+  def show
+    render :text => "foo"
   end
-  def attributes=(attributes)
-    attributes.each { |k,v| send("#{k}=", v) }
+
+  def new
+    render :text => "foo"
   end
 end
 
-class ConferencesController < ActionController::Base
+class AttendeesController < ActionController::Base
   include Rails.application.routes.url_helpers
 
-  expose_decorated(:conference)
-  expose_decorated(:other_conference, model: Conference, decorator: CoolConferenceDecorator)
+  expose_decorated(:attendee)
+  expose_decorated(:attendees) { [Attendee.new, Attendee.new] }
 
   def show
     render :text => "foo"

data/spec/fixtures/decorators.rb

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'draper'
 
 class ConferenceDecorator < SimpleDelegator
   def decorated_object
@@ -8,3 +9,13 @@ end
 
 class CoolConferenceDecorator < ConferenceDecorator
 end
+
+class AttendeeDecorator < Draper::Decorator
+  def full_name
+    "#{first_name} #{last_name}"
+  end
+
+  def self.find(id)
+    Attendee.find(id)
+  end
+end

data/spec/fixtures/fake_rails_application.rb

@@ -16,6 +16,8 @@ module Rails
       @routes.draw do
         get '/conferences/new' => "conferences#new"
         get '/conference/(:id)' => "conferences#show"
+        get '/attendees/new' => "attendees#new"
+        get '/attendee/(:id)' => "attendees#show"
       end
       @routes
     end
@@ -27,3 +29,7 @@ module Rails
     @app ||= App.new
   end
 end
+
+require 'fixtures/models'
+require 'fixtures/decorators'
+require 'fixtures/controllers'

data/spec/fixtures/models.rb

@@ -0,0 +1,31 @@
+module Model
+  extend ActiveModel::Naming
+
+  def initialize(attrs={})
+    self.attributes = attrs
+  end
+
+  def attributes=(attributes)
+    attributes.each { |k,v| send("#{k}=", v) }
+  end
+
+  def self.included(klass)
+    def klass.find(id)
+      new if id
+    end
+
+    def klass.scoped
+      self
+    end
+  end
+end
+
+class Conference
+  include Model
+  attr_accessor :name, :location
+end
+
+class Attendee
+  include Model
+  attr_accessor :first_name, :last_name
+end

data/spec/integration/draper_spec.rb

@@ -0,0 +1,16 @@
+require 'fixtures/fake_rails_application'
+require 'rspec/rails'
+
+describe AttendeesController, type: :controller do
+  it "should be a decorator" do
+    get '/attendee/dave'
+    controller.attendee.should be_instance_of(AttendeeDecorator)
+  end
+
+  it "should be a decorator in collection" do
+    get '/attendee/dave'
+    controller.attendees.each do |attendee|
+      attendee.should be_instance_of(AttendeeDecorator)
+    end
+  end
+end

data/spec/integration/rails_application_spec.rb

@@ -1,5 +1,4 @@
-require 'fixtures/decorators'
-require 'fixtures/controllers'
+require 'fixtures/fake_rails_application'
 require 'rspec/rails'
 
 describe ConferencesController, type: :controller do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decent_decoration
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decent_exposure
@@ -91,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: draper
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Use decent_exposure with decorators (e.g. Draper)
 email:
 - pewniak747@gmail.com
@@ -99,6 +115,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -110,6 +127,8 @@ files:
 - spec/fixtures/controllers.rb
 - spec/fixtures/decorators.rb
 - spec/fixtures/fake_rails_application.rb
+- spec/fixtures/models.rb
+- spec/integration/draper_spec.rb
 - spec/integration/rails_application_spec.rb
 homepage: https://github.com/netguru/decent_decoration
 licenses: []
@@ -131,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Use decent_exposure with decorators (e.g. Draper)
@@ -139,5 +158,6 @@ test_files:
 - spec/fixtures/controllers.rb
 - spec/fixtures/decorators.rb
 - spec/fixtures/fake_rails_application.rb
+- spec/fixtures/models.rb
+- spec/integration/draper_spec.rb
 - spec/integration/rails_application_spec.rb
-has_rdoc: