killbill-client 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7884db06718c90098514ddffc4d5840fdf2eea57
-  data.tar.gz: c062ac56ca9e7c9037d49fe6ec26563c76b09fff
+  metadata.gz: dad39131d3cbc2056cd9333e9943faf20e4c8bf8
+  data.tar.gz: 54e03e703307ad62140d9ed8d68595a4e879c543
 SHA512:
-  metadata.gz: 9f67cdd02e9ede604d08f25f35cdb27402953d4222ef7863d5cd1608c1d8154887a05e175033950c1a0a793a459f91874ebbdd67b9983caf7c976b95387992f4
-  data.tar.gz: c2a63017349eedd279f487fd431145711db6b15dfc2fcb5649826ac40e4ebf6746f0bb060d793b97f1bc942a99979f2d061100ef28edf038f8f49b172e2dc4d8
+  metadata.gz: dcb2f78089cd651ace503d68dac2a398190a5f820de513b32c69923ea27857be5153b8870316d5cce6f45e6fbb57a82cf0048e7bc2da362a35c0b4c5dfe1fe1e
+  data.tar.gz: 354334e362fca07e882e912196bdc1044b719c02411ab4f633296a4d05935377701be47fc80ce7e0f5b5f80583964550670a53b5ba57c0dbe7666f0d38c27b1d

data/killbill_client.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'json', '>= 1.2.0'
+  s.add_dependency 'json', '>= 1.2.0', '< 2.0.0'
 
   s.add_development_dependency 'rake', '>= 10.0.0', '< 11.0.0'
   s.add_development_dependency 'rspec', '~> 3.4'

data/lib/killbill_client/api/net_http_adapter.rb

@@ -63,6 +63,14 @@ module KillBillClient
           "?#{pairs.join '&'}"
         end
 
+        def create_http_client(uri, options = {})
+          http = ::Net::HTTP.new uri.host, uri.port
+          http.read_timeout = options[:read_timeout].to_f / 1000 if options[:read_timeout].is_a? Numeric
+          http.open_timeout = options[:connection_timeout].to_f / 1000 if options[:connection_timeout].is_a? Numeric
+          http.use_ssl = uri.scheme == 'https'
+          http
+        end
+
         def request(method, relative_uri, options = {})
           head = headers.dup
           head.update options[:head] if options[:head]
@@ -74,7 +82,7 @@ module KillBillClient
             # Note: make sure to keep the full path (if any) from URI::HTTP, for non-ROOT deployments
             # See https://github.com/killbill/killbill/issues/221#issuecomment-151980263
             base_path = uri.request_uri == '/' ? '' : uri.request_uri
-            uri += (base_path + URI.escape(relative_uri))
+            uri += (base_path + URI::DEFAULT_PARSER.escape(relative_uri))
           else
             uri = relative_uri
             uri = URI.parse(uri) unless uri.is_a?(URI)
@@ -140,8 +148,7 @@ module KillBillClient
             request['X-Request-Id'] = options[:request_id]
           end
 
-          http = ::Net::HTTP.new uri.host, uri.port
-          http.use_ssl = uri.scheme == 'https'
+          http = create_http_client uri, options
           net_http.each_pair { |key, value| http.send "#{key}=", value }
 
           if KillBillClient.logger

data/lib/killbill_client/models/invoice.rb

@@ -68,7 +68,7 @@ module KillBillClient
 
             res.refresh(options)
 
-          rescue KillBillClient::API::BadRequest => e
+          rescue KillBillClient::API::BadRequest
             # No invoice to generate : TODO parse json to verify this is indeed the case
           end
         end
@@ -94,7 +94,7 @@ module KillBillClient
 
             res.refresh(options)
 
-          rescue KillBillClient::API::NotFound => e
+          rescue KillBillClient::API::NotFound
             nil
           end
         end
@@ -126,7 +126,7 @@ module KillBillClient
                        Invoice
 
             res.refresh(options)
-          rescue KillBillClient::API::NotFound => e
+          rescue KillBillClient::API::NotFound
             nil
           end
         end
@@ -160,7 +160,7 @@ module KillBillClient
                        Invoice
 
             res.refresh(options)
-          rescue KillBillClient::API::NotFound => e
+          rescue KillBillClient::API::NotFound
             nil
           end
         end
@@ -193,7 +193,7 @@ module KillBillClient
 
             res.refresh(options)
 
-          rescue KillBillClient::API::NotFound => e
+          rescue KillBillClient::API::NotFound
             nil
           end
         end

data/lib/killbill_client/models/resource.rb

@@ -15,6 +15,7 @@ module KillBillClient
       @@attribute_names = {}
 
       def initialize(hash = nil)
+	@uri = nil
         # Make sure we support ActiveSupport::HashWithIndifferentAccess for Kaui
         if hash.respond_to?(:each)
           hash.each do |key, value|
@@ -75,8 +76,8 @@ module KillBillClient
             when %r{text/plain}
               response.body
             when %r{application/xml}
-              if response.header['location']
-                response.header['location']
+              if response['location']
+                response['location']
               else
                 response.body
               end
@@ -84,7 +85,7 @@ module KillBillClient
               record = from_json resource_class, response.body
               if record.nil?
                 record = resource_class.new
-                record.uri = response.header['location']
+                record.uri = response['location']
               end
 
               session_id = extract_session_id(response)
@@ -170,26 +171,22 @@ module KillBillClient
         end
 
         def attribute(name)
