mdquery 0.3.1 → 0.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/Gemfile +7 -7
- data/Gemfile.lock +78 -39
- data/VERSION +1 -1
- data/lib/mdquery/model.rb +1 -1
- data/mdquery.gemspec +25 -25
- data/spec/mdquery/model_spec.rb +3 -3
- metadata +25 -44
checksums.yaml
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
---
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: c3eaf2957a7f30e77e0bad487e3d643fa9df6a3a
|
4
|
+
data.tar.gz: 24e31343bd2a69c521025021e00cd1e78046953e
|
5
|
+
SHA512:
|
6
|
+
metadata.gz: 4a00a39261fb7b3771f0b0dd00fb3c72c8f2b49028b95afccfc7d9b7dcb8df712a820e9780c8bfacc6a0f2aef1d6964ffb491620da319610ce6676d636c21fb3
|
7
|
+
data.tar.gz: 4c988df242045b9519b47fff8e45862872eb53c2d4f0eb693bd3ad1a65296ca8542aa2b863cebfc61a372898b47b507d57b07a2d3229b59fede9344b78313718
|
data/Gemfile
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
source "http://rubygems.org"
|
2
2
|
|
3
|
-
gem "activerecord", ">= 3.2.
|
3
|
+
gem "activerecord", ">= 3.2.18"
|
4
4
|
|
5
5
|
group :development do
|
6
|
-
gem "rake", "~> 10.
|
7
|
-
gem "rspec", "~> 2.
|
8
|
-
gem "rdoc", "~> 4.
|
9
|
-
gem "bundler", "~> 1.3
|
10
|
-
gem "jeweler", "~>
|
6
|
+
gem "rake", "~> 10.3.2"
|
7
|
+
gem "rspec", "~> 2.14.1"
|
8
|
+
gem "rdoc", "~> 4.1.1"
|
9
|
+
gem "bundler", "~> 1.6.3"
|
10
|
+
gem "jeweler", "~> 2.0.1"
|
11
11
|
# gem "rcov", ">= 0"
|
12
|
-
gem 'rr', ">= 1.
|
12
|
+
gem 'rr', ">= 1.1.2"
|
13
13
|
end
|
data/Gemfile.lock
CHANGED
@@ -1,53 +1,92 @@
|
|
1
1
|
GEM
|
2
2
|
remote: http://rubygems.org/
|
3
3
|
specs:
|
4
|
-
activemodel (
|
5
|
-
activesupport (=
|
6
|
-
builder (~> 3.
|
7
|
-
activerecord (
|
8
|
-
activemodel (=
|
9
|
-
activesupport (=
|
10
|
-
arel (~>
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
4
|
+
activemodel (4.1.1)
|
5
|
+
activesupport (= 4.1.1)
|
6
|
+
builder (~> 3.1)
|
7
|
+
activerecord (4.1.1)
|
8
|
+
activemodel (= 4.1.1)
|
9
|
+
activesupport (= 4.1.1)
|
10
|
+
arel (~> 5.0.0)
|
11
|
+
activesupport (4.1.1)
|
12
|
+
i18n (~> 0.6, >= 0.6.9)
|
13
|
+
json (~> 1.7, >= 1.7.7)
|
14
|
+
minitest (~> 5.1)
|
15
|
+
thread_safe (~> 0.1)
|
16
|
+
tzinfo (~> 1.1)
|
17
|
+
addressable (2.3.6)
|
18
|
+
arel (5.0.1.20140414130214)
|
19
|
+
builder (3.2.2)
|
20
|
+
descendants_tracker (0.0.4)
|
21
|
+
thread_safe (~> 0.3, >= 0.3.1)
|
22
|
+
diff-lcs (1.2.5)
|
23
|
+
faraday (0.9.0)
|
24
|
+
multipart-post (>= 1.2, < 3)
|
25
|
+
git (1.2.7)
|
26
|
+
github_api (0.11.3)
|
27
|
+
addressable (~> 2.3)
|
28
|
+
descendants_tracker (~> 0.0.1)
|
29
|
+
faraday (~> 0.8, < 0.10)
|
30
|
+
hashie (>= 1.2)
|
31
|
+
multi_json (>= 1.7.5, < 2.0)
|
32
|
+
nokogiri (~> 1.6.0)
|
33
|
+
oauth2
|
34
|
+
hashie (3.0.0)
|
35
|
+
highline (1.6.21)
|
36
|
+
i18n (0.6.9)
|
37
|
+
jeweler (2.0.1)
|
38
|
+
builder
|
39
|
+
bundler (>= 1.0)
|
22
40
|
git (>= 1.2.5)
|
41
|
+
github_api
|
42
|
+
highline (>= 1.6.15)
|
43
|
+
nokogiri (>= 1.5.10)
|
23
44
|
rake
|
24
45
|
rdoc
|
25
|
-
json (1.
|
26
|
-
json (1.
|
27
|
-
|
28
|
-
|
29
|
-
|
46
|
+
json (1.8.1)
|
47
|
+
json (1.8.1-java)
|
48
|
+
jwt (1.0.0)
|
49
|
+
mini_portile (0.6.0)
|
50
|
+
minitest (5.3.5)
|
51
|
+
multi_json (1.10.1)
|
52
|
+
multi_xml (0.5.5)
|
53
|
+
multipart-post (2.0.0)
|
54
|
+
nokogiri (1.6.2.1)
|
55
|
+
mini_portile (= 0.6.0)
|
56
|
+
nokogiri (1.6.2.1-java)
|
57
|
+
oauth2 (0.9.4)
|
58
|
+
faraday (>= 0.8, < 0.10)
|
59
|
+
jwt (~> 1.0)
|
60
|
+
multi_json (~> 1.3)
|
61
|
+
multi_xml (~> 0.5)
|
62
|
+
rack (~> 1.2)
|
63
|
+
rack (1.5.2)
|
64
|
+
rake (10.3.2)
|
65
|
+
rdoc (4.1.1)
|
30
66
|
json (~> 1.4)
|
31
|
-
rr (1.
|
32
|
-
rspec (2.
|
33
|
-
rspec-core (~> 2.
|
34
|
-
rspec-expectations (~> 2.
|
35
|
-
rspec-mocks (~> 2.
|
36
|
-
rspec-core (2.
|
37
|
-
rspec-expectations (2.
|
67
|
+
rr (1.1.2)
|
68
|
+
rspec (2.14.1)
|
69
|
+
rspec-core (~> 2.14.0)
|
70
|
+
rspec-expectations (~> 2.14.0)
|
71
|
+
rspec-mocks (~> 2.14.0)
|
72
|
+
rspec-core (2.14.8)
|
73
|
+
rspec-expectations (2.14.5)
|
38
74
|
diff-lcs (>= 1.1.3, < 2.0)
|
39
|
-
rspec-mocks (2.
|
40
|
-
|
75
|
+
rspec-mocks (2.14.6)
|
76
|
+
thread_safe (0.3.4)
|
77
|
+
thread_safe (0.3.4-java)
|
78
|
+
tzinfo (1.2.1)
|
79
|
+
thread_safe (~> 0.1)
|
41
80
|
|
42
81
|
PLATFORMS
|
43
82
|
java
|
44
83
|
ruby
|
45
84
|
|
46
85
|
DEPENDENCIES
|
47
|
-
activerecord (>= 3.2.
|
48
|
-
bundler (~> 1.3
|
49
|
-
jeweler (~>
|
50
|
-
rake (~> 10.
|
51
|
-
rdoc (~> 4.
|
52
|
-
rr (>= 1.
|
53
|
-
rspec (~> 2.
|
86
|
+
activerecord (>= 3.2.18)
|
87
|
+
bundler (~> 1.6.3)
|
88
|
+
jeweler (~> 2.0.1)
|
89
|
+
rake (~> 10.3.2)
|
90
|
+
rdoc (~> 4.1.1)
|
91
|
+
rr (>= 1.1.2)
|
92
|
+
rspec (~> 2.14.1)
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.
|
1
|
+
0.4.0
|
data/lib/mdquery/model.rb
CHANGED
@@ -229,7 +229,7 @@ module MDQuery
|
|
229
229
|
|
230
230
|
select_string = (dimension_select_strings + measure_select_strings).join(",")
|
231
231
|
|
232
|
-
group_string = region_segment_models.
|
232
|
+
group_string = (1..region_segment_models.length).to_a.join(",")
|
233
233
|
|
234
234
|
narrowed_scope.select(select_string).group(group_string)
|
235
235
|
end
|
data/mdquery.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "mdquery"
|
8
|
-
s.version = "0.
|
8
|
+
s.version = "0.4.0"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["mccraigmccraig"]
|
12
|
-
s.date = "
|
12
|
+
s.date = "2014-06-25"
|
13
13
|
s.description = "provides a DSL for simply specifying and executing segmented multi-dimensional queries on your active-record-3 models"
|
14
14
|
s.email = "mccraigmccraig@gmail.com"
|
15
15
|
s.extra_rdoc_files = [
|
@@ -42,37 +42,37 @@ Gem::Specification.new do |s|
|
|
42
42
|
s.homepage = "http://github.com/mccraigmccraig/mdquery"
|
43
43
|
s.licenses = ["MIT"]
|
44
44
|
s.require_paths = ["lib"]
|
45
|
-
s.rubygems_version = "
|
45
|
+
s.rubygems_version = "2.0.3"
|
46
46
|
s.summary = "simple multi-dimensional queries on top of active-record-3"
|
47
47
|
|
48
48
|
if s.respond_to? :specification_version then
|
49
|
-
s.specification_version =
|
49
|
+
s.specification_version = 4
|
50
50
|
|
51
51
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
52
|
-
s.add_runtime_dependency(%q<activerecord>, [">= 3.2.
|
53
|
-
s.add_development_dependency(%q<rake>, ["~> 10.
|
54
|
-
s.add_development_dependency(%q<rspec>, ["~> 2.
|
55
|
-
s.add_development_dependency(%q<rdoc>, ["~> 4.
|
56
|
-
s.add_development_dependency(%q<bundler>, ["~> 1.3
|
57
|
-
s.add_development_dependency(%q<jeweler>, ["~>
|
58
|
-
s.add_development_dependency(%q<rr>, [">= 1.
|
52
|
+
s.add_runtime_dependency(%q<activerecord>, [">= 3.2.18"])
|
53
|
+
s.add_development_dependency(%q<rake>, ["~> 10.3.2"])
|
54
|
+
s.add_development_dependency(%q<rspec>, ["~> 2.14.1"])
|
55
|
+
s.add_development_dependency(%q<rdoc>, ["~> 4.1.1"])
|
56
|
+
s.add_development_dependency(%q<bundler>, ["~> 1.6.3"])
|
57
|
+
s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
|
58
|
+
s.add_development_dependency(%q<rr>, [">= 1.1.2"])
|
59
59
|
else
|
60
|
-
s.add_dependency(%q<activerecord>, [">= 3.2.
|
61
|
-
s.add_dependency(%q<rake>, ["~> 10.
|
62
|
-
s.add_dependency(%q<rspec>, ["~> 2.
|
63
|
-
s.add_dependency(%q<rdoc>, ["~> 4.
|
64
|
-
s.add_dependency(%q<bundler>, ["~> 1.3
|
65
|
-
s.add_dependency(%q<jeweler>, ["~>
|
66
|
-
s.add_dependency(%q<rr>, [">= 1.
|
60
|
+
s.add_dependency(%q<activerecord>, [">= 3.2.18"])
|
61
|
+
s.add_dependency(%q<rake>, ["~> 10.3.2"])
|
62
|
+
s.add_dependency(%q<rspec>, ["~> 2.14.1"])
|
63
|
+
s.add_dependency(%q<rdoc>, ["~> 4.1.1"])
|
64
|
+
s.add_dependency(%q<bundler>, ["~> 1.6.3"])
|
65
|
+
s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
|
66
|
+
s.add_dependency(%q<rr>, [">= 1.1.2"])
|
67
67
|
end
|
68
68
|
else
|
69
|
-
s.add_dependency(%q<activerecord>, [">= 3.2.
|
70
|
-
s.add_dependency(%q<rake>, ["~> 10.
|
71
|
-
s.add_dependency(%q<rspec>, ["~> 2.
|
72
|
-
s.add_dependency(%q<rdoc>, ["~> 4.
|
73
|
-
s.add_dependency(%q<bundler>, ["~> 1.3
|
74
|
-
s.add_dependency(%q<jeweler>, ["~>
|
75
|
-
s.add_dependency(%q<rr>, [">= 1.
|
69
|
+
s.add_dependency(%q<activerecord>, [">= 3.2.18"])
|
70
|
+
s.add_dependency(%q<rake>, ["~> 10.3.2"])
|
71
|
+
s.add_dependency(%q<rspec>, ["~> 2.14.1"])
|
72
|
+
s.add_dependency(%q<rdoc>, ["~> 4.1.1"])
|
73
|
+
s.add_dependency(%q<bundler>, ["~> 1.6.3"])
|
74
|
+
s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
|
75
|
+
s.add_dependency(%q<rr>, [">= 1.1.2"])
|
76
76
|
end
|
77
77
|
end
|
78
78
|
|
data/spec/mdquery/model_spec.rb
CHANGED
@@ -375,9 +375,9 @@ module MDQuery
|
|
375
375
|
select_string = "foofoo as foo,barbar as bar,count(*) as count"
|
376
376
|
|
377
377
|
# group_string
|
378
|
-
mock(dim0sm0).group_by_column{"foo"}
|
379
|
-
mock(dim1sm0).group_by_column{"bar"}
|
380
|
-
group_string = "
|
378
|
+
# mock(dim0sm0).group_by_column{"foo"}
|
379
|
+
# mock(dim1sm0).group_by_column{"bar"}
|
380
|
+
group_string = "1,2"
|
381
381
|
|
382
382
|
scope_n3 = Object.new
|
383
383
|
query = Object.new
|
metadata
CHANGED
@@ -1,128 +1,113 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: mdquery
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
5
|
-
prerelease:
|
4
|
+
version: 0.4.0
|
6
5
|
platform: ruby
|
7
6
|
authors:
|
8
7
|
- mccraigmccraig
|
9
8
|
autorequire:
|
10
9
|
bindir: bin
|
11
10
|
cert_chain: []
|
12
|
-
date:
|
11
|
+
date: 2014-06-25 00:00:00.000000000 Z
|
13
12
|
dependencies:
|
14
13
|
- !ruby/object:Gem::Dependency
|
15
14
|
name: activerecord
|
16
15
|
requirement: !ruby/object:Gem::Requirement
|
17
|
-
none: false
|
18
16
|
requirements:
|
19
|
-
- -
|
17
|
+
- - '>='
|
20
18
|
- !ruby/object:Gem::Version
|
21
|
-
version: 3.2.
|
19
|
+
version: 3.2.18
|
22
20
|
type: :runtime
|
23
21
|
prerelease: false
|
24
22
|
version_requirements: !ruby/object:Gem::Requirement
|
25
|
-
none: false
|
26
23
|
requirements:
|
27
|
-
- -
|
24
|
+
- - '>='
|
28
25
|
- !ruby/object:Gem::Version
|
29
|
-
version: 3.2.
|
26
|
+
version: 3.2.18
|
30
27
|
- !ruby/object:Gem::Dependency
|
31
28
|
name: rake
|
32
29
|
requirement: !ruby/object:Gem::Requirement
|
33
|
-
none: false
|
34
30
|
requirements:
|
35
31
|
- - ~>
|
36
32
|
- !ruby/object:Gem::Version
|
37
|
-
version: 10.
|
33
|
+
version: 10.3.2
|
38
34
|
type: :development
|
39
35
|
prerelease: false
|
40
36
|
version_requirements: !ruby/object:Gem::Requirement
|
41
|
-
none: false
|
42
37
|
requirements:
|
43
38
|
- - ~>
|
44
39
|
- !ruby/object:Gem::Version
|
45
|
-
version: 10.
|
40
|
+
version: 10.3.2
|
46
41
|
- !ruby/object:Gem::Dependency
|
47
42
|
name: rspec
|
48
43
|
requirement: !ruby/object:Gem::Requirement
|
49
|
-
none: false
|
50
44
|
requirements:
|
51
45
|
- - ~>
|
52
46
|
- !ruby/object:Gem::Version
|
53
|
-
version: 2.
|
47
|
+
version: 2.14.1
|
54
48
|
type: :development
|
55
49
|
prerelease: false
|
56
50
|
version_requirements: !ruby/object:Gem::Requirement
|
57
|
-
none: false
|
58
51
|
requirements:
|
59
52
|
- - ~>
|
60
53
|
- !ruby/object:Gem::Version
|
61
|
-
version: 2.
|
54
|
+
version: 2.14.1
|
62
55
|
- !ruby/object:Gem::Dependency
|
63
56
|
name: rdoc
|
64
57
|
requirement: !ruby/object:Gem::Requirement
|
65
|
-
none: false
|
66
58
|
requirements:
|
67
59
|
- - ~>
|
68
60
|
- !ruby/object:Gem::Version
|
69
|
-
version: 4.
|
61
|
+
version: 4.1.1
|
70
62
|
type: :development
|
71
63
|
prerelease: false
|
72
64
|
version_requirements: !ruby/object:Gem::Requirement
|
73
|
-
none: false
|
74
65
|
requirements:
|
75
66
|
- - ~>
|
76
67
|
- !ruby/object:Gem::Version
|
77
|
-
version: 4.
|
68
|
+
version: 4.1.1
|
78
69
|
- !ruby/object:Gem::Dependency
|
79
70
|
name: bundler
|
80
71
|
requirement: !ruby/object:Gem::Requirement
|
81
|
-
none: false
|
82
72
|
requirements:
|
83
73
|
- - ~>
|
84
74
|
- !ruby/object:Gem::Version
|
85
|
-
version: 1.3
|
75
|
+
version: 1.6.3
|
86
76
|
type: :development
|
87
77
|
prerelease: false
|
88
78
|
version_requirements: !ruby/object:Gem::Requirement
|
89
|
-
none: false
|
90
79
|
requirements:
|
91
80
|
- - ~>
|
92
81
|
- !ruby/object:Gem::Version
|
93
|
-
version: 1.3
|
82
|
+
version: 1.6.3
|
94
83
|
- !ruby/object:Gem::Dependency
|
95
84
|
name: jeweler
|
96
85
|
requirement: !ruby/object:Gem::Requirement
|
97
|
-
none: false
|
98
86
|
requirements:
|
99
87
|
- - ~>
|
100
88
|
- !ruby/object:Gem::Version
|
101
|
-
version:
|
89
|
+
version: 2.0.1
|
102
90
|
type: :development
|
103
91
|
prerelease: false
|
104
92
|
version_requirements: !ruby/object:Gem::Requirement
|
105
|
-
none: false
|
106
93
|
requirements:
|
107
94
|
- - ~>
|
108
95
|
- !ruby/object:Gem::Version
|
109
|
-
version:
|
96
|
+
version: 2.0.1
|
110
97
|
- !ruby/object:Gem::Dependency
|
111
98
|
name: rr
|
112
99
|
requirement: !ruby/object:Gem::Requirement
|
113
|
-
none: false
|
114
100
|
requirements:
|
115
|
-
- -
|
101
|
+
- - '>='
|
116
102
|
- !ruby/object:Gem::Version
|
117
|
-
version: 1.
|
103
|
+
version: 1.1.2
|
118
104
|
type: :development
|
119
105
|
prerelease: false
|
120
106
|
version_requirements: !ruby/object:Gem::Requirement
|
121
|
-
none: false
|
122
107
|
requirements:
|
123
|
-
- -
|
108
|
+
- - '>='
|
124
109
|
- !ruby/object:Gem::Version
|
125
|
-
version: 1.
|
110
|
+
version: 1.1.2
|
126
111
|
description: provides a DSL for simply specifying and executing segmented multi-dimensional
|
127
112
|
queries on your active-record-3 models
|
128
113
|
email: mccraigmccraig@gmail.com
|
@@ -156,29 +141,25 @@ files:
|
|
156
141
|
homepage: http://github.com/mccraigmccraig/mdquery
|
157
142
|
licenses:
|
158
143
|
- MIT
|
144
|
+
metadata: {}
|
159
145
|
post_install_message:
|
160
146
|
rdoc_options: []
|
161
147
|
require_paths:
|
162
148
|
- lib
|
163
149
|
required_ruby_version: !ruby/object:Gem::Requirement
|
164
|
-
none: false
|
165
150
|
requirements:
|
166
|
-
- -
|
151
|
+
- - '>='
|
167
152
|
- !ruby/object:Gem::Version
|
168
153
|
version: '0'
|
169
|
-
segments:
|
170
|
-
- 0
|
171
|
-
hash: 2205263928275995703
|
172
154
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
173
|
-
none: false
|
174
155
|
requirements:
|
175
|
-
- -
|
156
|
+
- - '>='
|
176
157
|
- !ruby/object:Gem::Version
|
177
158
|
version: '0'
|
178
159
|
requirements: []
|
179
160
|
rubyforge_project:
|
180
|
-
rubygems_version:
|
161
|
+
rubygems_version: 2.0.3
|
181
162
|
signing_key:
|
182
|
-
specification_version:
|
163
|
+
specification_version: 4
|
183
164
|
summary: simple multi-dimensional queries on top of active-record-3
|
184
165
|
test_files: []
|