draper 0.12.1 → 0.17.0

data/spec/draper/view_context_spec.rb

@@ -1,19 +1,30 @@
 require 'spec_helper'
+require 'draper/test/view_context'
 
 describe Draper::ViewContext do
+  before(:each) do
+    Thread.current[:current_view_context] = nil
+  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)
+  it "provides a method to create a view context while testing" do
+    Draper::ViewContext.should respond_to(:infect!)
   end
 
-  it "calls #before_filter with #set_current_view_context" do
-    app_controller.before_filters.should include(:set_current_view_context)
+  it "copies the controller's view context to draper" do
+    ctx = app_controller_instance.view_context
+    Draper::ViewContext.current.should == ctx
   end
 
-  it "raises an exception if the view_context is fetched without being set" do
-    Draper::ViewContext.current = nil
-    expect {app_controller.current_view_context}.should raise_exception(Exception)
+  describe "view_context priming" do
+    let(:app_controller_instance) { double(ApplicationController, :view_context => view_context) }
+    let(:view_context) { double("ApplicationController#view_context") }
+
+    it "primes the view_context when nil" do
+      app_controller.should_receive(:new).and_return(app_controller_instance)
+      Draper::ViewContext.current.should == view_context
+    end
   end
 end

data/spec/generators/decorator/decorator_generator_spec.rb

@@ -45,6 +45,10 @@ describe Rails::Generators::DecoratorGenerator do
        run_generator ["YourModel"]
       end
 
+      after do
+        Object.send(:remove_const, :ApplicationDecorator)
+      end
+
       subject { file('app/decorators/your_model_decorator.rb') }
       it { should exist }
       it { should contain "class YourModelDecorator < ApplicationDecorator" }

data/spec/spec_helper.rb

@@ -1,26 +1,36 @@
-require 'rubygems'
 require 'bundler/setup'
 require 'ammeter/init'
 require 'rails'
 
+require 'action_view'
+require './spec/support/samples/application_controller'
+
 Bundler.require
 
 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/decorator_with_denies_all'
+require './spec/support/samples/decorator_with_special_methods'
 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/sequel_product'
 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'
+
+module ActionController
+  class Base
+    Draper::System.setup(self)
+  end
+end

data/spec/support/samples/application_controller.rb

@@ -1,7 +1,16 @@
 require './spec/support/samples/application_helper'
 
 module ActionController
-  class Base
+  class AbstractController
+    def view_context
+      @view_context ||= ApplicationController
+    end
+
+    def view_context=(input)
+      @view_context = input
+    end
+  end
+  class Base < AbstractController
     @@before_filters = []
     def self.before_filters
       @@before_filters
@@ -12,22 +21,12 @@ module ActionController
   end
 end
 
-Draper::System.setup(:action_controller)
-
 class ApplicationController < ActionController::Base
   extend ActionView::Helpers
   extend ActionView::Helpers::TagHelper
   extend ActionView::Helpers::UrlHelper
   extend ApplicationHelper
 
-  def view_context
-    @view_context ||= ApplicationController
-  end
-
-  def view_context=(input)
-    @view_context = input
-  end
-
   def self.hello
     "Hello!"
   end

data/spec/support/samples/application_helper.rb

@@ -1,4 +1,7 @@
+require 'active_support/core_ext/string/output_safety.rb'
 module ApplicationHelper
+  include ERB::Util
+
   def hello_world
     "Hello, World!"
   end

data/spec/support/samples/decorator_with_application_helper.rb

@@ -18,4 +18,8 @@ class DecoratorWithApplicationHelper < Draper::Base
   def length
     "overridden"
   end
+
+  def sample_html_escaped_text
+    h.html_escape '<script>danger</script>'
+  end
 end

data/spec/support/samples/decorator_with_denies_all.rb

@@ -0,0 +1,3 @@
+class DecoratorWithDeniesAll < Draper::Base
+  denies_all
+end

data/spec/support/samples/decorator_with_special_methods.rb

