sakuramochi 0.5.4 → 0.5.5

data/lib/sakuramochi/predicate_builder.rb

@@ -62,7 +62,6 @@ module Sakuramochi
         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
         when Array, ActiveRecord::Associations::CollectionProxy
           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)}

data/lib/sakuramochi/relation.rb

@@ -10,50 +10,47 @@ module Sakuramochi
       alias :build_where :build_where_with_condition
     end
 
-    module InstanceMethods
-      def collapse_conditions(node, other)
-        case node
-        when Sakuramochi::Condition::Nodes::Expression
-          case node.operator.to_s
-          when 'and'
-            left = collapse_conditions(node.left, other)
-            right = collapse_conditions(node.right, other)
-            left && right ? Arel::Nodes::And.new([left, right]) : left || right
-
-          when 'or'
-            left = collapse_conditions(node.left, other)
-            right = collapse_conditions(node.right, other)
-            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) if right
-          end
-
-        when Sakuramochi::Condition::Nodes::Factor
-          wheres = build_where_without_condition(node.value, other)
-          arel = table.from(table)
-          collapse_wheres(arel, (wheres - ['']).uniq)
-          arel.constraints.inject { |left, right| left.and(right) }
-
-        when Sakuramochi::Condition::Nodes::Group
-          expression = collapse_conditions(node.expression, other)
-          Arel::Nodes::Grouping.new(expression) if expression
+    def collapse_conditions(node, other)
+      case node
+      when Sakuramochi::Condition::Nodes::Expression
+        case node.operator.to_s
+        when 'and'
+          left = collapse_conditions(node.left, other)
+          right = collapse_conditions(node.right, other)
+          left && right ? Arel::Nodes::And.new([left, right]) : left || right
+
+        when 'or'
+          left = collapse_conditions(node.left, other)
+          right = collapse_conditions(node.right, other)
+          left && right ? Arel::Nodes::Or.new(left, right) : left || right
         end
-      end
 
-      def build_where_with_condition(opts, other = [])
-        if Sakuramochi::Condition.condition?(opts)
-          ast = Sakuramochi::Condition::Parser.new(opts.dup).parse
-          [collapse_conditions(ast, other)].compact
-        else
-          build_where_without_condition(opts, other)
+      when Sakuramochi::Condition::Nodes::Term
+        case node.operator.to_s
+        when 'not'
+          right = collapse_conditions(node.value, other)
+          Arel::Nodes::Not.new(right) if right
         end
+
+      when Sakuramochi::Condition::Nodes::Factor
+        wheres = build_where_without_condition(node.value, other)
+        arel = table.from(table)
+        collapse_wheres(arel, (wheres - ['']).uniq)
+        arel.constraints.inject { |left, right| left.and(right) }
+
+      when Sakuramochi::Condition::Nodes::Group
+        expression = collapse_conditions(node.expression, other)
+        Arel::Nodes::Grouping.new(expression) if expression
       end
     end
 
+    def build_where_with_condition(opts, other = [])
+      if Sakuramochi::Condition.condition?(opts)
+        ast = Sakuramochi::Condition::Parser.new(opts.dup).parse
+        [collapse_conditions(ast, other)].compact
+      else
+        build_where_without_condition(opts, other)
+      end
+    end
   end
 end

data/lib/sakuramochi/version.rb

@@ -1,3 +1,3 @@
 module Sakuramochi
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/sakuramochi.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Sakuramochi::VERSION
   s.authors     = ["mashiro"]
   s.email       = ["mail@mashiro.org"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/mashiro/sakuramochi"
   s.summary     = %q{Minimal extensions for ActiveRecord 3}
   s.description = %q{Predicates and conditions that extends to the ActiveRecord 3}
 
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "activesupport", "~> 3.0"
   s.add_dependency "activerecord", "~> 3.0"
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "sqlite3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sakuramochi
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-19 00:00:00.000000000Z
+date: 2012-01-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &14986060 !ruby/object:Gem::Requirement
+  requirement: &22523360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *14986060
+  version_requirements: *22523360
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &14985560 !ruby/object:Gem::Requirement
+  requirement: &22522740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,21 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *14985560
+  version_requirements: *22522740
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &22461240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *22461240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15034740 !ruby/object:Gem::Requirement
+  requirement: &22460780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15034740
+  version_requirements: *22460780
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &15034280 !ruby/object:Gem::Requirement
+  requirement: &22460360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15034280
+  version_requirements: *22460360
 description: Predicates and conditions that extends to the ActiveRecord 3
 email:
 - mail@mashiro.org
@@ -85,7 +96,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/matcher.rb
 - spec/support/schema.rb
-homepage: ''
+homepage: https://github.com/mashiro/sakuramochi
 licenses: []
 post_install_message: 
 rdoc_options: []