killbill 8.3.1 → 8.3.2

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.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/NEWS +3 -0
  4. data/generators/active_merchant/templates/plugin.gemspec.rb +1 -3
  5. data/lib/killbill/helpers/active_merchant/configuration.rb +10 -2
  6. data/lib/killbill/version.rb +1 -1
  7. data/spec/killbill/helpers/configuration_spec.rb +1 -1
  8. metadata +119 -119
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4b24b6521c579ee81e3eaa2e9bd164a0a9c9a6a6
4
- data.tar.gz: a5e1b8331da5bf78bb135c63b26bbddca008982f
3
+ metadata.gz: c4dffa5dd19d78e5059a1cda70e9f5bc82a8d5f7
4
+ data.tar.gz: 3b91843721eb28689dc8ee7981a2f7ada8fd0bd4
5
5
  SHA512:
6
- metadata.gz: e9a11b9a5388bf7cd1458fc6649b5a8f20dcfc383e19fcf1858edf39119aeb1468b333f23df0a2a3479e5b110a1d8d10de8ac49cdeceba40c160284917375132
7
- data.tar.gz: 98d0b8417b688bb0f8e98f5b1df77a110ea4e59ff9e2f25d529ba363735742a26fa516799cc524598dd979946945ac84bbf35e7c520130d500e1bc5f77e9af48
6
+ metadata.gz: 934dd65cd6c40ebc5aa2d59230f46a726556978de8c67b5cfad5b09f6ffc1fd0ca91ba6206af752d7b5820dbb93cd07e23c4b576365c93ea3978f00a8e6a9980
7
+ data.tar.gz: abde94922b817a33e140dd4953435db0a9727269da943e9c14e6266bb0ed6a25b7b5a88161096f8880ac95c132fd19398d263cf46aafa7ad587308244d36c36e
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- killbill (8.3.1)
4
+ killbill (8.3.2)
5
5
  rack (>= 1.5.2)
6
6
  sinatra (~> 1.3.4)
7
7
  typhoeus (~> 0.6.9)
data/NEWS CHANGED
@@ -1,3 +1,6 @@
1
+ 8.3.2
2
+ Merge global configuration into each account specific configuration
3
+
1
4
  8.3.1
2
5
  Fix outdated EntitlementPluginApi models
3
6
 
data/generators/active_merchant/templates/plugin.gemspec.rb CHANGED
@@ -14,10 +14,8 @@ Gem::Specification.new do |s|
14
14
  s.email = 'killbilling-users@googlegroups.com'
15
15
  s.homepage = 'http://killbill.io'
16
16
 
17
- s.files = `git ls-files`.split("\n")
18
- s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
17
+ s.files = Dir['lib/**/*']
19
18
  s.bindir = 'bin'
20
- s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
21
19
  s.require_paths = ['lib']
22
20
 
23
21
  s.rdoc_options << '--exclude' << '.'
data/lib/killbill/helpers/active_merchant/configuration.rb CHANGED
@@ -69,11 +69,19 @@ module Killbill
69
69
  private
70
70
 
71
71
  def extract_gateway_config(config)
72
- gateways_config = {}
73
72
  gateway_configs = config[@@gateway_name.to_sym]
73
+ global_defaults = @@glob_config[@@gateway_name.to_sym] || {}
74
+ # Provided configuration is the same of global (i.e. no tenant specific configuration)
75
+ unless global_defaults.is_a?(Hash)
76
+ @@logger.warn "Ignoring #{@@gateway_name} global configuration. Invalid format, expecting a Hash."
77
+ global_defaults = {}
78
+ end
79
+
80
+ gateways_config = {}
74
81
  if gateway_configs.is_a?(Array)
75
82
  default_gateway = nil
76
83
  gateway_configs.each_with_index do |gateway_config, idx|
84
+ gateway_config = global_defaults.merge(gateway_config)
77
85
  gateway_account_id = gateway_config[:account_id]
78
86
  if gateway_account_id.nil?
79
87
  @@logger.warn "Skipping config #{gateway_config} -- missing :account_id"
@@ -88,7 +96,7 @@ module Killbill
88
96
  if gateway_configs.nil?
89
97
  @@logger.warn "Unable to configure gateway #{@@gateway_name}, invalid configuration: #{config}"
90
98
  else
