killbill-client 0.3.2 → 0.3.3

data/lib/killbill_client/api/net_http_adapter.rb

@@ -48,7 +48,7 @@ module KillBillClient
           request = METHODS[method].new uri.request_uri, head
 
           # Configure multi-tenancy headers, if enabled
-          if KillBillClient.api_key and KillBillClient.api_secret
+          if (options[:api_key] || KillBillClient.api_key) && (options[:api_secret] || KillBillClient.api_secret)
             request['X-Killbill-ApiKey'] = options[:api_key] || KillBillClient.api_key
             request['X-Killbill-ApiSecret'] = options[:api_secret] || KillBillClient.api_secret
           end

data/lib/killbill_client/models/entitlement_no_events.rb

@@ -41,7 +41,7 @@ module KillBillClient
         params = {}
         params[:callCompletion] = call_completion
         params[:requestedDate] = requested_date unless requested_date.nil?
-        params[:policy] = billing_policy unless billing_policy.nil?
+        params[:billingPolicy] = billing_policy unless billing_policy.nil?
 
         return self.class.put "#{KILLBILL_API_ENTITLEMENT_PREFIX}/#{@subscription_id}",
                               input.to_json,
@@ -59,11 +59,12 @@ module KillBillClient
       # @requested_date : the date when that change should occur
       # @billing_policy : the override for the billing policy {END_OF_TERM, IMMEDIATE}
       #
-      def cancel(user = nil, reason = nil, comment = nil, requested_date = nil, billing_policy = nil, options = {})
+      def cancel(user = nil, reason = nil, comment = nil, requested_date = nil, entitlementPolicy = nil, billing_policy = nil, options = {})
 
         params = {}
         params[:requestedDate] = requested_date unless requested_date.nil?
-        params[:policy] = billing_policy unless billing_policy.nil?
+        params[:billingPolicy] = billing_policy unless billing_policy.nil?
+        params[:entitlementPolicy] = entitlementPolicy unless entitlementPolicy.nil?
 
         return self.class.delete "#{KILLBILL_API_ENTITLEMENT_PREFIX}/#{@subscription_id}",
                               params,

data/lib/killbill_client/models/invoice.rb

@@ -10,10 +10,11 @@ module KillBillClient
       create_alias :bundle_keys, :external_bundle_keys
 
       class << self
-        def find_by_id_or_number(id_or_number, with_items = true, options = {})
+        def find_by_id_or_number(id_or_number, with_items = true, audit = "NONE", options = {})
           get "#{KILLBILL_API_INVOICES_PREFIX}/#{id_or_number}",
               {
-                :withItems => with_items
+                :withItems => with_items,
+                :audit => audit
               },
               options
         end

data/lib/killbill_client/models/invoice_item.rb

@@ -1,6 +1,9 @@
 module KillBillClient
   module Model
     class InvoiceItem < InvoiceItemAttributesSimple
+
+      has_many :audit_logs, KillBillClient::Model::AuditLog
+
       def create(user = nil, reason = nil, comment = nil, options = {})
         created_invoice_item = self.class.post "#{Invoice::KILLBILL_API_INVOICES_PREFIX}/charges",
                                                to_json,

data/lib/killbill_client/models/models.rb

@@ -12,6 +12,7 @@ require 'killbill_client/models/subscription_new_event'
 require 'killbill_client/models/chargeback'
 require 'killbill_client/models/subscription_event'
 require 'killbill_client/models/entitlement_no_events'
+require 'killbill_client/models/subscription_no_events'
 require 'killbill_client/models/bundle'
 require 'killbill_client/models/refund'
 require 'killbill_client/models/account'

data/lib/killbill_client/models/subscription_no_events.rb

@@ -0,0 +1,26 @@
+module KillBillClient
+  module Model
+    class SubscriptionNoEvents < SubscriptionAttributesNoEvents
+
+      KILLBILL_API_SUBSCRIPTIONS_PREFIX = "#{KILLBILL_API_PREFIX}/subscriptions"
+
+      KILLBILL_API_BUNDLE_PREFIX = "#{KILLBILL_API_PREFIX}/bundles"
+
+      class << self
+        def find_by_id(subscription_id, options = {})
+          get "#{KILLBILL_API_SUBSCRIPTIONS_PREFIX}/#{subscription_id}",
+              {},
+              options
+        end
+
+
+        def find_by_bundle_id(bundle_id, options = {})
+          get "#{KILLBILL_API_BUNDLE_PREFIX}/#{bundle_id}/subscriptions",
+              {},
+              options
+        end
+      end
+
+    end
+  end
+end

data/lib/killbill_client/models/tenant.rb

@@ -26,6 +26,12 @@ module KillBillClient
                                              :reason => reason,
                                              :comment => comment,
                                          }.merge(options)
+        #
+        # Specify api_key and api_secret before making the call to retrieve the tenant object
+        # otherwise that would fail with a 401
+        #
+        options[:api_key] = @api_key
+        options[:api_secret] = @api_secret
         created_tenant.refresh(options)
       end
     end

data/lib/killbill_client/version.rb

@@ -2,7 +2,7 @@ module KillBillClient
   module Version
     MAJOR = 0
     MINOR = 3
-    PATCH = 2
+    PATCH = 3
     PRE = nil
 
     VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.').freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -129,6 +129,7 @@ files:
 - lib/killbill_client/models/subscription_deleted_event.rb
 - lib/killbill_client/models/subscription_event.rb
 - lib/killbill_client/models/subscription_new_event.rb
+- lib/killbill_client/models/subscription_no_events.rb
 - lib/killbill_client/models/tag.rb
 - lib/killbill_client/models/tag_definition.rb
 - lib/killbill_client/models/tenant.rb
@@ -163,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2953616694403421406
+      hash: -3818846432645189032
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25