scopify 0.1.1 → 0.1.2

data/README.md

@@ -23,6 +23,25 @@ Create named scopes, with options, lambdas or other scopes
     MyDBWrapper.good.first
     MyDBWrapper.good.goodness(3).first
 
+### Custom scope helpers
+    class MyDBWrapper
+      def self.foo(num)
+        scoped(:foo => num)
+      end
+
+      def self.bar(num)
+        scoped(:bar => num)
+      end
+
+      # tell scopes to pass raw arguments to foo and bar (not merged options hash)
+      def self.raw_args_from_scope?(method_name)
+        return true if super
+        [:foo, :bar].include?(method_name)
+      end
+    end
+
+    MyDBWrapper.foo(1).bar(3) == MyDBWrapper.scoped(:foo => 1, :bar => 3)
+
 ### scope_to_hash
 Roll your own condition composing.
     # not good ?
@@ -45,22 +64,6 @@ Roll your own condition composing.
     # better now !
     MyDBWrapper.scoped(:order => 'a').scoped(:order => 'b).all --> {:order => "a AND b"}
 
-### Advanced: return_scope?(method_name)
-Get raw arguments instead of a merged options hash.
-    class MyDBWrapper
-      def self.return_scope?(method_name)
-        return true if super
-        method_name == :i_return_scope
-      end
-
-      def self.i_return_scope(pure_args)
-        scoped(pure_args.merge(:offset => 1))
-      end
-    end
-
-    MyDBWrapper.scoped(:limit=>1).i_return_scope(:order => 'x')
-    --> receives {:order => 'x'}, not a merged options hash. 
-
 Author
 ======
 [Michael Grosser](http://pragmatig.wordpress.com)  

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/scopify.rb

@@ -12,8 +12,8 @@ module Scopify
       Scope.build(self, options)
     end
 
-    # overwrite tis to enable your custom scopes
-    def return_scope?(method_name)
+    # overwrite tis to build your custom scopes
+    def raw_args_from_scope?(method_name)
       respond_to?("#{method_name}_scope_options")
     end
 
@@ -32,7 +32,7 @@ module Scopify
           elsif options.is_a?(Scope)
             options
           else
-            scoped(options)      
+            scoped(options)
           end
         end
       CODE

data/lib/scopify/scope.rb

@@ -20,9 +20,8 @@ module Scopify
       if options.is_a?(Scope)
         # merge in raw options e.g. :limit => [1, 2]
         options.scope_options.each do |k,v|
-          old = merged[k] || []
-          merged[k] = v
-          old.each{|x| merged[k] << x }
+          merged[k] ||= []
+          v.each{|x| merged[k] << x }
         end
       else
         # merge in a normal hash e.g. :limit => 1
@@ -59,10 +58,10 @@ module Scopify
     end
 
     def method_missing(method_name, *args, &block)
-      if @base.respond_to?(:return_scope?) and @base.return_scope?(method_name)
+      if @base.respond_to?(:raw_args_from_scope?) and @base.raw_args_from_scope?(method_name)
         # the method we call is a scope, continue chaining
-        scope = @base.send(method_name, *args, &block)
-        scope.scoped(self)
+        result = @base.send(method_name, *args, &block)
+        result.is_a?(Scope) ? scoped(result) : result
       else
         # the method we call is a normal method, flatten everything
         options = (args.first||{})

data/scopify.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scopify}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]

data/spec/scopify_spec.rb

@@ -32,12 +32,12 @@ class T3
     options
   end
 
-  def self.return_scope?(name)
+  def self.raw_args_from_scope?(name)
     return true if super
-    name == :i_return_scope
+    name == :i_scope
   end
 
-  def self.i_return_scope(options)
+  def self.i_scope(options)
     scoped(options)
   end
 end
@@ -115,8 +115,20 @@ describe Scopify do
 
     it "calls method with raw arguments if they return scope" do
       T3.scope(:bbb, :limit => 1)
-      T3.should_receive(:i_return_scope).with(:offset => 1).and_return T3.bbb
-      T3.bbb.i_return_scope(:offset => 1).scope_options.should == T3.bbb.bbb.scope_options
+      T3.should_receive(:i_scope).with(:offset => 2).and_return T3.scoped(:offset => 2)
+      T3.bbb.i_scope(:offset => 2)
+    end
+
+    it "scopes in corret order when using scope-returning method" do
+      T3.scope(:ccc, :limit => 1)
+      T3.stub!(:i_scope).and_return T3.scoped(:offset => 2)
+      T3.bbb.i_scope(:offset => 2).scope_options.should == T3.bbb.scoped(:offset => 2).scope_options
+    end
+
+    it "does not crash when scope-returning method does not return a scope" do
+      T3.scope(:ccc, :limit => 1)
+      T3.stub!(:i_scope).and_return []
+      T3.ccc.i_scope(:offset => 2).should == []
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Michael Grosser