draper 0.5.0 → 0.7.0

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
+*.rvmrc
 .bundle
 Gemfile.lock
 pkg/*
 coverage.data
-coverage/*
+coverage/*

data/Rakefile

@@ -1,19 +1,47 @@
 require 'bundler/gem_tasks'
+require 'rake'
+require 'rspec/core/rake_task'
 
-namespace :cover_me do
+RCOV = RUBY_VERSION.to_f == 1.8  
+
+namespace :spec do
+  
+  RSpec::Core::RakeTask.new(:coverage) do |t|
+    t.pattern = 'spec/**/*_spec.rb'
+    
+    if RCOV    
+      t.rcov = true
+      t.rcov_opts = '--exclude osx\/objc,spec,gems\/'
+    end
+  end
   
-  desc "Generates and opens code coverage report."
-  task :report do
-    require 'cover_me'
-    CoverMe.complete!
+  RSpec::Core::RakeTask.new(:normal) do |t|
+    t.pattern ='spec/**/*_spec.rb'
+    t.rcov = false
+  end
+  
+  namespace :coverage do
+    desc "Cleanup coverage data"
+    task :cleanup do
+      rm_rf 'coverage.data'
+      rm_rf 'coverage'
+    end
+    
+    desc "Browse the code coverage report."
+    task :report => ["spec:coverage:cleanup", "spec:coverage"] do
+      if RCOV
+        require "launchy"
+        Launchy.open("coverage/index.html")
+      else
+        require 'cover_me'
+        CoverMe.complete!
+      end
+    end
   end
   
 end
 
-task :test do
-  Rake::Task['cover_me:report'].invoke
-end
+desc "RSpec tests"
+task "spec" => "spec:normal"
 
-task :spec do
-  Rake::Task['cover_me:report'].invoke
-end
+task "default" => "spec"

data/Readme.markdown

@@ -3,25 +3,29 @@
 ## Quick Start
 
 1. Add `gem 'draper'` to your `Gemfile` and `bundle`
-2. Run `rails g draper:model YourModel`
-3. Edit `app/decorators/your_model_decorator.rb` using:
+2. Run `rails g draper:decorator YourModel`
+3. Edit `app/decorators/[your_model]_decorator.rb` using:
   1. `h` to proxy to Rails/application helpers like `h.current_user`
   2. `model` to access the wrapped object like `model.created_at`
-4. Wrap models in your controller with the decorator using:
-  1. `.find` automatic lookup & wrap: `ArticleDecorator.find(1)`
-  2. `.decorate` method with single object or collection: `ArticleDecorator.decorate(Article.all)`
-  3. `.new` method with single object: `ArticleDecorator.new(Article.first)`
-5. Call and output the methods in your view templates as normal
+4. Put common decorations in `app/decorators/application.rb`  
+5. Wrap models in your controller with the decorator using:
+  1. `.find` automatic lookup & wrap
+    ex: `ArticleDecorator.find(1)`
+  2. `.decorate` method with single object or collection, 
+    ex: `ArticleDecorator.decorate(Article.all)`
+  3. `.new` method with single object
+    ex: `ArticleDecorator.new(Article.first)`
+6. Output the instance methods in your view templates
+  ex: `@article_decorator.created_at`
 
 ## Goals
 
-This gem makes it easy to apply the decorator pattern to the data models in a Rails application. This gives you three wins:
+This gem makes it easy to apply the decorator pattern to domain models in a Rails application. This pattern gives you three wins:
 
 1. Replace most helpers with an object-oriented approach
 2. Filter data at the presentation level
 3. Enforce an interface between your controllers and view templates.
 
-
 ### 1. Object Oriented Helpers
 
 Why hate helpers? In Ruby/Rails we approach everything from an Object-Oriented perspective, then with helpers we get procedural.The job of a helper is to take in data and output a presentation-ready string. We can do that with a decorator.
