killbill-client 2.4.0 → 3.3.0

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

@@ -51,7 +51,6 @@ module KillBillClient
       attribute :phone
       attribute :notes
       attribute :is_migrated
-      attribute :is_notified_for_invoices
       attribute :account_balance
       attribute :account_cba
       attribute :audit_logs

data/lib/killbill_client/models/gen/{block_price_override_attributes.rb → block_price_attributes.rb}

@@ -27,7 +27,7 @@
 
 module KillBillClient
   module Model
-    class BlockPriceOverrideAttributes < Resource
+    class BlockPriceAttributes < Resource
       attribute :unit_name
       attribute :size
       attribute :price

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

@@ -42,6 +42,7 @@ module KillBillClient
       attribute :bundle_keys
       attribute :credits
       attribute :items
+      attribute :tracking_ids
       attribute :is_parent_invoice
       attribute :parent_invoice_id
       attribute :parent_account_id

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

@@ -52,6 +52,7 @@ module KillBillClient
       attribute :currency
       attribute :quantity
       attribute :item_details
+      attribute :catalog_effective_date
       attribute :child_items
       attribute :audit_logs
     end

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

@@ -30,7 +30,6 @@ module KillBillClient
     class OverdueStateAttributes < Resource
       attribute :name
       attribute :external_message
-      attribute :days_between_payment_retries
       attribute :is_disable_entitlement_and_changes_blocked
       attribute :is_block_changes
       attribute :is_clear_state

data/lib/killbill_client/models/gen/{phase_price_override_attributes.rb → phase_price_attributes.rb}

@@ -27,13 +27,13 @@
 
 module KillBillClient
   module Model
-    class PhasePriceOverrideAttributes < Resource
+    class PhasePriceAttributes < Resource
       attribute :plan_name
       attribute :phase_name
       attribute :phase_type
       attribute :fixed_price
       attribute :recurring_price
-      attribute :usage_overrides
+      attribute :usage_prices
     end
   end
 end

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

@@ -24,7 +24,27 @@
 #    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
 #
 
-require 'killbill_client/models/gen/invoice_dry_run_attributes'
+
+require 'killbill_client/models/gen/invoice_item_attributes'
+require 'killbill_client/models/gen/combo_hosted_payment_page_attributes'
+require 'killbill_client/models/gen/simple_plan_attributes'
+require 'killbill_client/models/gen/bundle_timeline_attributes'
+require 'killbill_client/models/gen/payment_transaction_attributes'
+require 'killbill_client/models/gen/unit_usage_record_attributes'
+require 'killbill_client/models/gen/usage_record_attributes'
+require 'killbill_client/models/gen/subscription_usage_record_attributes'
+require 'killbill_client/models/gen/rolled_up_unit_attributes'
+require 'killbill_client/models/gen/rolled_up_usage_attributes'
+require 'killbill_client/models/gen/role_definition_attributes'
+require 'killbill_client/models/gen/usage_price_attributes'
+require 'killbill_client/models/gen/combo_payment_transaction_attributes'
+require 'killbill_client/models/gen/hosted_payment_page_fields_attributes'
+require 'killbill_client/models/gen/plan_detail_attributes'
+require 'killbill_client/models/gen/invoice_payment_transaction_attributes'
+require 'killbill_client/models/gen/overdue_attributes'
+require 'killbill_client/models/gen/tier_price_attributes'
+require 'killbill_client/models/gen/tag_definition_attributes'
+require 'killbill_client/models/gen/hosted_payment_page_billing_address_attributes'
 require 'killbill_client/models/gen/unit_attributes'
 require 'killbill_client/models/gen/product_attributes'
 require 'killbill_client/models/gen/plan_attributes'
@@ -37,67 +57,46 @@ require 'killbill_client/models/gen/price_attributes'
 require 'killbill_client/models/gen/price_list_attributes'
 require 'killbill_client/models/gen/duration_attributes'
 require 'killbill_client/models/gen/catalog_attributes'
+require 'killbill_client/models/gen/custom_field_attributes'
+require 'killbill_client/models/gen/overdue_state_attributes'
+require 'killbill_client/models/gen/overdue_condition_attributes'
+require 'killbill_client/models/gen/bundle_attributes'
+require 'killbill_client/models/gen/invoice_attributes'
 require 'killbill_client/models/gen/payment_attributes'
-require 'killbill_client/models/gen/tag_definition_attributes'
-require 'killbill_client/models/gen/payment_transaction_attributes'
-require 'killbill_client/models/gen/bulk_subscriptions_bundle_attributes'
-require 'killbill_client/models/gen/simple_plan_attributes'
 require 'killbill_client/models/gen/node_command_attributes'
-require 'killbill_client/models/gen/hosted_payment_page_customer_attributes'
-require 'killbill_client/models/gen/invoice_email_attributes'
-require 'killbill_client/models/gen/invoice_payment_attributes'
-require 'killbill_client/models/gen/stack_trace_element_attributes'
-require 'killbill_client/models/gen/billing_exception_attributes'
-require 'killbill_client/models/gen/usage_price_override_attributes'
+require 'killbill_client/models/gen/payment_method_plugin_detail_attributes'
+require 'killbill_client/models/gen/payment_method_attributes'
+require 'killbill_client/models/gen/node_command_property_attributes'
 require 'killbill_client/models/gen/tenant_key_value_attributes'
-require 'killbill_client/models/gen/credit_attributes'
-require 'killbill_client/models/gen/account_timeline_attributes'
-require 'killbill_client/models/gen/tag_attributes'
+require 'killbill_client/models/gen/phase_price_attributes'
+require 'killbill_client/models/gen/overdue_state_config_attributes'
+require 'killbill_client/models/gen/invoice_payment_attributes'
+require 'killbill_client/models/gen/blocking_state_attributes'
+require 'killbill_client/models/gen/audit_log_attributes'
 require 'killbill_client/models/gen/payment_attempt_attributes'
+require 'killbill_client/models/gen/node_info_attributes'
 require 'killbill_client/models/gen/notification_attributes'
-require 'killbill_client/models/gen/overdue_state_attributes'
-require 'killbill_client/models/gen/custom_field_attributes'
-require 'killbill_client/models/gen/role_definition_attributes'
-require 'killbill_client/models/gen/tier_price_override_attributes'
-require 'killbill_client/models/gen/invoice_item_attributes'
-require 'killbill_client/models/gen/plugin_property_attributes'
-require 'killbill_client/models/gen/admin_payment_attributes'
 require 'killbill_client/models/gen/event_subscription_attributes'
 require 'killbill_client/models/gen/subscription_attributes'
+require 'killbill_client/models/gen/account_timeline_attributes'
+require 'killbill_client/models/gen/plugin_service_info_attributes'
+require 'killbill_client/models/gen/plugin_info_attributes'
 require 'killbill_client/models/gen/tenant_attributes'
-require 'killbill_client/models/gen/unit_usage_record_attributes'
-require 'killbill_client/models/gen/usage_record_attributes'
-require 'killbill_client/models/gen/subscription_usage_record_attributes'
-require 'killbill_client/models/gen/gateway_notification_attributes'
-require 'killbill_client/models/gen/audit_log_attributes'
-require 'killbill_client/models/gen/invoice_payment_transaction_attributes'
-require 'killbill_client/models/gen/account_attributes'
-require 'killbill_client/models/gen/invoice_attributes'
-require 'killbill_client/models/gen/block_price_override_attributes'
+require 'killbill_client/models/gen/plugin_property_attributes'
+require 'killbill_client/models/gen/user_roles_attributes'
 require 'killbill_client/models/gen/profiling_data_attributes_item'
 require 'killbill_client/models/gen/profiling_data_attributes'
-require 'killbill_client/models/gen/combo_payment_transaction_attributes'
-require 'killbill_client/models/gen/hosted_payment_page_fields_attributes'
-require 'killbill_client/models/gen/bundle_attributes'
-require 'killbill_client/models/gen/combo_hosted_payment_page_attributes'
-require 'killbill_client/models/gen/plan_detail_attributes'
-require 'killbill_client/models/gen/overdue_attributes'
-require 'killbill_client/models/gen/user_roles_attributes'
-require 'killbill_client/models/gen/bundle_timeline_attributes'
-require 'killbill_client/models/gen/plugin_service_info_attributes'
-require 'killbill_client/models/gen/plugin_info_attributes'
-require 'killbill_client/models/gen/phase_price_override_attributes'
+require 'killbill_client/models/gen/admin_payment_attributes'
+require 'killbill_client/models/gen/account_email_attributes'
 require 'killbill_client/models/gen/hosted_payment_page_form_descriptor_attributes'
-require 'killbill_client/models/gen/blocking_state_attributes'
-require 'killbill_client/models/gen/overdue_state_config_attributes'
-require 'killbill_client/models/gen/node_command_property_attributes'
-require 'killbill_client/models/gen/overdue_condition_attributes'
-require 'killbill_client/models/gen/hosted_payment_page_billing_address_attributes'
-require 'killbill_client/models/gen/rolled_up_unit_attributes'
-require 'killbill_client/models/gen/rolled_up_usage_attributes'
+require 'killbill_client/models/gen/bulk_subscriptions_bundle_attributes'
+require 'killbill_client/models/gen/subject_attributes'
+require 'killbill_client/models/gen/stack_trace_element_attributes'
+require 'killbill_client/models/gen/billing_exception_attributes'
+require 'killbill_client/models/gen/hosted_payment_page_customer_attributes'
+require 'killbill_client/models/gen/gateway_notification_attributes'
+require 'killbill_client/models/gen/account_attributes'
+require 'killbill_client/models/gen/invoice_dry_run_attributes'
 require 'killbill_client/models/gen/session_attributes'
