killbill-client 0.17.0 → 0.18.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzA3ZmU2NmI5ZDRlZTg3ZGRiZmMwZWIyNDMyZGRlNTFiYTFkM2NkMg==
+    MTJiMDNiZjBkYTg5OGMzNmJjMjY4MGE0YTM4ZDYyN2IyMTEzMTkyOA==
   data.tar.gz: !binary |-
-    ZDc4ZTM2OWQzNGFkYWYwOWFiZmU5ZTUzMDQ1YjdkNWFjYzI0ZjQ5MA==
+    MTVjMjVhYjJjNTUyNDlhMDZlNDJlMzVmMjdiOTMyMzZmZWRiNDU3OA==
 SHA512:
   metadata.gz: !binary |-
-    NmU3ODUyYzhjMDIzZTk3MTE2MmRkMWZmY2JkZTRkMzI4NjA0NjI3YmM3NWQw
-    OGQ4NWZiMTQxNGM5NTRmNTM1ZmU4OWEwMGY3NjExMDMwYjU2YTJkYmQyOTAx
-    ZDE4MTU2NmY5NTE2N2I5OGJkMTgxMjg3MzVhMjY4ZGQ5NWYyMjg=
+    NmRjYzEwMWVmOGM2YjAzODZlOTlkZjhhY2I1NTc0NWMyMmU0Yjg5YTRiZDU5
+    Y2FmZTRhNGZkYzUyMTA3ODI3ODI3NTBjYjc5MzExNjk1OThjNGUwYzJjMDVl
+    MWY2MGE2YjU3YmI5ZDMxN2ZiZTE0ZDIxMTg1YTUzMmVhNGM1ZGE=
   data.tar.gz: !binary |-
-    MDJlNWExYmU5MmEzZWJjYTMwNWUyYzNkNWE3MDQ0OTIzMmY1NWFmNTNlNDI3
-    Y2NhNjk3MzNiNWRmYmNhZThkMTI4NWFlY2M5MWFlNjRhY2QxMzEzYjUyOWE2
-    OTJhZTk4YmQ5MDA3ZjUzYWNjYjIzMjlmYmVjY2UwODFkOTRkZGU=
+    ZWZjODRjOGVhODUwZTUxNTlmNWU1YTQ2NzE3YzhkNmU0YTJmYjgzMjY0ZjBi
+    YzdmM2IwMzY0ZjU0YzhmOWQxODYyNGI4ZDgwYmQ5NDk0MjQ0MGQzMjUwYzg0
+    NDJmM2IwZDY3MmQ4NGIzYzYxZWEyNDUxNjczM2E5ZGY2NTQ3ZGI=

data/lib/killbill_client/api/api.rb

@@ -61,9 +61,11 @@ module KillBillClient
         request :delete, uri, {:body => body.to_s}.merge({:params => params}).merge(options)
       end
 
-      # @return [URI::Generic]
+      # @return [URI::HTTP]
       def base_uri
-        URI.parse(KillBillClient.url)
+        parsed_uri = URI.parse(KillBillClient.url)
+        parsed_uri = URI.parse("http://" + KillBillClient.url) unless parsed_uri.is_a?(URI::HTTP)
+        parsed_uri
       end
 
       # @return [String]

data/lib/killbill_client/models/combo_hosted_payment_page.rb

@@ -3,7 +3,9 @@ module KillBillClient
     class ComboHostedPaymentPage < ComboHostedPaymentPageAttributes
 
       def build_form_descriptor(user = nil, reason = nil, comment = nil, options = {})
-        query_map = {}
+        query_map = {
+            :controlPluginName => options.delete(:controlPluginNames)
+        }
 
         self.class.post "#{HostedPaymentPage::KILLBILL_API_HPP_PREFIX}/hosted/form",
                         to_json,

data/lib/killbill_client/models/combo_transaction.rb

@@ -23,7 +23,9 @@ module KillBillClient
       private
 
       def combo_payment(user, reason, comment, options)
-        query_map = {}
+        query_map = {
+            :controlPluginName => options.delete(:controlPluginNames)
+        }
 
         created_transaction = self.class.post "#{Payment::KILLBILL_API_PAYMENTS_PREFIX}/combo",
                                               to_json,

data/lib/killbill_client/version.rb

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

data/spec/killbill_client/base_uri_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe KillBillClient do
+
+  it 'should be able to parse a url with http' do
+    KillBillClient.url = "http://example.com:8080"
+    KillBillClient::API.base_uri.scheme.should == "http"
+    KillBillClient::API.base_uri.host.should == "example.com"
+    KillBillClient::API.base_uri.port.should == 8080
+  end
+
+  it 'should be able to parse a url without http' do
+    KillBillClient.url = "example.com:8080"
+    KillBillClient::API.base_uri.scheme.should == "http"
+    KillBillClient::API.base_uri.host.should == "example.com"
+    KillBillClient::API.base_uri.port.should == 8080
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -163,6 +163,7 @@ files:
 - lib/killbill_client/version.rb
 - lib/rails/generators/killbill_client/config_generator.rb
 - lib/rails/killbill_client.rb
+- spec/killbill_client/base_uri_spec.rb
 - spec/killbill_client/model_relation_spec.rb
 - spec/killbill_client/remote/api_spec.rb
 - spec/killbill_client/remote/model_spec.rb
@@ -196,6 +197,7 @@ signing_key:
 specification_version: 4
 summary: Kill Bill client library.
 test_files:
+- spec/killbill_client/base_uri_spec.rb
 - spec/killbill_client/model_relation_spec.rb
 - spec/killbill_client/remote/api_spec.rb
 - spec/killbill_client/remote/model_spec.rb