killbill-client 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2512da879d4f319ad4af8d1aac0b582555f60e35
-  data.tar.gz: 197bd8838c6f587c9f26e69dbcb592fd6af58abc
+  metadata.gz: f2ef126812dd995a0279bb40b3e5ebcbd8f6e846
+  data.tar.gz: 86db64653e7e29ae21541b4241dfcf01ee5de169
 SHA512:
-  metadata.gz: 9b24bd772578a41897e64745782c4ee2a338bb150b8dd8df92a54cb268ff65898a961f6adff564a9726165c4b01562763651d12c61a3eb7473b1bddce7f3d497
-  data.tar.gz: 73a8bcf6a96865889e2efcb8de9fe67e37d7428d31159f62c6d740c8fcdc7bbb1791c9b1522fe82e14d0e5a6252aa14264c1c416da9860b9c95f4ebacb25f15a
+  metadata.gz: 9b738f3f54f9d508126f79c0da7b962c87b2034524d38597dd9c68100b54b870dae165ca3a1584feb6e6dfd143bbb807b8a8e025a6df540b9dca53a55097f48e
+  data.tar.gz: 22dc8d5c9d4bd13fff971e20913be2e3a5a67fe150623c3cdeb6f44ff3aa8c9b10a870a0ba990c3ed87ae05eddd31e93189f00315e106ec3f352758a8f2a8684

data/lib/killbill_client/api/net_http_adapter.rb

@@ -76,7 +76,9 @@ module KillBillClient
           head.update options[:head] if options[:head]
           head.delete_if { |_, value| value.nil? }
 
-          if URI(relative_uri).scheme.nil?
+          # Need to encode in case of spaces (e.g. /1.0/kb/security/users/Mad Max/roles)
+          encoded_relative_uri = URI.encode(relative_uri)
+          if URI(encoded_relative_uri).scheme.nil?
             uri = (options[:base_uri] || base_uri)
             uri = URI.parse(uri) unless uri.is_a?(URI)
             # Note: make sure to keep the full path (if any) from URI::HTTP, for non-ROOT deployments
@@ -84,7 +86,7 @@ module KillBillClient
             base_path = uri.request_uri == '/' ? '' : uri.request_uri
             uri += (base_path + URI::DEFAULT_PARSER.escape(relative_uri))
           else
-            uri = relative_uri
+            uri = encoded_relative_uri
             uri = URI.parse(uri) unless uri.is_a?(URI)
           end
           uri += encode_params(options).to_s

data/lib/killbill_client/models/account.rb

@@ -67,10 +67,14 @@ module KillBillClient
         created_account.refresh(options)
       end
 
-      def update(user = nil, reason = nil, comment = nil, options = {})
+      def update(treat_null_as_reset = false, user = nil, reason = nil, comment = nil, options = {})
+
+        params = {}
+        params[:treatNullAsReset] = treat_null_as_reset
+
         updated_account = self.class.put "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}",
                                          to_json,
-                                         {},
+                                         params,
                                          {
                                              :user    => user,
                                              :reason  => reason,

data/lib/killbill_client/models/user_roles.rb

@@ -37,6 +37,12 @@ module KillBillClient
                               :comment => comment,
                           }.merge(options)
       end
+
+      def list(options = {})
+        self.class.get "#{Security::KILLBILL_API_SECURITY_PREFIX}/users/#{username}/roles",
+                       {},
+                       {}.merge(options)
+      end
     end
   end
 end

data/lib/killbill_client/version.rb

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

data/spec/killbill_client/remote/model_spec.rb

@@ -20,7 +20,7 @@ describe KillBillClient::Model do
     account.city = 'SnakeCase'
     account.state = 'Awesome'
     account.country = 'LalaLand'
-    account.locale = 'FR_fr'
+    account.locale = 'fr_FR'
     account.is_notified_for_invoices = false
     expect(account.account_id).to be_nil
 
@@ -35,6 +35,10 @@ describe KillBillClient::Model do
     expect(account.external_key).to eq(external_key)
     expect(account.payment_method_id).to be_nil
 
+    # Update account
+    account.name = 'Kill Bill Client'
+    account.update(false, 'KillBill Spec test')
+
     # Try to retrieve it
     account = KillBillClient::Model::Account.find_by_external_key external_key
     expect(account.account_id).to eq(account_id)
@@ -143,10 +147,19 @@ describe KillBillClient::Model do
 
     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(0)
-
+    # Check the account balance (need to wait a bit for the payment to happen)
+    begin
+      retries ||= 0
+      sleep(0.1) if retries > 0
+      account = KillBillClient::Model::Account.find_by_id account.account_id, true
+      expect(account.account_balance).to eq(0)
+    rescue => e
+      if (retries += 1) < 3
+        retry
+      else
+        raise e
+      end
+    end
 
     KillBillClient::Model::PaymentMethod.destroy(pm.payment_method_id, true, true, 'KillBill Spec test')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement