sakuramochi 0.5.8 → 0.5.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a6e50b44a4de3ce664fb316393ada00b3623a54c
+  data.tar.gz: 44e8e4257655ae97585c7702d1f513194e0721ef
+SHA512:
+  metadata.gz: 47d54d72735e47c685cc737598acec787c27d451fedeed35b07743dafc2d88e123427e2b002c9d91abde738298131fa54bb77638c99d4e773bbcaf47576fb8a7
+  data.tar.gz: 11199b04b1176f6b05fd944eea152d18f0e60aeb84e8c55a4994bcd67fb85f57299f626d83729a56e22ee48fbd83159ed990862f99cfd1259f6e22383e631f5b

data/lib/sakuramochi/predicate_builder.rb

@@ -8,37 +8,31 @@ module Sakuramochi
     included do
       unless respond_to? :build
         def self.build(attribute, value)
-          model_class = defined?(ActiveRecord::Model) ? ActiveRecord::Model : ActiveRecord::Base
-
           case value
           when ActiveRecord::Relation
             value = value.select(value.klass.arel_table[value.klass.primary_key]) if value.select_values.empty?
             attribute.in(value.arel.ast)
           when Array, ActiveRecord::Associations::CollectionProxy
-            values = value.to_a.map {|x| x.is_a?(model_class) ? x.id : x}
-            ranges, values = values.partition {|v| v.is_a?(Range)}
+            values = value.to_a.map {|x| x.is_a?(ActiveRecord::Base) ? x.id : x}
+            ranges, values = values.partition {|v| v.is_a?(Range) || v.is_a?(Arel::Relation)}
 
-            values_predicate = if values.include?(nil)
-              values = values.compact
+            array_predicates = ranges.map {|range| attribute.in(range)}
 
-              case values.length
-              when 0
-                attribute.eq(nil)
-              when 1
-                attribute.eq(values.first).or(attribute.eq(nil))
+            if values.include?(nil)
+              values = values.compact
+              if values.empty?
+                array_predicates << attribute.eq(nil)
               else
-                attribute.in(values).or(attribute.eq(nil))
+                array_predicates << attribute.in(values.compact).or(attribute.eq(nil))
               end
             else
-              attribute.in(values)
+              array_predicates << attribute.in(values)
             end
 
-            array_predicates = ranges.map { |range| attribute.in(range) }
-            array_predicates << values_predicate
-            array_predicates.inject { |composite, predicate| composite.or(predicate) }
-          when Range
+            array_predicates.inject {|composite, predicate| composite.or(predicate)}
+          when Range, Arel::Relation
             attribute.in(value)
-          when model_class
+          when ActiveRecord::Base
             attribute.eq(value.id)
           when Class
             # FIXME: I think we need to deprecate this behavior
@@ -56,17 +50,22 @@ module Sakuramochi
     end
 
     module ClassMethods
-      def build_from_hash_with_predicate(engine, attributes, default_table)
-        attributes.map do |column, value|
+      def build_from_hash_with_predicate(engine, attributes, default_table, allow_table_name = true)
+        predicates = attributes.map do |column, value|
           table = default_table
 
-          if value.is_a?(Hash)
+          if allow_table_name && value.is_a?(Hash)
             table = Arel::Table.new(column, engine)
-            build_from_hash_with_predicate(engine, value, table)
+
+            if value.empty?
+              '1 = 2'
+            else
+              build_from_hash_with_predicate(engine, value, table, false)
+            end
           else
             column = column.to_s
 
-            if column.include?('.')
+            if allow_table_name && column.include?('.')
               table_name, column = column.split('.', 2)
               table = Arel::Table.new(table_name, engine)
             end 
@@ -80,7 +79,9 @@ module Sakuramochi
               build(attribute, value)
             end
           end
-        end.flatten
+        end
+
+        predicates.flatten
       end
 
       private

data/lib/sakuramochi/version.rb

@@ -1,3 +1,3 @@
 module Sakuramochi
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: sakuramochi
 version: !ruby/object:Gem::Version
-  version: 0.5.8
-  prerelease: 
+  version: 0.5.9
 platform: ruby
 authors:
 - mashiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,49 +41,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Predicates and conditions that extends to the ActiveRecord 3
@@ -123,32 +112,25 @@ files:
 - spec/support/schema.rb
 homepage: https://github.com/mashiro/sakuramochi
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2940093351635761929
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2940093351635761929
 requirements: []
 rubyforge_project: sakuramochi
-rubygems_version: 1.8.21
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Minimal extensions for ActiveRecord 3
 test_files: []