draper 0.12.0 → 0.13.0

data/.travis.yml

@@ -1,6 +1,4 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - rbx
-  - ree
-  - jruby
+  - 1.9.3
+#  - rbx-19mode # not until rbx bug #1692 is resolved
+  - jruby-19mode

data/CHANGELOG.txt

@@ -1,8 +1,25 @@
 = Draper Changelog
 
-= Master
+= 0.13.0
 
-== 0.12.1
+* Upgraded all dependencies
+
+* Dropped support for Rubies < 1.9.3
+
+* #to_model has been renamed to #wrapped_object
+
+* Allow proper overriding of special ActiveModel methods
+
+== 0.12.2
+
+* Fix bug with initializing ammeter
+
+* Some gems are now development only in the gemspec
+
+* Fix bug where generated models were still inheriting from
+ApplicationDecorator
+
+== 0.12.0
 
 * Added Changelog
 

data/Gemfile

@@ -1,17 +1,3 @@
 source :rubygems
 
-gem 'rake'
-gem 'rspec', '~> 2.0'
-gem 'activesupport', '~> 3.1.3'
-gem 'actionpack', "~> 3.1.3", :require => 'action_view'
-gem 'ammeter', '~> 0.2.2', :require => 'ammeter/init'
-gem 'guard'
-gem 'guard-rspec'
-gem 'launchy'
-gem 'yard'
-
-group :development do
-  gem 'redcarpet'
-end
-
 gemspec

data/Readme.markdown

@@ -155,20 +155,12 @@ gem "draper"
 
 Then run `bundle` from the project directory.
 
-### Run the draper:install command
-
-This will create the `app/decorators` directory and the `ApplicationDecorator` inside it.
-
-```
-rails generate draper:install
-```
-
 ### Generate the Decorator
 
 To decorate a model named `Article`:
 
 ```
-rails generate draper:decorator article
+rails generate decorator article
 ```
 
 ### Writing Methods
@@ -176,7 +168,7 @@ rails generate draper:decorator article
 Open the decorator model (ex: `app/decorators/article_decorator.rb`) and add normal instance methods. To access the wrapped source object, use a method named after the `decorates` argument:
 
 ```ruby
-class ArticleDecorator < ApplicationDecorator
+class ArticleDecorator < Draper::Base
   decorates :article
   
   def author_name
@@ -190,7 +182,7 @@ end
 You probably want to make use of Rails helpers and those defined in your application. Use the `helpers` or `h` method proxy:
 
 ```ruby
-class ArticleDecorator < ApplicationDecorator
+class ArticleDecorator < Draper::Base
   decorates :article
   
   def published_at
@@ -206,7 +198,7 @@ end
 Hate seeing that `h.` proxy all over? Willing to mix a bazillion methods into your decorator? Then try lazy helpers:
 
 ```ruby
-class ArticleDecorator < ApplicationDecorator
+class ArticleDecorator < Draper::Base
   decorates :article
   include Draper::LazyHelpers
   
@@ -313,7 +305,7 @@ end
 Then you need to perform the wrapping in your controller. Here's the simplest method:
 
 ```ruby
-class ArticlesController < ApplicationController
+class ArticlesController < Draper::Decorator
   def show
     @article = ArticleDecorator.find params[:id]
   end
@@ -329,7 +321,7 @@ Then within your views you can utilize both the normal data methods and your new
 Ta-da! Object-oriented data formatting for your view layer. Below is the complete decorator with extra comments removed:
 
 ```ruby
-class ArticleDecorator < ApplicationDecorator
+class ArticleDecorator < Draper::Base
   decorates :article
   
   def published_at
@@ -345,12 +337,12 @@ end
 Add a `decorates_association :association_name` to gain access to a decorated version of your target association.
 
 ```ruby
-class ArticleDecorator < ApplicationDecorator
+class ArticleDecorator < Draper::Base
   decorates :article
   decorates_association :author # belongs_to :author association  
 end
 
-class AuthorDecorator < ApplicationDecorator
+class AuthorDecorator < Draper::Base
   decorates :author
   
   def fancy_name

data/draper.gemspec

@@ -15,6 +15,16 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency('activesupport', '>= 2.3.10')
-  s.add_development_dependency('redcarpet')
+
+  s.add_dependency 'activesupport', '~> 3.2'
+  s.add_dependency 'rake', '~> 0.9.2'
+  s.add_dependency 'rspec', '~> 2.10'
+  s.add_dependency 'activesupport', '~> 3.2'
+  s.add_dependency 'actionpack', '~> 3.2'
+
+  s.add_development_dependency 'ammeter', '~> 0.2.2'
+  s.add_development_dependency 'guard'
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'launchy'
+  s.add_development_dependency 'yard'
 end

