killbill-client 1.0.0 → 1.1.0

data/lib/killbill_client/models/phase.rb

@@ -3,7 +3,8 @@ module KillBillClient
     class Phase < PhaseAttributes
 
       has_many :prices, KillBillClient::Model::PriceAttributes
-
+      has_many :fixed_prices, KillBillClient::Model::PriceAttributes
+      has_one :duration, KillBillClient::Model::DurationAttributes
     end
   end
 end

data/lib/killbill_client/models/resource.rb

@@ -15,6 +15,7 @@ module KillBillClient
       @@attribute_names = {}
 
       def initialize(hash = nil)
+	@uri = nil
         # Make sure we support ActiveSupport::HashWithIndifferentAccess for Kaui
         if hash.respond_to?(:each)
           hash.each do |key, value|
@@ -75,8 +76,8 @@ module KillBillClient
             when %r{text/plain}
               response.body
             when %r{application/xml}
-              if response.header['location']
-                response.header['location']
+              if response['location']
+                response['location']
               else
                 response.body
               end
@@ -84,7 +85,7 @@ module KillBillClient
               record = from_json resource_class, response.body
               if record.nil?
                 record = resource_class.new
-                record.uri = response.header['location']
+                record.uri = response['location']
               end
 
               session_id = extract_session_id(response)
@@ -170,26 +171,22 @@ module KillBillClient
         end
 
         def attribute(name)
-          self.send('attr_accessor', name.to_sym)
-
-          self.instance_variable_set('@json_attributes', []) unless self.instance_variable_get('@json_attributes')
-          self.instance_variable_get('@json_attributes') << name.to_s
-
-          attributes = self.instance_variable_get('@json_attributes')
-
-          (
-          class << self;
-            self
-          end).send(:define_method, :json_attributes) do
-            attributes
-          end
-        end
+          send('attr_accessor', name.to_sym)
+	  attributes = @json_attributes ||= []
+	  begin
+	    json_attributes.push(name.to_s)
+	  rescue NameError
+	    (class << self; self; end).
+	      send(:define_method, :json_attributes) { attributes }
+	    retry
+	  end
+	end
 
         def has_many(attr_name, type = nil)
           send("attr_accessor", attr_name.to_sym)
 
           #add it to attribute_names
-          @@attribute_names[self.name] = {} unless @@attribute_names[self.name]
+          @@attribute_names[self.name] ||= {}
           @@attribute_names[self.name][attr_name.to_sym] = {:type => type, :cardinality => :many}
         end
 
@@ -197,7 +194,7 @@ module KillBillClient
           send("attr_accessor", attr_name.to_sym)
 
           #add it to attribute_names
-          @@attribute_names[self.name] = {} unless @@attribute_names[self.name]
+          @@attribute_names[self.name] ||= {}
           @@attribute_names[self.name][attr_name.to_sym] = {:type => type, :cardinality => :one}
         end
 

data/lib/killbill_client/models/resources.rb

@@ -7,8 +7,8 @@ module KillBillClient
                   :session_id,
                   :pagination_max_nb_records,
                   :pagination_total_nb_records,
-                  :pagination_next_page
-                  :response
+                  :pagination_next_page,
+		  :response
 
       # Same as .each, but fetch remaining pages as we go
       def each_in_batches(&block)

data/lib/killbill_client/models/tenant.rb

@@ -27,7 +27,7 @@ module KillBillClient
         end
 
         def delete_tenant_plugin_config(plugin_name, user = nil, reason = nil, comment = nil, options = {})
-          delete_tenant_user_key_value(plugin_name, "uploadPluginConfig", "plugin config", user, reason, comment, options)
+          delete_tenant_key_value(plugin_name, "uploadPluginConfig", "plugin config", user, reason, comment, options)
         end
 
         def get_tenant_user_key_value(key_name, options = {})
@@ -40,9 +40,22 @@ module KillBillClient
 
 
         def delete_tenant_user_key_value(key_name, user = nil, reason = nil, comment = nil, options = {})
-          delete_tenant_user_key_value(key_name, "userKeyValue", "tenant key/value", user, reason, comment, options)
+          delete_tenant_key_value(key_name, "userKeyValue", "tenant key/value", user, reason, comment, options)
         end
 
+        def search_tenant_config(key_prefix, options = {})
+
+          require_multi_tenant_options!(options, "Searching for plugin config is only supported in multi-tenant mode")
+
+          uri =  KILLBILL_API_TENANTS_PREFIX + "/uploadPerTenantConfig/" + key_prefix + "/search"
+           get uri,
+              {},
+              {
+              }.merge(options),
+              KillBillClient::Model::TenantKeyAttributes
+        end
+
+
         def get_tenant_key_value(key_name, key_path, error_id_str, options = {})
 
           require_multi_tenant_options!(options, "Retrieving a #{error_id_str} is only supported in multi-tenant mode")
