chicagowarehouse 0.4.5 → 0.4.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. data/Gemfile +4 -3
  2. data/Rakefile +1 -1
  3. data/chicagowarehouse.gemspec +12 -9
  4. data/lib/chicago.rb +1 -0
  5. data/spec/core_ext/sequel_extensions_spec.rb +1 -1
  6. data/spec/db_connections.yml.dist +1 -1
  7. data/spec/spec_helper.rb +1 -0
  8. metadata +73 -61
data/Gemfile CHANGED
@@ -1,17 +1,18 @@
1
1
  source "http://rubygems.org"
2
2
 
3
3
  # The distinct extension won't work in Sequel 3.30 onwards at present.
4
- gem "sequel", "~> 3.0"
4
+ gem "sequel", ">= 3.34"
5
5
  gem "sequel_migration_builder", ">= 0.3.2"
6
- gem "mysql", "2.8.1"
7
6
  gem "chronic"
8
7
 
9
8
  group :development do
9
+ gem "mysql2"
10
10
  gem "yard"
11
11
  gem "rspec", "~> 2.0"
12
12
  gem "bundler"
13
13
  gem "jeweler"
14
- gem "rcov"
14
+ gem "rcov", :platform => :ruby_18
15
+ gem "simplecov", :platform => :ruby_19
15
16
  gem "flog"
16
17
  gem "ZenTest"
17
18
  gem "timecop"
data/Rakefile CHANGED
@@ -14,7 +14,7 @@ require 'rake'
14
14
  require 'jeweler'
15
15
  Jeweler::Tasks.new do |gem|
16
16
  gem.name = "chicagowarehouse"
17
- gem.version = "0.4.5"
17
+ gem.version = "0.4.6"
18
18
  gem.summary = "Ruby Data Warehousing"
19
19
  gem.description = "Simple Data Warehouse toolkit for ruby"
20
20
  gem.author = "Roland Swingler"
data/chicagowarehouse.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "chicagowarehouse"
8
- s.version = "0.4.5"
8
+ s.version = "0.4.6"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Roland Swingler"]
12
- s.date = "2013-09-16"
12
+ s.date = "2014-01-06"
13
13
  s.description = "Simple Data Warehouse toolkit for ruby"
14
14
  s.email = "roland.swingler@gmail.com"
