active_decorator 0.3.1 → 0.3.2

data/README.md

@@ -51,7 +51,7 @@ You can use the generator for doing this ( `% rails g decorator user` )
     # app/controllers/users_controller.rb
     class UsersController < ApplicationController
       def index
-        User.all
+        @users = User.all
       end
     end
     

data/lib/active_decorator/decorator.rb

@@ -40,7 +40,8 @@ module ActiveDecorator
       d = decorator_name.constantize
       d.send :include, ActiveDecorator::Helpers
       @@decorators[model_class] = d
-      rescue NameError
+    rescue NameError
+      @@decorators[model_class] = nil
     end
   end
 end

data/lib/active_decorator/monkey/action_view/partial_renderer.rb

@@ -1,31 +1,35 @@
-if ActionPack::VERSION::STRING >= '3.1'
-  class ActionView::PartialRenderer
-    def setup_with_decorator(context, options, block) #:nodoc:
-      setup_without_decorator context, options, block
-
+module ActiveDecorator
+  module ActionViewExtension
+    def setup_decorator
       @locals.values.each do |v|
         ActiveDecorator::Decorator.instance.decorate v
-      end if @locals.present?
-      ActiveDecorator::Decorator.instance.decorate @object if @object.present?
-      ActiveDecorator::Decorator.instance.decorate @collection if @collection.present?
+      end unless @locals.blank?
+      ActiveDecorator::Decorator.instance.decorate @object unless @object.blank?
+      ActiveDecorator::Decorator.instance.decorate @collection unless @collection.blank?
 
       self
     end
+  end
+end
+
+if ActionPack::VERSION::STRING >= '3.1'
+  class ActionView::PartialRenderer
+    include ActiveDecorator::ActionViewExtension
+
+    def setup_with_decorator(context, options, block) #:nodoc:
+      setup_without_decorator context, options, block
+      setup_decorator
+    end
 
     alias_method_chain :setup, :decorator
   end
 else
   class ActionView::Partials::PartialRenderer
+    include ActiveDecorator::ActionViewExtension
+
     def setup_with_decorator(options, block) #:nodoc:
       setup_without_decorator options, block
-
-      @locals.values.each do |v|
-        ActiveDecorator::Decorator.instance.decorate v
-      end if @locals.present?
-      ActiveDecorator::Decorator.instance.decorate @object if @object.present?
-      ActiveDecorator::Decorator.instance.decorate @collection if @collection.present?
-
-      self
+      setup_decorator
     end
 
     alias_method_chain :setup, :decorator

data/lib/active_decorator/version.rb

@@ -1,3 +1,3 @@
 module ActiveDecorator
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/generators/rails/decorator_generator.rb

@@ -15,8 +15,6 @@ Examples:
 DESC
 
       def create_decorator_file
-        empty_directory 'app/decorators'
-
         template 'decorator.rb', File.join('app/decorators', "#{singular_name}_decorator.rb")
       end
 

data/lib/generators/rspec/decorator_generator.rb

@@ -3,8 +3,6 @@ module Rspec
     source_root File.expand_path('../templates', __FILE__)
 
     def create_spec_file
-      empty_directory 'spec/decorators'
-
       template 'decorator_spec.rb', File.join('spec/decorators', "#{singular_name}_decorator_spec.rb")
     end
   end

data/lib/generators/test_unit/decorator_generator.rb

@@ -3,8 +3,6 @@ module TestUnit
     source_root File.expand_path('../templates', __FILE__)
 
     def create_test_file
-      empty_directory 'test/decorators'
-
       template 'decorator_test.rb', File.join('test/decorators', "#{singular_name}_decorator_test.rb")
     end
   end

metadata

@@ -1,23 +1,33 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: active_decorator
-version: !ruby/object:Gem::Version
-  version: 0.3.1
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
-authors:
+authors: 
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+
+date: 2012-04-02 00:00:00 Z
 dependencies: []
+
 description: A simple and Rubyish view helper for Rails 3
-email:
+email: 
 - ronnie@dio.jp
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -54,29 +64,38 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/amatsuda/active_decorator
 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: active_decorator
-rubygems_version: 1.8.17
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A simple and Rubyish view helper for Rails 3
-test_files:
+test_files: 
 - spec/fake_app/authors/index.html.erb
 - spec/fake_app/authors/show.html.erb
 - spec/fake_app/books/_book.html.erb