sakuramochi 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/sakuramochi/condition.rb

@@ -75,10 +75,6 @@ module Sakuramochi
 
       private
 
-      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
@@ -133,7 +129,7 @@ module Sakuramochi
           expect PARENTHESES[token]
           Nodes::Group.new(node)
         else
-          if condition? peek
+          if Sakuramochi::Condition.condition? peek
             Nodes::Group.new(Sakuramochi::Condition::Parser.new(shift).parse)
           else
             Nodes::Factor.new(shift)
@@ -142,5 +138,9 @@ module Sakuramochi
       end
     end
 
+    def self.condition?(value)
+      value.is_a?(Array) && !value.first.is_a?(String)
+    end
+
   end
 end

data/lib/sakuramochi/relation.rb

@@ -46,8 +46,12 @@ module Sakuramochi
       end
 
       def build_where_with_condition(opts, other = [])
-        ast = Sakuramochi::Condition::Parser.new(opts.dup).parse
-        [collapse_conditions(ast, other)].compact
+        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
 

data/sakuramochi.gemspec

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

data/spec/sakuramochi/relation_spec.rb

@@ -3,6 +3,13 @@ require 'spec_helper'
 
 describe Sakuramochi::Relation do
   describe '#build_where_with_condition' do
+    describe 'scalar' do
+      before { @user = User.where(1).first }
+      subject { @user }
+
+      its(:id) { should eq 1 }
+    end
+
     describe 'not' do
       before { @users = User.where([:not, {:name_contains => 'あいら'}]) }
       subject { @users }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sakuramochi
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000Z
+date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &14949140 !ruby/object:Gem::Requirement
+  requirement: &28698160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *14949140
+  version_requirements: *28698160
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &14948540 !ruby/object:Gem::Requirement
+  requirement: &28697620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *14948540
+  version_requirements: *28697620
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &14947940 !ruby/object:Gem::Requirement
+  requirement: &28693800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14947940
+  version_requirements: *28693800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14944180 !ruby/object:Gem::Requirement
+  requirement: &28693280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14944180
+  version_requirements: *28693280
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &14943600 !ruby/object:Gem::Requirement
+  requirement: &28692740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14943600
+  version_requirements: *28692740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14943000 !ruby/object:Gem::Requirement
+  requirement: &28692220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14943000
+  version_requirements: *28692220
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &14942440 !ruby/object:Gem::Requirement
+  requirement: &28691640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14942440
+  version_requirements: *28691640
 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: -2318816981625713503
+      hash: 2986357789777950954
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: