active_decorator 0.3.0 → 0.3.1

data/.gitignore

@@ -1,5 +1,7 @@
 *.gem
 .bundle
 Gemfile.lock
+gemfiles/Gemfile-rails.3.0.x.lock
+gemfiles/Gemfile-rails.3.1.x.lock
 pkg/*
 log

data/.travis.yml

@@ -1,6 +1,10 @@
+language: ruby
+script: bundle exec rake spec
 rvm:
   - 1.8.7
   - 1.9.3
   - ruby-head
-
-script: bundle exec rake spec
+gemfile:
+  - gemfiles/Gemfile-rails.3.0.x
+  - gemfiles/Gemfile-rails.3.1.x
+  - Gemfile

data/Gemfile

@@ -1,4 +1,8 @@
-source "http://rubygems.org"
+source :rubygems
 
-# Specify your gem's dependencies in active_decorator.gemspec
 gemspec
+
+gem 'rails', '~> 3.2.0'
+gem 'rspec-rails'
+gem 'capybara'
+gem 'sqlite3'

data/active_decorator.gemspec

@@ -17,11 +17,4 @@ 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"]
-
-  # specify any dependencies here; for example:
-  s.add_development_dependency 'rails'
-  s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'capybara'
-  s.add_development_dependency 'sqlite3'
-  # s.add_runtime_dependency "rest-client"
 end

data/gemfiles/Gemfile-rails.3.0.x

@@ -0,0 +1,8 @@
+source :rubygems
+
+gem 'active_decorator', :path => '..'
+
+gem 'rails', '~> 3.0.0'
+gem 'rspec-rails'
+gem 'capybara'
+gem 'sqlite3'

data/gemfiles/Gemfile-rails.3.1.x

@@ -0,0 +1,8 @@
+source :rubygems
+
+gem 'active_decorator', :path => '..'
+
+gem 'rails', '~> 3.1.0'
+gem 'rspec-rails'
+gem 'capybara'
+gem 'sqlite3'

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

@@ -1,6 +1,6 @@
-module ActionView
-  class PartialRenderer < AbstractRenderer #:nodoc:
-    def setup_with_decorator(context, options, block)
+if ActionPack::VERSION::STRING >= '3.1'
+  class ActionView::PartialRenderer
+    def setup_with_decorator(context, options, block) #:nodoc:
       setup_without_decorator context, options, block
 
       @locals.values.each do |v|
@@ -12,6 +12,22 @@ module ActionView
       self
     end
 
+    alias_method_chain :setup, :decorator
+  end
+else
+  class ActionView::Partials::PartialRenderer
+    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
+    end
+
     alias_method_chain :setup, :decorator
   end
 end

data/lib/active_decorator/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,52 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70226630611740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70226630611740
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: &70226630609000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70226630609000
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: &70226630606920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70226630606920
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70226630605800 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70226630605800
+date: 2012-02-27 00:00:00.000000000 Z
+dependencies: []
 description: A simple and Rubyish view helper for Rails 3
 email:
 - ronnie@dio.jp
@@ -70,6 +26,8 @@ files:
 - README.md
 - Rakefile
 - active_decorator.gemspec
+- gemfiles/Gemfile-rails.3.0.x
+- gemfiles/Gemfile-rails.3.1.x
 - lib/active_decorator.rb
 - lib/active_decorator/decorator.rb
 - lib/active_decorator/helpers.rb