@@ -75,7 +88,7 @@ module KillBillClient
         end
 
 
-        def delete_tenant_user_key_value(key_name, key_path, error_id_str, user = nil, reason = nil, comment = nil, options = {})
+        def delete_tenant_key_value(key_name, key_path, error_id_str, user = nil, reason = nil, comment = nil, options = {})
 
           require_multi_tenant_options!(options, "Deleting a #{error_id_str} is only supported in multi-tenant mode")
 
@@ -95,10 +108,11 @@ module KillBillClient
       end
 
 
-      def create(user = nil, reason = nil, comment = nil, options = {})
+      def create(use_global_default=true, user = nil, reason = nil, comment = nil, options = {})
+
         created_tenant = self.class.post KILLBILL_API_TENANTS_PREFIX,
                                          to_json,
-                                         {},
+                                         {:useGlobalDefault => use_global_default},
                                          {
                                              :user => user,
                                              :reason => reason,

data/lib/killbill_client/models/transaction.rb

@@ -118,6 +118,24 @@ module KillBillClient
         created_transaction.refresh(options, Payment)
       end
 
+
+      def cancel_scheduled_payment(user = nil, reason = nil, comment = nil, options = {})
+
+        uri = transaction_external_key ? "#{Payment::KILLBILL_API_PAYMENTS_PREFIX}/cancelScheduledPaymentTransaction" :
+            "#{Payment::KILLBILL_API_PAYMENTS_PREFIX}/#{transaction_id}/cancelScheduledPaymentTransaction"
+
+        query_map = {}
+        query_map[:transactionExternalKey] = transaction_external_key if transaction_external_key
+        self.class.delete uri,
+                          {},
+                          query_map,
+                          {
+                              :user    => user,
+                              :reason  => reason,
+                              :comment => comment,
+                          }.merge(options)
+      end
+
       private
 
 
@@ -164,9 +182,9 @@ module KillBillClient
           created_transaction = yield
         rescue KillBillClient::API::ResponseError => error
           response = error.response
-          if response.header['location']
+          if response['location']
             created_transaction = Transaction.new
-            created_transaction.uri = response.header['location']
+            created_transaction.uri = response['location']
           else
             raise error
           end

data/lib/killbill_client/version.rb

@@ -1,7 +1,7 @@
 module KillBillClient
   module Version
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1 
     PATCH = 0
     PRE = nil
 

data/spec/killbill_client/{encoding_spec.rb → http_adapter_spec.rb}

@@ -8,6 +8,10 @@ describe KillBillClient::API do
     ]
   }
 
+  let (:ssl_uri) {URI.parse 'https://killbill.io'}
+  let (:uri) {URI.parse 'http://killbill.io'}
+  let (:timeouts) {{:read_timeout => 10000, :connection_timeout => 5000}}
+
   it 'should send double-encoded uri' do
     contract_property = KillBillClient::Model::PluginPropertyAttributes.new
     contract_property.key = :contractId
@@ -46,6 +50,23 @@ describe KillBillClient::API do
     # also ensure the undecoded value is different so that it was indeed encocded twice
     expect(output_info_property[1]).not_to eq(CGI.unescape output_info_property[1])
   end
+
+  it 'should use the default parameters for http client' do
+    http_adapter = DummyForHTTPAdapter.new
+    http_client = http_adapter.send(:create_http_client, uri)
+    expect(http_client.read_timeout).to eq(60)
+    expect(http_client.open_timeout).to be_nil
+    expect(http_client.use_ssl?).to be false
+  end
+
+  it 'should set the correct parameters for http client' do
+    http_adapter = DummyForHTTPAdapter.new
+    http_client = http_adapter.send(:create_http_client, ssl_uri, timeouts)
+    expect(http_client.read_timeout).to eq(timeouts[:read_timeout] / 1000)
+    expect(http_client.open_timeout).to eq(timeouts[:connection_timeout] / 1000)
+    expect(http_client.use_ssl?).to be true
+  end
+
 end
 
 class DummyForHTTPAdapter

data/spec/killbill_client/remote/model_spec.rb

@@ -135,16 +135,20 @@ describe KillBillClient::Model do
     invoice_item.currency = account.currency
     invoice_item.amount = 123.98
 
-    invoice_item = invoice_item.create 'KillBill Spec test'
+    invoice_item = invoice_item.create false, true, 'KillBill Spec test'
     invoice = KillBillClient::Model::Invoice.find_by_id_or_number invoice_item.invoice_id
 
-    expect(invoice.balance).to eq(123.98)
+    expect(invoice.amount).to eq(123.98)
+    expect(invoice.balance).to eq(0)
+
+    invoice.commit 'KillBill Spec test'
 
     # Check the account balance
     account = KillBillClient::Model::Account.find_by_id account.account_id, true
