killbill-client 2.4.0 → 2.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (17) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +16 -16
  3. data/lib/killbill_client/api/net_http_adapter.rb +20 -14
  4. data/lib/killbill_client/models/account.rb +0 -19
  5. data/lib/killbill_client/models/gen/account_attributes.rb +0 -1
  6. data/lib/killbill_client/models/gen/block_price_attributes.rb +37 -0
  7. data/lib/killbill_client/models/gen/phase_price_attributes.rb +39 -0
  8. data/lib/killbill_client/models/gen/require_gen.rb +54 -54
  9. data/lib/killbill_client/models/gen/subscription_attributes.rb +1 -0
  10. data/lib/killbill_client/models/gen/{invoice_email_attributes.rb → tier_price_attributes.rb} +2 -3
  11. data/lib/killbill_client/models/gen/usage_price_attributes.rb +38 -0
  12. data/lib/killbill_client/models/resource.rb +1 -1
  13. data/lib/killbill_client/models/subscription.rb +1 -1
  14. data/lib/killbill_client/version.rb +1 -1
  15. data/spec/killbill_client/http_adapter_spec.rb +6 -0
  16. data/spec/killbill_client/remote/model_spec.rb +0 -1
  17. metadata +6 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 403d07c57a0a99bf52f0f217a1c4c7378e5294f7
4
- data.tar.gz: 4370530c0ea0d936fd0eebaed4b18fa8e91a857a
3
+ metadata.gz: 6ceb8b0864f66479c25d4642ef31864325304bce
4
+ data.tar.gz: 274cf455f5228eb2ca616accae4458fdbf1ab36c
5
5
  SHA512:
6
- metadata.gz: be815f450d26601ab84be6df5772f5c04d6f4d2098fd6d0073cf755ddc63993e4cf4f2d538bfd179a95f1f21d66b65af572f975deacb6b001e6379d3dc3d5d8d
7
- data.tar.gz: beb28a9976f35f6b33c43739a137a4904db99f40171d2bfff0f63a1f3048191883595b12d974cc6dce680943e507e48074977168f94a4396b66051db7ad7945e
6
+ metadata.gz: a786b42ba432dcfebd288a6c9484ab90c301d5708ccc0ef7b56fd9b9b4d3664f66726a930d1ac9890e18eaf2d3f674581998646a84f53836e116896c1a32024c
7
+ data.tar.gz: 24200a5c6168ba05533a8887347679b296bd50a2f12e88e651c1c049d22ea10cd9004520998addc63fd66af43c4ceb1a0cc3b77295bfde0365b068a57ea00124
data/.circleci/config.yml CHANGED
@@ -12,7 +12,7 @@ jobs:
12
12
  steps:
13
13
  - checkout
14
14
  - restore_cache:
15
- key: v1-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
15
+ key: v2-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
16
16
  - run:
17
17
  name: Install gem dependencies
18
18
  command: |
@@ -22,20 +22,20 @@ jobs:
22
22
  - Gemfile.lock
23
23
  - .bundle
24
24
  - vendor/bundle
25
- key: v1-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
25
+ key: v2-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
26
26
 
27
27
  test-mysql-jruby-1.7.26:
28
28
  <<: *defaults
29
29
  docker:
30
30
  - image: killbill/kbbuild:0.5.0
31
- - image: killbill/killbill:0.19.16
31
+ - image: killbill/killbill:0.19.18
32
32
  - image: killbill/mariadb:0.19
33
33
  environment:
34
34
  - MYSQL_ROOT_PASSWORD=root
35
35
  steps:
36
36
  - checkout
37
37
  - restore_cache:
38
- key: v1-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
38
+ key: v2-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
39
39
  - run:
40
40
  name: Setup DDL
41
41
  command: |
@@ -92,7 +92,7 @@ jobs:
92
92
  steps:
93
93
  - checkout
94
94
  - restore_cache:
95
- key: v1-dependencies-ruby-2.2.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
95
+ key: v2-dependencies-ruby-2.2.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
96
96
  - run:
