killbill-client 3.0.0 → 3.3.1

data/lib/killbill_client/version.rb

@@ -1,18 +1,3 @@
 module KillBillClient
-  module Version
-    MAJOR = 3
-    MINOR = 0
-    PATCH = 0
-    PRE = nil
-
-    VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.').freeze
-
-    class << self
-      def inspect
-        VERSION.dup
-      end
-
-      alias to_s inspect
-    end
-  end
+  VERSION = '3.3.1'
 end

data/spec/killbill_client/http_adapter_spec.rb

@@ -1,6 +1,14 @@
 require 'spec_helper'
 
 describe KillBillClient::API do
+
+  before do
+    KillBillClient.url = nil
+    KillBillClient.disable_ssl_verification = nil
+    KillBillClient.read_timeout = nil
+    KillBillClient.connection_timeout = nil
+  end
+
   let(:expected_query_params) {
     [
         'controlPluginName=killbill-example-plugin',
@@ -55,11 +63,33 @@ describe KillBillClient::API do
     http_adapter = DummyForHTTPAdapter.new
     http_client = http_adapter.send(:create_http_client, uri)
     expect(http_client.read_timeout).to eq(60)
+    # The default value has changed from nil to 60 in 2.4
+    #expect(http_client.open_timeout).to eq(60)
     expect(http_client.use_ssl?).to be false
     expect(http_client.verify_mode).to be_nil
   end
 
+  it 'should set the global parameters for http client' do
+    KillBillClient.url = 'https://example.com'
+    KillBillClient.read_timeout = 123000
+    KillBillClient.connection_timeout = 456000
+    KillBillClient.disable_ssl_verification = true
+
+    http_adapter = DummyForHTTPAdapter.new
+    http_client = http_adapter.send(:create_http_client, ssl_uri, {})
+    expect(http_client.read_timeout).to eq(123)
+    expect(http_client.open_timeout).to eq(456)
+    expect(http_client.use_ssl?).to be true
+    expect(http_client.verify_mode).to eq(OpenSSL::SSL::VERIFY_NONE)
+  end
+
   it 'should set the correct parameters for http client' do
+    # These don't matter (overridden by options)
+    KillBillClient.url = 'https://example.com'
+    KillBillClient.read_timeout = 123000
+    KillBillClient.connection_timeout = 456000
+    KillBillClient.disable_ssl_verification = false
+
     http_adapter = DummyForHTTPAdapter.new
     http_client = http_adapter.send(:create_http_client, ssl_uri, options)
     expect(http_client.read_timeout).to eq(options[:read_timeout] / 1000)
@@ -70,6 +100,8 @@ describe KillBillClient::API do
 
   # See https://github.com/killbill/killbill-client-ruby/issues/69
   it 'should construct URIs' do
+    KillBillClient.url = 'http://example.com:8080'
+
     http_adapter = DummyForHTTPAdapter.new
     uri = http_adapter.send(:build_uri, KillBillClient::Model::Account::KILLBILL_API_ACCOUNTS_PREFIX, options)
     expect(uri).to eq(URI.parse("#{KillBillClient::API.base_uri.to_s}/1.0/kb/accounts"))

data/spec/killbill_client/remote/model_spec.rb

@@ -101,13 +101,17 @@ describe KillBillClient::Model do
     custom_field = KillBillClient::Model::CustomField.new
     custom_field.name = SecureRandom.uuid.to_s
     custom_field.value = SecureRandom.uuid.to_s
+    custom_field_other = KillBillClient::Model::CustomField.new
+    custom_field_other.name = SecureRandom.uuid.to_s
+    custom_field_other.value = SecureRandom.uuid.to_s
     account.add_custom_field(custom_field, 'KillBill Spec test')
+    account.add_custom_field(custom_field_other, 'KillBill Spec test other')
     custom_fields = account.custom_fields
-    expect(custom_fields.size).to eq(1)
+    expect(custom_fields.size).to eq(2)
     expect(custom_fields.first.name).to eq(custom_field.name)
     expect(custom_fields.first.value).to eq(custom_field.value)
     account.remove_custom_field(custom_fields.first.custom_field_id, 'KillBill Spec test')
-    expect(account.custom_fields.size).to eq(0)
+    expect(account.custom_fields.size).to eq(1)
 
     # Add a payment method
     pm = KillBillClient::Model::PaymentMethod.new
@@ -163,13 +167,13 @@ describe KillBillClient::Model do
     invoice.commit 'KillBill Spec test'
 
     # Add/Remove a invoice item tag
-    expect(invoice_item.tags.size).to eq(0)
-    invoice_item.add_tag('TEST', 'KillBill Spec test')
-    tags = invoice_item.tags
+    expect(invoice.tags.size).to eq(0)
+    invoice.add_tag('WRITTEN_OFF', 'KillBill Spec test')
+    tags = invoice.tags
     expect(tags.size).to eq(1)
-    expect(tags.first.tag_definition_name).to eq('TEST')
-    invoice_item.remove_tag('TEST', 'KillBill Spec test')
-    expect(invoice_item.tags.size).to eq(0)
+    expect(tags.first.tag_definition_name).to eq('WRITTEN_OFF')
+    invoice.remove_tag('WRITTEN_OFF', 'KillBill Spec test')
+    expect(invoice.tags.size).to eq(0)
 
     # Add/Remove a invoice item custom field
     expect(invoice_item.custom_fields.size).to eq(0)
@@ -285,7 +289,7 @@ describe KillBillClient::Model do
     expect(invoice_payment.credited_amount).to eq(0)
 
     # Refund the payment (with item adjustment)
-    invoice_item = KillBillClient::Model::Invoice.find_by_number(invoice_number, true).items.first
+    invoice_item = KillBillClient::Model::Invoice.find_by_number(invoice_number).items.first
     item = KillBillClient::Model::InvoiceItem.new
     item.invoice_item_id = invoice_item.invoice_item_id
     item.amount = invoice_item.amount
@@ -299,9 +303,9 @@ describe KillBillClient::Model do
 
     # Create a credit for invoice
     new_credit = KillBillClient::Model::Credit.new
-    new_credit.credit_amount = 10.1
+    new_credit.amount = 10.1
     new_credit.invoice_id = invoice_id
-    new_credit.effective_date = "2013-09-30"
+    new_credit.start_date = "2013-09-30"
     new_credit.account_id = account.account_id
 
     expect { new_credit.create(true, 'KillBill Spec test') }.to raise_error(KillBillClient::API::BadRequest)

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-23 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -46,15 +60,23 @@ dependencies:
         version: '3.4'
 description: An API client library for Kill Bill.
 email: killbilling-users@googlegroups.com
-executables: []
+executables:
+- retry
 extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/CONTRIBUTING.md"
+- ".github/FUNDING.yml"
+- ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
+- bin/retry
+- docker/docker-compose.ci.mysql.yml
+- docker/docker-compose.ci.postgresql.yml
 - gen_config/model.conf
 - killbill_client.gemspec
 - lib/killbill_client.rb
@@ -81,7 +103,6 @@ files:
 - lib/killbill_client/models/gen/audit_log_attributes.rb
 - lib/killbill_client/models/gen/billing_exception_attributes.rb
 - lib/killbill_client/models/gen/block_price_attributes.rb
-- lib/killbill_client/models/gen/block_price_override_attributes.rb
 - lib/killbill_client/models/gen/blocking_state_attributes.rb
 - lib/killbill_client/models/gen/bulk_subscriptions_bundle_attributes.rb
 - lib/killbill_client/models/gen/bundle_attributes.rb
@@ -89,7 +110,6 @@ files:
 - lib/killbill_client/models/gen/catalog_attributes.rb
 - lib/killbill_client/models/gen/combo_hosted_payment_page_attributes.rb
 - lib/killbill_client/models/gen/combo_payment_transaction_attributes.rb
-- lib/killbill_client/models/gen/credit_attributes.rb
 - lib/killbill_client/models/gen/custom_field_attributes.rb
 - lib/killbill_client/models/gen/duration_attributes.rb
 - lib/killbill_client/models/gen/event_subscription_attributes.rb
@@ -119,7 +139,6 @@ files:
 - lib/killbill_client/models/gen/payment_transaction_attributes.rb
 - lib/killbill_client/models/gen/phase_attributes.rb
 - lib/killbill_client/models/gen/phase_price_attributes.rb
-- lib/killbill_client/models/gen/phase_price_override_attributes.rb
 - lib/killbill_client/models/gen/plan_attributes.rb
 - lib/killbill_client/models/gen/plan_detail_attributes.rb
 - lib/killbill_client/models/gen/plugin_info_attributes.rb
@@ -146,13 +165,11 @@ files:
 - lib/killbill_client/models/gen/tenant_key_value_attributes.rb
 - lib/killbill_client/models/gen/tier_attributes.rb
 - lib/killbill_client/models/gen/tier_price_attributes.rb
-- lib/killbill_client/models/gen/tier_price_override_attributes.rb
 - lib/killbill_client/models/gen/tiered_block_attributes.rb
 - lib/killbill_client/models/gen/unit_attributes.rb
 - lib/killbill_client/models/gen/unit_usage_record_attributes.rb
 - lib/killbill_client/models/gen/usage_attributes.rb
 - lib/killbill_client/models/gen/usage_price_attributes.rb
-- lib/killbill_client/models/gen/usage_price_override_attributes.rb
 - lib/killbill_client/models/gen/usage_record_attributes.rb
 - lib/killbill_client/models/gen/user_roles_attributes.rb
 - lib/killbill_client/models/helpers/audit_log_with_history_helper.rb

data/lib/killbill_client/models/gen/block_price_override_attributes.rb

@@ -1,37 +0,0 @@
-#############################################################################################
-#                                                                                           #
-#                   Copyright 2010-2013 Ning, Inc.                                          #
-#                   Copyright 2014 Groupon, Inc.                                            #
-#                   Copyright 2014 The Billing Project, LLC                                 #
-#                                                                                           #
-#      The Billing Project licenses this file to you under the Apache License, version 2.0  #
-#      (the "License"); you may not use this file except in compliance with the             #
-#      License.  You may obtain a copy of the License at:                                   #
-#                                                                                           #
-#          http://www.apache.org/licenses/LICENSE-2.0                                       #
-#                                                                                           #
-#      Unless required by applicable law or agreed to in writing, software                  #
-#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
-#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
-#      License for the specific language governing permissions and limitations              #
-#      under the License.                                                                   #
-#                                                                                           #
-#############################################################################################
-
-
-#
-#                       DO NOT EDIT!!!
-#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
-#
-
-
-module KillBillClient
-  module Model
-    class BlockPriceOverrideAttributes < Resource
-      attribute :unit_name
-      attribute :size
-      attribute :price
-      attribute :max
-    end
-  end
-end

data/lib/killbill_client/models/gen/credit_attributes.rb

@@ -1,43 +0,0 @@
-#############################################################################################
-#                                                                                           #
-#                   Copyright 2010-2013 Ning, Inc.                                          #
-#                   Copyright 2014 Groupon, Inc.                                            #
-#                   Copyright 2014 The Billing Project, LLC                                 #
-#                                                                                           #
-#      The Billing Project licenses this file to you under the Apache License, version 2.0  #
-#      (the "License"); you may not use this file except in compliance with the             #
-#      License.  You may obtain a copy of the License at:                                   #
-#                                                                                           #
-#          http://www.apache.org/licenses/LICENSE-2.0                                       #
-#                                                                                           #
-#      Unless required by applicable law or agreed to in writing, software                  #
-#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
-#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
-#      License for the specific language governing permissions and limitations              #
-#      under the License.                                                                   #
-#                                                                                           #
-#############################################################################################
-
-
-#
-#                       DO NOT EDIT!!!
-#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
-#
-
-
-module KillBillClient
-  module Model
-    class CreditAttributes < Resource
-      attribute :credit_id
-      attribute :credit_amount
-      attribute :currency
-      attribute :invoice_id
-      attribute :invoice_number
-      attribute :effective_date
-      attribute :account_id
-      attribute :description
-      attribute :item_details
-      attribute :audit_logs
-    end
-  end
-end

data/lib/killbill_client/models/gen/phase_price_override_attributes.rb

@@ -1,39 +0,0 @@
-#############################################################################################
-#                                                                                           #
-#                   Copyright 2010-2013 Ning, Inc.                                          #
-#                   Copyright 2014 Groupon, Inc.                                            #
-#                   Copyright 2014 The Billing Project, LLC                                 #
-#                                                                                           #
-#      The Billing Project licenses this file to you under the Apache License, version 2.0  #
-#      (the "License"); you may not use this file except in compliance with the             #
-#      License.  You may obtain a copy of the License at:                                   #
-#                                                                                           #
-#          http://www.apache.org/licenses/LICENSE-2.0                                       #
-#                                                                                           #
-#      Unless required by applicable law or agreed to in writing, software                  #
-#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
-#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
-#      License for the specific language governing permissions and limitations              #
-#      under the License.                                                                   #
-#                                                                                           #
-#############################################################################################
-
-
-#
-#                       DO NOT EDIT!!!
-#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
-#
-
-
-module KillBillClient
-  module Model
-    class PhasePriceOverrideAttributes < Resource
-      attribute :plan_name
-      attribute :phase_name
-      attribute :phase_type
-      attribute :fixed_price
-      attribute :recurring_price
-      attribute :usage_overrides
-    end
-  end
-end

data/lib/killbill_client/models/gen/tier_price_override_attributes.rb

@@ -1,34 +0,0 @@
-#############################################################################################
-#                                                                                           #
-#                   Copyright 2010-2013 Ning, Inc.                                          #
-#                   Copyright 2014 Groupon, Inc.                                            #
-#                   Copyright 2014 The Billing Project, LLC                                 #
-#                                                                                           #
-#      The Billing Project licenses this file to you under the Apache License, version 2.0  #
-#      (the "License"); you may not use this file except in compliance with the             #
-#      License.  You may obtain a copy of the License at:                                   #
-#                                                                                           #
-#          http://www.apache.org/licenses/LICENSE-2.0                                       #
-#                                                                                           #
-#      Unless required by applicable law or agreed to in writing, software                  #
-#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
-#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
-#      License for the specific language governing permissions and limitations              #
-#      under the License.                                                                   #
-#                                                                                           #
-#############################################################################################
-
-
-#
-#                       DO NOT EDIT!!!
-#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
-#
-
-
-module KillBillClient
-  module Model
-    class TierPriceOverrideAttributes < Resource
-      attribute :block_price_overrides
-    end
-  end
-end

data/lib/killbill_client/models/gen/usage_price_override_attributes.rb

@@ -1,38 +0,0 @@
-#############################################################################################
-#                                                                                           #
-#                   Copyright 2010-2013 Ning, Inc.                                          #
-#                   Copyright 2014 Groupon, Inc.                                            #
-#                   Copyright 2014 The Billing Project, LLC                                 #
-#                                                                                           #
-#      The Billing Project licenses this file to you under the Apache License, version 2.0  #
-#      (the "License"); you may not use this file except in compliance with the             #
-#      License.  You may obtain a copy of the License at:                                   #
-#                                                                                           #
-#          http://www.apache.org/licenses/LICENSE-2.0                                       #
-#                                                                                           #
-#      Unless required by applicable law or agreed to in writing, software                  #
-#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
-#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
-#      License for the specific language governing permissions and limitations              #
-#      under the License.                                                                   #
-#                                                                                           #
-#############################################################################################
-
-
-#
-#                       DO NOT EDIT!!!
-#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
-#
-
-
-module KillBillClient
-  module Model
-    class UsagePriceOverrideAttributes < Resource
-      attribute :usage_name
-      attribute :usage_type
-      attribute :billing_mode
-      attribute :tier_block_policy
-      attribute :tier_price_overrides
-    end
-  end
-end