@@ -29,7 +33,7 @@ Why hate helpers? In Ruby/Rails we approach everything from an Object-Oriented p
 A decorator wraps an object with presentation-related accessor methods. For instance, if you had an `Article` object, then the decorator could override `.published_at` to use formatted output like this:
 
 ```ruby
-class ArticleDecorator < Draper::Base
+class ArticleDecorator < ApplicationDecorator
   decorates :article
   def published_at
     date = h.content_tag(:span, model.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
@@ -50,7 +54,7 @@ How would you handle this in the model layer? You'd probably pass the `current_u
 When you use a decorator you have the power of a Ruby object but it's a part of the view layer. This is where your `to_xml` belongs. You can access your `current_user` helper method using the `h` proxy available in the decorator:
 
 ```ruby
-class ArticleDecorator < Draper::Base
+class ArticleDecorator < ApplicationDecorator
   decorates :article
   ADMIN_VISIBLE_ATTRIBUTES = [:title, :body, :author, :status]
   PUBLIC_VISIBLE_ATTRIBUTES = [:title, :body]
@@ -71,7 +75,7 @@ Want to strictly control what methods are proxied to the original object? Use `d
 The `denies` method takes a blacklist approach. For instance:
 
 ```ruby
-class ArticleDecorator < Draper::Base
+class ArticleDecorator < ApplicationDecorator
   decorates :article
   denies :title
 end
@@ -91,7 +95,7 @@ NoMethodError: undefined method `title' for #<ArticleDecorator:0x000001020d7728>
 A better approach is to define a whitelist using `allows`:
 
 ```ruby
-class ArticleDecorator < Draper::Base
+class ArticleDecorator < ApplicationDecorator
   decorates :article
   allows :title, :description
 end
@@ -106,7 +110,7 @@ ruby-1.9.2-p290 :003 > ad.created_at
 NoMethodError: undefined method `created_at' for #<ArticleDecorator:0x000001020d7728>
 ```
 
-## Up an Running
+## Up and Running
 
 ### Setup
 
@@ -122,12 +126,24 @@ Run bundle:
 bundle
 ```
 
+#### Disable Rails Helper Generation (Optional) 
+
+When you generate a scaffold, Rails will create a matching helper file. If you're using decorators, this is probably unnecessary. You can disable the helper file creation by adding this to your `config/application.rb`
+
+```ruby
+config.generators do |g|
+  g.helper false
+end
+```
+
+If you want a helper, you can still call `rails generate helper` directly.
+
 ### Generate the Decorator
 
 To decorate a model named `Article`:
 
 ```
-rails generate draper:model Article
+rails generate draper:decorator Article
 ```
 
 ### Writing Methods
@@ -135,7 +151,7 @@ rails generate draper:model Article
 Open the decorator model (ex: `app/decorators/article_decorator.rb`) and add normal instance methods. To access the wrapped source object, use the `model` method:
 
 ```ruby
-class Article < Draper::Base
+class ArticleDecorator < ApplicationDecorator
   decorates :article
   
   def author_name
@@ -144,13 +160,12 @@ class Article < Draper::Base
 end
 ```
 
-
 ### Using Existing Helpers
 
 You probably want to make use of Rails helpers and those defined in your application. Use the `helpers` or `h` method proxy:
 
 ```ruby
-class Article < Draper::Base
+class ArticleDecorator < ApplicationDecorator
   decorates :article
   
   def published_at
@@ -161,6 +176,23 @@ class Article < Draper::Base
 end
 ```
 
+#### Lazy Helpers
+
+Hate seeing that `h.` proxy all over? Willing to mix a bazillion methods into your decorator? Then try lazy helpers:
+
+```ruby
+class ArticleDecorator < ApplicationDecorator
+  decorates :article
+  lazy_helpers
+  
+  def published_at
+    date = content_tag(:span, model.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
+    time = content_tag(:span, model.published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
+    content_tag :span, date + time, :class => 'created_at'
+  end
+end
+```
+
 ### In the Controller
 
 When writing your controller actions, you have three options:
@@ -218,7 +250,7 @@ First, follow the steps above to add the dependency and update your bundle.
 Since we're talking about the `Article` model we'll create an `ArticleDecorator` class. You could do it by hand, but use the provided generator:
 
 ```
-rails generate draper:model Article
+rails generate draper:decorator Article
 ```
 
 Now open up the created `app/decorators/article_decorator.rb` and you'll find an `ArticleDecorator` class. Add this method:
@@ -250,22 +282,38 @@ 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 < Draper::Base
+class ArticleDecorator < ApplicationDecorator
   decorates :article
   
   def published_at