97
97
  name: Install gem dependencies
98
98
  command: |
@@ -104,20 +104,20 @@ jobs:
104
104
  - Gemfile.lock
105
105
  - .bundle
106
106
  - vendor/bundle
107
- key: v1-dependencies-ruby-2.2.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
107
+ key: v2-dependencies-ruby-2.2.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
108
108
 
109
109
  test-mysql-ruby-2.2.2:
110
110
  <<: *defaults
111
111
  docker:
112
112
  - image: killbill/kbbuild:0.5.0
113
- - image: killbill/killbill:0.19.16
113
+ - image: killbill/killbill:0.19.18
114
114
  - image: killbill/mariadb:0.19
115
115
  environment:
116
116
  - MYSQL_ROOT_PASSWORD=root
117
117
  steps:
118
118
  - checkout
119
119
  - restore_cache:
120
- key: v1-dependencies-ruby-2.2.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
120
+ key: v2-dependencies-ruby-2.2.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
121
121
  - run:
122
122
  name: Setup DDL
123
123
  command: |
@@ -176,7 +176,7 @@ jobs:
176
176
  steps:
177
177
  - checkout
178
178
  - restore_cache:
179
- key: v1-dependencies-ruby-2.4.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
179
+ key: v2-dependencies-ruby-2.4.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
180
180
  - run:
181
181
  name: Install gem dependencies
182
182
  command: |
@@ -188,20 +188,20 @@ jobs:
188
188
  - Gemfile.lock
189
189
  - .bundle
190
190
  - vendor/bundle
191
- key: v1-dependencies-ruby-2.4.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
191
+ key: v2-dependencies-ruby-2.4.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
192
192
 
193
193
  test-mysql-ruby-2.4.2:
194
194
  <<: *defaults
195
195
  docker:
196
196
  - image: killbill/kbbuild:0.5.0
197
- - image: killbill/killbill:0.19.16
197
+ - image: killbill/killbill:0.19.18
198
198
  - image: killbill/mariadb:0.19
199
199
  environment:
200
200
  - MYSQL_ROOT_PASSWORD=root
201
201
  steps:
202
202
  - checkout
203
203
  - restore_cache:
204
- key: v1-dependencies-ruby-2.4.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
204
+ key: v2-dependencies-ruby-2.4.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
205
205
  - run:
206
206
  name: Setup DDL
207
207
  command: |
@@ -260,7 +260,7 @@ jobs:
260
260
  steps:
261
261
  - checkout
262
262
  - restore_cache:
263
- key: v1-dependencies-jruby-9.1.14.0-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
263
+ key: v2-dependencies-jruby-9.1.14.0-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
264
264
  - run:
265
265
  name: Install gem dependencies
266
266
  command: |
@@ -272,20 +272,20 @@ jobs:
272
272
  - Gemfile.lock
273
273
  - .bundle
274
274
  - vendor/bundle
275
- key: v1-dependencies-jruby-9.1.14.0-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
275
+ key: v2-dependencies-jruby-9.1.14.0-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
276
276
 
277
277
  test-mysql-jruby-9.1.14.0:
278
278
  <<: *defaults
279
279
  docker:
280
280
  - image: killbill/kbbuild:0.5.0
281
- - image: killbill/killbill:0.19.16
281
+ - image: killbill/killbill:0.19.18
282
282
  - image: killbill/mariadb:0.19
283
283
  environment:
284
284
  - MYSQL_ROOT_PASSWORD=root
285
285
  steps:
286
286
  - checkout
287
287
  - restore_cache:
288
- key: v1-dependencies-jruby-9.1.14.0-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
288
+ key: v2-dependencies-jruby-9.1.14.0-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
289
289
  - run:
290
290
  name: Setup DDL
291
291
  command: |
data/lib/killbill_client/api/net_http_adapter.rb CHANGED
@@ -35,6 +35,25 @@ module KillBillClient
35
35
  :delete => ::Net::HTTP::Delete
36
36
  }
37
37
 
38
+ def build_uri(relative_uri, options)
39
+ # Need to encode in case of spaces (e.g. /1.0/kb/security/users/Mad Max/roles)
40
+ encoded_relative_uri = URI::DEFAULT_PARSER.escape(relative_uri)
41
+ if URI(encoded_relative_uri).scheme.nil?
42
+ uri = (options[:base_uri] || KillBillClient::API.base_uri)
43
+ uri = URI.parse(uri) unless uri.is_a?(URI)
44
+ # Note: make sure to keep the full path (if any) from URI::HTTP, for non-ROOT deployments
45
+ # See https://github.com/killbill/killbill/issues/221#issuecomment-151980263
46
+ base_path = uri.request_uri == '/' ? '' : uri.request_uri
47
+ uri += (base_path + URI::DEFAULT_PARSER.escape(relative_uri))
48
+ else
49
+ uri = encoded_relative_uri
50
+ uri = URI.parse(uri) unless uri.is_a?(URI)
51
+ end
52
+ uri += encode_params(options).to_s
53
+
54
+ uri
55
+ end
56
+
38
57
  def encode_params(options = {})
39
58
  # Plugin properties and controlPluginNames are passed in the options but we want to send them as query parameters,
40
59
  # so remove with from global hash and insert them under :params
@@ -79,20 +98,7 @@ module KillBillClient
79
98
  head.update options[:head] if options[:head]
80
99
  head.delete_if { |_, value| value.nil? }
81
100
 
82
- # Need to encode in case of spaces (e.g. /1.0/kb/security/users/Mad Max/roles)
83
- encoded_relative_uri = URI::DEFAULT_PARSER.escape(relative_uri)
84
- if URI(encoded_relative_uri).scheme.nil?
85
- uri = (options[:base_uri] || base_uri)
86
- uri = URI.parse(uri) unless uri.is_a?(URI)
87
- # Note: make sure to keep the full path (if any) from URI::HTTP, for non-ROOT deployments
88
- # See https://github.com/killbill/killbill/issues/221#issuecomment-151980263
89
- base_path = uri.request_uri == '/' ? '' : uri.request_uri
90
- uri += (base_path + URI::DEFAULT_PARSER.escape(relative_uri))
91
- else
92
- uri = encoded_relative_uri
93
- uri = URI.parse(uri) unless uri.is_a?(URI)
94
- end
95
- uri += encode_params(options).to_s
101
+ uri = build_uri(relative_uri, options)
96
102
  request = METHODS[method].new uri.request_uri, head
97
103
 
98
104
  # Configure multi-tenancy headers, if enabled
data/lib/killbill_client/models/account.rb CHANGED
@@ -286,26 +286,7 @@ module KillBillClient
286
286
  AuditLog
287
287
  end
288
288
 
289
- def email_notifications(options = {})
290
- self.class.get "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/emailNotifications",
291
- {},
292
- options,
293
- InvoiceEmailAttributes
294
- end
295
-
296
- def update_email_notifications(user = nil, reason = nil, comment = nil, options = {})
297
- self.class.put "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/emailNotifications",
298
- to_json,
299
- {},
300
- {
301
- :user => user,
302
- :reason => reason,
303
- :comment => comment,
304
- }.merge(options)
305
- end
306
-
307
289
  def all_tags(object_type, included_deleted, audit = 'NONE', options = {})
308
-
309
290
  params = {}
310
291
  params[:objectType] = object_type if object_type
311
292
  params[:includedDeleted] = included_deleted if included_deleted
data/lib/killbill_client/models/gen/account_attributes.rb CHANGED
@@ -51,7 +51,6 @@ module KillBillClient
51
51
  attribute :phone
52
52
  attribute :notes
53
53
  attribute :is_migrated
54
- attribute :is_notified_for_invoices
55
54
  attribute :account_balance
56
55
  attribute :account_cba
57
56
  attribute :audit_logs
