Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #257 from jhsu/draper-scope-wrap

Wrap relation calls and scope calls in decorators
  • Loading branch information...
commit 99e45d3035582763022fb42b8802d0b4f0175246 2 parents beb14be + c46b0fd
@steveklabnik steveklabnik authored
View
15 lib/draper/base.rb
@@ -255,7 +255,12 @@ def method_missing(method, *args, &block)
if model.respond_to?(method)
self.class.send :define_method, method do |*args, &blokk|
- model.send method, *args, &blokk
+ result = model.send method, *args, &blokk
+ if defined?(ActiveRecord) && result.kind_of?(ActiveRecord::Relation)
+ self.class.new(model,self.options)
+ else
+ result
+ end
end
send method, *args, &block
@@ -269,10 +274,12 @@ def method_missing(method, *args, &block)
end
def self.method_missing(method, *args, &block)
- if method.to_s.match(/^find_((all_|last_)?by_|or_(initialize|create)_by_).*/)
- self.decorate(model_class.send(method, *args, &block), :context => args.dup.extract_options!)
+ model_result = model_class.send(method, *args, &block)
+ if model_result.kind_of?(model_class) ||
+ (defined?(ActiveRecord) && model_result.kind_of?(ActiveRecord::Relation))
+ self.decorate(model_result, :context => args.dup.extract_options!)
else
- model_class.send(method, *args, &block)
+ model_result
end
end
View
19 lib/draper/decorated_enumerable_proxy.rb
@@ -25,7 +25,24 @@ def find(ifnone_or_id = nil, &blk)
end
def method_missing (method, *args, &block)
- @wrapped_collection.send(method, *args, &block)
+ if @wrapped_collection.respond_to?(method)
+ self.class.send :define_method, method do |*args, &blokk|
+ scoped_result = @wrapped_collection.send(method, *args, &block)
+ if defined?(ActiveRecord) && scoped_result.kind_of?(ActiveRecord::Relation)
+ self.class.new(scoped_result, @klass, @options)
+ else
+ scoped_result
+ end
+ end
+
+ send method, *args, &block
+ else
+ super
+ end
+
+ rescue NoMethodError => no_method_error
+ super if no_method_error.name == method
+ raise no_method_error
end
def respond_to?(method, include_private = false)
View
29 spec/draper/base_spec.rb
@@ -50,6 +50,20 @@
ProductDecorator.new(product_decorator).model.should be_instance_of Product
end
+ it "returns a Decorator when a scope is called on decorated object" do
+ proxy = ProductDecorator.new(source)
+ klass = proxy.model.class
+ klass.class_eval { def some_scope ; ActiveRecord::Relation.new ; end }
+ proxy.some_scope.should be_instance_of(proxy.class)
+ end
+
+ it "returns a Decorator when a scope is called on the decorator" do
+ proxy = ProductDecorator
+ klass = source.class
+ klass.class_eval { def self.some_scope ; ActiveRecord::Relation.new ; end }
+ proxy.some_scope.should be_instance_of(proxy)
+ end
+
it "handle plural-like words properly'" do
class Business; end
expect do
@@ -162,6 +176,18 @@ class CustomDecorator < Draper::Base
end
end
+ context "with a scope applied after decoration" do
+ it "returns a DecoratedEnumerableProxy when a scope is called" do
+ class ActiveRecord::Relation
+ def some_scope; self ;end
+ end
+ klass = subject.model.class
+ klass.class_eval { def self.some_scope ; ActiveRecord::Relation.new ; end }
+ proxy = Draper::DecoratedEnumerableProxy
+ proxy.new(ActiveRecord::Relation.new, klass).some_scope.should be_instance_of(proxy)
+ end
+ end
+
context "for a polymorphic association" do
before(:each){ subject.class_eval{ decorates_association :thing, :polymorphic => true } }
it "causes the association to be decorated with the right decorator" do
@@ -352,8 +378,7 @@ class CustomDecorator < Draper::Base
it "uses the options hash in the decorator instantiation" do
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
+ ProductDecorator.find_by_name_and_size("apples", "large", {:role => :admin})
end
end
View
5 spec/spec_helper.rb
@@ -34,3 +34,8 @@ class Base
Draper::System.setup(self)
end
end
+
+module ActiveRecord
+ class Relation
+ end
+end
Please sign in to comment.
Something went wrong with that request. Please try again.