killbill-client 1.12.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6023e6dc3700baf51b54eb966013c0097df4bb6
-  data.tar.gz: 273deea1e796f0f63b06d1d911e58494e4d51b7f
+  metadata.gz: '08ccf5da38d550a6f93402e34d3519f31c85297a'
+  data.tar.gz: 8f3b236f0f4ce4b6f60f19b399efca3ec6d55eaa
 SHA512:
-  metadata.gz: 9a484124e71caf99ea3afb36f83cc8ccbd6c75d5f94f67646c9b6fb0fd4bc817257b99a47e3e19e735d758aed9440ecd3f60962e0810a0f49288d471faa58bce
-  data.tar.gz: 9934d9680adeed6c8d8c7777e908da473de810f3f9721951ee5201ad226abde89dd5c22de62629099d059e51cf7ae6f8657c057e656e6ef07183df8bf63908d3
+  metadata.gz: '0618d5fa43a3842a594ae3b8c5bdb5959c2a939906ba223eeb46f6f8c976fca3928cf42c6bc314f92232c79df670c2e61eb1a4d3cab80b6a8cecf373aa343475'
+  data.tar.gz: cdd4d1676c59da0d90c1a0f9e7cb0c649cb868d7d0fd58bdcd2194ed9f8d97ba4decf532f6b998931ea9502be9bb19d9c97766d26c438746db4fe41f95330d36

data/README.md

@@ -10,6 +10,7 @@ Kill Bill compatibility
 | -------------: | ----------------: |
 | 0.x.y          | 0.16.z            |
 | 1.x.y          | 0.18.z            |
+| 2.x.y          | 0.19.z            |
 
 Installation
 ------------

data/lib/killbill_client/models/catalog.rb

@@ -79,6 +79,18 @@ module KillBillClient
                    :comment => comment,
                }.merge(options)
         end
+
+        def delete_catalog(user = nil, reason = nil, comment = nil, options = {})
+
+          delete "#{KILLBILL_API_CATALOG_PREFIX}",
+                 {},
+                 {},
+                 {
+                     :user => user,
+                     :reason => reason,
+                     :comment => comment,
+                 }.merge(options)
+        end
       end
     end
   end

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

@@ -38,6 +38,7 @@ module KillBillClient
       attribute :parent_account_id
       attribute :is_payment_delegated_to_parent
       attribute :payment_method_id
+      attribute :reference_time
       attribute :time_zone
       attribute :address1
       attribute :address2

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

@@ -0,0 +1,37 @@
+#############################################################################################
+#                                                                                           #
+#                   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/catalog_attributes.rb

@@ -31,6 +31,7 @@ module KillBillClient
       attribute :name
       attribute :effective_date
       attribute :currencies
+      attribute :units
       attribute :products
       attribute :price_lists
     end

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

@@ -43,6 +43,8 @@ module KillBillClient
       attribute :credits
       attribute :items
       attribute :is_parent_invoice
+      attribute :parent_invoice_id
+      attribute :parent_account_id
       attribute :audit_logs
     end
   end

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

@@ -38,6 +38,9 @@ module KillBillClient
       attribute :plan_name
       attribute :phase_name
       attribute :usage_name
+      attribute :pretty_plan_name
+      attribute :pretty_phase_name
+      attribute :pretty_usage_name
       attribute :item_type
       attribute :description
       attribute :start_date

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

@@ -32,6 +32,7 @@ module KillBillClient
       attribute :account_id
       attribute :object_type
       attribute :object_id
+      attribute :meta_data
     end
   end
 end

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

@@ -33,6 +33,7 @@ module KillBillClient
       attribute :phase_type
       attribute :fixed_price
       attribute :recurring_price
+      attribute :usage_overrides
     end
   end
 end

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

@@ -29,6 +29,7 @@ module KillBillClient
   module Model
     class PlanAttributes < Resource
       attribute :name
+      attribute :pretty_name
       attribute :billing_period
       attribute :phases
     end

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

@@ -30,6 +30,7 @@ module KillBillClient
     class ProductAttributes < Resource
       attribute :type
       attribute :name
+      attribute :pretty_name
       attribute :plans
       attribute :included
       attribute :available

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

@@ -33,9 +33,11 @@ require 'killbill_client/models/gen/audit_log_attributes'
 require 'killbill_client/models/gen/stack_trace_element_attributes'
 require 'killbill_client/models/gen/billing_exception_attributes'
 require 'killbill_client/models/gen/blocking_state_attributes'
+require 'killbill_client/models/gen/block_price_override_attributes'
 require 'killbill_client/models/gen/bulk_base_subscription_and_add_ons_attributes'
 require 'killbill_client/models/gen/bundle_attributes'
 require 'killbill_client/models/gen/bundle_timeline_attributes'