data/lib/draper/active_model_support.rb

@@ -1,6 +1,6 @@
 module Draper::ActiveModelSupport
   module Proxies
-    def create_proxies
+    def self.extended(base)
       # These methods (as keys) will be created only if the correspondent
       # model descends from a specific class (as value)
       proxies = {}
@@ -9,16 +9,24 @@ module Draper::ActiveModelSupport
       proxies[:id]       = ActiveRecord::Base if defined?(ActiveRecord::Base)
 
       proxies.each do |method_name, dependency|
-        if model.kind_of?(dependency) || dependency.nil?
-          class << self
+        if base.model.kind_of?(dependency) || dependency.nil?
+          class << base
             self
           end.class_eval do
-            self.send(:define_method, method_name) do |*args, &block|
-              model.send(method_name, *args, &block)
+            if !base.class.instance_methods.include?(method_name) || base.class.instance_method(method_name).owner === Draper::Base
+              send(:define_method, method_name) do |*args, &block|
+                model.send(method_name, *args, &block)
+              end
             end
           end
         end
       end
+
+      base.class_eval do
+        def to_model
+          self
+        end
+      end
     end
   end
 end

data/lib/draper/base.rb

@@ -11,7 +11,7 @@ module Draper
     self.denied = DEFAULT_DENIED
     self.allowed = DEFAULT_ALLOWED
 
-    include Draper::ActiveModelSupport::Proxies
+
 
     # Initialize a new decorator instance by passing in
     # an instance of the source class. Pass in an optional
@@ -24,7 +24,7 @@ module Draper
       self.class.model_class = input.class if model_class.nil?
       @model = input.kind_of?(Draper::Base) ? input.model : input
       self.options = options
-      create_proxies
+      self.extend Draper::ActiveModelSupport::Proxies
     end
 
     # Proxies to the class specified by `decorates` to automatically
@@ -191,7 +191,7 @@ module Draper
     # Fetch the original wrapped model.
     #
     # @return [Object] original_model
-    def to_model
+    def wrapped_object
       @model
     end
 

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/lib/draper.rb

@@ -1,4 +1,6 @@
-require "draper/version"
+require 'action_view'
+
+require 'draper/version'
 require 'draper/system'
 require 'draper/active_model_support'
 require 'draper/base'

data/lib/generators/decorator/decorator_generator.rb

@@ -17,7 +17,7 @@ module Rails
       def parent_class_name
         if options[:parent]
           options[:parent]
-        elsif defined?(:ApplicationDecorator)
+        elsif defined?(ApplicationDecorator)
           "ApplicationDecorator"
         else
           "Draper::Base"

data/lib/generators/decorator/templates/decorator.rb

@@ -1,5 +1,5 @@
 <% module_namespacing do -%>
-class <%= class_name %>Decorator < ApplicationDecorator
+class <%= class_name %>Decorator < <%= parent_class_name %>
   decorates :<%= singular_name %>
 
   # Accessing Helpers

data/spec/draper/base_spec.rb

@@ -182,10 +182,9 @@ describe Draper::Base do
     end
   end
 
-  context(".model / .to_model") do
+  context(".wrapped_object") do
     it "should return the wrapped object" do
-      subject.to_model.should == source
-      subject.model.should == source
+      subject.wrapped_object.should == source
     end
   end
 
@@ -216,19 +215,33 @@ describe Draper::Base do
     end
 
     context "when an ActiveModel descendant" do
-      it "should always proxy to_param" do
+      it "should always proxy to_param if it is not defined on the decorator itself" do
         source.stub(:to_param).and_return(1)
         Draper::Base.new(source).to_param.should == 1
       end
 
-      it "should always proxy id" do
+      it "should always proxy id if it is not defined on the decorator itself" do
         source.stub(:id).and_return(123456789)
         Draper::Base.new(source).id.should == 123456789
       end
 
-      it "should always proxy errors" do
+      it "should always proxy errors if it is not defined on the decorator itself" do
         Draper::Base.new(source).errors.should be_an_instance_of ActiveModel::Errors
       end
+
+      it "should never proxy to_param if it is defined on the decorator itself" do
+        source.stub(:to_param).and_return(1)
+        DecoratorWithSpecialMethods.new(source).to_param.should == "foo"
+      end
+
+      it "should never proxy id if it is defined on the decorator itself" do
+        source.stub(:id).and_return(123456789)
+        DecoratorWithSpecialMethods.new(source).id.should == 1337
+      end
+
+      it "should never proxy errors if it is defined on the decorator itself" do
+        DecoratorWithSpecialMethods.new(source).errors.should be_an_instance_of Array
+      end
     end
 
     context "when not an ActiveModel descendant" do