data/lib/killbill_client/models/gen/block_price_attributes.rb ADDED
@@ -0,0 +1,37 @@
1
+ #############################################################################################
2
+ # #
3
+ # Copyright 2010-2013 Ning, Inc. #
4
+ # Copyright 2014 Groupon, Inc. #
5
+ # Copyright 2014 The Billing Project, LLC #
6
+ # #
7
+ # The Billing Project licenses this file to you under the Apache License, version 2.0 #
8
+ # (the "License"); you may not use this file except in compliance with the #
9
+ # License. You may obtain a copy of the License at: #
10
+ # #
11
+ # http://www.apache.org/licenses/LICENSE-2.0 #
12
+ # #
13
+ # Unless required by applicable law or agreed to in writing, software #
14
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT #
15
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the #
16
+ # License for the specific language governing permissions and limitations #
17
+ # under the License. #
18
+ # #
19
+ #############################################################################################
20
+
21
+
22
+ #
23
+ # DO NOT EDIT!!!
24
+ # File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
25
+ #
26
+
27
+
28
+ module KillBillClient
29
+ module Model
30
+ class BlockPriceAttributes < Resource
31
+ attribute :unit_name
32
+ attribute :size
33
+ attribute :price
34
+ attribute :max
35
+ end
36
+ end
37
+ end
data/lib/killbill_client/models/gen/phase_price_attributes.rb ADDED
@@ -0,0 +1,39 @@
1
+ #############################################################################################
2
+ # #
3
+ # Copyright 2010-2013 Ning, Inc. #
4
+ # Copyright 2014 Groupon, Inc. #
5
+ # Copyright 2014 The Billing Project, LLC #
6
+ # #
7
+ # The Billing Project licenses this file to you under the Apache License, version 2.0 #
8
+ # (the "License"); you may not use this file except in compliance with the #
9
+ # License. You may obtain a copy of the License at: #
10
+ # #
11
+ # http://www.apache.org/licenses/LICENSE-2.0 #
12
+ # #
13
+ # Unless required by applicable law or agreed to in writing, software #
14
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT #
15
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the #
16
+ # License for the specific language governing permissions and limitations #
17
+ # under the License. #
18
+ # #
19
+ #############################################################################################
20
+
21
+
22
+ #
23
+ # DO NOT EDIT!!!
24
+ # File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
25
+ #
26
+
27
+
28
+ module KillBillClient
29
+ module Model
30
+ class PhasePriceAttributes < Resource
31
+ attribute :plan_name
32
+ attribute :phase_name
33
+ attribute :phase_type
34
+ attribute :fixed_price
35
+ attribute :recurring_price
36
+ attribute :usage_prices
37
+ end
38
+ end
39
+ end
data/lib/killbill_client/models/gen/require_gen.rb CHANGED
@@ -24,7 +24,40 @@
24
24
  # File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
25
25
  #
26
26
 
27
- require 'killbill_client/models/gen/invoice_dry_run_attributes'
27
+
28
+ require 'killbill_client/models/gen/tenant_attributes'
29
+ require 'killbill_client/models/gen/subject_attributes'
30
+ require 'killbill_client/models/gen/account_email_attributes'
31
+ require 'killbill_client/models/gen/tag_attributes'
32
+ require 'killbill_client/models/gen/invoice_attributes'
33
+ require 'killbill_client/models/gen/plugin_property_attributes'
34
+ require 'killbill_client/models/gen/account_timeline_attributes'
35
+ require 'killbill_client/models/gen/overdue_state_attributes'
36
+ require 'killbill_client/models/gen/user_roles_attributes'
37
+ require 'killbill_client/models/gen/payment_method_plugin_detail_attributes'
38
+ require 'killbill_client/models/gen/payment_method_attributes'
39
+ require 'killbill_client/models/gen/plugin_service_info_attributes'
40
+ require 'killbill_client/models/gen/plugin_info_attributes'
41
+ require 'killbill_client/models/gen/tier_price_attributes'
42
+ require 'killbill_client/models/gen/tag_definition_attributes'
43
+ require 'killbill_client/models/gen/block_price_attributes'
44
+ require 'killbill_client/models/gen/account_attributes'
45
+ require 'killbill_client/models/gen/hosted_payment_page_form_descriptor_attributes'
46
+ require 'killbill_client/models/gen/bulk_subscriptions_bundle_attributes'
47
+ require 'killbill_client/models/gen/blocking_state_attributes'
48
+ require 'killbill_client/models/gen/invoice_item_attributes'
49
+ require 'killbill_client/models/gen/role_definition_attributes'
50
+ require 'killbill_client/models/gen/node_command_property_attributes'
51
+ require 'killbill_client/models/gen/invoice_payment_transaction_attributes'
52
+ require 'killbill_client/models/gen/hosted_payment_page_billing_address_attributes'
53
+ require 'killbill_client/models/gen/plan_detail_attributes'
54
+ require 'killbill_client/models/gen/custom_field_attributes'
55
+ require 'killbill_client/models/gen/rolled_up_unit_attributes'
56
+ require 'killbill_client/models/gen/rolled_up_usage_attributes'
57
+ require 'killbill_client/models/gen/gateway_notification_attributes'
58
+ require 'killbill_client/models/gen/event_subscription_attributes'
59
+ require 'killbill_client/models/gen/subscription_attributes'
60
+ require 'killbill_client/models/gen/notification_attributes'
28
61
  require 'killbill_client/models/gen/unit_attributes'