-    date = h.content_tag(:span, published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
-    time = h.content_tag(:span, published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
-    h.content_tag :span, date + time, :class => 'created_at'
+    date = h.content_tag(:span, model.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
+    time = h.content_tag(:span, model.published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
+    h.content_tag :span, date + time, :class => 'published_at'
   end
 end
 ```
 
 ## Issues / Pending
 
-* Test coverage for generators
-* Keep revising Readme for better organization/clarity
-* Build sample Rails application
+* Documentation
+  * Keep revising Readme for better organization/clarity
+  * Add more information about using "context"
+  * Add information about the `.decorator` method
+  * Make clear the pattern of overriding accessor methods of the wrapped model  
+  * Build sample Rails application(s)
+  * Add a short screencast
+  * Add YARD documentation to source
+  * Add a section about contributing
+* Generators
+  * Test coverage for generators (help!)
+  * Implement hook so generating a controller/scaffold generates a decorator  
+  * Add generators for...
+    * `draper:model`: Model + Decorator
+    * `draper:controller`: Controller setup with decoration calls
+    * `draper:scaffold`: Controller, Model, Decorator, Views, Tests
+* Other
+  * Implement a HATEOAS helper, maybe as a separate gem
+  * Build a fly website like http://fabricationgem.com
 
 ## License
 
@@ -277,4 +325,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/draper.gemspec

@@ -22,9 +22,15 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 2.0.1"
   s.add_development_dependency "activesupport", "~> 3.0.9"
   s.add_development_dependency "actionpack", "~> 3.0.9"
-  s.add_development_dependency "ruby-debug19"
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "rb-fsevent"
-  s.add_development_dependency 'cover_me', '>= 1.0.0.rc6'
+  if RUBY_VERSION.to_f == 1.8
+    s.add_development_dependency "ruby-debug"
+    s.add_development_dependency "rcov"
+    s.add_development_dependency "launchy"
+  else
+    s.add_development_dependency "ruby-debug19"
+    s.add_development_dependency 'cover_me', '>= 1.0.0.rc6'
+  end
 end

data/lib/draper.rb

@@ -3,5 +3,6 @@ require 'draper/system'
 require 'draper/all_helpers'
 require 'draper/base'
 require 'draper/lazy_helpers'
+require 'draper/model_support'
 
 Draper::System.setup

data/lib/draper/all_helpers.rb

@@ -1,5 +1,6 @@
 module Draper
   module AllHelpers
+    # Most of the black magic here thanks to Xavier Shay (@xshay)
     # Provide access to helper methods from outside controllers and views,
     # such as in Presenter objects. Rails provides ActionController::Base.helpers,
     # but this does not include any of our application helpers.
@@ -30,7 +31,7 @@ module Draper
           def url_for(*args)
             if args.last.is_a?(Hash) && !args.last[:only_path]
               args = args.dup
-              args << args.pop.merge(host: ActionMailer::Base.default_url_options[:host])
+              args << args.pop.merge('host' => ActionMailer::Base.default_url_options[:host])
             end
             super(*args)
           end

data/lib/draper/base.rb

@@ -1,44 +1,46 @@
 module Draper
-  class Base      
+  class Base
     require 'active_support/core_ext/class/attribute'
     class_attribute :denied, :allowed, :model_class
-    attr_accessor :model
-    
+    attr_accessor :context, :model
+
     DEFAULT_DENIED = Object.new.methods << :method_missing
     FORCED_PROXY = [:to_param]
     self.denied = DEFAULT_DENIED
 
-    def initialize(input)
+    def initialize(input, context = nil)
       input.inspect
       self.class.model_class = input.class if model_class.nil?
-      @model = input      
+      @model = input
+      self.context = context
       build_methods
     end
-    
+
     def self.find(input)
       self.new(model_class.find(input))
     end
-    
+
     def self.decorates(input)
       self.model_class = input.to_s.classify.constantize
+      model_class.send :include, Draper::ModelSupport
     end
-    
+
     def self.denies(*input_denied)
       raise ArgumentError, "Specify at least one method (as a symbol) to exclude when using denies" if input_denied.empty?
       raise ArgumentError, "Use either 'allows' or 'denies', but not both." if self.allowed?
       self.denied += input_denied
     end
-    
+
     def self.allows(*input_allows)
       raise ArgumentError, "Specify at least one method (as a symbol) to allow when using allows" if input_allows.empty?
       raise ArgumentError, "Use either 'allows' or 'denies', but not both." unless (self.denied == DEFAULT_DENIED)
       self.allowed = input_allows
     end
 
-    def self.decorate(input)
-      input.respond_to?(:each) ? input.map{|i| new(i)} : new(input)
+    def self.decorate(input, context = nil)
+      input.respond_to?(:each) ? input.map{|i| new(i, context)} : new(input, context)
     end
-    
+
     def helpers
       @helpers ||= ApplicationController::all_helpers
     end
@@ -47,19 +49,19 @@ module Draper
     def self.lazy_helpers
       self.send(:include, Draper::LazyHelpers)
     end
-    
+
     def self.model_name
       ActiveModel::Name.new(model_class)
     end
-    
+
     def to_model
       @model
     end
-            
-  private  
+
+  private
     def select_methods
-      specified = self.allowed || (model.public_methods - denied)
-      (specified - self.public_methods) + FORCED_PROXY
+      specified = self.allowed || (model.public_methods.map{|s| s.to_sym} - denied.map{|s| s.to_sym})
+      (specified - self.public_methods.map{|s| s.to_sym}) + FORCED_PROXY
     end
 
     def build_methods
@@ -69,7 +71,7 @@ module Draper
             model.send method, *args, &block
           end
         end
-      end  
-    end    
+      end
+    end
   end
-end
+end

data/lib/draper/model_support.rb

@@ -0,0 +1,5 @@
+module Draper::ModelSupport
+  def decorator
+    @decorator ||= "#{self.class.name}Decorator".constantize.decorate(self)
+  end
+end

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = "0.5.0"
+  VERSION = "0.7.0"
 end

data/lib/generators/draper/decorator/USAGE

@@ -0,0 +1,7 @@
+Description:
+    The draper:decorator generator creates a decorator model in /app/decorators.
+
+Examples:
+    rails generate draper:decorator Article
+
+        file: app/decorators/article_decorator.rb

data/lib/generators/draper/decorator/decorator_generator.rb

@@ -0,0 +1,17 @@
+module Draper
+  class DecoratorGenerator < Rails::Generators::NamedBase
+    source_root File.expand_path('../templates', __FILE__)
+
+    DECORATORS_ROOT = 'app/decorators/'
+    APPLICATION_DECORATOR = 'application_decorator.rb'
+    APPLICATION_DECORATOR_PATH = DECORATORS_ROOT + APPLICATION_DECORATOR
+
+    def build_model_and_application_decorators
+      empty_directory "app/decorators"
+      unless File.exists?(APPLICATION_DECORATOR_PATH)
+        template APPLICATION_DECORATOR, APPLICATION_DECORATOR_PATH
+      end
+      template 'decorator.rb', "#{DECORATORS_ROOT}#{singular_name}_decorator.rb"
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+class ApplicationDecorator < Draper::Base
+  # Lazy Helpers
+  #   PRO: Call Rails helpers without the h. proxy
+  #        ex: number_to_currency(model.price)
+  #   CON: Add a bazillion methods into your decorator's namespace
+  #        and probably sacrifice performance/memory
+  #  
+  #   Enable them by uncommenting this line:
+  #   lazy_helpers
+
+  # Shared Decorations
+  #   Consider defining shared methods common to all your models.
+  #   
+  #   Example: standardize the formatting of timestamps
+  #
+  #   def formatted_timestamp(time)
+  #     h.content_tag :span, time.strftime("%a %m/%d/%y"), 
+  #                   :class => 'timestamp' 
+  #   end
+  # 
+  #   def created_at
+  #     formatted_timestamp(model.created_at)
+  #   end
+  # 
+  #   def updated_at
+  #     formatted_timestamp(model.updated_at)
+  #   end
+end

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

@@ -0,0 +1,32 @@
+class <%= singular_name.camelize %>Decorator < ApplicationDecorator
+  decorates :<%= singular_name.to_sym %>
+
+  # Accessing Helpers
+  #   You can access any helper via a proxy
+  #
+  #   Normal Usage: helpers.number_to_currency(2)
+  #   Abbreviated : h.number_to_currency(2)
+  #   
+  #   Or, optionally enable "lazy helpers" by calling this method:
+  #     lazy_helpers
+  #   Then use the helpers with no proxy:
+  #     number_to_currency(2)
+
+  # Defining an Interface
+  #   Control access to the wrapped subject's methods using one of the following:
+  #
+  #   To allow only the listed methods (whitelist):
+  #     allows :method1, :method2
+  #
+  #   To allow everything except the listed methods (blacklist):
+  #     denies :method1, :method2
+
+  # Presentation Methods
+  #   Define your own instance methods, even overriding accessors
+  #   generated by ActiveRecord:
+  #   
+  #   def created_at
+  #     h.content_tag :span, time.strftime("%a %m/%d/%y"), 
+  #                   :class => 'timestamp'
+  #   end
+end

data/spec/base_spec.rb

@@ -3,7 +3,7 @@ require 'draper'
 
 describe Draper::Base do
   subject{ Draper::Base.new(source) }
-  let(:source){ Product.new }    
+  let(:source){ Product.new }
 
   context(".lazy_helpers") do
     it "makes Rails helpers available without using the h. proxy" do
@@ -11,7 +11,7 @@ describe Draper::Base do
       subject.send(:pluralize, 5, "cat").should == "5 cats"
     end
   end
-  
+
   context(".model_name") do
     it "should return an ActiveModel::Name instance" do
       Draper::Base.model_name.should be_instance_of(ActiveModel::Name)
@@ -23,14 +23,14 @@ describe Draper::Base do
       ProductDecorator.new(source).model_class == Product
     end
   end
-  
+
   context(".model / .to_model") do
     it "should return the wrapped object" do
       subject.to_model.should == source
       subject.model.should == source
     end
   end
-    
+
   context("selecting methods") do
     it "echos the methods of the wrapped class except default exclusions" do
       source.methods.each do |method|
@@ -39,149 +39,182 @@ describe Draper::Base do
         end
       end
     end
-    
+
     it "should not override a defined method with a source method" do
       DecoratorWithApplicationHelper.new(source).length.should == "overridden"
     end
-    
+
     it "should always proxy to_param" do
       source.send :class_eval, "def to_param; 1; end"
       Draper::Base.new(source).to_param.should == 1
     end
-    
+
     it "should not copy the .class, .inspect, or other existing methods" do
       source.class.should_not == subject.class
       source.inspect.should_not == subject.inspect
       source.to_s.should_not == subject.to_s
     end
-  end  
+  end
+
+  context 'the decorated model' do
+    it 'receives the mixin' do
+      source.class.ancestors.include?(Draper::ModelSupport)
+    end
+  end
 
   it "should wrap source methods so they still accept blocks" do
     subject.block{"marker"}.should == "marker"
   end
-  
+
   context ".find" do
     it "should lookup the associated model when passed an integer" do
       pd = ProductDecorator.find(1)
       pd.should be_instance_of(ProductDecorator)
       pd.model.should be_instance_of(Product)
     end
-  
+
     it "should lookup the associated model when passed a string" do
       pd = ProductDecorator.find("1")
       pd.should be_instance_of(ProductDecorator)
       pd.model.should be_instance_of(Product)
     end
   end
-  
+
   context ".decorate" do
-    it "should return a collection of wrapped objects when given a collection of source objects" do
-      sources = [Product.new, Product.new]
-      output = Draper::Base.decorate(sources)
-      output.should respond_to(:each)
-      output.size.should == sources.size
-      output.each{ |decorated| decorated.should be_instance_of(Draper::Base) }
-    end
-    
-    it "should return a single wrapped object when given a single source object" do
-      output = Draper::Base.decorate(source)
-      output.should be_instance_of(Draper::Base)
+    context "without any context" do
+      subject { Draper::Base.decorate(source) }
+
+      context "when given a collection of source objects" do
+        let(:source) { [Product.new, Product.new] }
+
+        its(:size) { should == source.size }
+
+        it "returns a collection of wrapped objects" do
+          subject.each{ |decorated| decorated.should be_instance_of(Draper::Base) }
+        end
+      end
+
+      context "when given a single source object" do
+        let(:source) { Product.new }
+
+        it { should be_instance_of(Draper::Base) }
+      end
+    end
+
+    context "with a context" do
+      let(:context) {{ :some => 'data' }}
+
+      subject { Draper::Base.decorate(source, context) }
+
+      context "when given a collection of source objects" do
+        let(:source) { [Product.new, Product.new] }
+
+        it "returns a collection of wrapped objects with the context" do
+          subject.each{ |decorated| decorated.context.should eq(context) }
+        end
+      end
+
+      context "when given a single source object" do
+        let(:source) { Product.new }
+
+        its(:context) { should eq(context) }
+      end
     end
   end
-    
-  describe "a sample usage with denies" do    
+
+  describe "a sample usage with denies" do
     let(:subject_with_denies){ DecoratorWithDenies.new(source) }
-    
+
     it "should proxy methods not listed in denies" do
       subject_with_denies.should respond_to(:hello_world)
     end
-    
+
     it "should not echo methods specified with denies" do
       subject_with_denies.should_not respond_to(:goodnight_moon)
     end
 
     it "should not clobber other decorators' methods" do
       subject.should respond_to(:hello_world)
-    end    
-    
+    end
+
     it "should not allow method_missing to circumvent a deny" do
       expect{subject_with_denies.title}.to raise_error(NoMethodError)
-    end    
+    end
   end
-  
+
   describe "a sample usage with allows" do
     let(:subject_with_allows){ DecoratorWithAllows.new(source) }
-    
+
     it "should echo the allowed method" do
       subject_with_allows.should respond_to(:upcase)
     end
-    
+
     it "should echo _only_ the allowed method" do
       subject_with_allows.should_not respond_to(:downcase)
     end
   end
-  
+
   describe "invalid usages of allows and denies" do
     let(:blank_allows){
-      class DecoratorWithInvalidAllows < Draper::Base  
+      class DecoratorWithInvalidAllows < Draper::Base
         allows
       end
     }
-    
+
     let(:blank_denies){
-      class DecoratorWithInvalidDenies < Draper::Base  
+      class DecoratorWithInvalidDenies < Draper::Base
         denies
       end
     }
-    
+
     let(:using_allows_then_denies){
-      class DecoratorWithAllowsAndDenies < Draper::Base  
+      class DecoratorWithAllowsAndDenies < Draper::Base
         allows :hello_world
         denies :goodnight_moon
       end
-    }    
-    
+    }
+
     let(:using_denies_then_allows){
-      class DecoratorWithDeniesAndAllows < Draper::Base  
+      class DecoratorWithDeniesAndAllows < Draper::Base
         denies :goodnight_moon
-        allows :hello_world        
+        allows :hello_world
       end
     }
 
     it "should raise an exception for a blank allows" do
       expect {blank_allows}.should raise_error(ArgumentError)
     end
-    
+
     it "should raise an exception for a blank denies" do
       expect {blank_denies}.should raise_error(ArgumentError)
     end
-    
+
     it "should raise an exception for calling allows then denies" do
       expect {using_allows_then_denies}.should raise_error(ArgumentError)
     end
-    
+
     it "should raise an exception for calling denies then allows" do
       expect {using_denies_then_allows}.should raise_error(ArgumentError)
     end
   end
-  
+
   context "in a Rails application" do
     let(:decorator){ DecoratorWithApplicationHelper.decorate(Object.new) }
-    
+
     it "should have access to ApplicationHelper helpers" do
       decorator.uses_hello_world == "Hello, World!"
     end
-    
+
     it "should be able to use the content_tag helper" do
       decorator.sample_content.to_s.should == "<span>Hello, World!</span>"
     end
-    
+
     it "should be able to use the link_to helper" do
       decorator.sample_link.should == "<a href=\"/World\">Hello</a>"
     end
-    
+
     it "should be able to use the pluralize helper" do
       decorator.sample_truncate.should == "Once..."
     end
   end
-end
+end

data/spec/draper/model_support_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Draper::ModelSupport do
+  subject { Product.new }
+
+  describe '#decorator' do
+    its(:decorator) { should be_kind_of(ProductDecorator) }
+    its(:decorator) { should be(subject.decorator) }
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,12 @@
 require 'rubygems'
 require 'bundler'
-require 'cover_me'
+
+require 'rspec'
+begin
+  require 'cover_me'
+rescue LoadError
+  # Silently fail
+end
 require './spec/samples/application_helper.rb'
 Bundler.require
 Dir.glob('./spec/samples/*') {|file| require file}

metadata

@@ -1,127 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: draper
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.7.0
   prerelease: 
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Jeff Casimir
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-27 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70309492944640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70309492944640
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70309492944140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.0.1
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70309492944140
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70309492943680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.9
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70309492943680
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70309492943220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.9
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70309492943220
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70309492942840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: guard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70309492942840
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70309492942380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70309492942380
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &70309492941960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rb-fsevent
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70309492941960
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &70309492941520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: cover_me
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70309492941520
+- !ruby/object:Gem::Dependency
+  name: cover_me
+  requirement: &70309492941020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0.rc6
   type: :development
-  version_requirements: *id009
-description: Draper reimagines the role of helpers in the view layer of a Rails application, allowing an object-oriented approach rather than procedural.
-email: 
+  prerelease: false
+  version_requirements: *70309492941020
+description: Draper reimagines the role of helpers in the view layer of a Rails application,
+  allowing an object-oriented approach rather than procedural.
+email:
 - jeff@casimircreative.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Guardfile
@@ -132,12 +128,15 @@ files:
 - lib/draper/all_helpers.rb
 - lib/draper/base.rb
 - lib/draper/lazy_helpers.rb
+- lib/draper/model_support.rb
 - lib/draper/system.rb
 - lib/draper/version.rb
-- lib/generators/draper/model/USAGE
-- lib/generators/draper/model/model_generator.rb
-- lib/generators/draper/model/templates/model.rb
+- lib/generators/draper/decorator/USAGE
+- lib/generators/draper/decorator/decorator_generator.rb
+- lib/generators/draper/decorator/templates/application_decorator.rb
+- lib/generators/draper/decorator/templates/decorator.rb
 - spec/base_spec.rb
+- spec/draper/model_support_spec.rb
 - spec/samples/active_record.rb
 - spec/samples/application_controller.rb
 - spec/samples/application_helper.rb
@@ -147,36 +146,33 @@ files:
 - spec/samples/product.rb
 - spec/samples/product_decorator.rb
 - spec/spec_helper.rb
-has_rdoc: true
 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
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: draper
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Decorator pattern implmentation for Rails.
-test_files: 
+test_files:
 - spec/base_spec.rb
+- spec/draper/model_support_spec.rb
 - spec/samples/active_record.rb
 - spec/samples/application_controller.rb
 - spec/samples/application_helper.rb

data/lib/generators/draper/model/USAGE

@@ -1,7 +0,0 @@
-Description:
-    The draper:model generator creates a decorator model in /app/decorators.
-
-Examples:
-    rails generate draper:model Article
-
-        file: app/decorators/article_decorator.rb

data/lib/generators/draper/model/model_generator.rb

@@ -1,10 +0,0 @@
-module Draper
-  class ModelGenerator < Rails::Generators::NamedBase
-    source_root File.expand_path('../templates', __FILE__)
-
-    def build_model
-      empty_directory "app/decorators"
-      template 'model.rb', "app/decorators/#{singular_name}_decorator.rb"
-    end
-  end
-end

data/lib/generators/draper/model/templates/model.rb

@@ -1,29 +0,0 @@
-class <%= singular_name.camelize %>Decorator < Draper::Base
-  decorates :<%= singular_name.to_sym %>
-
-  # Helpers from Rails an Your Application
-  #   You can access any helper via a proxy to ApplicationController
-  #
-  #   Normal Usage: helpers.number_to_currency(2)
-  #   Abbreviated : h.number_to_currency(2)
-  #   
-  #   You can optionally enable "lazy helpers" by including this module:
-  #     include Draper::LazyHelpers
-  #   Then use the helpers with no prefix:
-  #     number_to_currency(2)
-
-  # Wrapper Methods
-  #   Control access to the wrapped subject's methods using one of the following:
-  #
-  #   To allow only the listed methods (whitelist):
-  #     allows :method1, :method2
-  #
-  #   To allow everything except the listed methods (blacklist):
-  #     denies :method1, :method2
-
-  # Presentation Methods
-  #   Define your own instance methods. Ex:
-  #     def formatted_created_at
-  #       content_tag :span, created_at.strftime("%A")
-  #     end
-end