@@ -0,0 +1,13 @@
+class DecoratorWithSpecialMethods < Draper::Base
+  def to_param
+    "foo"
+  end
+
+  def id
+    1337
+  end
+
+  def errors
+    ["omg errors!"]
+  end
+end

data/spec/support/samples/sequel_product.rb

@@ -0,0 +1,13 @@
+module Sequel
+ class Model
+   def each
+   end
+ end
+end
+
+class SequelProduct < Sequel::Model
+  def some_attribute
+    "hello"
+  end
+end
+

metadata

@@ -1,188 +1,126 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: draper
-version: !ruby/object:Gem::Version 
-  hash: 45
+version: !ruby/object:Gem::Version
+  version: 0.17.0
   prerelease: 
-  segments: 
-  - 0
-  - 12
-  - 1
-  version: 0.12.1
 platform: ruby
-authors: 
+authors:
 - Jeff Casimir
 - Steve Klabnik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 3
-        - 10
-        version: 2.3.10
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        - 3
-        version: 3.1.3
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
   name: actionpack
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        - 3
-        version: 3.1.3
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: ammeter
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 2
-        - 2
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: ammeter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.2.2
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: guard
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
+- !ruby/object:Gem::Dependency
   name: yard
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
 - .yardopts
-- CHANGELOG.txt
+- CHANGELOG.markdown
 - Gemfile
 - Guardfile
 - Rakefile
@@ -219,6 +157,9 @@ files:
 - lib/draper/railtie.rb
 - lib/draper/rspec_integration.rb
 - lib/draper/system.rb
+- lib/draper/test/minitest_integration.rb
+- lib/draper/test/rspec_integration.rb
+- lib/draper/test/view_context.rb
 - lib/draper/version.rb
 - lib/draper/view_context.rb
 - lib/generators/decorator/decorator_generator.rb
@@ -246,12 +187,15 @@ 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_denies_all.rb
 - spec/support/samples/decorator_with_multiple_allows.rb
+- spec/support/samples/decorator_with_special_methods.rb
 - spec/support/samples/namespaced_product.rb
 - spec/support/samples/namespaced_product_decorator.rb
 - spec/support/samples/non_active_model_product.rb
 - spec/support/samples/product.rb
 - spec/support/samples/product_decorator.rb
+- spec/support/samples/sequel_product.rb
 - spec/support/samples/some_thing.rb
 - spec/support/samples/some_thing_decorator.rb
 - spec/support/samples/specific_product_decorator.rb
@@ -259,38 +203,35 @@ files:
 - 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 26927068821793701
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 26927068821793701
 requirements: []
-
 rubyforge_project: draper
 rubygems_version: 1.8.24
 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
@@ -305,12 +246,15 @@ 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_denies_all.rb
 - spec/support/samples/decorator_with_multiple_allows.rb
+- spec/support/samples/decorator_with_special_methods.rb
 - spec/support/samples/namespaced_product.rb
 - spec/support/samples/namespaced_product_decorator.rb
 - spec/support/samples/non_active_model_product.rb
 - spec/support/samples/product.rb
 - spec/support/samples/product_decorator.rb
+- spec/support/samples/sequel_product.rb
 - spec/support/samples/some_thing.rb
 - spec/support/samples/some_thing_decorator.rb
 - spec/support/samples/specific_product_decorator.rb

data/CHANGELOG.txt

@@ -1,23 +0,0 @@
-= Draper Changelog
-
-= Master
-
-== 0.12.1
-
-* Added Changelog
-
-* Prevented double decoration, see #173
-
-* ActiveModel::Errors support, 19496f0c
-
-* Fixed autoloading issue, see #188
-
-* Re-did generators, see 9155e58f
-
-* Added capybara integration, see 57c8678e
-
-* Fixed a few bugs with the DecoratedEnumerableProxy
-
-== 0.11.1
-
-* Fixed regression, we don't want to introduce a hard dependency on Rails. #107