+require 'killbill_client/models/gen/unit_attributes'
 require 'killbill_client/models/gen/product_attributes'
 require 'killbill_client/models/gen/plan_attributes'
 require 'killbill_client/models/gen/tiered_block_attributes'
@@ -97,4 +99,6 @@ require 'killbill_client/models/gen/tag_definition_attributes'
 require 'killbill_client/models/gen/tag_attributes'
 require 'killbill_client/models/gen/tenant_attributes'
 require 'killbill_client/models/gen/tenant_key_attributes'
+require 'killbill_client/models/gen/tier_price_override_attributes'
+require 'killbill_client/models/gen/usage_price_override_attributes'
 require 'killbill_client/models/gen/user_roles_attributes'

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

@@ -0,0 +1,34 @@
+#############################################################################################
+#                                                                                           #
+#                   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/unit_attributes.rb

@@ -0,0 +1,35 @@
+#############################################################################################
+#                                                                                           #
+#                   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 UnitAttributes < Resource
+      attribute :name
+      attribute :pretty_name
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+#############################################################################################
+#                                                                                           #
+#                   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

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

@@ -29,7 +29,11 @@ module KillBillClient
       end
 
       def set_tags(tag_definition_ids, user = nil, reason = nil, comment = nil, options = {})
-        current_tag_definition_ids = tags(false, 'NONE', options).map { |tag| tag.tag_definition_id }
+        begin
+          current_tag_definition_ids = tags(false, 'NONE', options).map { |tag| tag.tag_definition_id }
+        rescue KillBillClient::API::NotFound
+          current_tag_definition_ids = []
+        end
 
         tags_to_remove = current_tag_definition_ids - tag_definition_ids
         tags_to_add = tag_definition_ids - current_tag_definition_ids

data/lib/killbill_client/models/invoice_item.rb

@@ -2,8 +2,43 @@ module KillBillClient
   module Model
     class InvoiceItem < InvoiceItemAttributes
 
+      KILLBILL_API_INVOICE_ITEMS_PREFIX = "#{KILLBILL_API_PREFIX}/invoiceItems"
+
+      include KillBillClient::Model::TagHelper
+      include KillBillClient::Model::CustomFieldHelper
+
+      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
 
+      def tags(included_deleted = false, audit = 'NONE', options = {})
+        params = {}
+        params[:accountId] = account_id
+        params[:includedDeleted] = included_deleted if included_deleted
+        params[:audit] = audit
+        self.class.get "#{KILLBILL_API_INVOICE_ITEMS_PREFIX}/#{invoice_item_id}/tags",
+                       params,
+                       options,
+                       Tag
+      end
+
+      def add_tags_from_definition_ids(tag_definition_ids, user, reason, comment, options)
+
+        created_tag = self.class.post "#{KILLBILL_API_INVOICE_ITEMS_PREFIX}/#{invoice_item_id}/tags",
+                                      {},
+                                      {
+                                          :tagList => tag_definition_ids.join(',')
+                                      },
+                                      {
+                                          :user    => user,
+                                          :reason  => reason,
+                                          :comment => comment,
+                                      }.merge(options),
+                                      Tag
+        tags(false, 'NONE', options) unless created_tag.nil?
+      end
+
       def create(auto_commit = false, user = nil, reason = nil, comment = nil, options = {})
         created_invoice_item = self.class.post "#{Invoice::KILLBILL_API_INVOICES_PREFIX}/charges/#{account_id}",
                                                [to_hash].to_json,

data/lib/killbill_client/version.rb

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

data/spec/killbill_client/remote/model_spec.rb

@@ -147,6 +147,28 @@ 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(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)
+
+    # Add/Remove a invoice item custom field
+    expect(invoice_item.custom_fields.size).to eq(0)
+    custom_field = KillBillClient::Model::CustomField.new
+    custom_field.name = Time.now.to_i.to_s
+    custom_field.value = Time.now.to_i.to_s
+    invoice_item.add_custom_field(custom_field, 'KillBill Spec test')
+    custom_fields = invoice_item.custom_fields
+    expect(custom_fields.size).to eq(1)
+    expect(custom_fields.first.name).to eq(custom_field.name)
+    expect(custom_fields.first.value).to eq(custom_field.value)
+    invoice_item.remove_custom_field(custom_fields.first.custom_field_id, 'KillBill Spec test')
+    expect(invoice_item.custom_fields.size).to eq(0)
+
     # Check the account balance (need to wait a bit for the payment to happen)
     begin
       retries ||= 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,7 @@ files:
 - lib/killbill_client/models/gen/admin_payment_attributes.rb
 - 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_override_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
@@ -143,9 +144,12 @@ files:
 - 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/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_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/custom_field_helper.rb