draper 0.12.0 → 0.12.1

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', '>= 2.3.10'
+  s.add_dependency 'rake'
+  s.add_dependency 'rspec', '~> 2.0'
+  s.add_dependency 'activesupport', '~> 3.1.3'
+  s.add_dependency 'actionpack', "~> 3.1.3"
+
+  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.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/draper/version.rb

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

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/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

metadata

@@ -1,47 +1,183 @@
---- !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: 45
   prerelease: 
+  segments: 
+  - 0
+  - 12
+  - 1
+  version: 0.12.1
 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
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 3
+        - 10
         version: 2.3.10
   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 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  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: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  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: 5
+        segments: 
+        - 3
+        - 1
+        - 3
+        version: 3.1.3
+  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: 5
+        segments: 
+        - 3
+        - 1
+        - 3
+        version: 3.1.3
+  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
@@ -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