killbill-client 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fa87a6246a9c682976375f3e29fb18c0eeef1c3
-  data.tar.gz: f3aaea13d0f68ffbc516b7213d7de4053a56228f
+  metadata.gz: 44af1bd991b778b064fef43d2267e75b834ffe01
+  data.tar.gz: e51ee0a3a893b671cf8132e989d984779f32397a
 SHA512:
-  metadata.gz: e38d75f004f707a4684213ecc3b52da47913754beecffca0f009a633cbbfcbdabcb0d14d6c5076cf6a7124f3f938684e820cc6c7122ed6d5313a8815bfa77c5c
-  data.tar.gz: c186cfce4f402bbfbfdd78917aeda1b0761d28874f32dbbe96f48b15d27cd3ef9918edcf262eaa8ab55003edf9f6110f60b51f58450fdbc3f8c9c3099472b022
+  metadata.gz: e1b6517848128aeebefbb610fcdb5918e4fef7de7ef6138f45a5b4323464b82a456dc7d053e3990f143aa96ea3e85b0f47b649e774785fb3bd07d85e1359ed12
+  data.tar.gz: b2f7d36bf61d137218de09f8aae734ff13ada57cf9e73e171295e892d1b64d1ecdc7acba8f8476e7d664f7ce30eb3eb778fbad3638bc617db960b5d8507723f1

data/.circleci/config.yml

@@ -8,7 +8,7 @@ jobs:
   build-jruby-1.7.26:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.2.0
+      - image: killbill/kbbuild:0.4.0
     steps:
       - checkout
       - restore_cache:
@@ -27,8 +27,8 @@ jobs:
   test-mysql-jruby-1.7.26:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.2.0
-      - image: killbill/killbill:0.19.2
+      - image: killbill/kbbuild:0.4.0
+      - image: killbill/killbill:0.19.6
       - image: killbill/mariadb:0.19
         environment:
         - MYSQL_ROOT_PASSWORD=root
@@ -88,7 +88,7 @@ jobs:
   build-ruby-2.2.2:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.2.0
+      - image: killbill/kbbuild:0.4.0
     steps:
       - checkout
       - restore_cache:
@@ -109,8 +109,8 @@ jobs:
   test-mysql-ruby-2.2.2:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.2.0
-      - image: killbill/killbill:0.19.2
+      - image: killbill/kbbuild:0.4.0
+      - image: killbill/killbill:0.19.6
       - image: killbill/mariadb:0.19
         environment:
         - MYSQL_ROOT_PASSWORD=root
@@ -172,7 +172,7 @@ jobs:
   build-ruby-2.4.2:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.2.0
+      - image: killbill/kbbuild:0.4.0
     steps:
       - checkout
       - restore_cache:
@@ -193,8 +193,8 @@ jobs:
   test-mysql-ruby-2.4.2:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.2.0
-      - image: killbill/killbill:0.19.2
+      - image: killbill/kbbuild:0.4.0
+      - image: killbill/killbill:0.19.6
       - image: killbill/mariadb:0.19
         environment:
         - MYSQL_ROOT_PASSWORD=root
@@ -256,7 +256,7 @@ jobs:
   build-jruby-9.1.14.0:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.2.0
+      - image: killbill/kbbuild:0.4.0
     steps:
       - checkout
       - restore_cache:
@@ -277,8 +277,8 @@ jobs:
   test-mysql-jruby-9.1.14.0:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.2.0
-      - image: killbill/killbill:0.19.2
+      - image: killbill/kbbuild:0.4.0
+      - image: killbill/killbill:0.19.6
       - image: killbill/mariadb:0.19
         environment:
         - MYSQL_ROOT_PASSWORD=root

data/lib/killbill_client/api/errors.rb

@@ -114,6 +114,16 @@ module KillBillClient
     class NotAcceptable < ClientError
     end
 
+    # === 409 Conflict
+    #
+    # The request content type was not acceptable.
+    #
+    # The resource was found. This may be returned if the given
+    # key exists. The response body will explain
+    # which resource was found.
+    class Conflict < ClientError
+    end
+
     # === 415 Unsupported Media Type
     #
     # The request body was not recognized as XML.
