draper 0.10.0 → 0.11.0

data/spec/generators/draper/install/install_generator_spec.rb

@@ -19,24 +19,24 @@ describe Draper::InstallGenerator do
         it { should contain "class ApplicationDecorator < Draper::Base" }
       end
     end
-    
+
     describe 'spec/decorators/application_decorator_spec.rb' do
       subject { file('spec/decorators/application_decorator_spec.rb') }
       it { should exist }
       it { should contain "describe ApplicationDecorator do" }
     end
   end
-  
+
   context "using test_unit" do
     before { run_generator ["", "-t=test_unit"]  }
-    
+
     it_should_behave_like "ApplicationDecoratorGenerator"
-    
+
     describe 'spec/decorators/application_decorator_spec.rb' do
       subject { file('spec/decorators/application_decorator_spec.rb') }
       it { should_not exist }
     end
-    
+
     describe 'spec/decorators/application_decorator_test.rb' do
       subject { file('test/decorators/application_decorator_test.rb') }
       it { should exist }

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ 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'
@@ -14,5 +15,7 @@ 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'

data/spec/support/samples/application_controller.rb

@@ -9,38 +9,35 @@ module ActionController
     def self.before_filter(name)
       @@before_filters << name
     end
-    def self.helper(mod)
-      extend mod
-    end
   end
 end
 
+Draper::System.setup(:action_controller)
+
 class ApplicationController < ActionController::Base
   extend ActionView::Helpers
   extend ActionView::Helpers::TagHelper
   extend ActionView::Helpers::UrlHelper
-  extend ApplicationHelper    
-  
+  extend ApplicationHelper
+
   def view_context
     @view_context ||= ApplicationController
   end
-  
+
   def view_context=(input)
     @view_context = input
   end
-  
+
   def self.hello
     "Hello!"
   end
-  
+
   def self.capture(&block)
     @@capture = true
     block.call
   end
-  
+
   def self.capture_triggered
     @@capture ||= false
   end
 end
-
-Draper::System.setup

data/spec/support/samples/decorator_with_allows.rb

@@ -1,3 +1,3 @@
-class DecoratorWithAllows < Draper::Base  
+class DecoratorWithAllows < Draper::Base
   allows :goodnight_moon
 end

data/spec/support/samples/decorator_with_application_helper.rb

@@ -1,20 +1,20 @@
-class DecoratorWithApplicationHelper < Draper::Base  
+class DecoratorWithApplicationHelper < Draper::Base
   def uses_hello_world
     h.hello_world
   end
-  
+
   def sample_content
     h.content_tag :span, "Hello, World!"
   end
-  
+
   def sample_link
     h.link_to "Hello", "/World"
   end
-  
+
   def sample_truncate
     h.truncate("Once upon a time", :length => 7)
   end
-  
+
   def length
     "overridden"
   end

data/spec/support/samples/decorator_with_denies.rb

@@ -1,3 +1,3 @@
-class DecoratorWithDenies < Draper::Base  
+class DecoratorWithDenies < Draper::Base
   denies :goodnight_moon, :title
 end

data/spec/support/samples/decorator_with_multiple_allows.rb

@@ -0,0 +1,4 @@
+class DecoratorWithMultipleAllows < Draper::Base
+  allows :goodnight_moon
+  allows :hello_world
+end

data/spec/support/samples/product.rb

@@ -1,6 +1,10 @@
 class Product < ActiveRecord::Base
   include Draper::ModelSupport
 
+  def self.find_by_name(name)
+    @@dummy ||= Product.new
+  end
+
   def self.first
     @@first ||= Product.new
   end
@@ -8,7 +12,7 @@ class Product < ActiveRecord::Base
   def self.last
     @@last ||= Product.new
   end
-  
+
   def self.all
     [Product.new, Product.new]
   end
@@ -24,29 +28,33 @@ class Product < ActiveRecord::Base
   def self.find(id)
     return Product.new
   end
-  
+
   def self.sample_class_method
     "sample class method"
   end
-  
+
   def hello_world
     "Hello, World"
   end
-  
+
   def goodnight_moon
     "Goodnight, Moon"
   end
-  
+
   def title
     "Sample Title"
   end
-  
+
+  def some_action
+    self.nonexistant_method
+  end
+
   def block
     yield
   end
 
   def self.reflect_on_association(association_symbol)
-    OpenStruct.new(:klass => self)
+    association_symbol.to_s.starts_with?("poro") ? nil : OpenStruct.new(:klass => self)
   end
 
   def similar_products
@@ -56,4 +64,17 @@ class Product < ActiveRecord::Base
   def previous_version
     Product.new
   end
+
+  def thing
+    SomeThing.new
+  end
+
+  def poro_similar_products
+    [Product.new, Product.new]
+  end
+
+  def poro_previous_version
+    Product.new
+  end
+
 end

data/spec/support/samples/some_thing.rb

@@ -0,0 +1,2 @@
+class SomeThing < Product
+end

