draper 0.9.0 → 0.9.1

data/Readme.markdown

@@ -8,7 +8,7 @@
 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`
+  2. `[your_model]` to access the wrapped object like `article.created_at`
 4. Put common decorations in `app/decorators/application.rb`  
 5. Wrap models in your controller with the decorator using:
   1. `.find` automatic lookup & wrap
@@ -20,6 +20,17 @@
 6. Output the instance methods in your view templates
   ex: `@article_decorator.created_at`
 
+## What's New
+
+### Version 0.9.1
+
+* Automatically generate a named accessor for the wrapped object, so now inside of `ArticleDecorator` you can use `article` instead of just `model`
+* Removed the `lazy_helpers` method to favor using `include Draper::LazyHelpers`
+* Refactored how methods are selected for delegation to the wrapped model
+* Fixed how the view context is stored in the `Thread.current` to resolve cross-request issues
+* Decorated collections now return a collection proxy instead of an array, which fixes many compatibility issues
+* Automatically generate `RSpec` stub for decorators [PENDING: Make this work properly for `Test::Unit` -- help?]
+
 ## Goals
 
 This gem makes it easy to apply the decorator pattern to domain models in a Rails application. This pattern gives you three wins:
@@ -38,8 +49,8 @@ A decorator wraps an object with presentation-related accessor methods. For inst
 class ArticleDecorator < ApplicationDecorator
   decorates :article
   def published_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(" ")
+    date = h.content_tag(:span, article.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
+    time = h.content_tag(:span, article.published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
     h.content_tag :span, date + time, :class => 'created_at'
   end
 end
@@ -63,7 +74,7 @@ class ArticleDecorator < ApplicationDecorator
 
   def to_json
     attr_set = h.current_user.admin? ? ADMIN_VISIBLE_ATTRIBUTES : PUBLIC_VISIBLE_ATTRIBUTES
-    model.to_json(:only => attr_set)
+    article.to_json(:only => attr_set)
   end
 end
 ```
@@ -122,36 +133,7 @@ Add the dependency to your `Gemfile`:
 gem "draper"
 ```
 
-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.
-
-
-#### Add DecoratorGenerator to ActiveRecord Generator (Optional) 
-
-Add the following to your `config/application.rb`
-
-```ruby
-config.generators do |g|
-  g.orm :decorator, :invoke_after_finished => "active_record:model"
-end
-```
-
-From now on, every model you generate will first invoke the DecoratorGenerator. The Decorator will then invoke the active_record:model Generator.
-
+Then run `bundle` from the project directory.
 
 ### Generate the Decorator
 
@@ -163,14 +145,14 @@ rails generate draper:decorator Article
 
 ### Writing Methods
 
-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:
+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
   decorates :article
   
   def author_name
-    model.author.first_name + " " + model.author.last_name
+    article.author.first_name + " " + article.author.last_name
   end
 end
 ```
@@ -184,8 +166,8 @@ class ArticleDecorator < ApplicationDecorator
   decorates :article
   
   def published_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(" ")
+    date = h.content_tag(:span, article.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
+    time = h.content_tag(:span, article.published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
     h.content_tag :span, date + time, :class => 'created_at'
   end
 end
@@ -201,8 +183,8 @@ class ArticleDecorator < ApplicationDecorator
   include Draper::LazyHelpers
   
   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(" ")
+    date = content_tag(:span, article.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
+    time = content_tag(:span, article.published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
     content_tag :span, date + time, :class => 'created_at'
   end
 end
@@ -222,7 +204,7 @@ ArticleDecorator.new(Article.find(params[:id]))`
 
 ```ruby
 ArticleDecorator.decorate(Article.first) # Returns one instance of ArticleDecorator
-ArticleDecorator.decorate(Article.all)   # Returns an array of ArticleDecorator instances
+ArticleDecorator.decorate(Article.all)   # Returns an enumeration proxy of ArticleDecorator instances
 ```
   
 * Call `.find` to do automatically do a lookup on the `decorates` class:
@@ -274,8 +256,8 @@ Now open up the created `app/decorators/article_decorator.rb` and you'll find an
 
 ```ruby
 def published_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").delete(" "), :class => 'time')
+  date = h.content_tag(:span, article.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
+  time = h.content_tag(:span, article.published_at.strftime("%l:%M%p").delete(" "), :class => 'time')
   h.content_tag :span, date + time, :class => 'published_at'
 end
 ```
@@ -303,8 +285,8 @@ class ArticleDecorator < ApplicationDecorator
   decorates :article
   
   def published_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(" ")
+    date = h.content_tag(:span, article.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
+    time = h.content_tag(:span, article.published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
     h.content_tag :span, date + time, :class => 'published_at'
   end
 end
@@ -317,8 +299,6 @@ end
   * 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
   * Implement hook so generating a controller/scaffold generates a decorator  

data/lib/draper/base.rb

@@ -51,6 +51,7 @@ module Draper
     def self.decorates(input)
       self.model_class = input.to_s.camelize.constantize
       model_class.send :include, Draper::ModelSupport
+      define_method(input){ @model }
     end
 
     # Specifies a black list of methods which may *not* be proxied to

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/spec/base_spec.rb

@@ -40,6 +40,11 @@ describe Draper::Base do
         BusinessDecorator.model_class.should == Business
       end.should_not raise_error
     end
+    
+    it "creates a named accessor for the wrapped model" do
+      pd = ProductDecorator.new(source)
+      pd.send(:product).should == source
+    end
   end
 
   context(".model / .to_model") do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors: