draper 0.11.1 → 0.12.0

data/lib/draper/version.rb

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

data/lib/generators/decorator/decorator_generator.rb

@@ -0,0 +1,28 @@
+module Rails
+  module Generators
+   class DecoratorGenerator < NamedBase
+      source_root File.expand_path("../templates", __FILE__)
+      check_class_collision :suffix => "Decorator"
+
+      class_option :parent, :type => :string, :desc => "The parent class for the generated decorator"
+
+      def create_decorator_file
+        template 'decorator.rb', File.join('app/decorators', class_path, "#{file_name}_decorator.rb")
+      end
+
+      hook_for :test_framework
+
+      private
+
+      def parent_class_name
+        if options[:parent]
+          options[:parent]
+        elsif defined?(:ApplicationDecorator)
+          "ApplicationDecorator"
+        else
+          "Draper::Base"
+        end
+      end
+   end
+  end
+end

data/lib/generators/{draper/decorator → decorator}/templates/decorator.rb

@@ -1,5 +1,6 @@
-class <%= resource_name.singularize.camelize %>Decorator < ApplicationDecorator
-  decorates :<%= resource_name.singularize.to_sym %>
+<% module_namespacing do -%>
+class <%= class_name %>Decorator < ApplicationDecorator
+  decorates :<%= singular_name %>
 
   # Accessing Helpers
   #   You can access any helper via a proxy
@@ -29,4 +30,5 @@ class <%= resource_name.singularize.camelize %>Decorator < ApplicationDecorator
   #     h.content_tag :span, time.strftime("%a %m/%d/%y"),
   #                   :class => 'timestamp'
   #   end
-end
+end
+<% end -%>

data/lib/generators/resource_override.rb

@@ -0,0 +1,12 @@
+require "rails/generators"
+require "rails/generators/rails/resource/resource_generator"
+
+module Rails
+  module Generators
+    ResourceGenerator.class_eval do
+      def add_decorator
+        invoke "decorator"
+      end
+    end
+  end
+end

data/lib/generators/rspec/decorator_generator.rb

@@ -0,0 +1,9 @@
+module Rspec
+  class DecoratorGenerator < ::Rails::Generators::NamedBase
+    source_root File.expand_path('../templates', __FILE__)
+
+    def create_spec_file
+      template 'decorator_spec.rb', File.join('spec/decorators', "#{singular_name}_decorator_spec.rb")
+    end
+  end
+end

data/lib/generators/rspec/templates/decorator_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe <%= class_name %>Decorator do
+end

data/lib/generators/test_unit/decorator_generator.rb

@@ -0,0 +1,9 @@
+module TestUnit
+  class DecoratorGenerator < ::Rails::Generators::NamedBase
+    source_root File.expand_path('../templates', __FILE__)
+
+    def create_test_file
+      template 'decorator_test.rb', File.join('test/decorators', "#{singular_name}_decorator_test.rb")
+    end
+  end
+end

data/lib/generators/test_unit/templates/decorator_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class <%= class_name %>DecoratorTest < ActiveSupport::TestCase
+  def setup
+    ApplicationController.new.set_current_view_context
+  end
+end

data/performance/active_record.rb

@@ -1,4 +1,4 @@
 module ActiveRecord
   class Base
   end
-end
+end

data/performance/models.rb

@@ -17,4 +17,4 @@ class FastProduct < ActiveRecord::Base
   def hello_world
     "Hello, World"
   end
-end
+end

data/spec/draper/base_spec.rb

@@ -4,6 +4,7 @@ describe Draper::Base do
   before(:each){ ApplicationController.new.set_current_view_context }
   subject{ Decorator.new(source) }
   let(:source){ Product.new }
+  let(:non_active_model_source){ NonActiveModelProduct.new }
 
   context("proxying class methods") do
     it "should pass missing class method calls on to the wrapped class" do
@@ -14,7 +15,7 @@ describe Draper::Base do
       subject.class.should respond_to(:sample_class_method)
     end
 
-    it "should still respond_to it's own class methods" do
+    it "should still respond_to its own class methods" do
       subject.class.should respond_to(:own_class_method)
     end
   end
@@ -44,6 +45,11 @@ describe Draper::Base do
       ProductDecorator.new(source).model_class.should == Product
     end
 
+    it "returns decorator if it's decorated model already" do
+      product_decorator = ProductDecorator.new(source)
+      ProductDecorator.new(product_decorator).model.should be_instance_of Product
+    end
+
     it "should handle plural-like words properly'" do
       class Business; end
       expect do
@@ -190,7 +196,7 @@ describe Draper::Base do
     end
   end
 
-  context("selecting methods") do
+  describe "method selection" do
     it "echos the methods of the wrapped class except default exclusions" do
       source.methods.each do |method|
         unless Draper::Base::DEFAULT_DENIED.include?(method)
@@ -203,27 +209,48 @@ describe Draper::Base do
       DecoratorWithApplicationHelper.new(source).length.should == "overridden"
     end
 
-    it "should always proxy to_param" do
-      source.send :class_eval, "def to_param; 1; end"
-      Draper::Base.new(source).to_param.should == 1
-    end
-
-    it "should always proxy id" do
-      source.send :class_eval, "def id; 123456789; end"
-      Draper::Base.new(source).id.should == 123456789
-    end
-
     it "should not copy the .class, .inspect, or other existing methods" do
       source.class.should_not == subject.class
       source.inspect.should_not == subject.inspect
       source.to_s.should_not == subject.to_s
     end
+
+    context "when an ActiveModel descendant" do
+      it "should always proxy to_param" do
+        source.stub(:to_param).and_return(1)
+        Draper::Base.new(source).to_param.should == 1
+      end
+
+      it "should always proxy id" do
+        source.stub(:id).and_return(123456789)
+        Draper::Base.new(source).id.should == 123456789
+      end
+
+      it "should always proxy errors" do
+        Draper::Base.new(source).errors.should be_an_instance_of ActiveModel::Errors
+      end
+    end
+
+    context "when not an ActiveModel descendant" do
+      it "does not proxy to_param" do
+        non_active_model_source.stub(:to_param).and_return(1)
+        Draper::Base.new(non_active_model_source).to_param.should_not == 1
+      end
+
+      it "does not proxy errors" do
+        Draper::Base.new(non_active_model_source).should_not respond_to :errors
+      end
+    end
   end
 
   context 'the decorated model' do
     it 'receives the mixin' do
       source.class.ancestors.include?(Draper::ModelSupport)
     end
+
+    it 'includes ActiveModel support' do
+      source.class.ancestors.include?(Draper::ActiveModelSupport)
+    end
   end
 
   it "should wrap source methods so they still accept blocks" do
@@ -264,13 +291,32 @@ describe Draper::Base do
       ProductDecorator.find_by_name_and_size("apples", "large")
     end
 
+    it "runs find_all_by_(x) finders" do
+      Product.should_receive(:find_all_by_name_and_size)
+      ProductDecorator.find_all_by_name_and_size("apples", "large")
+    end
+
+    it "runs find_last_by_(x) finders" do
+      Product.should_receive(:find_last_by_name_and_size)
+      ProductDecorator.find_last_by_name_and_size("apples", "large")
+    end
+
+    it "runs find_or_initialize_by_(x) finders" do
+      Product.should_receive(:find_or_initialize_by_name_and_size)
+      ProductDecorator.find_or_initialize_by_name_and_size("apples", "large")
+    end
+
+    it "runs find_or_create_by_(x) finders" do
+      Product.should_receive(:find_or_create_by_name_and_size)
+      ProductDecorator.find_or_create_by_name_and_size("apples", "large")
+    end
+
     it "accepts an options hash" do
       Product.should_receive(:find_by_name_and_size).with("apples", "large", {:role => :admin})
       ProductDecorator.find_by_name_and_size("apples", "large", {:role => :admin})
     end
 
     it "uses the options hash in the decorator instantiation" do
-      pending "Figure out an implementation that supports multiple args (find_by_name_and_count_and_size) plus an options hash"
       Product.should_receive(:find_by_name_and_size).with("apples", "large", {:role => :admin})
       pd = ProductDecorator.find_by_name_and_size("apples", "large", {:role => :admin})
       pd.context[:role].should == :admin
@@ -289,6 +335,11 @@ describe Draper::Base do
         it "returns a collection of wrapped objects" do
           subject.each{ |decorated| decorated.should be_instance_of(Draper::Base) }
         end
+
+        it 'should accepted and store a context for a collection' do
+          subject.context = :admin
+          subject.each { |decorated| decorated.context.should == :admin }
+        end
       end
 
       context "when given a single source object" do
@@ -395,6 +446,14 @@ describe Draper::Base do
     end
   end
 
+  context ".respond_to?" do
+    it "should delegate respond_to? to the decorated model" do
+      other = Draper::Base.new(source)
+      source.should_receive(:respond_to?).with(:whatever, true)
+      subject.respond_to?(:whatever, true)
+    end
+  end
+
   context 'position accessors' do
     [:first, :last].each do |method|
       context "##{method}" do
@@ -441,8 +500,8 @@ describe Draper::Base do
 
     it "should delegate respond_to? to the wrapped collection" do
       decorator = ProductDecorator.decorate(paged_array)
-      paged_array.should_receive(:respond_to?).with(:whatever)
-      decorator.respond_to?(:whatever)
+      paged_array.should_receive(:respond_to?).with(:whatever, true)
+      decorator.respond_to?(:whatever, true)
     end
 
     it "should return blank for a decorated empty collection" do

data/spec/draper/helper_support_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
 describe Draper::HelperSupport do
-  before(:each){ @product = Product.new}
+  let(:product){ Product.new }
 
   context '#decorate' do
     it 'renders a block' do
-      output = ApplicationController.decorate(@product){|p| p.model.object_id }
-      output.should == @product.object_id
+      output = ApplicationController.decorate(product){|p| p.model.object_id }
+      output.should == product.object_id
     end
 
     it 'uses #capture so Rails only renders the content once' do
-      ApplicationController.decorate(@product){|p| p.model.object_id }
+      ApplicationController.decorate(product){|p| p.model.object_id }
       ApplicationController.capture_triggered.should be
     end
   end

data/spec/draper/model_support_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Draper::ModelSupport do
+describe Draper::ActiveModelSupport do
   subject { Product.new }
 
   describe '#decorator' do

data/spec/draper/view_context_spec.rb

@@ -1,13 +1,8 @@
 require 'spec_helper'
 
 describe Draper::ViewContext do
-  let (:app_controller) do
-    ApplicationController
-  end
-
-  let (:app_controller_instance) do
-    app_controller.new
-  end
+  let(:app_controller) { ApplicationController }
+  let(:app_controller_instance) { app_controller.new }
 
   it "implements #set_current_view_context" do
     app_controller_instance.should respond_to(:set_current_view_context)

data/spec/generators/decorator/decorator_generator_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/decorator/decorator_generator'
+
+describe Rails::Generators::DecoratorGenerator do
+  # Tell the generator where to put its output (what it thinks of as Rails.root)
+  destination File.expand_path("../../../../../tmp", __FILE__)
+
+  before { prepare_destination }
+
+  context 'decorator context' do
+    before { run_generator ["YourModel"]  }
+
+    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 "decorates :your_model" }
+    end
+  end
+
+  context 'decorator name' do
+    before { run_generator ["YourModel", '-t=rspec']  }
+
+    describe 'spec/decorators/your_model_decorator_spec.rb' do
+      subject { file('spec/decorators/your_model_decorator_spec.rb') }
+      it { should exist }
+      it { should contain "describe YourModelDecorator" }
+    end
+  end
+
+  context 'using rspec' do
+    before { run_generator ["YourModel", "-t=rspec"]  }
+
+    describe 'spec/decorators/your_model_decorator_spec.rb' do
+      subject { file('spec/decorators/your_model_decorator_spec.rb') }
+      it { should exist }
+      it { should contain "describe YourModelDecorator" }
+    end
+  end
+
+  context 'using rspec' do
+    before { run_generator ["YourModel", "-t=test_unit"]  }
+
+    describe 'test/decorators/YourModel_decorator_test.rb' do
+      subject { file('test/decorators/your_model_decorator_test.rb') }
+      it { should exist }
+      it { should contain "class YourModelDecoratorTest < ActiveSupport::TestCase" }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,21 +1,25 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'rails'
+
 Bundler.require
 
-require './spec/support/samples/active_record.rb'
-require './spec/support/samples/application_controller.rb'
-require './spec/support/samples/application_helper.rb'
-require './spec/support/samples/decorator.rb'
-require './spec/support/samples/decorator_with_allows.rb'
-require './spec/support/samples/decorator_with_multiple_allows.rb'
-require './spec/support/samples/decorator_with_application_helper.rb'
-require './spec/support/samples/decorator_with_denies.rb'
-require './spec/support/samples/namespaced_product.rb'
-require './spec/support/samples/namespaced_product_decorator.rb'
-require './spec/support/samples/product.rb'
-require './spec/support/samples/product_decorator.rb'
-require './spec/support/samples/specific_product_decorator.rb'
-require './spec/support/samples/some_thing.rb'
-require './spec/support/samples/some_thing_decorator.rb'
-require './spec/support/samples/widget.rb'
-require './spec/support/samples/widget_decorator.rb'
+require './spec/support/samples/active_model'
+require './spec/support/samples/active_record'
+require './spec/support/samples/application_controller'
+require './spec/support/samples/application_helper'
+require './spec/support/samples/decorator'
+require './spec/support/samples/decorator_with_allows'
+require './spec/support/samples/decorator_with_multiple_allows'
+require './spec/support/samples/decorator_with_application_helper'
+require './spec/support/samples/decorator_with_denies'
+require './spec/support/samples/namespaced_product'
+require './spec/support/samples/namespaced_product_decorator'
+require './spec/support/samples/non_active_model_product'
+require './spec/support/samples/product'
+require './spec/support/samples/product_decorator'
+require './spec/support/samples/specific_product_decorator'
+require './spec/support/samples/some_thing'
+require './spec/support/samples/some_thing_decorator'
+require './spec/support/samples/widget'
+require './spec/support/samples/widget_decorator'

data/spec/support/samples/active_model.rb

@@ -0,0 +1,9 @@
+module ActiveModel
+  module Conversion; end
+  module Validations; end
+
+  class Errors
+    def initialize(params = nil)
+    end
+  end
+end

data/spec/support/samples/active_record.rb

@@ -1,5 +1,13 @@
 module ActiveRecord
   class Base
+    include ActiveModel::Validations
+    include ActiveModel::Conversion
+
+    attr_reader :errors, :to_model
+
+    def initialize
+      @errors = ActiveModel::Errors.new(self)
+    end
 
     def self.limit
       self