scopify 0.1.3 → 0.1.5

data/README.md

@@ -23,6 +23,14 @@ Create named scopes, with options, lambdas or other scopes
     MyDBWrapper.good.first
     MyDBWrapper.good.goodness(3).first
 
+### simple_scope
+Defines otherwise repetitive named scopes for you.
+
+    simple_scope :limit, :order, :where => :conditions
+    --> MyDBWrapper.limit(3).order('foo').where("1 = 2") == 
+        {:limit => 3, :order => 'foo', :conditions => "1 = 2"}
+
+
 ### Custom scope helpers
     class MyDBWrapper
       def self.foo(num)

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.5

data/lib/scopify.rb

@@ -37,5 +37,17 @@ module Scopify
         end
       CODE
     end
+
+    def simple_scope(*args)
+      args.each do |names|
+        if names.is_a?(Hash)
+          names.each do |name, value|
+            scope name, lambda{|x| {value => x}}
+          end
+        else
+          scope names, lambda{|x| {names => x}}
+        end
+      end
+    end
   end
 end

data/lib/scopify/scope.rb

@@ -68,10 +68,13 @@ module Scopify
         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||{})
+        # the method we call is a normal method
+        # - scope by options from last method call
+        # - flatten scope to options hash
+        options = (args.last.is_a?(Hash) ? args.pop : {})
         options = scoped(options).to_hash
-        @base.send(method_name, options, &block)
+        args << options
+        @base.send(method_name, *args, &block)
       end
     end
   end

data/scopify.gemspec

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

data/spec/scopify_spec.rb

@@ -42,22 +42,47 @@ class T3
   end
 end
 
+class T4
+  include Scopify
+  simple_scope :limit, :where => :conditions
+end
+
+class T5
+  include Scopify
+
+  def self.foo(*args)
+    args
+  end
+end
+
 describe Scopify do
   describe :scoped do
     it "returns a new scope" do
       T1.scoped({}).class.should == Scopify::Scope
     end
 
+    it "can call hash on scope to reach base" do
+      T5.scoped({:limit => 1}).foo.should == [{:limit => 1}]
+    end
+
     it "can call anything on scope to reach base" do
-      T1.scoped({:limit => 1}).foo.should == {:limit => 1}
+      T5.scoped({:limit => 1}).foo(:xxx).should == [:xxx, {:limit => 1}]
     end
 
-    it "can call anything giving additional options" do
-      T1.scoped({:limit => 1}).foo(:offset => 1).should == {:limit => 1, :offset => 1}
+    it "can call giving additional options" do
+      T5.scoped({:limit => 1}).foo(:offset => 1).should == [{:limit => 1, :offset => 1}]
+    end
+
+    it "can call with args and giving additional options" do
+      T5.scoped({:limit => 1}).foo(:xxx, :offset => 1).should == [:xxx, {:limit => 1, :offset => 1}]
     end
 
     it "can stack" do
-      T1.scoped(:limit => 1).scoped(:order => 'X').foo.should == {:limit => 1, :order => 'X'}
+      T5.scoped(:limit => 1).scoped(:order => 'X').foo.should == [{:limit => 1, :order => 'X'}]
+    end
+
+    it "can stack with additional args" do
+      T5.scoped(:limit => 1).scoped(:order => 'X').foo(:xxx).should == [:xxx, {:limit => 1, :order => 'X'}]
     end
 
     it "overwrites limit with the minimum" do
@@ -119,7 +144,7 @@ describe Scopify do
       T3.bbb.i_scope(:offset => 2)
     end
 
-    it "scopes in corret order when using scope-returning method" do
+    it "scopes in correct 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
@@ -132,6 +157,16 @@ describe Scopify do
     end
   end
 
+  describe :simple_scope do
+    it "builds simple scopes" do
+      T4.limit(1).scope_options.should == {:limit => [1]}
+    end
+
+    it "builds renamed scopes" do
+      T4.where('x').scope_options.should == {:conditions => ['x']}
+    end
+  end
+
   describe "default to_hash" do
     it "merges conditions that are hashes" do
       T1.scoped(:conditions => {:x=>true}).scoped(:conditions => {:y => true}).to_hash.should == {:conditions => {:x => true, :y => true}}

metadata

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