killbill-client 0.35.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dad39131d3cbc2056cd9333e9943faf20e4c8bf8
-  data.tar.gz: 54e03e703307ad62140d9ed8d68595a4e879c543
+  metadata.gz: c703102c2d5b0ca273db8faa154cc6875b2b6021
+  data.tar.gz: 660786f1bf17d6bec10c01720ac0550de1f59f5c
 SHA512:
-  metadata.gz: dcb2f78089cd651ace503d68dac2a398190a5f820de513b32c69923ea27857be5153b8870316d5cce6f45e6fbb57a82cf0048e7bc2da362a35c0b4c5dfe1fe1e
-  data.tar.gz: 354334e362fca07e882e912196bdc1044b719c02411ab4f633296a4d05935377701be47fc80ce7e0f5b5f80583964550670a53b5ba57c0dbe7666f0d38c27b1d
+  metadata.gz: fe35609bef6402e72d22dd442f8c2dc875e69a49cd3ececf6fda7e04a7fc455178d41ab2f239fc8e8364b86f4e8db91f8cd35774702ee4b35b5547d343272ad9
+  data.tar.gz: 72a29072e1eafcc1c6f1b0fedca4fa248191b1fe5498892411f671c9a5be7e9bf79ce2967752706b1d7b04edf6857c09ef55ecae5e00b4f9eab8f5a82cd6d638

data/README.md

