activecube 0.1.16 → 0.1.17
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/activecube/query/selector.rb +4 -4
- data/lib/activecube/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4ba2ca856a96d75c2628e55d650d8151b8a7a21b4f403e147d9d1f84f19a94b8
|
4
|
+
data.tar.gz: ea75a5c6d7fa9471213788d65be3c55e5a4b0587af8c53c14b79d7c02f40d554
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 92fec873743db10f2f2b7b9bbd919e96d960ade4a3abf2dd0fd82f32e5642ff0eddccfd78ec66a787e62a1de5958b12143410899edd7a80251525cb907dbc29a
|
7
|
+
data.tar.gz: 1006ba66ef723a95503b61d1598226358f1c0a8fbff3946a4a0ea7aa6f34408c016a817e3a7a8bfd35588b9b49aac45a7feed8058e7db47792eedcd367167256
|
data/Gemfile.lock
CHANGED
@@ -20,13 +20,13 @@ module Activecube::Query
|
|
20
20
|
end
|
21
21
|
|
22
22
|
def to_s
|
23
|
-
"Selector
|
23
|
+
"Selector #{operator.operation}(#{@selectors.map(&:to_s).join(',')})"
|
24
24
|
end
|
25
25
|
|
26
26
|
def expression model, arel_table, cube_query
|
27
27
|
expr = nil
|
28
28
|
@selectors.each do |s|
|
29
|
-
expr = expr ? expr.send(
|
29
|
+
expr = expr ? expr.send( operator.operation, s.expression(model, arel_table, cube_query)) : s.expression(model, arel_table, cube_query)
|
30
30
|
end
|
31
31
|
expr
|
32
32
|
end
|
@@ -137,11 +137,11 @@ module Activecube::Query
|
|
137
137
|
end
|
138
138
|
|
139
139
|
def self.or(selectors)
|
140
|
-
CombineSelector.new(selectors, :or)
|
140
|
+
CombineSelector.new(selectors, Operator.new(:or, nil) )
|
141
141
|
end
|
142
142
|
|
143
143
|
def self.and(selectors)
|
144
|
-
CombineSelector.new(selectors, :and)
|
144
|
+
CombineSelector.new(selectors, Operator.new(:and, nil))
|
145
145
|
end
|
146
146
|
|
147
147
|
end
|
data/lib/activecube/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: activecube
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.17
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Aleksey Studnev
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-05-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activerecord
|