29
62
  require 'killbill_client/models/gen/product_attributes'
30
63
  require 'killbill_client/models/gen/plan_attributes'
@@ -37,67 +70,34 @@ require 'killbill_client/models/gen/price_attributes'
37
70
  require 'killbill_client/models/gen/price_list_attributes'
38
71
  require 'killbill_client/models/gen/duration_attributes'
39
72
  require 'killbill_client/models/gen/catalog_attributes'
40
- require 'killbill_client/models/gen/payment_attributes'
41
- require 'killbill_client/models/gen/tag_definition_attributes'
73
+ require 'killbill_client/models/gen/combo_payment_transaction_attributes'
74
+ require 'killbill_client/models/gen/usage_price_attributes'
75
+ require 'killbill_client/models/gen/bundle_attributes'
42
76
  require 'killbill_client/models/gen/payment_transaction_attributes'
43
- require 'killbill_client/models/gen/bulk_subscriptions_bundle_attributes'
44
- require 'killbill_client/models/gen/simple_plan_attributes'
45
- require 'killbill_client/models/gen/node_command_attributes'
46
- require 'killbill_client/models/gen/hosted_payment_page_customer_attributes'
47
- require 'killbill_client/models/gen/invoice_email_attributes'
48
- require 'killbill_client/models/gen/invoice_payment_attributes'
49
- require 'killbill_client/models/gen/stack_trace_element_attributes'
50
- require 'killbill_client/models/gen/billing_exception_attributes'
51
- require 'killbill_client/models/gen/usage_price_override_attributes'
52
- require 'killbill_client/models/gen/tenant_key_value_attributes'
53
- require 'killbill_client/models/gen/credit_attributes'
54
- require 'killbill_client/models/gen/account_timeline_attributes'
55
- require 'killbill_client/models/gen/tag_attributes'
56
- require 'killbill_client/models/gen/payment_attempt_attributes'
57
- require 'killbill_client/models/gen/notification_attributes'
58
- require 'killbill_client/models/gen/overdue_state_attributes'
59
- require 'killbill_client/models/gen/custom_field_attributes'
60
- require 'killbill_client/models/gen/role_definition_attributes'
61
- require 'killbill_client/models/gen/tier_price_override_attributes'
62
- require 'killbill_client/models/gen/invoice_item_attributes'
63
- require 'killbill_client/models/gen/plugin_property_attributes'
64
- require 'killbill_client/models/gen/admin_payment_attributes'
65
- require 'killbill_client/models/gen/event_subscription_attributes'
66
- require 'killbill_client/models/gen/subscription_attributes'
67
- require 'killbill_client/models/gen/tenant_attributes'
77
+ require 'killbill_client/models/gen/payment_attributes'
68
78
  require 'killbill_client/models/gen/unit_usage_record_attributes'
69
79
  require 'killbill_client/models/gen/usage_record_attributes'
70
80
  require 'killbill_client/models/gen/subscription_usage_record_attributes'
71
- require 'killbill_client/models/gen/gateway_notification_attributes'
81
+ require 'killbill_client/models/gen/overdue_attributes'
82
+ require 'killbill_client/models/gen/stack_trace_element_attributes'
83
+ require 'killbill_client/models/gen/billing_exception_attributes'
72
84
  require 'killbill_client/models/gen/audit_log_attributes'
73
- require 'killbill_client/models/gen/invoice_payment_transaction_attributes'
74
- require 'killbill_client/models/gen/account_attributes'
75
- require 'killbill_client/models/gen/invoice_attributes'
76
- require 'killbill_client/models/gen/block_price_override_attributes'
85
+ require 'killbill_client/models/gen/phase_price_attributes'
77
86
  require 'killbill_client/models/gen/profiling_data_attributes_item'
78
87
  require 'killbill_client/models/gen/profiling_data_attributes'
79
- require 'killbill_client/models/gen/combo_payment_transaction_attributes'
80
- require 'killbill_client/models/gen/hosted_payment_page_fields_attributes'
81
- require 'killbill_client/models/gen/bundle_attributes'
82
- require 'killbill_client/models/gen/combo_hosted_payment_page_attributes'
83
- require 'killbill_client/models/gen/plan_detail_attributes'
84
- require 'killbill_client/models/gen/overdue_attributes'
85
- require 'killbill_client/models/gen/user_roles_attributes'
88
+ require 'killbill_client/models/gen/node_command_attributes'
89
+ require 'killbill_client/models/gen/session_attributes'
90
+ require 'killbill_client/models/gen/hosted_payment_page_customer_attributes'
91
+ require 'killbill_client/models/gen/tenant_key_value_attributes'
92
+ require 'killbill_client/models/gen/admin_payment_attributes'
86
93
  require 'killbill_client/models/gen/bundle_timeline_attributes'
87
- require 'killbill_client/models/gen/plugin_service_info_attributes'
88
- require 'killbill_client/models/gen/plugin_info_attributes'
89
- require 'killbill_client/models/gen/phase_price_override_attributes'
90
- require 'killbill_client/models/gen/hosted_payment_page_form_descriptor_attributes'
91
- require 'killbill_client/models/gen/blocking_state_attributes'
94
+ require 'killbill_client/models/gen/invoice_dry_run_attributes'
95
+ require 'killbill_client/models/gen/payment_attempt_attributes'
96
+ require 'killbill_client/models/gen/hosted_payment_page_fields_attributes'
97
+ require 'killbill_client/models/gen/invoice_payment_attributes'
92
98
  require 'killbill_client/models/gen/overdue_state_config_attributes'
93
- require 'killbill_client/models/gen/node_command_property_attributes'
99
+ require 'killbill_client/models/gen/simple_plan_attributes'
100
+ require 'killbill_client/models/gen/combo_hosted_payment_page_attributes'
101
+ require 'killbill_client/models/gen/credit_attributes'
94
102
  require 'killbill_client/models/gen/overdue_condition_attributes'
95
- require 'killbill_client/models/gen/hosted_payment_page_billing_address_attributes'
96
- require 'killbill_client/models/gen/rolled_up_unit_attributes'
97
- require 'killbill_client/models/gen/rolled_up_usage_attributes'
98
- require 'killbill_client/models/gen/session_attributes'
99
103
  require 'killbill_client/models/gen/node_info_attributes'
100
- require 'killbill_client/models/gen/account_email_attributes'
101
- require 'killbill_client/models/gen/payment_method_plugin_detail_attributes'
102
- require 'killbill_client/models/gen/payment_method_attributes'
103
- require 'killbill_client/models/gen/subject_attributes'
data/lib/killbill_client/models/gen/subscription_attributes.rb CHANGED
@@ -48,6 +48,7 @@ module KillBillClient
48
48
  attribute :bill_cycle_day_local
