killbill-client 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 819aaea84a56ac9c47cde389a7a31370c15fff54
-  data.tar.gz: 7b2e3861bad56ae984fc38f3c955ef68b119a6eb
+  metadata.gz: af54df91b8798a89eb4f9ef3c54ec9c6bf24a29e
+  data.tar.gz: 2bfd6ec299800e5d4e4baba7db34fbb907ab915a
 SHA512:
-  metadata.gz: 81e7ee389303f02b9112c99c34a8b45ca60427eb71e97cc7f498c6b4bd0101e98e10bf97a0a9013041b4ad162252585b55f5afe35e19f55e3433edc08c345427
-  data.tar.gz: 40d096db6f30a5922dddda046388482c71d76df687c24158e01c1cf7bb7a194190da4850d6fffdeeff55bcfc7471f70fb862cfd1c40cfd69a4fd6dd5acc05014
+  metadata.gz: 54023ed88e5864e3de534031cf79df96e41fdd0ee202d1a08576a1ff7314dcfd0b0dc8ef624cc153e52aa7754b245c58fb4fca89c3232136ba10248762c235be
+  data.tar.gz: 9e1765d6a5455f61ce85f2f1b348c3b746fefb49710bd0b67e7b3231edcfca892f9af9bc4c8cab12aa32619062f78683f78b9fdb52bcd8f1e7da5422a4a15e14

data/.travis.yml

@@ -1,27 +1,47 @@
 language: ruby
 
-sudo: false
+sudo: required
+cache: bundler
+
+dist: trusty
+
+before_install:
+  - sudo sysctl -w net.ipv4.tcp_fin_timeout=15
+  - sudo sysctl -w net.ipv4.tcp_tw_reuse=1
+  - travis_retry gem install bundler
+  - travis_retry curl -LO 'https://search.maven.org/remotecontent?filepath=org/kill-bill/billing/killbill-profiles-killbill/0.18.8/killbill-profiles-killbill-0.18.8-jetty-console.war' && java -Dorg.killbill.catalog.uri=SpyCarAdvanced.xml -Djava.security.egd=file:/dev/./urandom -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -jar killbill-profiles-killbill-0.18.8-jetty-console.war --port 8080 --headless 2>&1 | egrep -v "lvl='INFO'| < | > |[ \t]*at [ \ta-zA-Z0-9\.\:\(\)]+" & sleep 80 && travis_retry curl -v -X POST -u 'admin:password' -H 'Content-Type:application/json' -H 'X-Killbill-CreatedBy:admin' -d '{"apiKey":"bob", "apiSecret":"lazar"}' "http://127.0.0.1:8080/1.0/kb/tenants"
+
+before_script:
+  - jdk_switcher use $JDK
+
+# Need Kill Bill 0.18.9
+#script: 'bundle exec rake test:spec test:remote:spec'
+script: 'bundle exec rake test:spec'
 
 notifications:
   email:
     - kill-bill-commits@googlegroups.com
 
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - ruby-head
-  - jruby-19mode
-  - jruby-20mode
-  - jruby-head
-
-jdk:
-  - openjdk6
-  - openjdk7
-  - oraclejdk7
+env:
+  global:
+    - JRUBY_OPTS='--2.0 -J-Xmx1024M'
 
 matrix:
+  include:
+    - rvm: ree-1.8.7-2011.12
+    - rvm: 1.8.7
+    - rvm: 1.9.3
+    - rvm: 2.2.0
+    - rvm: ruby-head
+    - rvm: jruby-1.7.26
+      env: JDK=oraclejdk8
+    - rvm: jruby-1.7.26
+      env: JDK=openjdk8
+    - rvm: jruby-head
+      env: JDK=oraclejdk8
+    - rvm: jruby-head
+      env: JDK=openjdk8
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+  fast_finish: true

data/lib/killbill_client.rb

@@ -41,6 +41,8 @@ module KillBillClient
 
     attr_writer :url
 
+    attr_accessor :disable_ssl_verification
+
     # Tenant key/secret. Optional.
     attr_accessor :api_key
     attr_accessor :api_secret

data/lib/killbill_client/api/net_http_adapter.rb

@@ -68,6 +68,7 @@ module KillBillClient
           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.verify_mode = OpenSSL::SSL::VERIFY_NONE if (options[:disable_ssl_verification] || KillBillClient.disable_ssl_verification)
           http
         end
 

data/lib/killbill_client/models/event_subscription.rb

@@ -2,8 +2,6 @@ module KillBillClient
   module Model
     class EventSubscription < EventSubscriptionAttributes
       has_many :audit_logs, KillBillClient::Model::AuditLog
-
-      create_alias :effective_date, :effective_dt
     end
   end
 end

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

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

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

@@ -39,7 +39,7 @@ module KillBillClient
       attribute :invoice_number
       attribute :balance
       attribute :account_id
-      attribute :external_bundle_keys
+      attribute :bundle_keys
       attribute :credits
       attribute :items
       attribute :is_parent_invoice

data/lib/killbill_client/models/invoice.rb

@@ -13,8 +13,6 @@ module KillBillClient
 
       has_custom_fields KILLBILL_API_INVOICES_PREFIX, :invoice_id
 
-      create_alias :bundle_keys, :external_bundle_keys
-
       class << self
         def find_by_id_or_number(id_or_number, with_items = true, audit = "NONE", options = {})
           get "#{KILLBILL_API_INVOICES_PREFIX}/#{id_or_number}",

data/lib/killbill_client/version.rb

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

data/spec/killbill_client/http_adapter_spec.rb

@@ -10,7 +10,7 @@ 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}}
+  let (:options) {{:read_timeout => 10000, :connection_timeout => 5000, :disable_ssl_verification => true}}
 
   it 'should send double-encoded uri' do
     contract_property = KillBillClient::Model::PluginPropertyAttributes.new
@@ -57,14 +57,16 @@ describe KillBillClient::API do
     expect(http_client.read_timeout).to eq(60)
     expect(http_client.open_timeout).to be_nil
     expect(http_client.use_ssl?).to be false
+    expect(http_client.verify_mode).to be_nil
   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)
+    http_client = http_adapter.send(:create_http_client, ssl_uri, options)
+    expect(http_client.read_timeout).to eq(options[:read_timeout] / 1000)
+    expect(http_client.open_timeout).to eq(options[:connection_timeout] / 1000)
     expect(http_client.use_ssl?).to be true
+    expect(http_client.verify_mode).to eq(OpenSSL::SSL::VERIFY_NONE)
   end
 
 end

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, :effective_dt
+    KillBillClient::Model::EventSubscription.create_alias :alias_date, :effective_date
 
     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.effective_dt).to eq("devaroop")
+    expect(evt.effective_date).to eq("devaroop")
     expect(evt.alias_date).to eq("devaroop")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement