killbill 8.2.0 → 8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29fee0970cdeaff406a2aee20c1c520e713dc94c
-  data.tar.gz: 7c5f710a8e850cd5605175cda4915e465600d9d8
+  metadata.gz: 0f1ccd70a55b23376aa218718b92c6039d67d2b7
+  data.tar.gz: 7bedb70d47746cfb35cb81cd6dfc26969f85b53d
 SHA512:
-  metadata.gz: 3e120adcb4df8eb458f03568d8ebdcc88f9896f03cea32a3b6bd57099cea244eafafcad5b4abb77b85a2931861a2d22ae3a3bd0504ab3cb60d218f17ae544b69
-  data.tar.gz: f234a09ec0ad9ebef215447ff62342c64a61afade91d379408ef4998b57ad7c534897fa040293f4e1847259aff8b73e7ce94094db711654dd850db32f57d4bf6
+  metadata.gz: b3f8588f85ac21c46f12b0f4ade6310ad3f582f58003df22ede10eb01093fcc0cd4e396e77ef5e9040c80146e1a7ac6f40772b8028c6ba0b5712c699c148c053
+  data.tar.gz: 326d4589c0ec928f646fcef67843472f002c97d51e05d89b0c1d74e02a927b4bcd4d34b7e3fec964871076db88204941054469f86550adbc1e5e8b90a078adb5

data/.travis.yml

@@ -6,9 +6,14 @@ cache:
   directories:
     - $HOME/.m2
 
+services:
+  - mysql
+  - postgresql
+
 before_script:
   - bundle exec jbundle install
   - mysql -uroot -e 'create database killbill_test;'
+  - psql -c 'create database killbill_test;' -U postgres
 
 notifications:
   email:
@@ -20,6 +25,7 @@ env:
   matrix:
     # Need MySQL 5.6 - see https://github.com/travis-ci/travis-ci/issues/1986
     #- AR_ADAPTER='mariadb' AR_USERNAME='root' AR_PASSWORD='' AR_DATABASE='killbill_test'
+    - AR_ADAPTER='postgresql' AR_USERNAME='postgres' AR_DATABASE='killbill_test'
     - AR_ADAPTER='sqlite3' AR_DATABASE='test.db'
 
 rvm:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill (8.2.0)
+    killbill (8.3.0)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
@@ -35,7 +35,7 @@ GEM
       activesupport (= 4.1.16)
       arel (~> 5.0.0)
     activerecord-bogacs (0.5.0)
-    activerecord-jdbc-adapter (1.3.20)
+    activerecord-jdbc-adapter (1.3.21)
       activerecord (>= 2.2)
     activesupport (4.1.16)
       i18n (~> 0.6, >= 0.6.9)
@@ -56,28 +56,29 @@ GEM
     diff-lcs (1.1.3)
     equalizer (0.0.11)
     erubis (2.7.0)
-    ethon (0.9.0)
+    ethon (0.9.1)
       ffi (>= 1.3.0)
     ffi (1.9.14-java)
     i18n (0.7.0)
     ice_nine (0.11.2)
-    jar-dependencies (0.3.4)
+    jar-dependencies (0.3.5)
     jbundler (0.9.3)
       bundler (~> 1.5)
       jar-dependencies (~> 0.3)
       maven-tools (~> 1.1)
       ruby-maven (~> 3.3, >= 3.3.8)
     jdbc-mariadb (1.1.9)
+    jdbc-postgres (9.4.1206)
     jdbc-sqlite3 (3.8.11.2)
     json (1.8.3-java)
     maven-tools (1.1.6)
       virtus (~> 1.0)
-    minitest (5.9.0)
+    minitest (5.9.1)
     monetize (1.1.0)
       money (~> 6.5.0)
     money (6.5.1)
       i18n (>= 0.6.4, <= 0.7.0)