49
49
  attribute :events
50
50
  attribute :price_overrides
51
+ attribute :prices
51
52
  attribute :audit_logs
52
53
  end
53
54
  end
data/lib/killbill_client/models/gen/{invoice_email_attributes.rb → tier_price_attributes.rb} RENAMED
@@ -27,9 +27,8 @@
27
27
 
28
28
  module KillBillClient
29
29
  module Model
30
- class InvoiceEmailAttributes < Resource
31
- attribute :account_id
32
- attribute :is_notified_for_invoices
30
+ class TierPriceAttributes < Resource
31
+ attribute :block_prices
33
32
  end
34
33
  end
35
34
  end
data/lib/killbill_client/models/gen/usage_price_attributes.rb ADDED
@@ -0,0 +1,38 @@
1
+ #############################################################################################
2
+ # #
3
+ # Copyright 2010-2013 Ning, Inc. #
4
+ # Copyright 2014 Groupon, Inc. #
5
+ # Copyright 2014 The Billing Project, LLC #
6
+ # #
7
+ # The Billing Project licenses this file to you under the Apache License, version 2.0 #
8
+ # (the "License"); you may not use this file except in compliance with the #
9
+ # License. You may obtain a copy of the License at: #
10
+ # #
11
+ # http://www.apache.org/licenses/LICENSE-2.0 #
12
+ # #
13
+ # Unless required by applicable law or agreed to in writing, software #
14
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT #
15
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the #
16
+ # License for the specific language governing permissions and limitations #
17
+ # under the License. #
18
+ # #
19
+ #############################################################################################
20
+
21
+
22
+ #
23
+ # DO NOT EDIT!!!
24
+ # File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
25
+ #
26
+
27
+
28
+ module KillBillClient
29
+ module Model
30
+ class UsagePriceAttributes < Resource
31
+ attribute :usage_name
32
+ attribute :usage_type
33
+ attribute :billing_mode
34
+ attribute :tier_block_policy
35
+ attribute :tier_prices
36
+ end
37
+ end
38
+ end
data/lib/killbill_client/models/resource.rb CHANGED
@@ -9,7 +9,7 @@ module KillBillClient
9
9
  :session_id,
10
10
  :response
11
11
 
12
- KILLBILL_API_PREFIX = '/1.0/kb/'
12
+ KILLBILL_API_PREFIX = '/1.0/kb'
13
13
  KILLBILL_API_PAGINATION_PREFIX = 'pagination'
14
14
 
15
15
  @@attribute_names = {}
data/lib/killbill_client/models/subscription.rb CHANGED
@@ -8,7 +8,7 @@ module KillBillClient
8
8
  KILLBILL_API_ENTITLEMENT_PREFIX = "#{KILLBILL_API_PREFIX}/subscriptions"
9
9
 
10
10
  has_many :events, KillBillClient::Model::EventSubscription
11
- has_many :price_overrides, KillBillClient::Model::PhasePriceOverrideAttributes
11
+ has_many :price_overrides, KillBillClient::Model::PhasePriceAttributes
12
12
 
13
13
  has_custom_fields KILLBILL_API_ENTITLEMENT_PREFIX, :subscription_id
14
14
  has_tags KILLBILL_API_ENTITLEMENT_PREFIX, :subscription_id
data/lib/killbill_client/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module KillBillClient
2
2
  module Version
3
3
  MAJOR = 2
4
- MINOR = 4
4
+ MINOR = 5
5
5
  PATCH = 0
6
6
  PRE = nil
7
7
 
data/spec/killbill_client/http_adapter_spec.rb CHANGED
@@ -68,6 +68,12 @@ describe KillBillClient::API do
68
68
  expect(http_client.verify_mode).to eq(OpenSSL::SSL::VERIFY_NONE)
69
69
  end
70
70
 