data/spec/generators/decorator/decorator_generator_spec.rb

@@ -15,7 +15,7 @@ describe Rails::Generators::DecoratorGenerator do
     describe 'app/decorators/your_model_decorator.rb' do
       subject { file('app/decorators/your_model_decorator.rb') }
       it { should exist }
-      it { should contain "class YourModelDecorator < ApplicationDecorator" }
+      it { should contain "class YourModelDecorator < Draper::Base" }
       it { should contain "decorates :your_model" }
     end
   end
@@ -30,6 +30,27 @@ describe Rails::Generators::DecoratorGenerator do
     end
   end
 
+  context 'parent decorator' do
+    describe 'decorator inhereted from Draper::Base' do
+      before { run_generator ["YourModel"] }
+
+      subject { file('app/decorators/your_model_decorator.rb') }
+      it { should exist }
+      it { should contain "class YourModelDecorator < Draper::Base" }
+    end
+
+    describe "decorator inhereted from ApplicationDecorator if it's present" do
+      before do
+       class ApplicationDecorator; end
+       run_generator ["YourModel"]
+      end
+
+      subject { file('app/decorators/your_model_decorator.rb') }
+      it { should exist }
+      it { should contain "class YourModelDecorator < ApplicationDecorator" }
+    end
+  end
+
   context 'using rspec' do
     before { run_generator ["YourModel", "-t=rspec"]  }
 

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'ammeter/init'
 require 'rails'
 
 Bundler.require
@@ -13,6 +14,7 @@ require './spec/support/samples/decorator_with_allows'
 require './spec/support/samples/decorator_with_multiple_allows'
 require './spec/support/samples/decorator_with_application_helper'
 require './spec/support/samples/decorator_with_denies'
+require './spec/support/samples/decorator_with_special_methods'
 require './spec/support/samples/namespaced_product'
 require './spec/support/samples/namespaced_product_decorator'
 require './spec/support/samples/non_active_model_product'

data/spec/support/samples/decorator_with_special_methods.rb

@@ -0,0 +1,13 @@
+class DecoratorWithSpecialMethods < Draper::Base
+  def to_param
+    "foo"
+  end
+
+  def id
+    1337
+  end
+
+  def errors
+    ["omg errors!"]
+  end
+end

metadata

@@ -1,47 +1,182 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: draper
-version: !ruby/object:Gem::Version
-  version: 0.12.0
+version: !ruby/object:Gem::Version 
+  hash: 43
   prerelease: 
+  segments: 
+  - 0
+  - 13
+  - 0
+  version: 0.13.0
 platform: ruby
-authors:
+authors: 
 - Jeff Casimir
 - Steve Klabnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-05-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &70309298925200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 2
+        version: "3.2"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.10
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: *70309298925200
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: &70309298924340 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 10
+        version: "2.10"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 2
+        version: "3.2"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 2
+        version: "3.2"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: ammeter
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 2
+        - 2
+        version: 0.2.2
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: guard
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: launchy
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: yard
   prerelease: false
-  version_requirements: *70309298924340
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: Draper implements a decorator or presenter pattern for Rails applications.
-email:
+email: 
 - jeff@casimircreative.com
 - steve@steveklabnik.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -111,6 +246,7 @@ files:
 - spec/support/samples/decorator_with_application_helper.rb
 - spec/support/samples/decorator_with_denies.rb
 - spec/support/samples/decorator_with_multiple_allows.rb
+- spec/support/samples/decorator_with_special_methods.rb
 - spec/support/samples/namespaced_product.rb
 - spec/support/samples/namespaced_product_decorator.rb
 - spec/support/samples/non_active_model_product.rb
@@ -123,29 +259,38 @@ files:
 - spec/support/samples/widget_decorator.rb
 homepage: http://github.com/jcasimir/draper
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: draper
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Decorator pattern implementation for Rails.
-test_files:
+test_files: 
 - spec/draper/base_spec.rb
 - spec/draper/helper_support_spec.rb
 - spec/draper/model_support_spec.rb
@@ -161,6 +306,7 @@ test_files:
 - spec/support/samples/decorator_with_application_helper.rb
 - spec/support/samples/decorator_with_denies.rb
 - spec/support/samples/decorator_with_multiple_allows.rb
+- spec/support/samples/decorator_with_special_methods.rb
 - spec/support/samples/namespaced_product.rb
 - spec/support/samples/namespaced_product_decorator.rb
 - spec/support/samples/non_active_model_product.rb