active_decorator 0.1.0 → 0.2.0

data/README.md

@@ -1,6 +1,6 @@
 # ActiveDecorator
 
-A simple and Rubyish view helper for ActiveRecord models. Keep your helpers and views Object-Oriented!
+A simple and Rubyish view helper for Rails 3. Keep your helpers and views Object-Oriented!
 
 
 ## Features ##
@@ -17,6 +17,11 @@ A simple and Rubyish view helper for ActiveRecord models. Keep your helpers and
 Rails 3.0.x, 3.1.x, and 3.2 (edge)
 
 
+## Supported ORMs ##
+
+ActiveRecord, ActiveResource, and any kind of ORMs that uses Ruby Objects as model objects
+
+
 ## Usage ##
 
 1. bundle 'active_decorator' gem

data/active_decorator.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Akira Matsuda"]
   s.email       = ["ronnie@dio.jp"]
   s.homepage    = ""
-  s.summary     = %q{A simple and Rubyish view helper for ActiveRecord models}
-  s.description = %q{A simple and Rubyish view helper for ActiveRecord models}
+  s.summary     = %q{A simple and Rubyish view helper for Rails 3}
+  s.description = %q{A simple and Rubyish view helper for Rails 3}
 
   s.rubyforge_project = "active_decorator"
 

data/lib/active_decorator/decorator.rb

@@ -9,33 +9,29 @@ module ActiveDecorator
       @@decorators = {}
     end
 
-    def decorate_if_model(obj)
-      case obj
-      when ActiveRecord::Base
-        decorate obj
-      when ActiveRecord::Relation
+    def decorate(obj)
+      return if obj.nil?
+
+      if obj.is_a? Array
+        obj.each do |r|
+          decorate r
+        end
+      elsif defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Relation)
         class << obj
           def to_a_with_decorator
-            arr = to_a_without_decorator
-            arr.each do |model|
-              ActiveDecorator::Decorator.instance.decorate model
+            to_a_without_decorator.tap do |arr|
+              ActiveDecorator::Decorator.instance.decorate arr
             end
           end
           alias_method_chain :to_a, :decorator
         end
-      when Array
-        obj.each do |r|
-          decorate_if_model r
-        end
+      else
+        d = decorator_for obj.class
+        return obj unless d
+        obj.extend d unless obj.is_a? d
       end
     end
 
-    def decorate(model)
-      d = decorator_for model.class
-      return model unless d
-      model.extend d unless model.is_a? d
-    end
-
     private
     def decorator_for(model_class)
       return @@decorators[model_class] if @@decorators.has_key? model_class

data/lib/{monkey → active_decorator/monkey}/abstract_controller/rendering.rb

@@ -3,7 +3,7 @@ module AbstractController
     def view_assigns_with_decorator
       hash = view_assigns_without_decorator
       hash.values.each do |v|
-        ActiveDecorator::Decorator.instance.decorate_if_model v
+        ActiveDecorator::Decorator.instance.decorate v
       end
       hash
     end

data/lib/{monkey → active_decorator/monkey}/action_view/partial_renderer.rb

@@ -4,12 +4,10 @@ module ActionView
       setup_without_decorator context, options, block
 
       @locals.values.each do |v|
-        ActiveDecorator::Decorator.instance.decorate_if_model v
+        ActiveDecorator::Decorator.instance.decorate v
       end if @locals.present?
-      ActiveDecorator::Decorator.instance.decorate_if_model @object
-      @collection.each do |v|
-        ActiveDecorator::Decorator.instance.decorate_if_model v
-      end if @collection.present?
+      ActiveDecorator::Decorator.instance.decorate @object if @object.present?
+      ActiveDecorator::Decorator.instance.decorate @collection if @collection.present?
 
       self
     end

data/lib/active_decorator/railtie.rb

@@ -4,13 +4,13 @@ module ActiveDecorator
   class Railtie < ::Rails::Railtie
     initializer 'active_decorator' do
       ActiveSupport.on_load(:action_view) do
-        require 'monkey/action_view/partial_renderer'
+        require 'active_decorator/monkey/action_view/partial_renderer'
       end
       ActiveSupport.on_load(:action_controller) do
-        require 'monkey/abstract_controller/rendering'
+        require 'active_decorator/monkey/abstract_controller/rendering'
       end
       ActiveSupport.on_load(:action_mailer) do
-        require 'monkey/abstract_controller/rendering'
+        require 'active_decorator/monkey/abstract_controller/rendering'
       end
     end
   end

data/lib/active_decorator/version.rb

@@ -1,3 +1,3 @@
 module ActiveDecorator
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000 Z
+date: 2011-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70282934150240 !ruby/object:Gem::Requirement
+  requirement: &70315505555960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282934150240
+  version_requirements: *70315505555960
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70282934149800 !ruby/object:Gem::Requirement
+  requirement: &70315505555540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282934149800
+  version_requirements: *70315505555540
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70282934149380 !ruby/object:Gem::Requirement
+  requirement: &70315505555120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282934149380
+  version_requirements: *70315505555120
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70282934148940 !ruby/object:Gem::Requirement
+  requirement: &70315505554700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,8 +54,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282934148940
-description: A simple and Rubyish view helper for ActiveRecord models
+  version_requirements: *70315505554700
+description: A simple and Rubyish view helper for Rails 3
 email:
 - ronnie@dio.jp
 executables: []
@@ -73,6 +73,8 @@ files:
 - lib/active_decorator.rb
 - lib/active_decorator/decorator.rb
 - lib/active_decorator/helpers.rb
+- lib/active_decorator/monkey/abstract_controller/rendering.rb
+- lib/active_decorator/monkey/action_view/partial_renderer.rb
 - lib/active_decorator/railtie.rb
 - lib/active_decorator/version.rb
 - lib/generators/rails/decorator_generator.rb
@@ -81,8 +83,6 @@ files:
 - lib/generators/rspec/templates/decorator_spec.rb
 - lib/generators/test_unit/decorator_generator.rb
 - lib/generators/test_unit/templates/decorator_test.rb
-- lib/monkey/abstract_controller/rendering.rb
-- lib/monkey/action_view/partial_renderer.rb
 - spec/fake_app/authors/index.html.erb
 - spec/fake_app/authors/show.html.erb
 - spec/fake_app/books/_book.html.erb
@@ -105,18 +105,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 965343407426954688
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 965343407426954688
 requirements: []
 rubyforge_project: active_decorator
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A simple and Rubyish view helper for ActiveRecord models
+summary: A simple and Rubyish view helper for Rails 3
 test_files:
 - spec/fake_app/authors/index.html.erb
 - spec/fake_app/authors/show.html.erb