-    nokogiri (1.6.8-java)
+    nokogiri (1.6.8.1-java)
     offsite_payments (2.1.0)
       actionpack (>= 3.2.20, < 5.0.0)
       active_utils (~> 3.0.0)
@@ -132,6 +133,7 @@ DEPENDENCIES
   activerecord-jdbc-adapter (~> 1.3)
   jbundler (~> 0.9.2)
   jdbc-mariadb (~> 1.1.8)
+  jdbc-postgres (~> 9.4)
   jdbc-sqlite3 (~> 3.7)
   killbill!
   monetize (~> 1.1.0)

data/Jarfile

@@ -1,12 +1,12 @@
-jar 'org.kill-bill.billing:killbill-api', '0.40'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.20'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.20'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.20'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.20'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.20'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.20'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.20'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.17.2'
-jar 'org.kill-bill.billing:killbill-util', '0.17.2'
+jar 'org.kill-bill.billing:killbill-api', '0.50'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.23'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.17.8'
+jar 'org.kill-bill.billing:killbill-util', '0.17.8'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/Jarfile.lock

@@ -4,61 +4,61 @@
 - joda-time:joda-time:jar:2.3
 - org.weakref:jmxutils:jar:1.18
 - commons-beanutils:commons-beanutils:jar:1.8.3
-- org.kill-bill.commons:killbill-clock:jar:0.19
+- org.kill-bill.billing:killbill-platform-api:jar:0.34
 - com.google.inject:guice:jar:3.0
 - org.osgi:org.osgi.core:jar:5.0.0
 - com.fasterxml.jackson.core:jackson-databind:jar:2.4.5
-- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.20
-- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.20
+- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.23
 - com.samskivert:jmustache:jar:1.5
-- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.20
+- org.kill-bill.billing:killbill-util:jar:tests:0.17.8
+- org.kill-bill.commons:killbill-clock:jar:0.20
 - com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.5
-- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.20
+- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.34
+- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.23
 - org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
 - com.h2database:h2:jar:1.4.186
-- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.31
 - com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.5
-- org.kill-bill.commons:killbill-queue:jar:0.19
-- org.kill-bill.billing:killbill-util:jar:tests:0.17.2
 - javax.activation:activation:jar:1.1
+- org.kill-bill.billing:killbill-internal-api:jar:0.17.8
 - org.javassist:javassist:jar:3.19.0-GA
 - org.skife.config:config-magic:jar:0.14
-- org.kill-bill.billing:killbill-util:jar:0.17.2
-- org.mockito:mockito-all:jar:1.10.19
 - org.apache.commons:commons-email:jar:1.2
+- org.mockito:mockito-all:jar:1.10.19
 - antlr:antlr:jar:2.7.7
 - aopalliance:aopalliance:jar:1.0
-- org.kill-bill.commons:killbill-concurrent:jar:0.19
 - com.zaxxer:HikariCP-java6:jar:2.3.7
 - org.slf4j:slf4j-api:jar:1.7.21
 - com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
 - org.antlr:stringtemplate:jar:3.2.1
-- org.kill-bill.commons:killbill-jdbi:jar:0.19
-- org.kill-bill.billing:killbill-platform-api:jar:0.31
 - org.slf4j:jcl-over-slf4j:jar:1.7.21
 - javax.mail:mail:jar:1.4.1
-- org.kill-bill.billing:killbill-api:jar:0.40
 - io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
-- org.kill-bill.commons:killbill-xmlloader:jar:0.19
-- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.20
-- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.20
+- org.kill-bill.billing:killbill-platform-osgi:jar:0.34
 - org.jdbi:jdbi:jar:2.62
 - com.fasterxml.jackson.core:jackson-core:jar:2.4.5
 - org.apache.felix:org.apache.felix.framework:jar:4.4.1
 - org.joda:joda-money:jar:0.9
+- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.23
+- org.kill-bill.billing:killbill-util:jar:0.17.8
 - org.apache.shiro:shiro-core:jar:1.2.3