@@ -1,6 +1,14 @@
 [![Build Status](https://travis-ci.org/killbill/killbill-client-ruby.png)](https://travis-ci.org/killbill/killbill-client-ruby)
 [![Code Climate](https://codeclimate.com/github/killbill/killbill-client-ruby.png)](https://codeclimate.com/github/killbill/killbill-client-ruby)
 
+------------------------------------------------
+| Ruby client              | Kill Bill version |
+| -----------------------: | ----------------: |
+| 0.x.y                    | 0.16.z            |
+| -----------------------: | ----------------: |
+| 1.x.y                    | 0.18.z(and 0.17.x)|
+
+
 killbill-client-ruby
 ====================
 

data/killbill_client.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'json', '>= 1.2.0', '< 2.0.0'
+  s.add_dependency 'json', '>= 1.2.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,14 +63,6 @@ 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]
@@ -82,7 +74,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::DEFAULT_PARSER.escape(relative_uri))
+            uri += (base_path + URI.escape(relative_uri))
           else
             uri = relative_uri
             uri = URI.parse(uri) unless uri.is_a?(URI)
@@ -148,7 +140,8 @@ module KillBillClient
             request['X-Request-Id'] = options[:request_id]
           end
 
-          http = create_http_client uri, options
+          http = ::Net::HTTP.new uri.host, uri.port
+          http.use_ssl = uri.scheme == 'https'
           net_http.each_pair { |key, value| http.send "#{key}=", value }
 
           if KillBillClient.logger

data/lib/killbill_client/models/bundle.rb

@@ -59,6 +59,7 @@ module KillBillClient
         params                 = {}
         params[:requestedDate] = requested_date unless requested_date.nil?
         params[:billingPolicy] = billing_policy unless billing_policy.nil?
+
         result                 = self.class.put "#{KILLBILL_API_BUNDLES_PREFIX}/#{bundle_id}",
                                                 to_json,
                                                 params,
@@ -106,17 +107,19 @@ module KillBillClient
       # Low level api to block/unblock a given subscription/bundle/account
       def set_blocking_state(state_name, service, block_change, block_entitlement, block_billing, requested_date = nil, user = nil, reason = nil, comment = nil, options = {})
 
+        params                 = {}
+        params[:requestedDate] = requested_date unless requested_date.nil?
+
         body = KillBillClient::Model::BlockingStateAttributes.new
         body.state_name = state_name
         body.service = service
         body.block_change = block_change
         body.block_entitlement = block_entitlement
         body.block_billing = block_billing
-        body.effective_date = requested_date
 
         self.class.put "#{KILLBILL_API_BUNDLES_PREFIX}/#{@bundle_id}/block",
                        body.to_json,
-                       {},
+                       params,
                        {
                            :user    => user,
                            :reason  => reason,

data/lib/killbill_client/models/event_subscription.rb

@@ -3,7 +3,6 @@ module KillBillClient
     class EventSubscription < EventSubscriptionAttributes
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
-      create_alias :requested_date, :requested_dt
       create_alias :effective_date, :effective_dt
     end
   end

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

@@ -29,10 +29,12 @@ module KillBillClient
   module Model
     class CreditAttributes < Resource
       attribute :credit_amount
+      attribute :currency
       attribute :invoice_id
       attribute :invoice_number
       attribute :effective_date
       attribute :account_id
+      attribute :description
       attribute :audit_logs
     end
   end

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

@@ -30,7 +30,6 @@ module KillBillClient
     class EventSubscriptionAttributes < Resource
       attribute :event_id
       attribute :billing_period
-      attribute :requested_dt
       attribute :effective_dt
       attribute :product
       attribute :price_list

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

@@ -36,6 +36,8 @@ module KillBillClient
       attribute :amount
       attribute :currency
       attribute :effective_date
+      attribute :processed_amount
+      attribute :processed_currency
       attribute :status
       attribute :gateway_error_code
       attribute :gateway_error_msg

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

@@ -36,6 +36,8 @@ module KillBillClient
       attribute :amount
       attribute :currency
       attribute :effective_date
+      attribute :processed_amount
+      attribute :processed_currency
       attribute :status
       attribute :gateway_error_code
       attribute :gateway_error_msg

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

@@ -44,6 +44,7 @@ module KillBillClient
       attribute :charged_through_date
       attribute :billing_start_date
       attribute :billing_end_date
+      attribute :bill_cycle_day_local
       attribute :events
       attribute :price_overrides
       attribute :audit_logs

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

@@ -29,6 +29,7 @@ module KillBillClient
   module Model
     class SubscriptionUsageRecordAttributes < Resource
       attribute :subscription_id
+      attribute :tracking_id
       attribute :unit_usage_records
     end
   end

data/lib/killbill_client/models/invoice.rb

@@ -68,7 +68,7 @@ module KillBillClient
 
             res.refresh(options)
 
-          rescue KillBillClient::API::BadRequest
+          rescue KillBillClient::API::BadRequest => e
             # 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
+          rescue KillBillClient::API::NotFound => e
             nil
           end
         end
@@ -126,7 +126,7 @@ module KillBillClient
                        Invoice
 
             res.refresh(options)
-          rescue KillBillClient::API::NotFound
+          rescue KillBillClient::API::NotFound => e
             nil
           end
         end
@@ -160,7 +160,7 @@ module KillBillClient
                        Invoice
 
             res.refresh(options)
-          rescue KillBillClient::API::NotFound
+          rescue KillBillClient::API::NotFound => e
             nil
           end
         end
@@ -193,7 +193,7 @@ module KillBillClient
 
             res.refresh(options)
 
-          rescue KillBillClient::API::NotFound
+          rescue KillBillClient::API::NotFound => e
             nil
           end
         end

data/lib/killbill_client/models/resource.rb

@@ -15,7 +15,6 @@ 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|
@@ -76,8 +75,8 @@ module KillBillClient
             when %r{text/plain}
               response.body
             when %r{application/xml}
-              if response['location']
-                response['location']
+              if response.header['location']
+                response.header['location']
               else
                 response.body
               end
@@ -85,7 +84,7 @@ module KillBillClient
               record = from_json resource_class, response.body
               if record.nil?
                 record = resource_class.new
-                record.uri = response['location']
+                record.uri = response.header['location']
               end
 
               session_id = extract_session_id(response)
@@ -171,22 +170,26 @@ module KillBillClient
         end
 
         def attribute(name)
-          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
+          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
 
         def has_many(attr_name, type = nil)
           send("attr_accessor", attr_name.to_sym)
 
           #add it to attribute_names
-          @@attribute_names[self.name] ||= {}
+          @@attribute_names[self.name] = {} unless @@attribute_names[self.name]
           @@attribute_names[self.name][attr_name.to_sym] = {:type => type, :cardinality => :many}
         end
 
@@ -194,7 +197,7 @@ module KillBillClient
           send("attr_accessor", attr_name.to_sym)
 
           #add it to attribute_names
-          @@attribute_names[self.name] ||= {}
+          @@attribute_names[self.name] = {} unless @@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_key_value(plugin_name, "uploadPluginConfig", "plugin config", user, reason, comment, options)
+          delete_tenant_user_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_key_value(key_name, "userKeyValue", "tenant key/value", user, reason, comment, options)
+          delete_tenant_user_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_key_value(key_name, key_path, error_id_str, user = nil, reason = nil, comment = nil, options = {})
+        def delete_tenant_user_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['location']
+          if response.header['location']
             created_transaction = Transaction.new
-            created_transaction.uri = response['location']
+            created_transaction.uri = response.header['location']
           else
             raise error
           end

data/lib/killbill_client/version.rb

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

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

@@ -8,10 +8,6 @@ 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
@@ -50,23 +46,6 @@ 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

data/spec/killbill_client/model_relation_spec.rb

@@ -59,7 +59,7 @@ describe KillBillClient::Model::Resource do
   end
 
   it 'should create alias attr accessors' do
-    KillBillClient::Model::EventSubscription.create_alias :alias_date, :requested_dt
+    KillBillClient::Model::EventSubscription.create_alias :alias_date, :effective_dt
 
     methods = KillBillClient::Model::EventSubscription.instance_methods
     expect(methods.map(&:to_sym)).to include :alias_date
@@ -67,7 +67,7 @@ describe KillBillClient::Model::Resource do
 
     evt = KillBillClient::Model::EventSubscription.new
     evt.alias_date = "devaroop"
-    expect(evt.requested_dt).to eq("devaroop")
+    expect(evt.effective_dt).to eq("devaroop")
     expect(evt.alias_date).to eq("devaroop")
   end
 end

metadata

@@ -1,77 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Killbill core team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !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
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 11.0.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 11.0.0
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-  prerelease: false
-  type: :development
 description: An API client library for Kill Bill.
 email: killbilling-users@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -187,8 +181,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
@@ -199,26 +193,35 @@ homepage: http://www.killbilling.org
 licenses:
 - Apache License (2.0)
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
-- --exclude
-- .
+- "--exclude"
+- "."
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.6
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: Kill Bill client library.
-test_files: []
+test_files:
+- spec/killbill_client/base_uri_spec.rb
+- spec/killbill_client/encoding_spec.rb
+- spec/killbill_client/errors_spec.rb
+- spec/killbill_client/model_relation_spec.rb
+- spec/killbill_client/remote/api_spec.rb
+- spec/killbill_client/remote/model_spec.rb
+- spec/killbill_client/resource_spec.rb
+- spec/killbill_client/resources_spec.rb
+- spec/spec_helper.rb