-          self.send('attr_accessor', name.to_sym)
-
-          self.instance_variable_set('@json_attributes', []) unless self.instance_variable_get('@json_attributes')
-          self.instance_variable_get('@json_attributes') << name.to_s
-
-          attributes = self.instance_variable_get('@json_attributes')
-
-          (
-          class << self;
-            self
-          end).send(:define_method, :json_attributes) do
-            attributes
-          end
-        end
+          send('attr_accessor', name.to_sym)
+	  attributes = @json_attributes ||= []
+	  begin
+	    json_attributes.push(name.to_s)
+	  rescue NameError
+	    (class << self; self; end).
+	      send(:define_method, :json_attributes) { attributes }
+	    retry
+	  end
+	end
 
         def has_many(attr_name, type = nil)
           send("attr_accessor", attr_name.to_sym)
 
           #add it to attribute_names
-          @@attribute_names[self.name] = {} unless @@attribute_names[self.name]
+          @@attribute_names[self.name] ||= {}
           @@attribute_names[self.name][attr_name.to_sym] = {:type => type, :cardinality => :many}
         end
 
@@ -197,7 +194,7 @@ module KillBillClient
           send("attr_accessor", attr_name.to_sym)
 
           #add it to attribute_names
-          @@attribute_names[self.name] = {} unless @@attribute_names[self.name]
+          @@attribute_names[self.name] ||= {}
           @@attribute_names[self.name][attr_name.to_sym] = {:type => type, :cardinality => :one}
         end
 

data/lib/killbill_client/models/resources.rb

@@ -7,8 +7,8 @@ module KillBillClient
                   :session_id,
                   :pagination_max_nb_records,
                   :pagination_total_nb_records,
-                  :pagination_next_page
-                  :response
+                  :pagination_next_page,
+		  :response
 
       # Same as .each, but fetch remaining pages as we go
       def each_in_batches(&block)

data/lib/killbill_client/models/tenant.rb

@@ -27,7 +27,7 @@ module KillBillClient
         end
 
         def delete_tenant_plugin_config(plugin_name, user = nil, reason = nil, comment = nil, options = {})
-          delete_tenant_user_key_value(plugin_name, "uploadPluginConfig", "plugin config", user, reason, comment, options)
+          delete_tenant_key_value(plugin_name, "uploadPluginConfig", "plugin config", user, reason, comment, options)
         end
 
         def get_tenant_user_key_value(key_name, options = {})
@@ -40,7 +40,7 @@ module KillBillClient
 
 
         def delete_tenant_user_key_value(key_name, user = nil, reason = nil, comment = nil, options = {})
-          delete_tenant_user_key_value(key_name, "userKeyValue", "tenant key/value", user, reason, comment, options)
+          delete_tenant_key_value(key_name, "userKeyValue", "tenant key/value", user, reason, comment, options)
         end
 
         def get_tenant_key_value(key_name, key_path, error_id_str, options = {})
@@ -75,7 +75,7 @@ module KillBillClient
         end
 
 
-        def delete_tenant_user_key_value(key_name, key_path, error_id_str, user = nil, reason = nil, comment = nil, options = {})
+        def delete_tenant_key_value(key_name, key_path, error_id_str, user = nil, reason = nil, comment = nil, options = {})
 
           require_multi_tenant_options!(options, "Deleting a #{error_id_str} is only supported in multi-tenant mode")
 

data/lib/killbill_client/models/transaction.rb

@@ -164,9 +164,9 @@ module KillBillClient
           created_transaction = yield
         rescue KillBillClient::API::ResponseError => error
           response = error.response
-          if response.header['location']
+          if response['location']
             created_transaction = Transaction.new
-            created_transaction.uri = response.header['location']
+            created_transaction.uri = response['location']
           else
             raise error
           end

data/lib/killbill_client/version.rb

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

data/spec/killbill_client/{encoding_spec.rb → http_adapter_spec.rb}

@@ -8,6 +8,10 @@ describe KillBillClient::API do
     ]
   }
 
+  let (:ssl_uri) {URI.parse 'https://killbill.io'}
+  let (:uri) {URI.parse 'http://killbill.io'}
+  let (:timeouts) {{:read_timeout => 10000, :connection_timeout => 5000}}
+
   it 'should send double-encoded uri' do
     contract_property = KillBillClient::Model::PluginPropertyAttributes.new
     contract_property.key = :contractId
@@ -46,6 +50,23 @@ describe KillBillClient::API do
     # also ensure the undecoded value is different so that it was indeed encocded twice
     expect(output_info_property[1]).not_to eq(CGI.unescape output_info_property[1])
   end
+
+  it 'should use the default parameters for http client' do
+    http_adapter = DummyForHTTPAdapter.new
+    http_client = http_adapter.send(:create_http_client, uri)
+    expect(http_client.read_timeout).to eq(60)
+    expect(http_client.open_timeout).to be_nil
+    expect(http_client.use_ssl?).to be false
+  end
+
+  it 'should set the correct parameters for http client' do
+    http_adapter = DummyForHTTPAdapter.new
+    http_client = http_adapter.send(:create_http_client, ssl_uri, timeouts)
+    expect(http_client.read_timeout).to eq(timeouts[:read_timeout] / 1000)
+    expect(http_client.open_timeout).to eq(timeouts[:connection_timeout] / 1000)
+    expect(http_client.use_ssl?).to be true
+  end
+
 end
 
 class DummyForHTTPAdapter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -17,11 +17,17 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -181,8 +187,8 @@ files:
 - lib/rails/generators/killbill_client/config_generator.rb
 - lib/rails/killbill_client.rb
 - spec/killbill_client/base_uri_spec.rb
-- spec/killbill_client/encoding_spec.rb
 - spec/killbill_client/errors_spec.rb
+- spec/killbill_client/http_adapter_spec.rb
 - spec/killbill_client/model_relation_spec.rb
 - spec/killbill_client/remote/api_spec.rb
 - spec/killbill_client/remote/model_spec.rb