91
- gateways_config[:default] = Gateway.wrap(@@gateway_builder, gateway_configs, @@logger)
99
+ gateways_config[:default] = Gateway.wrap(@@gateway_builder, global_defaults.merge(gateway_configs), @@logger)
92
100
  end
93
101
  end
94
102
  gateways_config
data/lib/killbill/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Killbill
2
- VERSION = '8.3.1'
2
+ VERSION = '8.3.2'
3
3
  end
data/spec/killbill/helpers/configuration_spec.rb CHANGED
@@ -169,7 +169,7 @@ describe Killbill::Plugin::ActiveMerchant do
169
169
  it 'interprets the config file through ERB' do
170
170
  value = '<%= 12 %>'
171
171
  do_initialize!({ :key => value })
172
- ::Killbill::Plugin::ActiveMerchant.config[:test][:key].should == 12
172
+ ::Killbill::Plugin::ActiveMerchant.config[:test][:key].to_i.should == 12
173
173
  end
174
174
 
175
175
  after do
metadata CHANGED
@@ -1,315 +1,315 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: killbill
3
3
  version: !ruby/object:Gem::Version
4
- version: 8.3.1
4
+ version: 8.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kill Bill core team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-11-21 00:00:00.000000000 Z
11
+ date: 2017-05-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: sinatra
15
- version_requirements: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - ~>
18
- - !ruby/object:Gem::Version
19
- version: 1.3.4
20
14
  requirement: !ruby/object:Gem::Requirement
21
15
  requirements:
22
- - - ~>
16
+ - - "~>"
23
17
  - !ruby/object:Gem::Version
24
18
  version: 1.3.4
19
+ name: sinatra
25
20
  prerelease: false
26
21
  type: :runtime
27
- - !ruby/object:Gem::Dependency
28
- name: rack
29
22
  version_requirements: !ruby/object:Gem::Requirement
30
23
  requirements:
31
- - - '>='
24
+ - - "~>"
32
25
  - !ruby/object:Gem::Version
33
- version: 1.5.2
26
+ version: 1.3.4
27
+ - !ruby/object:Gem::Dependency
34
28
  requirement: !ruby/object:Gem::Requirement
35
29
  requirements:
36
- - - '>='
30
+ - - ">="
37
31
  - !ruby/object:Gem::Version
38
32
  version: 1.5.2
33
+ name: rack
39
34
  prerelease: false
40
35
  type: :runtime
41
- - !ruby/object:Gem::Dependency
42
- name: typhoeus
43
36
  version_requirements: !ruby/object:Gem::Requirement
44
37
  requirements:
45
- - - ~>
38
+ - - ">="
46
39
  - !ruby/object:Gem::Version
47
- version: 0.6.9
40
+ version: 1.5.2
41
+ - !ruby/object:Gem::Dependency
48
42
  requirement: !ruby/object:Gem::Requirement
49
43
  requirements:
50
- - - ~>
44
+ - - "~>"
51
45
  - !ruby/object:Gem::Version
52
46
  version: 0.6.9
47
+ name: typhoeus
53
48
  prerelease: false
54
49
  type: :runtime
55
- - !ruby/object:Gem::Dependency
56
- name: tzinfo
57
50
  version_requirements: !ruby/object:Gem::Requirement
58
51
  requirements:
59
- - - ~>
52
+ - - "~>"
60
53
  - !ruby/object:Gem::Version
61
- version: 1.2.0
54
+ version: 0.6.9
55
+ - !ruby/object:Gem::Dependency
62
56
  requirement: !ruby/object:Gem::Requirement
63
57
  requirements:
64
- - - ~>
58
+ - - "~>"
65
59
  - !ruby/object:Gem::Version
66
60
  version: 1.2.0
61
+ name: tzinfo
67
62
  prerelease: false
68
63
  type: :runtime
69
- - !ruby/object:Gem::Dependency
70
- name: thread_safe
71
64
  version_requirements: !ruby/object:Gem::Requirement
72
65
  requirements:
73
- - - ~>
66
+ - - "~>"
74
67
  - !ruby/object:Gem::Version
75
- version: 0.3.4
68
+ version: 1.2.0
69
+ - !ruby/object:Gem::Dependency
76
70
  requirement: !ruby/object:Gem::Requirement
77
71
  requirements:
78
- - - ~>
72
+ - - "~>"
79
73
  - !ruby/object:Gem::Version
80
74
  version: 0.3.4
75
+ name: thread_safe
81
76
  prerelease: false
82
77
  type: :development