data/spec/support/samples/some_thing_decorator.rb

@@ -0,0 +1,3 @@
+class SomeThingDecorator < Draper::Base
+  decorates :some_thing
+end

metadata

@@ -1,34 +1,50 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: draper
-version: !ruby/object:Gem::Version
-  version: 0.10.0
+version: !ruby/object:Gem::Version 
+  hash: 51
   prerelease: 
+  segments: 
+  - 0
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
-authors:
+authors: 
 - Jeff Casimir
+- Steve Klabnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &70130732077940 !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
-  prerelease: false
-  version_requirements: *70130732077940
+  version_requirements: *id001
 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
@@ -65,6 +81,7 @@ files:
 - lib/draper/helper_support.rb
 - lib/draper/lazy_helpers.rb
 - lib/draper/model_support.rb
+- lib/draper/railtie.rb
 - lib/draper/rspec_integration.rb
 - lib/draper/system.rb
 - lib/draper/version.rb
@@ -72,15 +89,13 @@ files:
 - lib/generators/draper/decorator/USAGE
 - lib/generators/draper/decorator/decorator_generator.rb
 - lib/generators/draper/decorator/templates/decorator.rb
+- lib/generators/draper/decorator/templates/decorator_spec.rb
+- lib/generators/draper/decorator/templates/decorator_test.rb
 - lib/generators/draper/install/install_generator.rb
 - lib/generators/draper/install/templates/application_decorator.rb
 - lib/generators/draper/install/templates/application_decorator_spec.rb
 - lib/generators/draper/install/templates/application_decorator_test.rb
 - lib/generators/rails/decorator_generator.rb
-- lib/generators/rspec/decorator_generator.rb
-- lib/generators/rspec/templates/decorator_spec.rb
-- lib/generators/test_unit/decorator_generator.rb
-- lib/generators/test_unit/templates/decorator_test.rb
 - performance/active_record.rb
 - performance/bechmark.rb
 - performance/decorators.rb
@@ -91,8 +106,6 @@ files:
 - spec/draper/view_context_spec.rb
 - spec/generators/draper/decorator/decorator_generator_spec.rb
 - spec/generators/draper/install/install_generator_spec.rb
-- spec/generators/rspec/decorator_generator_spec.rb
-- spec/generators/test_unit/decorator_generator_spec.rb
 - spec/spec_helper.rb
 - spec/support/samples/active_record.rb
 - spec/support/samples/application_controller.rb
@@ -101,46 +114,56 @@ files:
 - spec/support/samples/decorator_with_allows.rb
 - spec/support/samples/decorator_with_application_helper.rb
 - spec/support/samples/decorator_with_denies.rb
+- spec/support/samples/decorator_with_multiple_allows.rb
 - spec/support/samples/namespaced_product.rb
 - spec/support/samples/namespaced_product_decorator.rb
 - spec/support/samples/product.rb
 - spec/support/samples/product_decorator.rb
+- spec/support/samples/some_thing.rb
+- spec/support/samples/some_thing_decorator.rb
 - spec/support/samples/specific_product_decorator.rb
 - spec/support/samples/widget.rb
 - 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.10
+rubygems_version: 1.8.15
 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
 - spec/draper/view_context_spec.rb
 - spec/generators/draper/decorator/decorator_generator_spec.rb
 - spec/generators/draper/install/install_generator_spec.rb
-- spec/generators/rspec/decorator_generator_spec.rb
-- spec/generators/test_unit/decorator_generator_spec.rb
 - spec/spec_helper.rb
 - spec/support/samples/active_record.rb
 - spec/support/samples/application_controller.rb
@@ -149,11 +172,13 @@ test_files:
 - spec/support/samples/decorator_with_allows.rb
 - spec/support/samples/decorator_with_application_helper.rb
 - spec/support/samples/decorator_with_denies.rb
+- spec/support/samples/decorator_with_multiple_allows.rb
 - spec/support/samples/namespaced_product.rb
 - spec/support/samples/namespaced_product_decorator.rb
 - spec/support/samples/product.rb
 - spec/support/samples/product_decorator.rb
+- spec/support/samples/some_thing.rb
+- spec/support/samples/some_thing_decorator.rb
 - spec/support/samples/specific_product_decorator.rb
 - spec/support/samples/widget.rb
 - spec/support/samples/widget_decorator.rb
-has_rdoc: 

data/lib/generators/rspec/decorator_generator.rb

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

data/lib/generators/test_unit/decorator_generator.rb

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

data/spec/generators/rspec/decorator_generator_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-# Generators are not automatically loaded by Rails
-require 'generators/rspec/decorator_generator'
-
-describe Rspec::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 }
-
-  describe 'no arguments' do
-    before { run_generator %w(products)  }
-
-    describe 'spec/decorators/products_decorator_spec.rb' do
-      subject { file('spec/decorators/products_decorator_spec.rb') }
-      it { should exist }
-      it { should contain "describe ProductsDecorator" }
-    end
-
-  end
-end