-- org.kill-bill.billing:killbill-internal-api:jar:0.17.2
+- org.kill-bill.billing:killbill-platform-base:jar:0.34
+- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.23
+- org.kill-bill.commons:killbill-jdbi:jar:0.20
 - com.google.guava:guava:jar:r09
-- org.kill-bill.billing:killbill-platform-base:jar:0.31
-- org.kill-bill.billing:killbill-platform-osgi:jar:0.31
+- org.kill-bill.commons:killbill-queue:jar:0.20
 - org.osgi:org.osgi.compendium:jar:5.0.0
+- org.kill-bill.commons:killbill-xmlloader:jar:0.20
 - javax.servlet:javax.servlet-api:jar:3.1.0
 - org.apache.shiro:shiro-ehcache:jar:1.2.3
 - javax.inject:javax.inject:jar:1
+- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.23
+- org.kill-bill.billing:killbill-api:jar:0.50
 - com.google.inject.extensions:guice-multibindings:jar:3.0
-- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.20
 - net.sf.ehcache:ehcache:jar:2.9.1
-- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.19
+- org.kill-bill.commons:killbill-locker:jar:0.20
+- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.20
 - org.apache.shiro:shiro-guice:jar:1.2.3
-- org.kill-bill.commons:killbill-locker:jar:0.19
 - com.google.code.findbugs:annotations:jar:3.0.0
+- org.kill-bill.commons:killbill-concurrent:jar:0.20
+- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.23
+- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.23

data/NEWS

@@ -1,3 +1,6 @@
+8.3.0
+    Initial release for Kill Bill 0.18.x
+
 8.2.0
     Updates for 0.17.2
 
@@ -10,6 +13,10 @@
 8.0.0
     Initial release for Kill Bill 0.17.x
 
+7.0.6
+    ActiveMerchant: pass currency to auth_reversal call
+    Improve PostgreSQL support
+
 7.0.5
     Fix regression when loading Rake tasks
 

data/README.md

