sakuramochi 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/sakuramochi/relation.rb

@@ -18,18 +18,19 @@ module Sakuramochi
           when 'and'
             left = collapse_conditions(node.left, other)
             right = collapse_conditions(node.right, other)
-            Arel::Nodes::And.new([left, right])
+            left && right ? Arel::Nodes::And.new([left, right]) : left || right
+
           when 'or'
             left = collapse_conditions(node.left, other)
             right = collapse_conditions(node.right, other)
-            Arel::Nodes::Or.new(left, right)
+            left && right ? Arel::Nodes::Or.new(left, right) : left || right
           end
 
         when Sakuramochi::Condition::Nodes::Term
           case node.operator.to_s
           when 'not'
             right = collapse_conditions(node.value, other)
-            Arel::Nodes::Not.new(right)
+            Arel::Nodes::Not.new(right) if right
           end
 
         when Sakuramochi::Condition::Nodes::Factor
@@ -40,13 +41,13 @@ module Sakuramochi
 
         when Sakuramochi::Condition::Nodes::Group
           expression = collapse_conditions(node.expression, other)
-          Arel::Nodes::Grouping.new(expression)
+          Arel::Nodes::Grouping.new(expression) if expression
         end
       end
 
       def build_where_with_condition(opts, other = [])
         ast = Sakuramochi::Condition::Parser.new(opts.dup).parse
-        [collapse_conditions(ast, other)]
+        [collapse_conditions(ast, other)].compact
       end
     end
 

data/sakuramochi.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sakuramochi"
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mashiro"]

data/spec/sakuramochi/relation_spec.rb

@@ -39,5 +39,13 @@ describe Sakuramochi::Relation do
       it { subject.map(&:name).should_not be_match_all /うる|える/ }
       it { subject.map(&:name).should_not be_match_all /みおん/ }
     end
+
+    describe 'with validation' do
+      before { @users = User.where([{:name_contains => nil}, :or, {:name_contains => 'りずむ'}]) }
+      subject { puts @users.to_sql; @users }
+
+      it { subject.map(&:name).should_not be_match_all /あいら|みおん/ }
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sakuramochi
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &25804160 !ruby/object:Gem::Requirement
+  requirement: &14949140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *25804160
+  version_requirements: *14949140
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &25803660 !ruby/object:Gem::Requirement
+  requirement: &14948540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *25803660
+  version_requirements: *14948540
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &25799800 !ruby/object:Gem::Requirement
+  requirement: &14947940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25799800
+  version_requirements: *14947940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25799260 !ruby/object:Gem::Requirement
+  requirement: &14944180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25799260
+  version_requirements: *14944180
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &25798740 !ruby/object:Gem::Requirement
+  requirement: &14943600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25798740
+  version_requirements: *14943600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &25798160 !ruby/object:Gem::Requirement
+  requirement: &14943000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25798160
+  version_requirements: *14943000
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &25797600 !ruby/object:Gem::Requirement
+  requirement: &14942440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25797600
+  version_requirements: *14942440
 description: Minimal extensions for active record 3
 email: mail@mashiro.org
 executables: []
@@ -134,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3184035355756086876
+      hash: -2318816981625713503
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: