scopify 0.1.0 → 0.1.1

data/README.md

@@ -45,9 +45,21 @@ Roll your own condition composing.
     # better now !
     MyDBWrapper.scoped(:order => 'a').scoped(:order => 'b).all --> {:order => "a AND b"}
 
-### first
-When calling first on and scope, `:limit => 1` will be added
-    MyDBWrapper.scoped(:limit => 1).all == MyDBWrapper.first
+### 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
 ======

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/scopify.rb

@@ -12,6 +12,11 @@ module Scopify
       Scope.build(self, options)
     end
 
+    # overwrite tis to enable your custom scopes
+    def return_scope?(method_name)
+      respond_to?("#{method_name}_scope_options")
+    end
+
     def scope(name, options)
       # give access to current options inside of evaled method
       meta_class = (class << self; self; end)

data/lib/scopify/scope.rb

@@ -42,6 +42,7 @@ module Scopify
         @options.map do |k,v|
           result = case k
           when :limit, :offset then v.min
+          when :conditions then "(#{v * ") AND ("})"    
           when :order then v * ', '
           else v
           end
@@ -58,14 +59,13 @@ module Scopify
     end
 
     def method_missing(method_name, *args, &block)
-      if @base.respond_to?("#{method_name}_scope_options")
+      if @base.respond_to?(:return_scope?) and @base.return_scope?(method_name)
         # the method we call is a scope, continue chaining
-        scope = @base.send(method_name, *args)
+        scope = @base.send(method_name, *args, &block)
         scope.scoped(self)
       else
         # the method we call is a normal method, flatten everything
         options = (args.first||{})
-        options = options.merge(:limit => 1) if method_name.to_sym == :first
         options = scoped(options).to_hash
         @base.send(method_name, options, &block)
       end

data/scopify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scopify}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-05-13}
+  s.date = %q{2010-05-14}
   s.email = %q{grosser.michael@gmail.com}
   s.extra_rdoc_files = [
     "README.md"

data/spec/scopify_spec.rb

@@ -26,6 +26,22 @@ class T2
   end
 end
 
+class T3
+  include Scopify
+  def self.foo(options)
+    options
+  end
+
+  def self.return_scope?(name)
+    return true if super
+    name == :i_return_scope
+  end
+
+  def self.i_return_scope(options)
+    scoped(options)
+  end
+end
+
 describe Scopify do
   describe :scoped do
     it "returns a new scope" do
@@ -40,10 +56,6 @@ describe Scopify do
       T1.scoped({:limit => 1}).foo(:offset => 1).should == {:limit => 1, :offset => 1}
     end
 
-    it "adds limit => 1 to first queries" do
-      T1.scoped({:order => 'FOO'}).first.should == {:limit => 1, :order => 'FOO'}
-    end
-
     it "can stack" do
       T1.scoped(:limit => 1).scoped(:order => 'X').foo.should == {:limit => 1, :order => 'X'}
     end
@@ -95,6 +107,17 @@ describe Scopify do
       T1.scope(:ccc2, :order => 'b')
       T1.ccc2.ccc.foo.should == {:order => 'b, a'}
     end
+
+    it "calls methods with a options if they dont accept scopes" do
+      T3.scope(:aaa, :limit => 1)
+      T3.aaa.foo(:offset => 1).should == {:offset => 1, :limit => 1}
+    end
+
+    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
+    end
   end
 
   it "has a VERSION" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 +02:00
+date: 2010-05-14 00:00:00 +02:00
 default_executable: 
 dependencies: []