83
- - !ruby/object:Gem::Dependency
84
- name: activerecord
85
78
  version_requirements: !ruby/object:Gem::Requirement
86
79
  requirements:
87
- - - ~>
80
+ - - "~>"
88
81
  - !ruby/object:Gem::Version
89
- version: 4.1.0
82
+ version: 0.3.4
83
+ - !ruby/object:Gem::Dependency
90
84
  requirement: !ruby/object:Gem::Requirement
91
85
  requirements:
92
- - - ~>
86
+ - - "~>"
93
87
  - !ruby/object:Gem::Version
94
88
  version: 4.1.0
89
+ name: activerecord
95
90
  prerelease: false
96
91
  type: :development
97
- - !ruby/object:Gem::Dependency
98
- name: activerecord-bogacs
99
92
  version_requirements: !ruby/object:Gem::Requirement
100
93
  requirements:
101
- - - ~>
94
+ - - "~>"
102
95
  - !ruby/object:Gem::Version
103
- version: '0.3'
96
+ version: 4.1.0
97
+ - !ruby/object:Gem::Dependency
104
98
  requirement: !ruby/object:Gem::Requirement
105
99
  requirements:
106
- - - ~>
100
+ - - "~>"
107
101
  - !ruby/object:Gem::Version
108
102
  version: '0.3'
103
+ name: activerecord-bogacs
109
104
  prerelease: false
110
105
  type: :development
111
- - !ruby/object:Gem::Dependency
112
- name: activerecord-jdbc-adapter
113
106
  version_requirements: !ruby/object:Gem::Requirement
114
107
  requirements:
115
- - - ~>
108
+ - - "~>"
116
109
  - !ruby/object:Gem::Version
117
- version: '1.3'
110
+ version: '0.3'
111
+ - !ruby/object:Gem::Dependency
118
112
  requirement: !ruby/object:Gem::Requirement
119
113
  requirements:
120
- - - ~>
114
+ - - "~>"
121
115
  - !ruby/object:Gem::Version
122
116
  version: '1.3'
117
+ name: activerecord-jdbc-adapter
123
118
  prerelease: false
124
119
  type: :development
125
- - !ruby/object:Gem::Dependency
126
- name: jdbc-mariadb
127
120
  version_requirements: !ruby/object:Gem::Requirement
128
121
  requirements:
129
- - - ~>
122
+ - - "~>"
130
123
  - !ruby/object:Gem::Version
131
- version: 1.1.8
124
+ version: '1.3'
125
+ - !ruby/object:Gem::Dependency
132
126
  requirement: !ruby/object:Gem::Requirement
133
127
  requirements:
134
- - - ~>
128
+ - - "~>"
135
129
  - !ruby/object:Gem::Version
136
130
  version: 1.1.8
131
+ name: jdbc-mariadb
137
132
  prerelease: false
138
133
  type: :development
139
- - !ruby/object:Gem::Dependency
140
- name: jdbc-postgres
141
134
  version_requirements: !ruby/object:Gem::Requirement
142
135
  requirements:
143
- - - ~>
136
+ - - "~>"
144
137
  - !ruby/object:Gem::Version
145
- version: '9.4'
138
+ version: 1.1.8
139
+ - !ruby/object:Gem::Dependency
146
140
  requirement: !ruby/object:Gem::Requirement
147
141
  requirements:
148
- - - ~>
142
+ - - "~>"
149
143
  - !ruby/object:Gem::Version
150
144
  version: '9.4'
145
+ name: jdbc-postgres
151
146
  prerelease: false
152
147
  type: :development
153
- - !ruby/object:Gem::Dependency
154
- name: actionpack
155
148
  version_requirements: !ruby/object:Gem::Requirement
156
149
  requirements:
157
- - - ~>
150
+ - - "~>"
158
151
  - !ruby/object:Gem::Version
159
- version: 4.1.0
152
+ version: '9.4'
153
+ - !ruby/object:Gem::Dependency
160
154
  requirement: !ruby/object:Gem::Requirement
161
155
  requirements:
162
- - - ~>
156
+ - - "~>"
163
157
  - !ruby/object:Gem::Version
164
158
  version: 4.1.0
159
+ name: actionpack
165
160
  prerelease: false
166
161
  type: :development
167
- - !ruby/object:Gem::Dependency
168
- name: actionview
169
162
  version_requirements: !ruby/object:Gem::Requirement
