sakuramochi 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/sakuramochi/condition.rb

@@ -66,6 +66,7 @@ module Sakuramochi
       def initialize(tokens)
         @tokens = tokens.dup
         @tokens = @tokens.split(/\s+/) if @tokens.is_a?(String) # debug
+        @tokens = [@tokens] unless @tokens.is_a?(Array)
       end
 
       def parse
@@ -74,7 +75,11 @@ module Sakuramochi
 
       private
 
-      def self.indifferenct_key(token)
+      def condition?(value)
+        value.is_a?(Array) && !value.first.is_a?(String)
+      end
+
+      def indifferenct_key(token)
         if token.is_a?(String) || token.is_a?(Symbol)
           token.to_s.downcase
         else
@@ -83,13 +88,11 @@ module Sakuramochi
       end
 
       def peek
-        token = @tokens.first
-        self.class.indifferenct_key token
+        indifferenct_key @tokens.first
       end
 
       def shift
-        token = @tokens.shift
-        self.class.indifferenct_key token
+        indifferenct_key @tokens.shift
       end
 
       def accept(*args)
@@ -130,7 +133,11 @@ module Sakuramochi
           expect PARENTHESES[token]
           Nodes::Group.new(node)
         else
-          Nodes::Factor.new(shift)
+          if condition? peek
+            Nodes::Group.new(Sakuramochi::Condition::Parser.new(shift).parse)
+          else
+            Nodes::Factor.new(shift)
+          end
         end
       end
     end

data/lib/sakuramochi/relation.rb

@@ -45,12 +45,8 @@ module Sakuramochi
       end
 
       def build_where_with_condition(opts, other = [])
-        if opts.is_a?(Array) && !opts.first.is_a?(String)
-          ast = Sakuramochi::Condition::Parser.new(opts.dup).parse
-          [collapse_conditions(ast, other)]
-        else
-          build_where_without_condition(opts, other)
-        end
+        ast = Sakuramochi::Condition::Parser.new(opts.dup).parse
+        [collapse_conditions(ast, other)]
       end
     end
 

data/sakuramochi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sakuramochi"
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mashiro"]
-  s.date = "2011-11-28"
+  s.date = "2011-12-05"
   s.description = "Minimal extensions for active record 3"
   s.email = "mail@mashiro.org"
   s.extra_rdoc_files = [

data/spec/sakuramochi/relation_spec.rb

@@ -25,5 +25,19 @@ describe Sakuramochi::Relation do
 
       it { subject.map(&:name).should_not be_match_all /みおん/ }
     end
+
+    describe 'nested' do
+      before do
+        @users = User.where([
+               [{:name_contains => '春音'}, :and, {:name_contains => 'あいら'}],
+          :or, [{:name_contains => '天宮'}, :and, {:name_contains => 'りずむ'}]
+        ])
+      end
+      subject { @users }
+
+      it { should have(2).items }
+      it { subject.map(&:name).should_not be_match_all /うる|える/ }
+      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.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000Z
+date: 2011-12-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &21741100 !ruby/object:Gem::Requirement
+  requirement: &25804160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *21741100
+  version_requirements: *25804160
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &21740560 !ruby/object:Gem::Requirement
+  requirement: &25803660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *21740560
+  version_requirements: *25803660
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &21736720 !ruby/object:Gem::Requirement
+  requirement: &25799800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21736720
+  version_requirements: *25799800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21736180 !ruby/object:Gem::Requirement
+  requirement: &25799260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21736180
+  version_requirements: *25799260
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21735640 !ruby/object:Gem::Requirement
+  requirement: &25798740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21735640
+  version_requirements: *25798740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21735140 !ruby/object:Gem::Requirement
+  requirement: &25798160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21735140
+  version_requirements: *25798160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21734540 !ruby/object:Gem::Requirement
+  requirement: &25797600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21734540
+  version_requirements: *25797600
 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: 493135335537982085
+      hash: 3184035355756086876
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: