sakuramochi 0.5.0 → 0.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/lib/sakuramochi/condition.rb +13 -6
- data/lib/sakuramochi/relation.rb +2 -6
- data/sakuramochi.gemspec +2 -2
- data/spec/sakuramochi/relation_spec.rb +14 -0
- metadata +17 -17
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.5.
|
1
|
+
0.5.1
|
@@ -66,6 +66,7 @@ module Sakuramochi
|
|
66
66
|
def initialize(tokens)
|
67
67
|
@tokens = tokens.dup
|
68
68
|
@tokens = @tokens.split(/\s+/) if @tokens.is_a?(String) # debug
|
69
|
+
@tokens = [@tokens] unless @tokens.is_a?(Array)
|
69
70
|
end
|
70
71
|
|
71
72
|
def parse
|
@@ -74,7 +75,11 @@ module Sakuramochi
|
|
74
75
|
|
75
76
|
private
|
76
77
|
|
77
|
-
def
|
78
|
+
def condition?(value)
|
79
|
+
value.is_a?(Array) && !value.first.is_a?(String)
|
80
|
+
end
|
81
|
+
|
82
|
+
def indifferenct_key(token)
|
78
83
|
if token.is_a?(String) || token.is_a?(Symbol)
|
79
84
|
token.to_s.downcase
|
80
85
|
else
|
@@ -83,13 +88,11 @@ module Sakuramochi
|
|
83
88
|
end
|
84
89
|
|
85
90
|
def peek
|
86
|
-
|
87
|
-
self.class.indifferenct_key token
|
91
|
+
indifferenct_key @tokens.first
|
88
92
|
end
|
89
93
|
|
90
94
|
def shift
|
91
|
-
|
92
|
-
self.class.indifferenct_key token
|
95
|
+
indifferenct_key @tokens.shift
|
93
96
|
end
|
94
97
|
|
95
98
|
def accept(*args)
|
@@ -130,7 +133,11 @@ module Sakuramochi
|
|
130
133
|
expect PARENTHESES[token]
|
131
134
|
Nodes::Group.new(node)
|
132
135
|
else
|
133
|
-
|
136
|
+
if condition? peek
|
137
|
+
Nodes::Group.new(Sakuramochi::Condition::Parser.new(shift).parse)
|
138
|
+
else
|
139
|
+
Nodes::Factor.new(shift)
|
140
|
+
end
|
134
141
|
end
|
135
142
|
end
|
136
143
|
end
|
data/lib/sakuramochi/relation.rb
CHANGED
@@ -45,12 +45,8 @@ module Sakuramochi
|
|
45
45
|
end
|
46
46
|
|
47
47
|
def build_where_with_condition(opts, other = [])
|
48
|
-
|
49
|
-
|
50
|
-
[collapse_conditions(ast, other)]
|
51
|
-
else
|
52
|
-
build_where_without_condition(opts, other)
|
53
|
-
end
|
48
|
+
ast = Sakuramochi::Condition::Parser.new(opts.dup).parse
|
49
|
+
[collapse_conditions(ast, other)]
|
54
50
|
end
|
55
51
|
end
|
56
52
|
|
data/sakuramochi.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "sakuramochi"
|
8
|
-
s.version = "0.5.
|
8
|
+
s.version = "0.5.1"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["mashiro"]
|
12
|
-
s.date = "2011-
|
12
|
+
s.date = "2011-12-05"
|
13
13
|
s.description = "Minimal extensions for active record 3"
|
14
14
|
s.email = "mail@mashiro.org"
|
15
15
|
s.extra_rdoc_files = [
|
@@ -25,5 +25,19 @@ describe Sakuramochi::Relation do
|
|
25
25
|
|
26
26
|
it { subject.map(&:name).should_not be_match_all /みおん/ }
|
27
27
|
end
|
28
|
+
|
29
|
+
describe 'nested' do
|
30
|
+
before do
|
31
|
+
@users = User.where([
|
32
|
+
[{:name_contains => '春音'}, :and, {:name_contains => 'あいら'}],
|
33
|
+
:or, [{:name_contains => '天宮'}, :and, {:name_contains => 'りずむ'}]
|
34
|
+
])
|
35
|
+
end
|
36
|
+
subject { @users }
|
37
|
+
|
38
|
+
it { should have(2).items }
|
39
|
+
it { subject.map(&:name).should_not be_match_all /うる|える/ }
|
40
|
+
it { subject.map(&:name).should_not be_match_all /みおん/ }
|
41
|
+
end
|
28
42
|
end
|
29
43
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sakuramochi
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2011-
|
12
|
+
date: 2011-12-05 00:00:00.000000000Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: activesupport
|
16
|
-
requirement: &
|
16
|
+
requirement: &25804160 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '3.0'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *25804160
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: activerecord
|
27
|
-
requirement: &
|
27
|
+
requirement: &25803660 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ~>
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '3.0'
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *25803660
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: sqlite3
|
38
|
-
requirement: &
|
38
|
+
requirement: &25799800 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :development
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *25799800
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: rspec
|
49
|
-
requirement: &
|
49
|
+
requirement: &25799260 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: '0'
|
55
55
|
type: :development
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *25799260
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: rdoc
|
60
|
-
requirement: &
|
60
|
+
requirement: &25798740 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: '0'
|
66
66
|
type: :development
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *25798740
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: bundler
|
71
|
-
requirement: &
|
71
|
+
requirement: &25798160 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ! '>='
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: '0'
|
77
77
|
type: :development
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *25798160
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: jeweler
|
82
|
-
requirement: &
|
82
|
+
requirement: &25797600 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ! '>='
|
@@ -87,7 +87,7 @@ dependencies:
|
|
87
87
|
version: '0'
|
88
88
|
type: :development
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *25797600
|
91
91
|
description: Minimal extensions for active record 3
|
92
92
|
email: mail@mashiro.org
|
93
93
|
executables: []
|
@@ -134,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
134
134
|
version: '0'
|
135
135
|
segments:
|
136
136
|
- 0
|
137
|
-
hash:
|
137
|
+
hash: 3184035355756086876
|
138
138
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
139
139
|
none: false
|
140
140
|
requirements:
|