@@ -1,18 +1,3 @@
-[![Build Status](https://travis-ci.org/killbill/killbill-plugin-framework-ruby.png)](https://travis-ci.org/killbill/killbill-plugin-framework-ruby)
-[![Code Climate](https://codeclimate.com/github/killbill/killbill-plugin-framework-ruby.png)](https://codeclimate.com/github/killbill/killbill-plugin-framework-ruby)
-
-
-Kill Bill compatibility
------------------------
-
-| Plugin Framework version | Kill Bill version  |
-| -----------------------: | ----------------:  |
-| 7.x.y                    | 0.16.z             |
-| 8.x.y                    | 0.18.z (and 0.17.x)|
-
-
-
-
 killbill-plugin-framework-ruby
 ==============================
 
@@ -28,6 +13,15 @@ There are various types of plugins one can write for Killbill:
 
 All plugin types can interact with Kill Bill directly via APIs and expose HTTP endpoints.
 
+Kill Bill compatibility
+-----------------------
+
+| OSS parent version | Kill Bill version |
+| -----------------: | ----------------: |
+| 7.x.y              | 0.16.z            |
+| 8.3.y              | 0.18.z            |
+
+
 How to write a Notification plugin
 ----------------------------------
 
@@ -261,4 +255,5 @@ To change the database driver:
 
 ```bash
 AR_ADAPTER=mariadb AR_USERNAME=root AR_PASSWORD=root AR_DATABASE=kbtest rake
+AR_ADAPTER=postgresql AR_DATABASE=kbtest rake
 ```

data/generators/active_merchant/templates/spec/spec_helper.rb

@@ -12,11 +12,15 @@ RSpec.configure do |config|
   config.formatter = 'documentation'
 end
 
-require 'active_record'
-ActiveRecord::Base.establish_connection(
-    :adapter => 'sqlite3',
-    :database => 'test.db'
-)
+require defined?(JRUBY_VERSION) ? 'arjdbc' : 'active_record'
+db_config = {
+    :adapter => ENV['AR_ADAPTER'] || 'sqlite3',
+    :database => ENV['AR_DATABASE'] || 'test.db',
+}
+db_config[:username] = ENV['AR_USERNAME'] if ENV['AR_USERNAME']
+db_config[:password] = ENV['AR_PASSWORD'] if ENV['AR_PASSWORD']
+ActiveRecord::Base.establish_connection(db_config)
+
 # For debugging
 #ActiveRecord::Base.logger = Logger.new(STDOUT)
 # Create the schema

data/killbill.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     # See https://github.com/killbill/killbill-plugin-framework-ruby/issues/33
     s.add_development_dependency 'activerecord-jdbc-adapter', '~> 1.3'
     s.add_development_dependency 'jdbc-mariadb', '~> 1.1.8'
+    s.add_development_dependency 'jdbc-postgres', '~> 9.4'
   end
   s.add_development_dependency 'actionpack', '~> 4.1.0'
   s.add_development_dependency 'actionview', '~> 4.1.0'

data/lib/killbill/gen/api/account.rb

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.account.api.Account
 
-        attr_accessor :id, :created_date, :updated_date, :external_key, :currency, :time_zone, :parent_account_id, :is_payment_delegated_to_parent, :fixed_offset_time_zone, :reference_time, :name, :first_name_length, :email, :bill_cycle_day_local, :payment_method_id, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices
+        attr_accessor :id, :created_date, :updated_date, :external_key, :currency, :time_zone, :parent_account_id, :is_payment_delegated_to_parent, :fixed_offset_time_zone, :reference_time, :name, :first_name_length, :email, :bill_cycle_day_local, :payment_method_id, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices, :notes
 
         def initialize()
         end
@@ -130,6 +130,9 @@ module Killbill
 
           # conversion for is_notified_for_invoices [type = java.lang.Boolean]
           @is_notified_for_invoices = @is_notified_for_invoices.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_notified_for_invoices)
+
+          # conversion for notes [type = java.lang.String]
+          @notes = @notes.to_s unless @notes.nil?
           self
         end
 
@@ -254,6 +257,9 @@ module Killbill
             tmp_bool = (@is_notified_for_invoices.java_kind_of? java.lang.Boolean) ? @is_notified_for_invoices.boolean_value : @is_notified_for_invoices
             @is_notified_for_invoices = tmp_bool ? true : false
           end
+
+          # conversion for notes [type = java.lang.String]
+          @notes = j_obj.notes
           self
         end
 

data/lib/killbill/gen/api/account_data.rb

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.account.api.AccountData
 
-        attr_accessor :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices, :parent_account_id, :is_payment_delegated_to_parent
+        attr_accessor :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices, :parent_account_id, :is_payment_delegated_to_parent, :notes
 
         def initialize()
         end
@@ -104,6 +104,9 @@ module Killbill
 
           # conversion for is_payment_delegated_to_parent [type = java.lang.Boolean]
           @is_payment_delegated_to_parent = @is_payment_delegated_to_parent.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_payment_delegated_to_parent)
+
+          # conversion for notes [type = java.lang.String]
+          @notes = @notes.to_s unless @notes.nil?
           self
         end
 
@@ -194,6 +197,9 @@ module Killbill
             tmp_bool = (@is_payment_delegated_to_parent.java_kind_of? java.lang.Boolean) ? @is_payment_delegated_to_parent.boolean_value : @is_payment_delegated_to_parent
             @is_payment_delegated_to_parent = tmp_bool ? true : false
           end
+
+          # conversion for notes [type = java.lang.String]
+          @notes = j_obj.notes
           self
         end
 

data/lib/killbill/gen/api/base_entitlement_with_add_ons_specifier.rb

@@ -0,0 +1,117 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, Inc.                                            #
+#                   Copyright 2014 The Billing Project, LLC                                 #
+#                                                                                           #
+#      The Billing Project licenses this file to you under the Apache License, version 2.0  #
+#      (the "License"); you may not use this file except in compliance with the             #
+#      License.  You may obtain a copy of the License at:                                   #
+#                                                                                           #
+#          http://www.apache.org/licenses/LICENSE-2.0                                       #
+#                                                                                           #
+#      Unless required by applicable law or agreed to in writing, software                  #
+#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
+#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
+#      License for the specific language governing permissions and limitations              #
+#      under the License.                                                                   #
+#                                                                                           #
+#############################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module Killbill
+  module Plugin
+    module Model
+
+      java_package 'org.killbill.billing.entitlement.api'
+      class BaseEntitlementWithAddOnsSpecifier
+
+        include org.killbill.billing.entitlement.api.BaseEntitlementWithAddOnsSpecifier
+
+        attr_accessor :bundle_id, :external_key, :entitlement_specifier, :entitlement_effective_date, :billing_effective_date, :is_migrated
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for bundle_id [type = java.util.UUID]
+          @bundle_id = java.util.UUID.fromString(@bundle_id.to_s) unless @bundle_id.nil?
+
+          # conversion for external_key [type = java.lang.String]
+          @external_key = @external_key.to_s unless @external_key.nil?
+
+          # conversion for entitlement_specifier [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (@entitlement_specifier || []).each do |m|
+            # conversion for m [type = org.killbill.billing.entitlement.api.EntitlementSpecifier]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @entitlement_specifier = tmp
+
+          # conversion for entitlement_effective_date [type = org.joda.time.LocalDate]
+          if !@entitlement_effective_date.nil?
+            @entitlement_effective_date = Java::org.joda.time.LocalDate.parse(@entitlement_effective_date.to_s)
+          end
+
+          # conversion for billing_effective_date [type = org.joda.time.LocalDate]
+          if !@billing_effective_date.nil?
+            @billing_effective_date = Java::org.joda.time.LocalDate.parse(@billing_effective_date.to_s)
+          end
+
+          # conversion for is_migrated [type = boolean]
+          @is_migrated = @is_migrated.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_migrated)
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for bundle_id [type = java.util.UUID]
+          @bundle_id = j_obj.bundle_id
+          @bundle_id = @bundle_id.nil? ? nil : @bundle_id.to_s
+
+          # conversion for external_key [type = java.lang.String]
+          @external_key = j_obj.external_key
+
+          # conversion for entitlement_specifier [type = java.lang.Iterable]
+          @entitlement_specifier = j_obj.entitlement_specifier
+          tmp = []
+          (@entitlement_specifier.nil? ? [] : @entitlement_specifier.iterator).each do |m|
+            # conversion for m [type = org.killbill.billing.entitlement.api.EntitlementSpecifier]
+            m = Killbill::Plugin::Model::EntitlementSpecifier.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @entitlement_specifier = tmp
+
+          # conversion for entitlement_effective_date [type = org.joda.time.LocalDate]
+          @entitlement_effective_date = j_obj.entitlement_effective_date
+          if !@entitlement_effective_date.nil?
+            @entitlement_effective_date = @entitlement_effective_date.to_s
+          end
+
+          # conversion for billing_effective_date [type = org.joda.time.LocalDate]
+          @billing_effective_date = j_obj.billing_effective_date
+          if !@billing_effective_date.nil?
+            @billing_effective_date = @billing_effective_date.to_s
+          end
+
+          # conversion for is_migrated [type = boolean]
+          @is_migrated = j_obj.is_migrated
+          if @is_migrated.nil?
+            @is_migrated = false
+          else
+            tmp_bool = (@is_migrated.java_kind_of? java.lang.Boolean) ? @is_migrated.boolean_value : @is_migrated
+            @is_migrated = tmp_bool ? true : false
+          end
+          self
+        end
+
+      end
+    end
+  end
+end