scopify 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/scopify/scope.rb

@@ -38,14 +38,19 @@ module Scopify
       result = if @base.respond_to?(:scope_to_hash)
         @base.scope_to_hash(@options)
       else
-        @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
+        @options.map do |key, values|
+          result = case key
+          when :limit, :offset then values.min
+          when :conditions
+            if values.all?{|x| x.is_a?(Hash)}
+              values.inject({}){|hash, x| hash.merge(x)}
+            else
+              "(#{values * ") AND ("})"
+            end
+          when :order then values * ', '
+          else values
           end
-          [k, result]
+          [key, result]
         end
       end
 

data/scopify.gemspec

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

data/spec/scopify_spec.rb

@@ -132,6 +132,16 @@ describe Scopify do
     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}}
+    end
+
+    it "merges conditions that are strings" do
+      T1.scoped(:conditions => "x = 1").scoped(:conditions => "y = 1").to_hash.should == {:conditions => "(x = 1) AND (y = 1)"}
+    end
+  end
+
   it "has a VERSION" do
     Scopify::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end

metadata

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