draper 0.16.0 → 0.17.0

data/CHANGELOG.markdown

@@ -0,0 +1,51 @@
+# Draper Changelog
+
+## 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)
+* Fixed issues with newer minitest
+* [Changed the way the `view_context` gets set](https://github.com/jcasimir/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)
+
+## 0.14.0
+
+* [Properly prime the view context in Rails Console](https://github.com/jcasimir/draper/commit/738074f)
+* Make more gems development requirements only
+
+## 0.13.0
+
+* Upgraded all dependencies
+* Dropped support for Rubies < 1.9.3
+* `#to_model` has been renamed to `#wrapped_object`
+* Allow proper overriding of special `ActiveModel` methods
+
+## 0.12.3
+
+* [Fix i18n issue](https://github.com/jcasimir/draper/issues/202)
+
+## 0.12.2
+
+* Fix bug with initializing ammeter
+* Some gems are now development only in the gemspec
+* Fix bug where generated models were still inheriting from `ApplicationDecorator`
+
+## 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)
+* 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)

data/lib/draper/base.rb

@@ -64,6 +64,7 @@ module Draper
         orig_association = model.send(association_symbol)
 
         return orig_association if orig_association.nil?
+        return decorated_associations[association_symbol] if decorated_associations[association_symbol]
 
         orig_association = orig_association.send(options[:scope]) if options[:scope]
 
@@ -79,7 +80,7 @@ module Draper
                   orig_association.class
                 end
 
-        "#{klass}Decorator".constantize.decorate(orig_association, options)
+        decorated_associations[association_symbol] = "#{klass}Decorator".constantize.decorate(orig_association, options)
       end
     end
 
@@ -105,6 +106,16 @@ module Draper
       self.denied += input_denied
     end
 
+    # Specifies that all methods may *not* be proxied to
+    # to the wrapped object.
+    #
+    # Do not use `.allows` and `.denies` in combination with '.denies_all'
+    def self.denies_all
+      raise ArgumentError, "Use either 'allows' or 'denies', but not both." unless ((self.allowed == DEFAULT_ALLOWED && self.denied == DEFAULT_DENIED) || (self.allowed != DEFAULT_ALLOWED && self.denied != DEFAULT_DENIED))
+      self.denied  += [nil]  # Add dummy value to denied to prevent calls to #allows.  Hacky???
+      self.allowed += [nil]  # Add dummy value to allowed to prevent calls to #denies
+    end
+
     # Specifies a white list of methods which *may* be proxied to
     # to the wrapped object. When `allows` is used, only the listed
     # methods and methods defined in the decorator itself will be
@@ -293,5 +304,9 @@ module Draper
         model.class.reflect_on_association(association)
       end
     end
+
+    def decorated_associations
+      @decorated_associations ||= {}
+    end
   end
 end

data/lib/draper/decorated_enumerable_proxy.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/blank'
 module Draper
   class DecoratedEnumerableProxy
     include Enumerable
@@ -13,6 +14,16 @@ module Draper
     end
     alias_method :to_ary, :decorated_collection
 
+    def find(ifnone_or_id = nil, &blk)
+      if block_given?
+        source.find(ifnone_or_id, &blk)
+      else
+        obj = decorated_collection.first
+        return nil if obj.blank?
+        obj.class.find(ifnone_or_id)
+      end
+    end
+
     def method_missing (method, *args, &block)
       @wrapped_collection.send(method, *args, &block)
     end

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = "0.16.0"
+  VERSION = "0.17.0"
 end

data/lib/draper/view_context.rb

@@ -1,7 +1,7 @@
 module Draper
   module ViewContext
     def self.current
-      Thread.current[:current_view_context] || view_context
+      Thread.current[:current_view_context] || ApplicationController.new.view_context
     end
 
     def self.current=(input)

data/spec/draper/base_spec.rb

@@ -178,6 +178,23 @@ describe Draper::Base do
         subject.previous_version.should be_nil
       end
     end
+
+    context "#find" do
+      before(:each){ subject.class_eval{ decorates_association :similar_products } }
+      context "with a block" do
+        it "delegates to #each" do
+          subject.similar_products.source.should_receive :find
+          subject.similar_products.find {|p| p.title == "title" }
+        end
+      end
+
+      context "without a block" do
+        it "calls a finder method" do
+          subject.similar_products.source.should_not_receive :find
+          subject.similar_products.find 1
+        end
+      end
+    end
   end
 
   context('.decorates_associations') do
@@ -693,6 +710,69 @@ describe Draper::Base do
     end
   end
 
+  describe "a sample usage with denies_all" do
+    let(:subject_with_denies_all){ DecoratorWithDeniesAll.new(source) }
+
+    [:goodnight_moon, :hello_world, :title].each do |method|
+      it "does echo #{method} method" do
+        subject_with_denies_all.should_not respond_to(method)
+      end
+    end
+
+    let(:using_denies_all_then_denies_all) {
+      class DecoratorWithDeniesAllAndDeniesAll < Draper::Base
+        denies_all
+        denies_all
+      end
+    }
+
+    it "allows multple calls to .denies_all" do
+      expect { using_denies_all_then_denies_all }.to_not raise_error(ArgumentError)
+    end
+  end
+
+  describe "invalid usages of denies_all" do
+    let(:using_allows_then_denies_all) {
+      class DecoratorWithAllowsAndDeniesAll < Draper::Base
+        allows :hello_world
+        denies_all
+      end
+    }
+    let(:using_denies_then_denies_all) {
+      class DecoratorWithDeniesAndDeniesAll < Draper::Base
+        denies :goodnight_moon
+        denies_all
+      end
+    }
+    let(:using_denies_all_then_allows) {
+      class DecoratorWithDeniesAllAndAllows < Draper::Base
+        denies_all
+        allows :hello_world
+      end
+    }
+    let(:using_denies_all_then_denies) {
+      class DecoratorWithDeniesAllAndDenies < Draper::Base
+        denies_all
+        denies :goodnight_moon
+      end
+    }
+    it "raises an exception when calling allows then denies_all" do
+      expect {using_allows_then_denies_all}.to raise_error(ArgumentError)
+    end
+
+    it "raises an exception when calling denies then denies_all" do
+      expect {using_denies_then_denies_all}.to raise_error(ArgumentError)
+    end
+
+    it "raises an exception when calling denies_all then allows" do
+      expect {using_denies_all_then_allows}.to raise_error(ArgumentError)
+    end
+
+    it "raises an exception when calling denies_all then denies" do
+      expect {using_denies_all_then_denies}.to raise_error(ArgumentError)
+    end
+  end
+
   context "in a Rails application" do
     let(:decorator){ DecoratorWithApplicationHelper.decorate(Object.new) }
 

data/spec/draper/view_context_spec.rb

@@ -2,6 +2,10 @@ 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 }
 
@@ -13,4 +17,14 @@ describe Draper::ViewContext do
     ctx = app_controller_instance.view_context
     Draper::ViewContext.current.should == ctx
   end
+
+  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/spec_helper.rb

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

data/spec/support/samples/decorator_with_denies_all.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,7 +120,7 @@ files:
 - .rspec
 - .travis.yml
 - .yardopts
-- CHANGELOG.txt
+- CHANGELOG.markdown
 - Gemfile
 - Guardfile
 - Rakefile
@@ -187,6 +187,7 @@ 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
@@ -214,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -943728829209315877
+      hash: 26927068821793701
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -223,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -943728829209315877
+      hash: 26927068821793701
 requirements: []
 rubyforge_project: draper
 rubygems_version: 1.8.24
@@ -245,6 +246,7 @@ 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

data/CHANGELOG.txt

@@ -1,70 +0,0 @@
-= Draper Changelog
-
-= 0.16.0
-
-* Automatically prime view_context, see 057ab4
-
-* Fixed bug where rspec eq matchers didn't work, see 57617b
-
-* Sequel ORM support, see 7d4942
-
-* Fixed issues with newer minitest
-
-* changed the way the view_context gets set. See 0b039c
-
-= 0.15.0
-
-* Proper minitest integration
-
-* We can properly decorate scoped associations, see #223
-
-* Fixed awkward eager loading, see 7dc3510b
-
-= 0.14.0
-
-* Properly prime the view context in Rails Console 738074f
-
-* Make more gems development requirements only
-
-= 0.13.0
-
-* Upgraded all dependencies
-
-* Dropped support for Rubies < 1.9.3
-
-* #to_model has been renamed to #wrapped_object
-
-* Allow proper overriding of special ActiveModel methods
-
-== v0.12.3
-
-* Fix i18n issue, see #202
-
-== 0.12.2
-
-* Fix bug with initializing ammeter
-
-* Some gems are now development only in the gemspec
-
-* Fix bug where generated models were still inheriting from
-ApplicationDecorator
-
-== 0.12.0
-
-* 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