-require 'killbill_client/models/gen/node_info_attributes'
-require 'killbill_client/models/gen/account_email_attributes'
-require 'killbill_client/models/gen/payment_method_plugin_detail_attributes'
-require 'killbill_client/models/gen/payment_method_attributes'
-require 'killbill_client/models/gen/subject_attributes'
+require 'killbill_client/models/gen/block_price_attributes'
+require 'killbill_client/models/gen/tag_attributes'

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

@@ -30,6 +30,7 @@ module KillBillClient
     class SubscriptionAttributes < Resource
       attribute :account_id
       attribute :bundle_id
+      attribute :bundle_external_key
       attribute :subscription_id
       attribute :external_key
       attribute :start_date
@@ -48,6 +49,7 @@ module KillBillClient
       attribute :bill_cycle_day_local
       attribute :events
       attribute :price_overrides
+      attribute :prices
       attribute :audit_logs
     end
   end

data/lib/killbill_client/models/gen/{tier_price_override_attributes.rb → tier_price_attributes.rb}

@@ -27,8 +27,8 @@
 
 module KillBillClient
   module Model
-    class TierPriceOverrideAttributes < Resource
-      attribute :block_price_overrides
+    class TierPriceAttributes < Resource
+      attribute :block_prices
     end
   end
 end

data/lib/killbill_client/models/gen/{usage_price_override_attributes.rb → usage_price_attributes.rb}

@@ -27,12 +27,12 @@
 
 module KillBillClient
   module Model
-    class UsagePriceOverrideAttributes < Resource
+    class UsagePriceAttributes < Resource
       attribute :usage_name
       attribute :usage_type
       attribute :billing_mode
       attribute :tier_block_policy
-      attribute :tier_price_overrides
+      attribute :tier_prices
     end
   end
 end

data/lib/killbill_client/models/helpers/custom_field_helper.rb

@@ -71,7 +71,7 @@ module KillBillClient
             self.class.delete "#{url_prefix}/#{send(id_alias)}/customFields",
                               {},
                               {
-                                  :customFieldList => custom_fields_param
+                                  :customField => custom_fields_param
                               },
                               {
                                   :user    => user,

data/lib/killbill_client/models/invoice.rb

@@ -4,41 +4,41 @@ module KillBillClient
 
       include KillBillClient::Model::CustomFieldHelper
       include KillBillClient::Model::TagHelper
+      include KillBillClient::Model::AuditLogWithHistoryHelper
 
       KILLBILL_API_INVOICES_PREFIX = "#{KILLBILL_API_PREFIX}/invoices"
       KILLBILL_API_DRY_RUN_INVOICES_PREFIX = "#{KILLBILL_API_INVOICES_PREFIX}/dryRun"
 
       has_many :audit_logs, KillBillClient::Model::AuditLog
       has_many :items, KillBillClient::Model::InvoiceItem
-      has_many :credits, KillBillClient::Model::Credit
+      has_many :credits, KillBillClient::Model::InvoiceItem
 
       has_custom_fields KILLBILL_API_INVOICES_PREFIX, :invoice_id
       has_tags KILLBILL_API_INVOICES_PREFIX, :invoice_id
+      has_audit_logs_with_history KILLBILL_API_INVOICES_PREFIX, :invoice_id
+
 
       class << self
-        def find_by_id(invoice_id, with_items = true, audit = "NONE", options = {})
+        def find_by_id(invoice_id, audit = "NONE", options = {})
           get "#{KILLBILL_API_INVOICES_PREFIX}/#{invoice_id}",
               {
-                  :withItems => with_items,
                   :audit     => audit
               },
               options
         end
 
-        def find_by_number(number, with_items = true, audit = "NONE", options = {})
+        def find_by_number(number, audit = "NONE", options = {})
           get "#{KILLBILL_API_INVOICES_PREFIX}/byNumber/#{number}",
               {
-                  :withItems => with_items,
                   :audit     => audit
               },
               options
         end
 
-        def find_by_invoice_item_id(invoice_item_id, with_items = true, with_children_items = false, audit = "NONE", options = {})
+        def find_by_invoice_item_id(invoice_item_id, with_children_items = false, audit = "NONE", options = {})
           get "#{KILLBILL_API_INVOICES_PREFIX}/byItemId/#{invoice_item_id}",
               {
                   :withChildrenItems => with_children_items,
-                  :withItems => with_items,
                   :audit     => audit
               },
               options

data/lib/killbill_client/models/invoice_item.rb

@@ -6,12 +6,15 @@ module KillBillClient
 
       include KillBillClient::Model::TagHelper
       include KillBillClient::Model::CustomFieldHelper
+      include KillBillClient::Model::AuditLogWithHistoryHelper
 
       has_custom_fields KILLBILL_API_INVOICE_ITEMS_PREFIX, :invoice_item_id
       has_tags KILLBILL_API_INVOICE_ITEMS_PREFIX, :invoice_item_id
-
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
+      has_audit_logs_with_history KILLBILL_API_INVOICE_ITEMS_PREFIX, :invoice_item_id
+
+
       # DO NOT DELETE THIS METHOD
       def tags(included_deleted = false, audit = 'NONE', options = {})
         params = {}

data/lib/killbill_client/models/invoice_payment.rb

@@ -4,6 +4,7 @@ module KillBillClient
 
       include KillBillClient::Model::CustomFieldHelper
       include KillBillClient::Model::TagHelper
+      include KillBillClient::Model::AuditLogWithHistoryHelper
 
       KILLBILL_API_INVOICE_PAYMENTS_PREFIX = "#{KILLBILL_API_PREFIX}/invoicePayments"
 
@@ -14,6 +15,8 @@ module KillBillClient
       has_custom_fields KILLBILL_API_INVOICE_PAYMENTS_PREFIX, :payment_id
       has_tags KILLBILL_API_INVOICE_PAYMENTS_PREFIX, :payment_id
 
+      has_audit_logs_with_history KILLBILL_API_INVOICE_PAYMENTS_PREFIX, :payment_id
+
       class << self
         def find_by_id(payment_id, with_plugin_info = false, with_attempts = false, options = {})
           get "#{KILLBILL_API_INVOICE_PAYMENTS_PREFIX}/#{payment_id}",

data/lib/killbill_client/models/models.rb

@@ -42,6 +42,7 @@ require 'killbill_client/models/usage_record'
 require 'killbill_client/models/rolled_up_usage'
 require 'killbill_client/models/account_timeline'
 require 'killbill_client/models/nodes_info'
+require 'killbill_client/models/admin'
 
 require 'killbill_client/models/export'
 

data/lib/killbill_client/models/resource.rb

@@ -9,7 +9,7 @@ module KillBillClient
                   :session_id,
                   :response
 
-      KILLBILL_API_PREFIX = '/1.0/kb/'
+      KILLBILL_API_PREFIX = '/1.0/kb'
       KILLBILL_API_PAGINATION_PREFIX = 'pagination'
 
       @@attribute_names = {}

data/lib/killbill_client/models/subscription.rb

@@ -4,21 +4,42 @@ module KillBillClient
 
       include KillBillClient::Model::TagHelper
       include KillBillClient::Model::CustomFieldHelper
+      include KillBillClient::Model::AuditLogWithHistoryHelper
 
       KILLBILL_API_ENTITLEMENT_PREFIX = "#{KILLBILL_API_PREFIX}/subscriptions"
 
       has_many :events, KillBillClient::Model::EventSubscription
-      has_many :price_overrides, KillBillClient::Model::PhasePriceOverrideAttributes
+      has_many :price_overrides, KillBillClient::Model::PhasePriceAttributes
 
       has_custom_fields KILLBILL_API_ENTITLEMENT_PREFIX, :subscription_id
       has_tags KILLBILL_API_ENTITLEMENT_PREFIX, :subscription_id
 
+      has_audit_logs_with_history KILLBILL_API_ENTITLEMENT_PREFIX, :subscription_id
+
       class << self
         def find_by_id(subscription_id, options = {})
           get "#{KILLBILL_API_ENTITLEMENT_PREFIX}/#{subscription_id}",
               {},
               options
         end
+
+        def find_by_external_key(external_key, options = {})
+          params = {}
+          params[:externalKey] = external_key
+
+          get "#{KILLBILL_API_ENTITLEMENT_PREFIX}",
+              params,
+              options
+        end
+
+
+        def event_audit_logs_with_history(event_id, options = {})
+          get "#{KILLBILL_API_ENTITLEMENT_PREFIX}/events/#{event_id}/auditLogsWithHistory",
+              {},
+              options,
+              AuditLog
+        end
+
       end
       #
       # Create a new entitlement
@@ -196,6 +217,7 @@ module KillBillClient
                            :comment => comment,
                        }.merge(options)
       end
+
     end
   end
 end

data/lib/killbill_client/version.rb

@@ -1,18 +1,3 @@
 module KillBillClient
-  module Version
-    MAJOR = 2
-    MINOR = 4
-    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.0'
 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)
@@ -68,6 +98,14 @@ describe KillBillClient::API do
     expect(http_client.verify_mode).to eq(OpenSSL::SSL::VERIFY_NONE)
   end
 
+  # 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"))
+  end
 end
 
 class DummyForHTTPAdapter