170
163
  requirements:
171
- - - ~>
164
+ - - "~>"
172
165
  - !ruby/object:Gem::Version
173
166
  version: 4.1.0
167
+ - !ruby/object:Gem::Dependency
174
168
  requirement: !ruby/object:Gem::Requirement
175
169
  requirements:
176
- - - ~>
170
+ - - "~>"
177
171
  - !ruby/object:Gem::Version
178
172
  version: 4.1.0
173
+ name: actionview
179
174
  prerelease: false
180
175
  type: :development
181
- - !ruby/object:Gem::Dependency
182
- name: activemerchant
183
176
  version_requirements: !ruby/object:Gem::Requirement
184
177
  requirements:
185
- - - ~>
178
+ - - "~>"
186
179
  - !ruby/object:Gem::Version
187
- version: 1.48.0
180
+ version: 4.1.0
181
+ - !ruby/object:Gem::Dependency
188
182
  requirement: !ruby/object:Gem::Requirement
189
183
  requirements:
190
- - - ~>
184
+ - - "~>"
191
185
  - !ruby/object:Gem::Version
192
186
  version: 1.48.0
187
+ name: activemerchant
193
188
  prerelease: false
194
189
  type: :development
195
- - !ruby/object:Gem::Dependency
196
- name: offsite_payments
197
190
  version_requirements: !ruby/object:Gem::Requirement
198
191
  requirements:
199
- - - ~>
192
+ - - "~>"
200
193
  - !ruby/object:Gem::Version
201
- version: 2.1.0
194
+ version: 1.48.0
195
+ - !ruby/object:Gem::Dependency
202
196
  requirement: !ruby/object:Gem::Requirement
203
197
  requirements:
204
- - - ~>
198
+ - - "~>"
205
199
  - !ruby/object:Gem::Version
206
200
  version: 2.1.0
201
+ name: offsite_payments
207
202
  prerelease: false
208
203
  type: :development
209
- - !ruby/object:Gem::Dependency
210
- name: monetize
211
204
  version_requirements: !ruby/object:Gem::Requirement
212
205
  requirements:
213
- - - ~>
206
+ - - "~>"
214
207
  - !ruby/object:Gem::Version
215
- version: 1.1.0
208
+ version: 2.1.0
209
+ - !ruby/object:Gem::Dependency
216
210
  requirement: !ruby/object:Gem::Requirement
217
211
  requirements:
218
- - - ~>
212
+ - - "~>"
219
213
  - !ruby/object:Gem::Version
220
214
  version: 1.1.0
215
+ name: monetize
221
216
  prerelease: false
222
217
  type: :development
223
- - !ruby/object:Gem::Dependency
224
- name: money
225
218
  version_requirements: !ruby/object:Gem::Requirement
226
219
  requirements:
227
- - - ~>
220
+ - - "~>"
228
221
  - !ruby/object:Gem::Version
229
- version: 6.5.1
222
+ version: 1.1.0
223
+ - !ruby/object:Gem::Dependency
230
224
  requirement: !ruby/object:Gem::Requirement
231
225
  requirements:
232
- - - ~>
226
+ - - "~>"
233
227
  - !ruby/object:Gem::Version
234
228
  version: 6.5.1
229
+ name: money
235
230
  prerelease: false
236
231
  type: :development
237
- - !ruby/object:Gem::Dependency
238
- name: jbundler
239
232
  version_requirements: !ruby/object:Gem::Requirement
240
233
  requirements:
241
- - - ~>
234
+ - - "~>"
242
235
  - !ruby/object:Gem::Version
243
- version: 0.9.2
236
+ version: 6.5.1
237
+ - !ruby/object:Gem::Dependency
244
238
  requirement: !ruby/object:Gem::Requirement
245
239
  requirements:
246
- - - ~>
240
+ - - "~>"
247
241
  - !ruby/object:Gem::Version
248
242
  version: 0.9.2
243
+ name: jbundler
249
244
  prerelease: false
250
245
  type: :development
251
- - !ruby/object:Gem::Dependency
252
- name: rake
253
246
  version_requirements: !ruby/object:Gem::Requirement
254
247
  requirements:
255
- - - '>='
256
- - !ruby/object:Gem::Version
257
- version: 10.0.0
258
- - - <
248
+ - - "~>"
259
249
  - !ruby/object:Gem::Version