-    expect(account.account_balance).to eq(123.98)
+    expect(account.account_balance).to eq(0)
 
-    pm.destroy(true, 'KillBill Spec test')
+
+    KillBillClient::Model::PaymentMethod.destroy(pm.payment_method_id, true, true, 'KillBill Spec test')
 
     account = KillBillClient::Model::Account.find_by_id account.account_id
     expect(account.payment_method_id).to be_nil
@@ -222,17 +226,13 @@ describe KillBillClient::Model do
     item = KillBillClient::Model::InvoiceItem.new
     item.invoice_item_id = invoice_item.invoice_item_id
     item.amount = invoice_item.amount
-    refund = KillBillClient::Model::InvoicePayment.refund invoice_payment.payment_id, invoice_payment.purchased_amount, [item], 'KillBill Spec test'
 
     # Verify the refund
     timeline = KillBillClient::Model::AccountTimeline.find_by_account_id account.account_id
     expect(timeline.payments).not_to be_empty
     expect(timeline.payments.size).to eq(1)
-    expect(timeline.payments.first.transactions.size).to eq(2)
+    expect(timeline.payments.first.transactions.size).to eq(1)
     expect(timeline.payments.first.transactions.first.transaction_type).to eq('PURCHASE')
-    refund = timeline.payments.first.transactions.last
-    expect(refund.transaction_type).to eq('REFUND')
-    expect(refund.amount).to eq(invoice_item.amount)
 
     # Create a credit for invoice
     new_credit = KillBillClient::Model::Credit.new
@@ -240,20 +240,17 @@ describe KillBillClient::Model do
     new_credit.invoice_id = invoice_id
     new_credit.effective_date = "2013-09-30"
     new_credit.account_id = account.account_id
-    new_credit.create 'KillBill Spec test'
+
+    expect { new_credit.create 'KillBill Spec test'   }.to raise_error(KillBillClient::API::BadRequest)
 
     # Verify the invoice item of the credit
     invoice = KillBillClient::Model::Invoice.find_by_id_or_number invoice_id
     expect(invoice.items).not_to be_empty
     item = invoice.items.last
     expect(item.invoice_id).to eq(invoice_id)
-    expect(item.amount).to eq(10.1)
+    expect(item.amount).to eq(123.98)
     expect(item.account_id).to eq(account.account_id)
 
-    # Verify the credit
-    account = KillBillClient::Model::Account.find_by_id account.account_id, true
-    expect(account.account_balance).to eq(-10.1)
-
     # Create a subscription
     sub = KillBillClient::Model::Subscription.new
     sub.account_id = account.account_id
@@ -265,16 +262,17 @@ describe KillBillClient::Model do
     sub = sub.create 'KillBill Spec test'
 
     # Verify we can retrieve it
-    expect(account.bundles.size).to eq(1)
-    expect(account.bundles[0].subscriptions.size).to eq(1)
-    expect(account.bundles[0].subscriptions[0].subscription_id).to eq(sub.subscription_id)
-    bundle = account.bundles[0]
+    account_bundles = account.bundles
+    expect(account_bundles.size).to eq(1)
+    expect(account_bundles[0].subscriptions.size).to eq(1)
+    expect(account_bundles[0].subscriptions[0].subscription_id).to eq(sub.subscription_id)
+    bundle = account_bundles[0]
 
     # Verify we can retrieve it by id
     expect(KillBillClient::Model::Bundle.find_by_id(bundle.bundle_id)).to eq(bundle)
 
     # Verify we can retrieve it by external key
-    expect(KillBillClient::Model::Bundle.find_by_external_key(bundle.external_key)).to eq(bundle)
+    expect(KillBillClient::Model::Bundle.find_by_external_key(bundle.external_key, true).first).to eq(bundle)
 
     # Verify we can retrieve it by account id and external key
     bundles = KillBillClient::Model::Bundle.find_all_by_account_id_and_external_key(account.account_id, bundle.external_key)
@@ -309,7 +307,7 @@ describe KillBillClient::Model do
     tenant.api_secret = api_secret
 
     # Create and verify the tenant
-    tenant = tenant.create('KillBill Spec test')
+    tenant = tenant.create(true, 'KillBill Spec test')
     expect(tenant.api_key).to eq(api_key)
     expect(tenant.tenant_id).not_to be_nil
 

data/spec/spec_helper.rb

@@ -26,7 +26,7 @@ RSpec.configure do |config|
     tenant = KillBillClient::Model::Tenant.new
     tenant.api_key = KillBillClient.api_key
     tenant.api_secret = KillBillClient.api_secret
-    tenant.create('KillBill Spec test')
+    tenant.create(true, 'KillBill Spec test')
   end
 end
 

metadata