71
+ # See https://github.com/killbill/killbill-client-ruby/issues/69
72
+ it 'should construct URIs' do
73
+ http_adapter = DummyForHTTPAdapter.new
74
+ uri = http_adapter.send(:build_uri, KillBillClient::Model::Account::KILLBILL_API_ACCOUNTS_PREFIX, options)
75
+ expect(uri).to eq(URI.parse("#{KillBillClient::API.base_uri.to_s}/1.0/kb/accounts"))
76
+ end
71
77
  end
72
78
 
73
79
  class DummyForHTTPAdapter
data/spec/killbill_client/remote/model_spec.rb CHANGED
@@ -37,7 +37,6 @@ describe KillBillClient::Model do
37
37
  account.state = 'Awesome'
38
38
  account.country = 'LalaLand'
39
39
  account.locale = 'fr_FR'
40
- account.is_notified_for_invoices = false
41
40
  expect(account.account_id).to be_nil
42
41
 
43
42
  # Create and verify the account
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: killbill-client
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.0
4
+ version: 2.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Killbill core team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-06-26 00:00:00.000000000 Z
11
+ date: 2018-07-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -79,6 +79,7 @@ files:
79
79
  - lib/killbill_client/models/gen/admin_payment_attributes.rb
80
80
  - lib/killbill_client/models/gen/audit_log_attributes.rb
81
81
  - lib/killbill_client/models/gen/billing_exception_attributes.rb
82
+ - lib/killbill_client/models/gen/block_price_attributes.rb
82
83
  - lib/killbill_client/models/gen/block_price_override_attributes.rb
83
84
  - lib/killbill_client/models/gen/blocking_state_attributes.rb
84
85
  - lib/killbill_client/models/gen/bulk_subscriptions_bundle_attributes.rb
@@ -98,7 +99,6 @@ files:
98
99
  - lib/killbill_client/models/gen/hosted_payment_page_form_descriptor_attributes.rb
99
100
  - lib/killbill_client/models/gen/invoice_attributes.rb
100
101
  - lib/killbill_client/models/gen/invoice_dry_run_attributes.rb
101
- - lib/killbill_client/models/gen/invoice_email_attributes.rb
102
102
  - lib/killbill_client/models/gen/invoice_item_attributes.rb
103
103
  - lib/killbill_client/models/gen/invoice_payment_attributes.rb
104
104
  - lib/killbill_client/models/gen/invoice_payment_transaction_attributes.rb
@@ -117,6 +117,7 @@ files:
117
117
  - lib/killbill_client/models/gen/payment_method_plugin_detail_attributes.rb
118
118
  - lib/killbill_client/models/gen/payment_transaction_attributes.rb
119
119
  - lib/killbill_client/models/gen/phase_attributes.rb
120
+ - lib/killbill_client/models/gen/phase_price_attributes.rb
120
121
  - lib/killbill_client/models/gen/phase_price_override_attributes.rb
121
122
  - lib/killbill_client/models/gen/plan_attributes.rb
122
123
  - lib/killbill_client/models/gen/plan_detail_attributes.rb
@@ -143,11 +144,13 @@ files:
143
144
  - lib/killbill_client/models/gen/tenant_attributes.rb
144
145
  - lib/killbill_client/models/gen/tenant_key_value_attributes.rb
145
146
  - lib/killbill_client/models/gen/tier_attributes.rb
147
+ - lib/killbill_client/models/gen/tier_price_attributes.rb
146
148
  - lib/killbill_client/models/gen/tier_price_override_attributes.rb
147
149
  - lib/killbill_client/models/gen/tiered_block_attributes.rb
148
150
  - lib/killbill_client/models/gen/unit_attributes.rb
149
151
  - lib/killbill_client/models/gen/unit_usage_record_attributes.rb
150
152
  - lib/killbill_client/models/gen/usage_attributes.rb
153
+ - lib/killbill_client/models/gen/usage_price_attributes.rb
151
154
  - lib/killbill_client/models/gen/usage_price_override_attributes.rb
152
155
  - lib/killbill_client/models/gen/usage_record_attributes.rb
153
156
  - lib/killbill_client/models/gen/user_roles_attributes.rb