260
- version: 11.0.0
250
+ version: 0.9.2
251
+ - !ruby/object:Gem::Dependency
261
252
  requirement: !ruby/object:Gem::Requirement
262
253
  requirements:
263
- - - '>='
254
+ - - ">="
264
255
  - !ruby/object:Gem::Version
265
256
  version: 10.0.0
266
- - - <
257
+ - - "<"
267
258
  - !ruby/object:Gem::Version
268
259
  version: 11.0.0
260
+ name: rake
269
261
  prerelease: false
270
262
  type: :development
271
- - !ruby/object:Gem::Dependency
272
- name: rspec
273
263
  version_requirements: !ruby/object:Gem::Requirement
274
264
  requirements:
275
- - - ~>
265
+ - - ">="
276
266
  - !ruby/object:Gem::Version
277
- version: 2.12.0
267
+ version: 10.0.0
268
+ - - "<"
269
+ - !ruby/object:Gem::Version
270
+ version: 11.0.0
271
+ - !ruby/object:Gem::Dependency
278
272
  requirement: !ruby/object:Gem::Requirement
279
273
  requirements:
280
- - - ~>
274
+ - - "~>"
281
275
  - !ruby/object:Gem::Version
282
276
  version: 2.12.0
277
+ name: rspec
283
278
  prerelease: false
284
279
  type: :development
285
- - !ruby/object:Gem::Dependency
286
- name: thor
287
280
  version_requirements: !ruby/object:Gem::Requirement
288
281
  requirements:
289
- - - ~>
282
+ - - "~>"
290
283
  - !ruby/object:Gem::Version
291
- version: 0.19.1
284
+ version: 2.12.0
285
+ - !ruby/object:Gem::Dependency
292
286
  requirement: !ruby/object:Gem::Requirement
293
287
  requirements:
294
- - - ~>
288
+ - - "~>"
295
289
  - !ruby/object:Gem::Version
296
290
  version: 0.19.1
291
+ name: thor
297
292
  prerelease: false
298
293
  type: :development
299
- - !ruby/object:Gem::Dependency
300
- name: jdbc-sqlite3
301
294
  version_requirements: !ruby/object:Gem::Requirement
302
295
  requirements:
303
- - - ~>
296
+ - - "~>"
304
297
  - !ruby/object:Gem::Version
305
- version: '3.7'
298
+ version: 0.19.1
299
+ - !ruby/object:Gem::Dependency
306
300
  requirement: !ruby/object:Gem::Requirement
307
301
  requirements:
308
- - - ~>
302
+ - - "~>"
309
303
  - !ruby/object:Gem::Version
310
304
  version: '3.7'
305
+ name: jdbc-sqlite3
311
306
  prerelease: false
312
307
  type: :development
308
+ version_requirements: !ruby/object:Gem::Requirement
309
+ requirements:
310
+ - - "~>"
311
+ - !ruby/object:Gem::Version
312
+ version: '3.7'
313
313
  description: Base classes to write plugins.
314
314
  email: killbilling-users@googlegroups.com
315
315
  executables:
@@ -317,8 +317,8 @@ executables:
317
317
  extensions: []
318
318
  extra_rdoc_files: []
319
319
  files:
320
- - .gitignore
321
- - .travis.yml
320
+ - ".gitignore"
321
+ - ".travis.yml"
322
322
  - Gemfile
323
323
  - Gemfile.head
324
324
  - Gemfile.lock
@@ -612,23 +612,23 @@ licenses:
612
612
  metadata: {}
613
613
  post_install_message:
614
614
  rdoc_options:
615
- - --exclude
616
- - .
615
+ - "--exclude"
616
+ - "."
617
617
  require_paths:
618
618
  - lib
619
619
  required_ruby_version: !ruby/object:Gem::Requirement
620
620
  requirements:
621
- - - '>='
621
+ - - ">="
622
622
  - !ruby/object:Gem::Version
623
623
  version: 1.9.3
624
624
  required_rubygems_version: !ruby/object:Gem::Requirement
625
625
  requirements:
626
- - - '>='
626
+ - - ">="
627
627
  - !ruby/object:Gem::Version
628
628
  version: '0'
629
629
  requirements: []
630
630
  rubyforge_project:
631
- rubygems_version: 2.4.6
631
+ rubygems_version: 2.4.8
632
632
  signing_key:
633
633
  specification_version: 4
634
634
  summary: Framework to write Kill Bill plugins in Ruby.