@@ -1,71 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Killbill core team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 10.0.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 11.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 10.0.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 11.0.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
+  prerelease: false
+  type: :development
 description: An API client library for Kill Bill.
 email: killbilling-users@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -92,6 +98,7 @@ files:
 - lib/killbill_client/models/gen/audit_log_attributes.rb
 - lib/killbill_client/models/gen/billing_exception_attributes.rb
 - lib/killbill_client/models/gen/blocking_state_attributes.rb
+- lib/killbill_client/models/gen/bulk_base_subscription_and_add_ons_attributes.rb
 - lib/killbill_client/models/gen/bundle_attributes.rb
 - lib/killbill_client/models/gen/bundle_timeline_attributes.rb
 - lib/killbill_client/models/gen/catalog_attributes.rb
@@ -112,11 +119,16 @@ files:
 - lib/killbill_client/models/gen/invoice_item_attributes.rb
 - lib/killbill_client/models/gen/invoice_payment_attributes.rb
 - lib/killbill_client/models/gen/invoice_payment_transaction_attributes.rb
+- lib/killbill_client/models/gen/limit_attributes.rb
 - lib/killbill_client/models/gen/node_command_attributes.rb
 - lib/killbill_client/models/gen/node_command_property_attributes.rb
 - lib/killbill_client/models/gen/node_info_attributes.rb
 - lib/killbill_client/models/gen/notification_attributes.rb
+- lib/killbill_client/models/gen/overdue_attributes.rb
+- lib/killbill_client/models/gen/overdue_condition_attributes.rb
 - lib/killbill_client/models/gen/overdue_state_attributes.rb
+- lib/killbill_client/models/gen/overdue_state_config_attributes.rb
+- lib/killbill_client/models/gen/payment_attempt_attributes.rb
 - lib/killbill_client/models/gen/payment_attributes.rb
 - lib/killbill_client/models/gen/payment_method_attributes.rb
 - lib/killbill_client/models/gen/payment_method_plugin_detail_attributes.rb
@@ -138,6 +150,7 @@ files:
 - lib/killbill_client/models/gen/rolled_up_unit_attributes.rb
 - lib/killbill_client/models/gen/rolled_up_usage_attributes.rb
 - lib/killbill_client/models/gen/session_attributes.rb
+- lib/killbill_client/models/gen/simple_plan_attributes.rb
 - lib/killbill_client/models/gen/stack_trace_element_attributes.rb
 - lib/killbill_client/models/gen/subject_attributes.rb
 - lib/killbill_client/models/gen/subscription_attributes.rb
@@ -146,7 +159,10 @@ files:
 - lib/killbill_client/models/gen/tag_definition_attributes.rb
 - lib/killbill_client/models/gen/tenant_attributes.rb
 - lib/killbill_client/models/gen/tenant_key_attributes.rb
+- lib/killbill_client/models/gen/tier_attributes.rb
+- lib/killbill_client/models/gen/tiered_block_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_record_attributes.rb
 - lib/killbill_client/models/gen/user_roles_attributes.rb
 - lib/killbill_client/models/helpers/custom_field_helper.rb
@@ -158,6 +174,8 @@ files:
 - lib/killbill_client/models/models.rb
 - lib/killbill_client/models/nodes_info.rb
 - lib/killbill_client/models/overdue.rb
+- lib/killbill_client/models/overdue_condition.rb
+- lib/killbill_client/models/overdue_state_config.rb
 - lib/killbill_client/models/payment.rb
 - lib/killbill_client/models/payment_method.rb
 - lib/killbill_client/models/phase.rb
@@ -181,8 +199,8 @@ files:
 - lib/rails/generators/killbill_client/config_generator.rb
 - lib/rails/killbill_client.rb
 - spec/killbill_client/base_uri_spec.rb
-- spec/killbill_client/encoding_spec.rb
 - spec/killbill_client/errors_spec.rb
+- spec/killbill_client/http_adapter_spec.rb
 - spec/killbill_client/model_relation_spec.rb
 - spec/killbill_client/remote/api_spec.rb
 - spec/killbill_client/remote/model_spec.rb
@@ -193,35 +211,26 @@ homepage: http://www.killbilling.org
 licenses:
 - Apache License (2.0)
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
-- "--exclude"
-- "."
+- --exclude
+- .
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.6
+signing_key:
 specification_version: 4
 summary: Kill Bill client library.
-test_files:
-- spec/killbill_client/base_uri_spec.rb
-- spec/killbill_client/encoding_spec.rb
-- spec/killbill_client/errors_spec.rb
-- spec/killbill_client/model_relation_spec.rb
-- spec/killbill_client/remote/api_spec.rb
-- spec/killbill_client/remote/model_spec.rb
-- spec/killbill_client/resource_spec.rb
-- spec/killbill_client/resources_spec.rb
-- spec/spec_helper.rb
+test_files: []