draper 1.0.0.beta3 → 1.0.0.beta4

data/CHANGELOG.markdown

@@ -1,5 +1,23 @@
 # Draper Changelog
 
+## 1.0.0.beta4
+
+* Fixed a race condition with capybara integration. [https://github.com/drapergem/draper/commit/e79464931e7b98c85ed5d78ed9ca38d51f43006e](https://github.com/drapergem/draper/commit/e79464931e7b98c85ed5d78ed9ca38d51f43006e)
+
+* `[]` can be decorated again. [https://github.com/drapergem/draper/commit/597fbdf0c80583f5ea6df9f7350fefeaa0cca989](https://github.com/drapergem/draper/commit/597fbdf0c80583f5ea6df9f7350fefeaa0cca989)
+
+* `model == decorator` as well as `decorator == model`. [https://github.com/drapergem/draper/commit/46f8a6823c50c13e5c9ab3c07723f335c4e291bc](https://github.com/drapergem/draper/commit/46f8a6823c50c13e5c9ab3c07723f335c4e291bc)
+
+* Preliminary Mongoid integration. [https://github.com/drapergem/draper/commit/892d1954202c61fd082a07213c8d4a23560687bc](https://github.com/drapergem/draper/commit/892d1954202c61fd082a07213c8d4a23560687bc)
+
+* Add a helper method `sign_in` for devise in decorator specs. [https://github.com/drapergem/draper/commit/66a30093ed4207d02d8fa60bda4df2da091d85a3](https://github.com/drapergem/draper/commit/66a30093ed4207d02d8fa60bda4df2da091d85a3)
+
+* Brought back `context`. [https://github.com/drapergem/draper/commit/9609156b997b3a469386eef3a5f043b24d8a2fba](https://github.com/drapergem/draper/commit/9609156b997b3a469386eef3a5f043b24d8a2fba)
+
+* Fixed issue where classes were incorrectly being looked up. [https://github.com/drapergem/draper/commit/ee2a015514ff87dfd2158926457e988c2fc3fd79](https://github.com/drapergem/draper/commit/ee2a015514ff87dfd2158926457e988c2fc3fd79)
+
+* Integrate RequestStore for per-request storage. [https://github.com/drapergem/draper/commit/fde1cde9adfb856750c1f616d8b62d221ef97fc6](https://github.com/drapergem/draper/commit/fde1cde9adfb856750c1f616d8b62d221ef97fc6)
+
 ## 1.0.0.beta3
 
 * Relaxed Rails version requirement to 3.0. Support for < 3.2 should be
@@ -7,13 +25,13 @@
 
 ## 1.0.0.beta2
 
-* `has_finders` is now `decorates_finders`. [https://github.com/haines/draper/commit/33f18aa062e0d3848443dbd81047f20d5665579f](https://github.com/haines/draper/commit/33f18aa062e0d3848443dbd81047f20d5665579f)
+* `has_finders` is now `decorates_finders`. [https://github.com/drapergem/draper/commit/33f18aa062e0d3848443dbd81047f20d5665579f](https://github.com/drapergem/draper/commit/33f18aa062e0d3848443dbd81047f20d5665579f)
 
-* If a finder method is used, and the source class is not set and cannot be inferred, an `UninferrableSourceError` is raised. [https://github.com/haines/draper/commit/8ef5bf2f02f7033e3cd4f1f5de7397b02c984fe3](https://github.com/haines/draper/commit/8ef5bf2f02f7033e3cd4f1f5de7397b02c984fe3)
+* If a finder method is used, and the source class is not set and cannot be inferred, an `UninferrableSourceError` is raised. [https://github.com/drapergem/draper/commit/8ef5bf2f02f7033e3cd4f1f5de7397b02c984fe3](https://github.com/drapergem/draper/commit/8ef5bf2f02f7033e3cd4f1f5de7397b02c984fe3)
 
-* Class methods are now properly delegated again. [https://github.com/haines/draper/commit/731995a5feac4cd06cf9328d2892c0eca9992db6](https://github.com/haines/draper/commit/731995a5feac4cd06cf9328d2892c0eca9992db6)
+* Class methods are now properly delegated again. [https://github.com/drapergem/draper/commit/731995a5feac4cd06cf9328d2892c0eca9992db6](https://github.com/drapergem/draper/commit/731995a5feac4cd06cf9328d2892c0eca9992db6)
 
-* We no longer `respond_to?` private methods on the source. [https://github.com/haines/draper/commit/18ebac81533a6413aa20a3c26f23e91d0b12b031](https://github.com/haines/draper/commit/18ebac81533a6413aa20a3c26f23e91d0b12b031)
+* We no longer `respond_to?` private methods on the source. [https://github.com/drapergem/draper/commit/18ebac81533a6413aa20a3c26f23e91d0b12b031](https://github.com/drapergem/draper/commit/18ebac81533a6413aa20a3c26f23e91d0b12b031)
 
 * Rails versioning relaxed to support Rails 4 [https://github.com/drapergem/draper/commit/8bfd393b5baa7aa1488076a5e2cb88648efaa815](https://github.com/drapergem/draper/commit/8bfd393b5baa7aa1488076a5e2cb88648efaa815)
 
@@ -50,27 +68,27 @@ And many small bug fixes and refactorings.
 
 ## 0.17.0
 
-* [Fix earlier fix of `view_context` priming](https://github.com/jcasimir/draper/commit/5da44336)
-* [Add `denies_all`](https://github.com/jcasimir/draper/commit/148e732)
-* [Properly proxy associations with regard to `find`](https://github.com/jcasimir/draper/commit/d46d19205e)
+* [Fix earlier fix of `view_context` priming](https://github.com/drapergem/draper/commit/5da44336)
+* [Add `denies_all`](https://github.com/drapergem/draper/commit/148e732)
+* [Properly proxy associations with regard to `find`](https://github.com/drapergem/draper/commit/d46d19205e)
 
 ## 0.16.0
 
-* [Automatically prime `view_context`](https://github.com/jcasimir/draper/commit/057ab4e8)
-* [Fixed bug where rspec eq matchers didn't work]((https://github.com/jcasimir/draper/commit/57617b)
-* [Sequel ORM support](https://github.com/jcasimir/draper/commit/7d4942)
+* [Automatically prime `view_context`](https://github.com/drapergem/draper/commit/057ab4e8)
+* [Fixed bug where rspec eq matchers didn't work]((https://github.com/drapergem/draper/commit/57617b)
+* [Sequel ORM support](https://github.com/drapergem/draper/commit/7d4942)
 * Fixed issues with newer minitest
-* [Changed the way the `view_context` gets set](https://github.com/jcasimir/draper/commit/0b03d9c)
+* [Changed the way the `view_context` gets set](https://github.com/drapergem/draper/commit/0b03d9c)
 
 ## 0.15.0
 
 * Proper minitest integration
-* [We can properly decorate scoped associations](https://github.com/jcasimir/draper/issues/223)
-* [Fixed awkward eager loading](https://github.com/jcasimir/draper/commit/7dc3510b)
+* [We can properly decorate scoped associations](https://github.com/drapergem/draper/issues/223)
+* [Fixed awkward eager loading](https://github.com/drapergem/draper/commit/7dc3510b)
 
 ## 0.14.0
 
-* [Properly prime the view context in Rails Console](https://github.com/jcasimir/draper/commit/738074f)
+* [Properly prime the view context in Rails Console](https://github.com/drapergem/draper/commit/738074f)
 * Make more gems development requirements only
 
 ## 0.13.0
@@ -82,7 +100,7 @@ And many small bug fixes and refactorings.
 
 ## 0.12.3
 
-* [Fix i18n issue](https://github.com/jcasimir/draper/issues/202)
+* [Fix i18n issue](https://github.com/drapergem/draper/issues/202)
 
 ## 0.12.2
 
@@ -93,13 +111,13 @@ And many small bug fixes and refactorings.
 ## 0.12.0
 
 * Added Changelog
-* [Prevented double decoration](https://github.com/jcasimir/draper/issues/173)
-* [`ActiveModel::Errors` support](https://github.com/jcasimir/draper/commit/19496f0c)
-* [Fixed autoloading issue](https://github.com/jcasimir/draper/issues/188)
-* [Re-did generators](https://github.com/jcasimir/draper/commit/9155e58f)
-* [Added capybara integration](https://github.com/jcasimir/draper/commit/57c8678e)
+* [Prevented double decoration](https://github.com/drapergem/draper/issues/173)
+* [`ActiveModel::Errors` support](https://github.com/drapergem/draper/commit/19496f0c)
+* [Fixed autoloading issue](https://github.com/drapergem/draper/issues/188)
+* [Re-did generators](https://github.com/drapergem/draper/commit/9155e58f)
+* [Added capybara integration](https://github.com/drapergem/draper/commit/57c8678e)
 * Fixed a few bugs with the `DecoratedEnumerableProxy`
 
 ## 0.11.1
 
-* [Fixed regression, we don't want to introduce a hard dependency on Rails](https://github.com/jcasimir/draper/issues/107)
+* [Fixed regression, we don't want to introduce a hard dependency on Rails](https://github.com/drapergem/draper/issues/107)

data/Readme.markdown

@@ -12,10 +12,12 @@
   1. `h` to proxy to Rails/application helpers like `h.current_user`
   2. the name of your decorated model to access the wrapped object like `article.created_at`
 5. Wrap models in your controller with the decorator using:
-  1. `.decorate` method with a single object or collection,
-    ex: `ArticleDecorator.decorate(Article.all)`
+  1. `.decorate` method with a single object,
+    ex: `ArticleDecorator.decorate(Article.first)`
   2. `.new` method with single object
     ex: `ArticleDecorator.new(Article.first)`
+  3. `.decorate_collection` method with a collection,
+    ex: `ArticleDecorator.decorate_collection(Article.all)`
 6. Call decorator methods from your view templates
   ex: `<%= @article_decorator.created_at %>`
 
@@ -201,7 +203,7 @@ ArticleDecorator.new(Article.find(params[:id]))
 
 ```ruby
 ArticleDecorator.decorate(Article.first) # Returns one instance of ArticleDecorator
-ArticleDecorator.decorate(Article.all)   # Returns an enumeration proxy of ArticleDecorator instances
+ArticleDecorator.decorate_collection(Article.all)   # Returns CollectionDecorator of ArticleDecorator
 ```
 
 ### In Your Views

data/draper.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activesupport', '>= 3.0'
   s.add_dependency 'actionpack', '>= 3.0'
+  s.add_dependency 'request_store', '~> 1.0.0'
 
   s.add_development_dependency 'ammeter'
   s.add_development_dependency 'rake', '~> 0.9.2'

data/lib/draper.rb

@@ -14,10 +14,7 @@ require 'draper/view_context'
 require 'draper/collection_decorator'
 require 'draper/railtie' if defined?(Rails)
 
-# Test Support
-require 'draper/test/rspec_integration'     if defined?(RSpec) and RSpec.respond_to?(:configure)
-require 'draper/test/minitest_integration'  if defined?(MiniTest::Rails)
-require 'draper/test/test_unit_integration'
+require 'active_support/core_ext/hash/keys'
 
 module Draper
   def self.setup_action_controller(base)
@@ -37,7 +34,7 @@ module Draper
     end
   end
 
-  def self.setup_active_record(base)
+  def self.setup_orm(base)
     base.class_eval do
       include Draper::Decoratable
     end

data/lib/draper/collection_decorator.rb

@@ -3,20 +3,21 @@ module Draper
     include Enumerable
     include ViewHelpers
 
-    attr_accessor :source, :options, :decorator_class
+    attr_accessor :source, :context, :decorator_class
     alias_method :to_source, :source
 
     delegate :as_json, *(Array.instance_methods - Object.instance_methods), to: :decorated_collection
 
     # @param source collection to decorate
-    # @param options [Hash] passed to each item's decorator (except
-    #   for the keys listed below)
-    # @option options [Class,Symbol] :with the class used to decorate
+    # @param [Hash] options (optional)
+    # @option options [Class, Symbol] :with the class used to decorate
     #   items, or `:infer` to call each item's `decorate` method instead
+    # @option options [Hash] :context context available to each item's decorator
     def initialize(source, options = {})
+      options.assert_valid_keys(:with, :context)
       @source = source
-      @decorator_class = options.delete(:with) || self.class.inferred_decorator_class
-      @options = options
+      @decorator_class = options.fetch(:with) { self.class.inferred_decorator_class }
+      @context = options.fetch(:context, {})
     end
 
     class << self
@@ -56,18 +57,18 @@ module Draper
       "#<CollectionDecorator of #{decorator_class} for #{source.inspect}>"
     end
 
-    def options=(options)
-      each {|item| item.options = options }
-      @options = options
+    def context=(value)
+      @context = value
+      each {|item| item.context = value } if @decorated_collection
     end
 
     protected
 
     def decorate_item(item)
       if decorator_class == :infer
-        item.decorate(options)
+        item.decorate(context: context)
       else
-        decorator_class.decorate(item, options)
+        decorator_class.decorate(item, context: context)
       end
     end
 

data/lib/draper/decoratable.rb

@@ -21,7 +21,7 @@ module Draper::Decoratable
     false
   end
 
-  def ===(other)
+  def ==(other)
     super || (other.respond_to?(:source) && super(other.source))
   end
 

data/lib/draper/decorated_association.rb

@@ -1,19 +1,24 @@
 module Draper
   class DecoratedAssociation
 
-    attr_reader :source, :association, :options
+    attr_reader :base, :association, :options
 
-    def initialize(source, association, options)
-      @source = source
+    def initialize(base, association, options)
+      @base = base
       @association = association
+      options.assert_valid_keys(:with, :scope, :context)
       @options = options
     end
 
     def call
-      return undecorated if undecorated.nil? || undecorated == []
+      return undecorated if undecorated.nil?
       decorate
     end
 
+    def source
+      base.source
+    end
+
     private
 
     def undecorated
@@ -25,7 +30,7 @@ module Draper
     end
 
     def decorate
-      @decorated ||= decorator_class.send(decorate_method, undecorated, options)
+      @decorated ||= decorator_class.send(decorate_method, undecorated, decorator_options)
     end
 
     def decorate_method
@@ -51,5 +56,15 @@ module Draper
       end
     end
 
+    def decorator_options
+      decorator_class # Ensures options[:with] = :infer for unspecified collections
+
+      dec_options = collection? ? options.slice(:with, :context) : options.slice(:context)
+      dec_options[:context] = base.context unless dec_options.key?(:context)
+      if dec_options[:context].respond_to?(:call)
+        dec_options[:context] = dec_options[:context].call(base.context) 
+      end
+      dec_options
+    end
   end
 end

data/lib/draper/decorator.rb

@@ -5,14 +5,15 @@ module Draper
     include Draper::ViewHelpers
     include ActiveModel::Serialization if defined?(ActiveModel::Serialization)
 
-    attr_accessor :source, :options
+    attr_accessor :source, :context
 
     alias_method :model, :source
     alias_method :to_source, :source
 
     # Initialize a new decorator instance by passing in
     # an instance of the source class. Pass in an optional
-    # context inside the options hash is stored for later use.
+    # :context inside the options hash which is available
+    # for later use.
     #
     # A decorator cannot be applied to other instances of the
     # same decorator and will instead result in a decorator
@@ -23,11 +24,13 @@ module Draper
     #
     # @param [Object] source object to decorate
     # @param [Hash] options (optional)
+    # @option options [Hash] :context context available to the decorator
     def initialize(source, options = {})
+      options.assert_valid_keys(:context)
       source.to_a if source.respond_to?(:to_a) # forces evaluation of a lazy query from AR
       @source = source
-      @options = options
-      handle_multiple_decoration if source.is_a?(Draper::Decorator)
+      @context = options.fetch(:context, {})
+      handle_multiple_decoration(options) if source.is_a?(Draper::Decorator)
     end
 
     class << self
@@ -38,7 +41,7 @@ module Draper
     #
     # @param [String, Symbol, Class] Class or name of class to decorate.
     def self.decorates(klass)
-      @source_class = klass.to_s.classify.constantize
+      @source_class = klass.to_s.camelize.constantize
     end
 
     # @return [Class] The source class corresponding to this
@@ -72,9 +75,15 @@ module Draper
     # @param [Symbol] association name of association to decorate, like `:products`
     # @option options [Class] :with the decorator to apply to the association
     # @option options [Symbol] :scope a scope to apply when fetching the association
+    # @option options [Hash, #call] :context context available to decorated
+    #   objects in collection.  Passing a `lambda` or similar will result in that
+    #   block being called when the association is evaluated.  The block will be
+    #   passed the base decorator's `context` Hash and should return the desired
+    #   context Hash for the decorated items.
     def self.decorates_association(association, options = {})
+      options.assert_valid_keys(:with, :scope, :context)
       define_method(association) do
-        decorated_associations[association] ||= Draper::DecoratedAssociation.new(source, association, options)
+        decorated_associations[association] ||= Draper::DecoratedAssociation.new(self, association, options)
         decorated_associations[association].call
       end
     end
@@ -82,7 +91,8 @@ module Draper
     # A convenience method for decorating multiple associations. Calls
     # decorates_association on each of the given symbols.
     #
-    # @param [Symbols*] associations name of associations to decorate
+    # @param [Symbols*] associations names of associations to decorate
+    # @param [Hash] options passed to `decorate_association`
     def self.decorates_associations(*associations)
       options = associations.extract_options!
       associations.each do |association|
@@ -128,7 +138,9 @@ module Draper
     #   for the keys listed below)
     # @option options [Class,Symbol] :with (self) the class used to decorate
     #   items, or `:infer` to call each item's `decorate` method instead
+    # @option options [Hash] :context context available to decorated items
     def self.decorate_collection(source, options = {})
+      options.assert_valid_keys(:with, :context)
       Draper::CollectionDecorator.new(source, options.reverse_merge(with: self))
     end
 
@@ -244,9 +256,9 @@ module Draper
       self.class.security.allow?(method)
     end
 
-    def handle_multiple_decoration
+    def handle_multiple_decoration(options)
       if source.instance_of?(self.class)
-        self.options = source.options if options.empty?
+        self.context = source.context unless options.has_key?(:context)
         self.source = source.source
       elsif source.decorated_with?(self.class)
         warn "Reapplying #{self.class} decorator to target that is already decorated with it. Call stack:\n#{caller(1).join("\n")}"

data/lib/draper/railtie.rb

@@ -16,6 +16,11 @@ module Draper
 
     config.after_initialize do |app|
       app.config.paths.add 'app/decorators', eager_load: true
+
+      # Test Support
+      require 'draper/test/rspec_integration' if defined?(RSpec) and RSpec.respond_to?(:configure)
+      require 'draper/test/minitest_integration'  if defined?(MiniTest::Rails)
+      require 'draper/test/test_unit_integration'
     end
 
     initializer "draper.setup_action_controller" do |app|
@@ -30,9 +35,11 @@ module Draper
       end
     end
 
-    initializer "draper.setup_active_record" do |app|
-      ActiveSupport.on_load :active_record do
-        Draper.setup_active_record self
+    initializer "draper.setup_orm" do |app|
+      [:active_record, :mongoid].each do |orm|
+        ActiveSupport.on_load orm do
+          Draper.setup_orm self
+        end
       end
     end
 

data/lib/draper/test/rspec_integration.rb

@@ -3,6 +3,39 @@ module Draper
     extend ActiveSupport::Concern
     included { metadata[:type] = :decorator }
   end
+
+  module DeviseHelper
+    def sign_in(user)
+      warden.stub :authenticate! => user
+      controller.stub :current_user => user
+      user
+    end
+
+    private
+
+    def request
+      @request ||= ::ActionDispatch::TestRequest.new
+    end
+
+    def controller
+      return @controller if @controller
+      @controller = ApplicationController.new
+      @controller.request = request
+      ::Draper::ViewContext.current = @controller.view_context
+      @controller
+    end
+
+    # taken from Devise's helper but uses the request method instead of @request
+    #   and we don't really need the rest of their helper
+    def warden
+      @warden ||= begin
+        manager = Warden::Manager.new(nil) do |config|
+          config.merge! Devise.warden_config
+        end
+        request.env['warden'] = Warden::Proxy.new(request.env, manager)
+      end
+    end
+  end
 end
 
 RSpec.configure do |config|
@@ -11,12 +44,24 @@ RSpec.configure do |config|
     :file_path => /spec[\\\/]decorators/
   }
 
+  if defined?(Devise)
+    config.include Draper::DeviseHelper, :type => :decorator
+  end
 end
 
-if defined?(Capybara)
-  require 'capybara/rspec/matchers'
+module Draper
+  module RSpec
+    class Railtie < Rails::Railtie
+      config.after_initialize do |app|
+        if defined?(Capybara)
+          require 'capybara/rspec/matchers'
 
-  RSpec.configure do |config|
-    config.include Capybara::RSpecMatchers, :type => :decorator
+          ::RSpec.configure do |config|
+            config.include Capybara::RSpecMatchers, :type => :decorator
+          end
+        end
+      end
+    end
   end
 end
+

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = "1.0.0.beta3"
+  VERSION = "1.0.0.beta4"
 end

data/lib/draper/view_context.rb

@@ -1,3 +1,5 @@
+require 'request_store'
+
 module Draper
   module ViewContext
     def view_context
@@ -7,19 +9,19 @@ module Draper
     end
 
     def self.current_controller
-      Thread.current[:current_controller] || ApplicationController.new
+      RequestStore.store[:current_controller] || ApplicationController.new
     end
 
     def self.current_controller=(controller)
-      Thread.current[:current_controller] = controller
+      RequestStore.store[:current_controller] = controller
     end
 
     def self.current
-      Thread.current[:current_view_context] ||= build_view_context
+      RequestStore.store[:current_view_context] ||= build_view_context
     end
 
     def self.current=(context)
-      Thread.current[:current_view_context] = context
+      RequestStore.store[:current_view_context] = context
     end
 
     def self.build_view_context

data/spec/draper/collection_decorator_spec.rb

@@ -16,33 +16,70 @@ describe Draper::CollectionDecorator do
     subject.map{|item| item.source}.should == source
   end
 
-  context "with options" do
-    subject { Draper::CollectionDecorator.new(source, with: ProductDecorator, some: "options") }
+  context "with context" do
+    subject { Draper::CollectionDecorator.new(source, with: ProductDecorator, context: {some: 'context'}) }
 
-    its(:options) { should == {some: "options"} }
+    its(:context) { should == {some: 'context'} }
 
-    it "passes options to the individual decorators" do
+    it "passes context to the individual decorators" do
       subject.each do |item|
-        item.options.should == {some: "options"}
+        item.context.should == {some: 'context'}
       end
     end
 
-    describe "#options=" do
-      it "updates the options on the collection decorator" do
-        subject.options = {other: "options"}
-        subject.options.should == {other: "options"}
+    it "does not tie the individual decorators' contexts together" do
+      subject.each do |item|
+        item.context.should == {some: 'context'}
+        item.context = {alt: 'context'}
+        item.context.should == {alt: 'context'}
+      end
+    end
+
+    describe "#context=" do
+      it "updates the collection decorator's context" do
+        subject.context = {other: 'context'}
+        subject.context.should == {other: 'context'}
       end
 
-      it "updates the options on the individual decorators" do
-        subject.options = {other: "options"}
-        subject.each do |item|
-          item.options.should == {other: "options"}
+      context "when the collection is already decorated" do
+        it "updates the items' context" do
+          subject.decorated_collection
+          subject.context = {other: 'context'}
+          subject.each do |item|
+            item.context.should == {other: 'context'}
+          end
+        end
+      end
+
+      context "when the collection has not yet been decorated" do
+        it "does not trigger decoration" do
+          subject.should_not_receive(:decorated_collection)
+          subject.context = {other: 'context'}
+        end
+
+        it "sets context after decoration is triggered" do
+          subject.context = {other: 'context'}
+          subject.each do |item|
+            item.context.should == {other: 'context'}
+          end
         end
       end
     end
   end
 
   describe "#initialize" do
+    describe "options validation" do
+      let(:valid_options) { {with: ProductDecorator, context: {}} }
+
+      it "does not raise error on valid options" do
+        expect { Draper::CollectionDecorator.new(source, valid_options) }.to_not raise_error
+      end
+
+      it "raises error on invalid options" do
+        expect { Draper::CollectionDecorator.new(source, valid_options.merge(foo: 'bar')) }.to raise_error(ArgumentError, 'Unknown key: foo')
+      end
+    end
+
     context "when the :with option is given" do
       context "and the decorator can't be inferred from the class" do
         subject { Draper::CollectionDecorator.new(source, with: ProductDecorator) }
@@ -123,14 +160,14 @@ describe Draper::CollectionDecorator do
   end
 
   describe "#localize" do
-    before { subject.helpers.should_receive(:localize).with(:an_object, {some: "options"}) }
+    before { subject.helpers.should_receive(:localize).with(:an_object, {some: 'parameter'}) }
 
     it "delegates to helpers" do
-      subject.localize(:an_object, some: "options")
+      subject.localize(:an_object, some: 'parameter')
     end
 
     it "is aliased to #l" do
-      subject.l(:an_object, some: "options")
+      subject.l(:an_object, some: 'parameter')
     end
   end
 

data/spec/draper/decoratable_spec.rb

@@ -9,9 +9,9 @@ describe Draper::Decoratable do
      subject.decorate.source.should be subject
    end
 
-    it "accepts options" do
-      decorator = subject.decorate(some: "options")
-      decorator.options.should == {some: "options"}
+    it "accepts context" do
+      decorator = subject.decorate(context: {some: 'context'})
+      decorator.context.should == {some: 'context'}
     end
 
     it "is not memoized" do
@@ -45,6 +45,34 @@ describe Draper::Decoratable do
     end
   end
 
+  describe "#==" do
+    context "with itself" do
+      it "returns true" do
+        (subject == subject).should be_true
+      end
+    end
+
+    context "with another instance" do
+      it "returns false" do
+        (subject == Product.new).should be_false
+      end
+    end
+
+    context "with a decorated version of itself" do
+      it "returns true" do
+        decorator = double(source: subject)
+        (subject == decorator).should be_true
+      end
+    end
+
+    context "with a decorated other instance" do
+      it "returns false" do
+        decorator = double(source: Product.new)
+        (subject == decorator).should be_false
+      end
+    end
+  end
+
   describe "#===" do
     context "with itself" do
       it "returns true" do
@@ -125,9 +153,9 @@ describe Draper::Decoratable do
       decorator.source.should be Product.scoped
     end
 
-    it "accepts options" do
-      decorator = Product.decorate(some: "options")
-      decorator.options.should == {some: "options"}
+    it "accepts context" do
+      decorator = Product.decorate(context: {some: 'context'})
+      decorator.context.should == {some: 'context'}
     end
 
     it "is not memoized" do

data/spec/draper/decorated_association_spec.rb

@@ -1,10 +1,52 @@
 require 'spec_helper'
 
 describe Draper::DecoratedAssociation do
-  let(:decorated_association) { Draper::DecoratedAssociation.new(source, association, options) }
+  let(:decorated_association) { Draper::DecoratedAssociation.new(base, association, options) }
   let(:source) { Product.new }
+  let(:base) { source.decorate }
   let(:options) { {} }
 
+  describe "#initialize" do
+    describe "options validation" do
+      let(:association) { :similar_products }
+      let(:valid_options) { {with: ProductDecorator, scope: :foo, context: {}} }
+
+      it "does not raise error on valid options" do
+        expect { Draper::DecoratedAssociation.new(base, association, valid_options) }.to_not raise_error
+      end
+
+      it "raises error on invalid options" do
+        expect { Draper::DecoratedAssociation.new(base, association, valid_options.merge(foo: 'bar')) }.to raise_error(ArgumentError, 'Unknown key: foo')
+      end
+    end
+  end
+
+  describe "#base" do
+    subject { decorated_association.base }
+    let(:association) { :similar_products }
+
+    it "returns the base decorator" do
+      should be base
+    end
+
+    it "returns a Decorator" do
+      subject.class.should == ProductDecorator
+    end
+  end
+
+  describe "#source" do
+    subject { decorated_association.source }
+    let(:association) { :similar_products }
+
+    it "returns the base decorator's source" do
+      should be base.source
+    end
+
+    it "returns a Model" do
+      subject.class.should == Product
+    end
+  end
+
   describe "#call" do
     subject { decorated_association.call }
 
@@ -22,10 +64,11 @@ describe Draper::DecoratedAssociation do
       end
 
       context "when the association is empty" do
-        it "doesn't decorate the collection" do
+        it "returns an empty collection decorator" do
           source.stub(:similar_products).and_return([])
-          subject.should_not be_a Draper::CollectionDecorator
+          subject.should be_a Draper::CollectionDecorator
           subject.should be_empty
+          subject.first.should be_nil
         end
       end
     end
@@ -44,10 +87,11 @@ describe Draper::DecoratedAssociation do
       end
 
       context "when the association is empty" do
-        it "doesn't decorate the collection" do
+        it "returns an empty collection decorator" do
           source.stub(:poro_similar_products).and_return([])
-          subject.should_not be_a Draper::CollectionDecorator
+          subject.should be_a Draper::CollectionDecorator
           subject.should be_empty
+          subject.first.should be_nil
         end
       end
     end
@@ -126,5 +170,144 @@ describe Draper::DecoratedAssociation do
         subject.source.should be scoped
       end
     end
+
+    context "base has context" do
+      let(:association) { :similar_products }
+      let(:base) { source.decorate(context: {some: 'context'}) }
+
+      context "when no context is specified" do
+        it "it should inherit context from base" do
+          subject.context.should == {some: 'context'}
+        end
+
+        it "it should share context hash with base" do
+          subject.context.should be base.context
+        end
+      end
+
+      context "when static context is specified" do
+        let(:options) { {context: {other: 'context'}} }
+
+        it "it should get context from static option" do
+          subject.context.should == {other: 'context'}
+        end
+      end
+
+      context "when lambda context is specified" do
+        let(:options) { {context: lambda {|context| context.merge(other: 'protext')}} }
+
+        it "it should get generated context" do
+          subject.context.should == {some: 'context', other: 'protext'}
+        end
+      end
+    end
+  end
+
+  describe "#decorator_options" do
+    subject { decorated_association.send(:decorator_options) }
+
+    context "collection association" do
+      let(:association) { :similar_products }
+
+      context "no options" do
+        it "should return default options" do
+          should == {with: :infer, context: {}}
+        end
+
+        it "should set with: to :infer" do
+          decorated_association.send(:options).should == options
+          subject
+          decorated_association.send(:options).should == {with: :infer}
+        end
+      end
+
+      context "option with: ProductDecorator" do
+        let(:options) { {with: ProductDecorator} }
+        it "should pass with: from options" do
+          should == {with: ProductDecorator, context: {}}
+        end
+      end
+
+      context "option scope: :to_a" do
+        let(:options) { {scope: :to_a} }
+        it "should strip scope: from options" do
+          decorated_association.send(:options).should == options
+          should == {with: :infer, context: {}}
+        end
+      end
+
+      context "base has context" do
+        let(:base) { source.decorate(context: {some: 'context'}) }
+
+        context "no options" do
+          it "should return context from base" do
+            should == {with: :infer, context: {some: 'context'}}
+          end
+        end
+
+        context "option context: {other: 'context'}" do
+          let(:options) { {context: {other: 'context'}} }
+          it "should return specified context" do
+            should == {with: :infer, context: {other: 'context'}}
+          end
+        end
+
+        context "option context: lambda" do
+          let(:options) { {context: lambda {|context| context.merge(other: 'protext')}} }
+          it "should return specified context" do
+            should == {with: :infer, context: {some: 'context', other: 'protext'}}
+          end
+        end
+      end
+    end
+
+    context "singular association" do
+      let(:association) { :previous_version }
+
+      context "no options" do
+        it "should return default options" do
+          should == {context: {}}
+        end
+      end
+
+      context "option with: ProductDecorator" do
+        let(:options) { {with: ProductDecorator} }
+        it "should strip with: from options" do
+          should == {context: {}}
+        end
+      end
+
+      context "option scope: :decorate" do
+        let(:options) { {scope: :decorate} }
+        it "should strip scope: from options" do
+          decorated_association.send(:options).should == options
+          should == {context: {}}
+        end
+      end
+
+      context "base has context" do
+        let(:base) { source.decorate(context: {some: 'context'}) }
+
+        context "no options" do
+          it "should return context from base" do
+            should == {context: {some: 'context'}}
+          end
+        end
+
+        context "option context: {other: 'context'}" do
+          let(:options) { {context: {other: 'context'}} }
+          it "should return specified context" do
+            should == {context: {other: 'context'}}
+          end
+        end
+
+        context "option context: lambda" do
+          let(:options) { {context: lambda {|context| context.merge(other: 'protext')}} }
+          it "should return specified context" do
+            should == {context: {some: 'context', other: 'protext'}}
+          end
+        end
+      end
+    end
   end
 end

data/spec/draper/decorator_spec.rb

@@ -7,13 +7,25 @@ describe Draper::Decorator do
   let(:source) { Product.new }
 
   describe "#initialize" do
+    describe "options validation" do
+      let(:valid_options) { {context: {}} }
+
+      it "does not raise error on valid options" do
+        expect { decorator_class.new(source, valid_options) }.to_not raise_error
+      end
+
+      it "raises error on invalid options" do
+        expect { decorator_class.new(source, valid_options.merge(foo: 'bar')) }.to raise_error(ArgumentError, 'Unknown key: foo')
+      end
+    end
+
     it "sets the source" do
       subject.source.should be source
     end
 
-    it "stores options" do
-      decorator = decorator_class.new(source, some: "options")
-      decorator.options.should == {some: "options"}
+    it "stores context" do
+      decorator = decorator_class.new(source, context: {some: 'context'})
+      decorator.context.should == {some: 'context'}
     end
 
     context "when decorating an instance of itself" do
@@ -23,16 +35,16 @@ describe Draper::Decorator do
       end
 
       context "when options are supplied" do
-        it "overwrites existing options" do
-          decorator = ProductDecorator.new(source, role: :admin)
-          ProductDecorator.new(decorator, role: :user).options.should == {role: :user}
+        it "overwrites existing context" do
+          decorator = ProductDecorator.new(source, context: {role: :admin})
+          ProductDecorator.new(decorator, context: {role: :user}).context.should == {role: :user}
         end
       end
 
       context "when no options are supplied" do
-        it "preserves existing options" do
-          decorator = ProductDecorator.new(source, role: :admin)
-          ProductDecorator.new(decorator).options.should == {role: :admin}
+        it "preserves existing context" do
+          decorator = ProductDecorator.new(source, context: {role: :admin})
+          ProductDecorator.new(decorator).context.should == {role: :admin}
         end
       end
     end
@@ -55,10 +67,31 @@ describe Draper::Decorator do
     end
   end
 
+  describe "#context=" do
+    it "modifies the context" do
+      decorator = decorator_class.new(source, context: {some: 'context'})
+      decorator.context = {some: 'other_context'}
+      decorator.context.should == {some: 'other_context'}
+    end
+  end
+
   describe ".decorate_collection" do
     subject { ProductDecorator.decorate_collection(source) }
     let(:source) { [Product.new, Widget.new] }
 
+    describe "options validation" do
+      let(:valid_options) { {with: :infer, context: {}} }
+      before(:each) { Draper::CollectionDecorator.stub(:new) }
+
+      it "does not raise error on valid options" do
+        expect { ProductDecorator.decorate_collection(source, valid_options) }.to_not raise_error
+      end
+
+      it "raises error on invalid options" do
+        expect { ProductDecorator.decorate_collection(source, valid_options.merge(foo: 'bar')) }.to raise_error(ArgumentError, 'Unknown key: foo')
+      end
+    end
+
     it "returns a collection decorator" do
       subject.should be_a Draper::CollectionDecorator
       subject.source.should be source
@@ -77,11 +110,11 @@ describe Draper::Decorator do
       end
     end
 
-    context "with options" do
-      subject { ProductDecorator.decorate_collection(source, with: :infer, some: "options") }
+    context "with context" do
+      subject { ProductDecorator.decorate_collection(source, with: :infer, context: {some: 'context'}) }
 
-      it "passes the options to the collection decorator" do
-        subject.options.should == {some: "options"}
+      it "passes the context to the collection decorator" do
+        subject.context.should == {some: 'context'}
       end
     end
   end
@@ -104,14 +137,14 @@ describe Draper::Decorator do
   end
 
   describe "#localize" do
-    before { subject.helpers.should_receive(:localize).with(:an_object, {some: "options"}) }
+    before { subject.helpers.should_receive(:localize).with(:an_object, {some: 'parameter'}) }
 
     it "delegates to #helpers" do
-      subject.localize(:an_object, some: "options")
+      subject.localize(:an_object, some: 'parameter')
     end
 
     it "is aliased to #l" do
-      subject.l(:an_object, some: "options")
+      subject.l(:an_object, some: 'parameter')
     end
   end
 
@@ -223,8 +256,26 @@ describe Draper::Decorator do
     describe "overridden association method" do
       let(:decorated_association) { ->{} }
 
+      describe "options validation" do
+        let(:valid_options) { {with: ProductDecorator, scope: :foo, context: {}} }
+        before(:each) { Draper::DecoratedAssociation.stub(:new).and_return(decorated_association) }
+
+        it "does not raise error on valid options" do
+          expect { decorator_class.decorates_association :similar_products, valid_options }.to_not raise_error
+        end
+
+        it "raises error on invalid options" do
+          expect { decorator_class.decorates_association :similar_products, valid_options.merge(foo: 'bar') }.to raise_error(ArgumentError, 'Unknown key: foo')
+        end
+      end
+
       it "creates a DecoratedAssociation" do
-        Draper::DecoratedAssociation.should_receive(:new).with(source, :similar_products, {with: ProductDecorator}).and_return(decorated_association)
+        Draper::DecoratedAssociation.should_receive(:new).with(subject, :similar_products, {with: ProductDecorator}).and_return(decorated_association)
+        subject.similar_products
+      end
+
+      it "receives the Decorator" do
+        Draper::DecoratedAssociation.should_receive(:new).with(kind_of(decorator_class), :similar_products, {with: ProductDecorator}).and_return(decorated_association)
         subject.similar_products
       end
 

data/spec/draper/finders_spec.rb

@@ -15,9 +15,9 @@ describe Draper::Finders do
       decorator.source.should be found
     end
 
-    it "passes options to the decorator" do
-      decorator = ProductDecorator.find(1, some: "options")
-      decorator.options.should == {some: "options"}
+    it "passes context to the decorator" do
+      decorator = ProductDecorator.find(1, context: {some: 'context'})
+      decorator.context.should == {some: 'context'}
     end
   end
 
@@ -55,10 +55,10 @@ describe Draper::Finders do
       ProductDecorator.find_or_create_by_name_and_size("apples", "large")
     end
 
-    it "passes options to the decorator" do
-      Product.should_receive(:find_by_name_and_size).with("apples", "large", {some: "options"})
-      decorator = ProductDecorator.find_by_name_and_size("apples", "large", some: "options")
-      decorator.options.should == {some: "options"}
+    it "passes context to the decorator" do
+      Product.should_receive(:find_by_name_and_size).with("apples", "large", context: {some: 'context'})
+      decorator = ProductDecorator.find_by_name_and_size("apples", "large", context: {some: 'context'})
+      decorator.context.should == {some: 'context'}
     end
   end
 
@@ -84,9 +84,9 @@ describe Draper::Finders do
       collection.first.should be_a ProductDecorator
     end
 
-    it "passes options to the collection decorator" do
-      collection = ProductDecorator.all(some: "options")
-      collection.options.should == {some: "options"}
+    it "passes context to the collection decorator" do
+      collection = ProductDecorator.all(context: {some: 'context'})
+      collection.context.should == {some: 'context'}
     end
   end
 
@@ -104,9 +104,9 @@ describe Draper::Finders do
       decorator.source.should be first
     end
 
-    it "passes options to the decorator" do
-      decorator = ProductDecorator.first(some: "options")
-      decorator.options.should == {some: "options"}
+    it "passes context to the decorator" do
+      decorator = ProductDecorator.first(context: {some: 'context'})
+      decorator.context.should == {some: 'context'}
     end
   end
 
@@ -124,9 +124,9 @@ describe Draper::Finders do
       decorator.source.should be last
     end
 
-    it "passes options to the decorator" do
-      decorator = ProductDecorator.last(some: "options")
-      decorator.options.should == {some: "options"}
+    it "passes context to the decorator" do
+      decorator = ProductDecorator.last(context: {some: 'context'})
+      decorator.context.should == {some: 'context'}
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta3
+  version: 1.0.0.beta4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,6 +44,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -274,9 +290,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1515210213471723462
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -285,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: draper
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Decorator pattern implementation for Rails.