15
15
  s.extra_rdoc_files = [
@@ -83,49 +83,52 @@ Gem::Specification.new do |s|
83
83
  s.homepage = "http://github.com/notonthehighstreet/chicago"
84
84
  s.licenses = ["MIT"]
85
85
  s.require_paths = ["lib"]
86
- s.rubygems_version = "1.8.15"
86
+ s.rubygems_version = "1.8.25"
87
87
  s.summary = "Ruby Data Warehousing"
88
88
 
89
89
  if s.respond_to? :specification_version then
90
90
  s.specification_version = 3
91
91
 
92
92
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
93
- s.add_runtime_dependency(%q<sequel>, ["~> 3.0"])
93
+ s.add_runtime_dependency(%q<sequel>, [">= 3.34"])
94
94
  s.add_runtime_dependency(%q<sequel_migration_builder>, [">= 0.3.2"])
95
- s.add_runtime_dependency(%q<mysql>, ["= 2.8.1"])
96
95
  s.add_runtime_dependency(%q<chronic>, [">= 0"])
96
+ s.add_development_dependency(%q<mysql2>, [">= 0"])
97
97
  s.add_development_dependency(%q<yard>, [">= 0"])
98
98
  s.add_development_dependency(%q<rspec>, ["~> 2.0"])
99
99
  s.add_development_dependency(%q<bundler>, [">= 0"])
100
100
  s.add_development_dependency(%q<jeweler>, [">= 0"])
101
101
  s.add_development_dependency(%q<rcov>, [">= 0"])
102
+ s.add_development_dependency(%q<simplecov>, [">= 0"])
102
103
  s.add_development_dependency(%q<flog>, [">= 0"])
103
104
  s.add_development_dependency(%q<ZenTest>, [">= 0"])
104
105
  s.add_development_dependency(%q<timecop>, [">= 0"])
105
106
  else
106
- s.add_dependency(%q<sequel>, ["~> 3.0"])
107
+ s.add_dependency(%q<sequel>, [">= 3.34"])
107
108
  s.add_dependency(%q<sequel_migration_builder>, [">= 0.3.2"])
108
- s.add_dependency(%q<mysql>, ["= 2.8.1"])
109
109
  s.add_dependency(%q<chronic>, [">= 0"])
110
+ s.add_dependency(%q<mysql2>, [">= 0"])
110
111
  s.add_dependency(%q<yard>, [">= 0"])
111
112
  s.add_dependency(%q<rspec>, ["~> 2.0"])
112
113
  s.add_dependency(%q<bundler>, [">= 0"])
113
114
  s.add_dependency(%q<jeweler>, [">= 0"])
114
115
  s.add_dependency(%q<rcov>, [">= 0"])
116
+ s.add_dependency(%q<simplecov>, [">= 0"])
115
117
  s.add_dependency(%q<flog>, [">= 0"])
116
118
  s.add_dependency(%q<ZenTest>, [">= 0"])
117
119
  s.add_dependency(%q<timecop>, [">= 0"])
118
120
  end
119
121
  else
120
- s.add_dependency(%q<sequel>, ["~> 3.0"])
122
+ s.add_dependency(%q<sequel>, [">= 3.34"])
121
123
  s.add_dependency(%q<sequel_migration_builder>, [">= 0.3.2"])
122
- s.add_dependency(%q<mysql>, ["= 2.8.1"])
123
124
  s.add_dependency(%q<chronic>, [">= 0"])
125
+ s.add_dependency(%q<mysql2>, [">= 0"])
124
126
  s.add_dependency(%q<yard>, [">= 0"])
125
127
  s.add_dependency(%q<rspec>, ["~> 2.0"])
126
128
  s.add_dependency(%q<bundler>, [">= 0"])
127
129
  s.add_dependency(%q<jeweler>, [">= 0"])
128
130
  s.add_dependency(%q<rcov>, [">= 0"])
131
+ s.add_dependency(%q<simplecov>, [">= 0"])
129
132
  s.add_dependency(%q<flog>, [">= 0"])
130
133
  s.add_dependency(%q<ZenTest>, [">= 0"])
131
134
  s.add_dependency(%q<timecop>, [">= 0"])
data/lib/chicago.rb CHANGED
@@ -2,6 +2,7 @@
2
2
  require 'chronic'
3
3
  require 'sequel'
4
4
  require 'sequel/extensions/inflector'
5
+ Sequel.extension(:core_extensions)
5
6
 
6
7
  # TODO: move this back to the Sequel MySQL adapter
7
8
  require 'chicago/core_ext/sequel/dataset'
data/spec/core_ext/sequel_extensions_spec.rb CHANGED
@@ -24,6 +24,6 @@ describe Sequel::SQL::DistinctExpression do
24
24
  end
25
25
 
26
26
  it "is rendered as 'DISTINCT expression'" do
27
- described_class.new(:foo).to_s(TEST_DB[:foo]).should == "DISTINCT `foo`"
27
+ described_class.new(:foo).sql_literal(TEST_DB[:foo]).should == "DISTINCT `foo`"
28
28
  end
29
29
  end
data/spec/db_connections.yml.dist CHANGED
@@ -1,4 +1,4 @@
1
- adapter: mysql
1
+ adapter: mysql2
2
2
  username: root
3
3
  socket: /tmp/mysql.sock
4
4
  database: chicago_test_db
data/spec/spec_helper.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  $LOAD_PATH.unshift(File.dirname(__FILE__))
2
2
  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
3
3
  require 'chicago'
4
+ require 'mysql2'
4
5
  require 'rspec'
5
6
  require 'yaml'
6
7
  require 'rspec/autorun'
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chicagowarehouse
3
3
  version: !ruby/object:Gem::Version
4
- hash: 5
4
+ hash: 3
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 4
9
- - 5
10
- version: 0.4.5
9
+ - 6
10
+ version: 0.4.6
11
11
  platform: ruby
12
12
  authors:
13
13
  - Roland Swingler
@@ -15,27 +15,25 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2013-09-16 00:00:00 Z
18
+ date: 2014-01-06 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
- type: :runtime
22
- prerelease: false
23
- requirement: &id001 !ruby/object:Gem::Requirement
21
+ version_requirements: &id001 !ruby/object:Gem::Requirement
24
22
  none: false
25
23
  requirements:
26
- - - ~>
24
+ - - ">="
27
25
  - !ruby/object:Gem::Version
28
- hash: 7
26
+ hash: 67
29
27
  segments:
30
28
  - 3
31
- - 0
32
- version: "3.0"
33
- name: sequel
34
- version_requirements: *id001
35
- - !ruby/object:Gem::Dependency
29
+ - 34
30
+ version: "3.34"
31
+ requirement: *id001
36
32
  type: :runtime
37
33
  prerelease: false
38
- requirement: &id002 !ruby/object:Gem::Requirement
34
+ name: sequel
35
+ - !ruby/object:Gem::Dependency
36
+ version_requirements: &id002 !ruby/object:Gem::Requirement
39
37
  none: false
40
38
  requirements:
41
39
  - - ">="
@@ -46,28 +44,26 @@ dependencies:
46
44
  - 3
47
45
  - 2
48
46
  version: 0.3.2
49
- name: sequel_migration_builder
50
- version_requirements: *id002
51
- - !ruby/object:Gem::Dependency
47
+ requirement: *id002
52
48
  type: :runtime
53
49
  prerelease: false
54
- requirement: &id003 !ruby/object:Gem::Requirement
50
+ name: sequel_migration_builder
51
+ - !ruby/object:Gem::Dependency
52
+ version_requirements: &id003 !ruby/object:Gem::Requirement
55
53
  none: false
56
54
  requirements:
57
- - - "="
55
+ - - ">="
58
56
  - !ruby/object:Gem::Version
59
- hash: 45
57
+ hash: 3
60
58
  segments:
61
- - 2
62
- - 8
63
- - 1
64
- version: 2.8.1
65
- name: mysql
66
- version_requirements: *id003
67
- - !ruby/object:Gem::Dependency
59
+ - 0
60
+ version: "0"
61
+ requirement: *id003
68
62
  type: :runtime
69
63
  prerelease: false
70
- requirement: &id004 !ruby/object:Gem::Requirement
64
+ name: chronic
65
+ - !ruby/object:Gem::Dependency
66
+ version_requirements: &id004 !ruby/object:Gem::Requirement
71
67
  none: false
72
68
  requirements:
73
69
  - - ">="
@@ -76,12 +72,12 @@ dependencies:
76
72
  segments:
77
73
  - 0
78
74
  version: "0"
79
- name: chronic
80
- version_requirements: *id004
81
- - !ruby/object:Gem::Dependency
75
+ requirement: *id004
82
76
  type: :development
83
77
  prerelease: false
84
- requirement: &id005 !ruby/object:Gem::Requirement
78
+ name: mysql2
79
+ - !ruby/object:Gem::Dependency
80
+ version_requirements: &id005 !ruby/object:Gem::Requirement
85
81
  none: false
86
82
  requirements:
87
83
  - - ">="
@@ -90,12 +86,12 @@ dependencies:
90
86
  segments:
91
87
  - 0
92
88
  version: "0"
93
- name: yard
94
- version_requirements: *id005
95
- - !ruby/object:Gem::Dependency
89
+ requirement: *id005
96
90
  type: :development
97
91
  prerelease: false
98
- requirement: &id006 !ruby/object:Gem::Requirement
92
+ name: yard
93
+ - !ruby/object:Gem::Dependency
94
+ version_requirements: &id006 !ruby/object:Gem::Requirement
99
95
  none: false
100
96
  requirements:
101
97
  - - ~>
@@ -105,12 +101,12 @@ dependencies:
105
101
  - 2
106
102
  - 0
107
103
  version: "2.0"
108
- name: rspec
109
- version_requirements: *id006
110
- - !ruby/object:Gem::Dependency
104
+ requirement: *id006
111
105
  type: :development
112
106
  prerelease: false
113
- requirement: &id007 !ruby/object:Gem::Requirement
107
+ name: rspec
108
+ - !ruby/object:Gem::Dependency
109
+ version_requirements: &id007 !ruby/object:Gem::Requirement
114
110
  none: false
115
111
  requirements:
116
112
  - - ">="
@@ -119,12 +115,12 @@ dependencies:
119
115
  segments:
120
116
  - 0
121
117
  version: "0"
122
- name: bundler
123
- version_requirements: *id007
124
- - !ruby/object:Gem::Dependency
118
+ requirement: *id007
125
119
  type: :development
126
120
  prerelease: false
127
- requirement: &id008 !ruby/object:Gem::Requirement
121
+ name: bundler
122
+ - !ruby/object:Gem::Dependency
123
+ version_requirements: &id008 !ruby/object:Gem::Requirement
128
124
  none: false
129
125
  requirements:
130
126
  - - ">="
@@ -133,12 +129,12 @@ dependencies:
133
129
  segments:
134
130
  - 0
135
131
  version: "0"
136
- name: jeweler
137
- version_requirements: *id008
138
- - !ruby/object:Gem::Dependency
132
+ requirement: *id008
139
133
  type: :development
140
134
  prerelease: false
141
- requirement: &id009 !ruby/object:Gem::Requirement
135
+ name: jeweler
136
+ - !ruby/object:Gem::Dependency
137
+ version_requirements: &id009 !ruby/object:Gem::Requirement
142
138
  none: false
143
139
  requirements:
144
140
  - - ">="
@@ -147,12 +143,26 @@ dependencies:
147
143
  segments:
148
144
  - 0
149
145
  version: "0"
146
+ requirement: *id009
147
+ type: :development
148
+ prerelease: false
150
149
  name: rcov
151
- version_requirements: *id009
152
150
  - !ruby/object:Gem::Dependency
151
+ version_requirements: &id010 !ruby/object:Gem::Requirement
152
+ none: false
153
+ requirements:
154
+ - - ">="
155
+ - !ruby/object:Gem::Version
156
+ hash: 3
157
+ segments:
158
+ - 0
159
+ version: "0"
160
+ requirement: *id010
153
161
  type: :development
154
162
  prerelease: false
155
- requirement: &id010 !ruby/object:Gem::Requirement
163
+ name: simplecov
164
+ - !ruby/object:Gem::Dependency
165
+ version_requirements: &id011 !ruby/object:Gem::Requirement
156
166
  none: false
157
167
  requirements:
158
168
  - - ">="
@@ -161,12 +171,12 @@ dependencies:
161
171
  segments:
162
172
  - 0
163
173
  version: "0"
164
- name: flog
165
- version_requirements: *id010
166
- - !ruby/object:Gem::Dependency
174
+ requirement: *id011
167
175
  type: :development
168
176
  prerelease: false
169
- requirement: &id011 !ruby/object:Gem::Requirement
177
+ name: flog
178
+ - !ruby/object:Gem::Dependency
179
+ version_requirements: &id012 !ruby/object:Gem::Requirement
170
180
  none: false
171
181
  requirements:
172
182
  - - ">="
@@ -175,12 +185,12 @@ dependencies:
175
185
  segments:
176
186
  - 0
177
187
  version: "0"
178
- name: ZenTest
179
- version_requirements: *id011
180
- - !ruby/object:Gem::Dependency
188
+ requirement: *id012
181
189
  type: :development
182
190
  prerelease: false
183
- requirement: &id012 !ruby/object:Gem::Requirement
191
+ name: ZenTest
192
+ - !ruby/object:Gem::Dependency
193
+ version_requirements: &id013 !ruby/object:Gem::Requirement
184
194
  none: false
185
195
  requirements:
186
196
  - - ">="
@@ -189,8 +199,10 @@ dependencies:
189
199
  segments:
190
200
  - 0
191
201
  version: "0"
202
+ requirement: *id013
203
+ type: :development
204
+ prerelease: false
192
205
  name: timecop
193
- version_requirements: *id012
194
206
  description: Simple Data Warehouse toolkit for ruby
195
207
  email: roland.swingler@gmail.com
196
208
  executables: []
@@ -292,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
292
304
  requirements: []
293
305
 
294
306
  rubyforge_project:
295
- rubygems_version: 1.8.15
307
+ rubygems_version: 1.8.25
296
308
  signing_key:
297
309
  specification_version: 3
298
310
  summary: Ruby Data Warehousing