@@ -181,6 +191,7 @@ module KillBillClient
         403 => Forbidden,
         404 => NotFound,
         406 => NotAcceptable,
+        409 => Conflict,
         415 => UnsupportedMediaType,
         422 => UnprocessableEntity,
         500 => InternalServerError,

data/lib/killbill_client/api/net_http_adapter.rb

@@ -48,6 +48,8 @@ module KillBillClient
 
           return nil unless (options[:params] && !options[:params].empty?)
 
+          options[:params][:withStackTrace] = true if (options[:return_full_stacktraces] || KillBillClient.return_full_stacktraces)
+
           pairs = options[:params].map { |key, value|
             # If the value is an array, we 'demultiplex' into several
             if value.is_a? Array

data/lib/killbill_client/models/invoice_item.rb

@@ -12,6 +12,35 @@ module KillBillClient
 
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
+      # DO NOT DELETE THIS METHOD
+      def tags(included_deleted = false, audit = 'NONE', options = {})
+        params = {}
+        # Non-standard, required, parameter
+        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
+
+      # DO NOT DELETE THIS METHOD
+      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

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

data/lib/killbill_client.rb

@@ -42,6 +42,7 @@ module KillBillClient
     attr_writer :url
 
     attr_accessor :disable_ssl_verification
+    attr_accessor :return_full_stacktraces
 
     # Tenant key/secret. Optional.
     attr_accessor :api_key

data/spec/killbill_client/remote/api_spec.rb

@@ -7,4 +7,44 @@ describe KillBillClient::API do
     tag_definitions = KillBillClient::Model::Resource.from_response KillBillClient::Model::TagDefinition, response
     expect(tag_definitions.size).to be > 1
   end
+
+  it 'requests stacktraces on demand', :integration => true do
+    KillBillClient.api_key = Time.now.to_i.to_s + rand(100).to_s
+    KillBillClient.api_secret = KillBillClient.api_key
+
+    tenant = KillBillClient::Model::Tenant.new
+    tenant.api_key = KillBillClient.api_key
+    tenant.api_secret = KillBillClient.api_secret
+    tenant.create(true, 'KillBill Spec test')
+
+    begin
+      KillBillClient.return_full_stacktraces = true
+      tenant.create(true, 'KillBill Spec test')
+      fail
+    rescue KillBillClient::API::InternalServerError => e
+      billing_exception = JSON.parse(e.response.body)
+      expect(billing_exception['className']).to eq('java.lang.RuntimeException')
+      expect(billing_exception['stackTrace'].size).to be >= 90
+    ensure
+      KillBillClient.return_full_stacktraces = false
+    end
+
+    begin
+      tenant.create(true, 'KillBill Spec test')
+      fail
+    rescue KillBillClient::API::InternalServerError => e
+      billing_exception = JSON.parse(e.response.body)
+      expect(billing_exception['className']).to eq('java.lang.RuntimeException')
+      expect(billing_exception['stackTrace'].size).to be == 0
+    end
+
+    begin
+      tenant.create(true, 'KillBill Spec test', nil, nil, {:return_full_stacktraces => true})
+      fail
+    rescue KillBillClient::API::InternalServerError => e
+      billing_exception = JSON.parse(e.response.body)
+      expect(billing_exception['className']).to eq('java.lang.RuntimeException')
+      expect(billing_exception['stackTrace'].size).to be >= 50
+    end
+  end
 end

data/spec/killbill_client/remote/model_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe KillBillClient::Model do
   before do
+    KillBillClient.return_full_stacktraces = true
+
     KillBillClient.api_key = Time.now.to_i.to_s + rand(100).to_s
     KillBillClient.api_secret = KillBillClient.api_key
 
@@ -11,6 +13,10 @@ describe KillBillClient::Model do
     tenant.create(true, 'KillBill Spec test')
   end
 
+  after do
+    KillBillClient.return_full_stacktraces = false
+  end
+
   it 'should manipulate accounts', :integration => true  do
     # In case the remote server has lots of data
     search_limit = 100000

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake