killbill-client 1.11.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f34cbba28821aa7e8fdee247bd18b91f1934b13b
-  data.tar.gz: 09ef75444ac99a4bcecdc75bdad1a763ded0e27a
+  metadata.gz: e6023e6dc3700baf51b54eb966013c0097df4bb6
+  data.tar.gz: 273deea1e796f0f63b06d1d911e58494e4d51b7f
 SHA512:
-  metadata.gz: a963240b1466170b108ba01fc8503c03b35b8c564bac405e35b329ea1a37d8803a3a0a72ddfeb0c25bc94de04438369bcca6dd4379cdfe51dd37e9aa4d236853
-  data.tar.gz: 3b07fb964a98abf2bf20c22320567fd9cc426042db68adb2c69cf4162d53dfd313670a7b6d81fc8acddb58f8584084645100b63b18e2ddde9dfa95d4b82c5098
+  metadata.gz: 9a484124e71caf99ea3afb36f83cc8ccbd6c75d5f94f67646c9b6fb0fd4bc817257b99a47e3e19e735d758aed9440ecd3f60962e0810a0f49288d471faa58bce
+  data.tar.gz: 9934d9680adeed6c8d8c7777e908da473de810f3f9721951ee5201ad226abde89dd5c22de62629099d059e51cf7ae6f8657c057e656e6ef07183df8bf63908d3

data/.travis-install-dependencies.sh

@@ -0,0 +1,89 @@
+#!/usr/bin/env sh
+
+travis_retry() {
+  local result=0
+  local count=1
+  while [ $count -le 3 ]; do
+    [ $result -ne 0 ] && {
+      echo -e "\n${ANSI_RED}The command \"$@\" failed. Retrying, $count of 3.${ANSI_RESET}\n" >&2
+    }
+    "$@" && { result=0 && break; } || result=$?
+    count=$(($count + 1))
+    sleep 1
+  done
+  [ $count -gt 3 ] && {
+    echo -e "\n${ANSI_RED}The command \"$@\" failed 3 times.${ANSI_RESET}\n" >&2
+  }
+  return $result
+}
+
+sudo sysctl -w net.ipv4.tcp_fin_timeout=15
+sudo sysctl -w net.ipv4.tcp_tw_reuse=1
+
+if [ "$DB_ADAPTER" = 'mysql2' ] || [ "$DB_ADAPTER" = 'mariadb' ]; then
+  mysql -u $DB_USER -e 'create database killbill;'
+  curl 'http://docs.killbill.io/0.18/ddl.sql' | mysql -u $DB_USER killbill
+elif [ "$DB_ADAPTER" = 'postgresql' ]; then
+  psql -U $DB_USER -c 'create database killbill;'
+  curl 'https://raw.githubusercontent.com/killbill/killbill/master/util/src/main/resources/org/killbill/billing/util/ddl-postgresql.sql' | psql -U $DB_USER killbill
+  curl 'https://raw.githubusercontent.com/killbill/killbill/master/util/src/main/resources/org/killbill/billing/util/ddl-postgresql.sql' | psql -U $DB_USER kaui_test
+  curl 'http://docs.killbill.io/0.18/ddl.sql' | psql -U $DB_USER killbill
+fi
+
+if $(ruby -e'require "java"'); then
+  # Somehow missing on JRuby-9
+  gem install bundler
+  bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+else
+  bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+fi
+
+travis_retry curl -L -O https://search.maven.org/remotecontent?filepath=org/kill-bill/billing/installer/kpm/0.6.0/kpm-0.6.0-linux-x86_64.tar.gz
+tar zxf kpm-0.6.0-linux-x86_64.tar.gz
+kpm-0.6.0-linux-x86_64/kpm install
+
+if [ "$DB_ADAPTER" = 'mysql2' ] || [ "$DB_ADAPTER" = 'mariadb' ]; then
+  cat<<EOS >> conf/catalina.properties
+org.killbill.dao.url=jdbc:mysql://127.0.0.1:$DB_PORT/killbill
+org.killbill.billing.osgi.dao.url=jdbc:mysql://127.0.0.1:$DB_PORT/killbill
+EOS
+elif [ "$DB_ADAPTER" = 'postgresql' ]; then
+  cat<<EOS >> conf/catalina.properties
+org.killbill.dao.url=jdbc:postgresql://127.0.0.1:$DB_PORT/killbill
+org.killbill.billing.osgi.dao.url=jdbc:postgresql://127.0.0.1:$DB_PORT/killbill
+EOS
+fi
+
+cat<<EOS >> conf/catalina.properties
+org.killbill.dao.user=$DB_USER
+org.killbill.dao.password=
+org.killbill.billing.osgi.dao.user=$DB_USER
+org.killbill.billing.osgi.dao.password=
+org.killbill.catalog.uri=SpyCarAdvanced.xml
+org.killbill.server.test.mode=true
+EOS
+
+./bin/catalina.sh start
+
+TIME_LIMIT=$(( $(date +%s) + 120 ))
+RET=0
+while [ $RET != 201 -a $(date +%s) -lt $TIME_LIMIT ] ; do
+  RET=$(curl -s \
+             -o /dev/null \
+             -w "%{http_code}" \
+             -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?useGlobalDefault=true")
+  tail -50 logs/catalina.out
+  sleep 5
+done
+
+# For Travis debugging
+echo "*** conf/catalina.properties"
+cat conf/catalina.properties
+
+echo "*** logs/catalina.out"
+tail -50 logs/catalina.out

data/.travis.yml

@@ -3,20 +3,19 @@ language: ruby
 sudo: required
 cache: bundler
 
+services:
+ - mysql
+
 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"
+  - jdk_switcher use openjdk8
+  - ./.travis-install-dependencies.sh
 
 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'
+script: 'bundle exec rake test:spec test:remote:spec'
 
 notifications:
   email:
@@ -24,7 +23,7 @@ notifications:
 
 env:
   global:
-    - JRUBY_OPTS='--2.0 -J-Xmx1024M'
+    - DB_ADAPTER=mariadb DB_USER='root' DB_PORT=3306 JRUBY_OPTS='-J-Xmx1024m --debug -J-Djava.security.egd=file:/dev/./urandom'
 
 matrix:
   include:
@@ -32,16 +31,17 @@ matrix:
     - rvm: 1.8.7
     - rvm: 1.9.3
     - rvm: 2.2.0
+    - rvm: 2.4.2
     - 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
+    - rvm: 1.8.7
+    - rvm: 1.9.3
+    - rvm: 2.2.0
+    - rvm: jruby-1.7.26
   fast_finish: true

data/killbill_client.gemspec

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

data/lib/killbill_client.rb

@@ -123,4 +123,13 @@ rescue LoadError, NoMethodError
   end
 end
 
+# URI::DEFAULT_PARSER is NOT compatible with ree 1.8.3
+module URI
+  module DEFAULT_PARSER
+    def self.escape(*args)
+      URI.escape(*args)
+    end
+  end
+end unless defined? URI::DEFAULT_PARSER
+
 require 'rails/killbill_client' if defined? Rails::Railtie

data/lib/killbill_client/models/helpers/custom_field_helper.rb

@@ -46,7 +46,7 @@ module KillBillClient
             comment = args[3]
             options = args[4] || {}
 
-            custom_fields_param = custom_fields.is_a?(Enumerable) ? custom_fields.join(",") : custom_fields
+            custom_fields_param = custom_fields.respond_to?(:join) ? custom_fields.join(",") : custom_fields
             self.class.delete "#{url_prefix}/#{send(id_alias)}/customFields",
                               {},
                               {

data/lib/killbill_client/models/invoice_payment.rb

@@ -1,12 +1,17 @@
 module KillBillClient
   module Model
     class InvoicePayment < InvoicePaymentAttributes
+
+      include KillBillClient::Model::CustomFieldHelper
+
       KILLBILL_API_INVOICE_PAYMENTS_PREFIX = "#{KILLBILL_API_PREFIX}/invoicePayments"
 
       has_many :transactions, KillBillClient::Model::Transaction
       has_many :payment_attempts, KillBillClient::Model::PaymentAttemptAttributes
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
+      has_custom_fields KILLBILL_API_INVOICE_PAYMENTS_PREFIX, :payment_id
+
       class << self
         def find_by_id(payment_id, with_plugin_info = false, with_attempts = false, options = {})
           get "#{KILLBILL_API_INVOICE_PAYMENTS_PREFIX}/#{payment_id}",

data/lib/killbill_client/models/subscription.rb

@@ -2,6 +2,7 @@ module KillBillClient
   module Model
     class Subscription < SubscriptionAttributes
 
+      include KillBillClient::Model::TagHelper
       include KillBillClient::Model::CustomFieldHelper
 
       KILLBILL_API_ENTITLEMENT_PREFIX = "#{KILLBILL_API_PREFIX}/subscriptions"
@@ -10,6 +11,7 @@ module KillBillClient
       has_many :price_overrides, KillBillClient::Model::PhasePriceOverrideAttributes
 
       has_custom_fields KILLBILL_API_ENTITLEMENT_PREFIX, :subscription_id
+      has_tags KILLBILL_API_ENTITLEMENT_PREFIX, :subscription_id
 
       class << self
         def find_by_id(subscription_id, options = {})

data/lib/killbill_client/version.rb

@@ -1,8 +1,8 @@
 module KillBillClient
   module Version
     MAJOR = 1
-    MINOR = 11
-    PATCH = 0
+    MINOR = 12
+    PATCH = 1
     PRE = nil
 
     VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.').freeze

data/spec/killbill_client/http_adapter_spec.rb

@@ -55,7 +55,6 @@ describe KillBillClient::API 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
     expect(http_client.verify_mode).to be_nil
   end

data/spec/killbill_client/remote/model_spec.rb

@@ -150,11 +150,11 @@ describe KillBillClient::Model do
     # Check the account balance (need to wait a bit for the payment to happen)
     begin
       retries ||= 0
-      sleep(0.1) if retries > 0
+      sleep(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
+      if (retries += 1) < 6
         retry
       else
         raise e
@@ -218,6 +218,19 @@ describe KillBillClient::Model do
     expect(payments.size).to eq(1)
     expect(payments.first.account_id).to eq(account.account_id)
 
+    # Add/Remove an invoice payment custom field
+    expect(invoice_payment.custom_fields.size).to eq(0)
+    custom_field = KillBillClient::Model::CustomField.new
+    custom_field.name = Time.now.to_i.to_s
+    custom_field.value = Time.now.to_i.to_s
+    invoice_payment.add_custom_field(custom_field, 'KillBill Spec test')
+    custom_fields = invoice_payment.custom_fields
+    expect(custom_fields.size).to eq(1)
+    expect(custom_fields.first.name).to eq(custom_field.name)
+    expect(custom_fields.first.value).to eq(custom_field.value)
+    invoice_payment.remove_custom_field(custom_fields.first.custom_field_id, 'KillBill Spec test')
+    expect(invoice_payment.custom_fields.size).to eq(0)
+
     # Check the account balance
     account = KillBillClient::Model::Account.find_by_id account.account_id, true
     expect(account.account_balance).to eq(0)
@@ -291,7 +304,7 @@ describe KillBillClient::Model do
     bundles = KillBillClient::Model::Bundle.find_all_by_account_id_and_external_key(account.account_id, bundle.external_key)
     expect(bundles.size).to eq(1)
     expect(bundles[0]).to eq(bundle)
-    
+
     # Try to export it
     export = KillBillClient::Model::Export.find_by_account_id(account.account_id, 'KillBill Spec test')
     expect(export).to include(account.account_id)
@@ -316,7 +329,7 @@ describe KillBillClient::Model do
   end
 
   it 'should manipulate tenants', :integration => true  do
-    api_key = Time.now.to_i.to_s + Random.rand(100).to_s
+    api_key = Time.now.to_i.to_s + rand(100).to_s
     api_secret = 'S4cr3333333t!!!!!!lolz'
 
     tenant = KillBillClient::Model::Tenant.new

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ RSpec.configure do |config|
 
   config.before(:each, :integration => true) do
     # Setup a tenant for that test
-    KillBillClient.api_key = Time.now.to_i.to_s + Random.rand(100).to_s
+    KillBillClient.api_key = Time.now.to_i.to_s + rand(100).to_s
     KillBillClient.api_secret = 'S4cr3333333t!!!!!!lolz'
 
     tenant = KillBillClient::Model::Tenant.new

metadata

@@ -1,36 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Killbill core team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  name: json
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,9 +20,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 11.0.0
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -51,14 +31,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 11.0.0
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -71,6 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis-install-dependencies.sh"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -213,7 +194,7 @@ homepage: http://www.killbilling.org
 licenses:
 - Apache License (2.0)
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "--exclude"
 - "."
@@ -230,9 +211,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.13
+signing_key: 
 specification_version: 4
 summary: Kill Bill client library.
 test_files: []