killbill-currency-plugin 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49b458ed5c0f8a753d98e70478c8cb415100f749
-  data.tar.gz: 7f86e2672de8c4ea09e426e2e290f1a02c4284bd
+  metadata.gz: 9df831dd4b01fe8ed300e5277f63cdf08c5f736d
+  data.tar.gz: 4521c1e9beaf9ea9728297aa59f58bf6260c87c7
 SHA512:
-  metadata.gz: a54606535344490ab2aa4a8be6db5f792e0bb217588aba8333c2dba70f55d496e60a5269f17f639d244742af7cf6595a64042ec926e8646ae93a934ddbb51e4e
-  data.tar.gz: 5be835cec5fb0212ed13339dc0fa1ddbb7262322c9bb0eb2a96409fc5de6d2a9600687157abee6e9679ad74a13ca9a4f9b69f54e11ef7b8fca99c0aa5b6881c5
+  metadata.gz: e82381cfc918a28f913899c0f9e3f5da0dcc1a6a6a032ddddbdff03fb1cde146770fdf6a26ce9496f650eb3ccc7dcd18d4bde264154b96f946e6e636b5817b32
+  data.tar.gz: d40da42cf00e4de6f3594ef7b72482fa01be743dd986bdbdcf3af2041c3014f2143a7e2ad50d9f8f2427cd45214bb0949a4682a6a687b0143ed537f1782f5815

data/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
 gemspec
+#gem 'killbill', :github => 'killbill/killbill-plugin-framework-ruby'

data/Gemfile.lock

@@ -1,26 +1,26 @@
 PATH
   remote: .
   specs:
-    killbill-currency-plugin (2.0.0)
+    killbill-currency-plugin (3.0.0)
       activerecord (~> 4.1.0)
       activerecord-bogacs (~> 0.3)
       activerecord-jdbc-adapter (~> 1.3)
-      killbill (~> 7.0)
+      killbill (~> 8.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.14)
-      activesupport (= 4.1.14)
+    activemodel (4.1.16)
+      activesupport (= 4.1.16)
       builder (~> 3.1)
-    activerecord (4.1.14)
-      activemodel (= 4.1.14)
-      activesupport (= 4.1.14)
+    activerecord (4.1.16)
+      activemodel (= 4.1.16)
+      activesupport (= 4.1.16)
       arel (~> 5.0.0)
-    activerecord-bogacs (0.4.1)
-    activerecord-jdbc-adapter (1.3.19)
+    activerecord-bogacs (0.5.0)
+    activerecord-jdbc-adapter (1.3.21)
       activerecord (>= 2.2)
-    activesupport (4.1.14)
+    activesupport (4.1.16)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -38,9 +38,9 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.3)
     equalizer (0.0.11)
-    ethon (0.8.0)
+    ethon (0.9.1)
       ffi (>= 1.3.0)
-    ffi (1.9.10-java)
+    ffi (1.9.14-java)
     i18n (0.7.0)
     ice_nine (0.11.1)
     jar-dependencies (0.3.1)
@@ -52,15 +52,15 @@ GEM
     jdbc-mariadb (1.2.3)
     jdbc-sqlite3 (3.8.11.2)
     json (1.8.3-java)
-    killbill (7.0.0)
+    killbill (8.3.1)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
       tzinfo (~> 1.2.0)
     maven-tools (1.0.13)
       virtus (~> 1.0)
-    minitest (5.8.3)
-    rack (1.6.4)
+    minitest (5.9.1)
+    rack (1.6.5)
     rack-protection (1.5.3)
       rack
     rake (10.4.2)
@@ -103,4 +103,4 @@ DEPENDENCIES
   rspec (~> 2.12.0)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/Jarfile

@@ -1,11 +1,12 @@
-jar 'org.kill-bill.billing:killbill-api', '0.32'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.18'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.15.10'
+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.18.0'
+jar 'org.kill-bill.billing:killbill-util', '0.18.0'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/Jarfile.lock

@@ -1,61 +1,64 @@
 ---
 :runtime:
 - io.dropwizard.metrics:metrics-core:jar:3.1.1
-- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.18
-- com.fasterxml.jackson.core:jackson-core:jar:2.4.3
 - joda-time:joda-time:jar:2.3
 - org.weakref:jmxutils:jar:1.18
-- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.18
 - commons-beanutils:commons-beanutils:jar:1.8.3
-- org.kill-bill.billing:killbill-internal-api:jar:0.15.10
-- org.kill-bill.commons:killbill-xmlloader:jar:0.11
-- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.18
 - com.google.inject:guice:jar:3.0
 - org.osgi:org.osgi.core:jar:5.0.0
-- org.slf4j:slf4j-api:jar:1.7.12
+- com.fasterxml.jackson.core:jackson-databind:jar:2.4.5
+- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.23
+- org.kill-bill.billing:killbill-platform-api:jar:0.36.1
 - com.samskivert:jmustache:jar:1.5
-- org.kill-bill.billing:killbill-util:jar:tests:0.15.10
-- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.18
+- org.kill-bill.commons:killbill-clock:jar:0.20
+- org.kill-bill.billing:killbill-util:jar:0.18.0
+- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.5
+- 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
+- com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.5
 - javax.activation:activation:jar:1.1
+- org.javassist:javassist:jar:3.19.0-GA
 - org.skife.config:config-magic:jar:0.14
-- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
-- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.18
 - 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
+- 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-clock:jar:0.11
+- org.slf4j:jcl-over-slf4j:jar:1.7.21
 - javax.mail:mail:jar:1.4.1
-- org.kill-bill.billing:killbill-platform-base:jar:0.15
 - io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
-- org.slf4j:jcl-over-slf4j:jar:1.7.12
 - org.jdbi:jdbi:jar:2.62
-- org.kill-bill.billing:killbill-platform-api:jar:0.15
-- org.kill-bill.billing:killbill-platform-osgi:jar:0.15
+- 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.commons:killbill-jdbi:jar:0.11
-- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.11
+- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.23
 - org.apache.shiro:shiro-core:jar:1.2.3
-- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.15
-- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.18
-- com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
+- org.kill-bill.billing:killbill-internal-api:jar:0.18.0
+- org.kill-bill.billing:killbill-util:jar:tests:0.18.0
+- 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.commons:killbill-locker:jar:0.11
+- org.kill-bill.commons:killbill-queue:jar:0.20
 - org.osgi:org.osgi.compendium:jar:5.0.0
-- org.kill-bill.commons:killbill-queue:jar:0.11
-- org.kill-bill.commons:killbill-concurrent:jar:0.11
+- org.kill-bill.commons:killbill-xmlloader:jar:0.20
 - javax.servlet:javax.servlet-api:jar:3.1.0
+- org.kill-bill.billing:killbill-platform-osgi:jar:0.36.1
+- org.kill-bill.billing:killbill-platform-base:jar:0.36.1
 - org.apache.shiro:shiro-ehcache:jar:1.2.3
 - javax.inject:javax.inject:jar:1
-- com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.3
+- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.23
+- org.kill-bill.billing:killbill-api:jar:0.50
+- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.36.1
 - com.google.inject.extensions:guice-multibindings:jar:3.0
 - net.sf.ehcache:ehcache:jar:2.9.1
-- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.18
-- org.kill-bill.billing:killbill-api:jar:0.32
+- 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
 - 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/README.md

@@ -11,3 +11,4 @@ Kill Bill compatibility
 | Plugin version | Kill Bill version |
 | -------------: | ----------------: |
 | 2.0.0          | 0.16.z            |
+| 3.0.0          | 0.18.z            |

data/VERSION

@@ -1 +1 @@
-2.0.0
+3.0.0

data/killbill-currency-plugin.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 7.0'
+  s.add_dependency 'killbill', '~> 8.0'
   s.add_dependency 'activerecord', '~> 4.1.0'
   if defined?(JRUBY_VERSION)
     s.add_dependency 'activerecord-bogacs', '~> 0.3'

data/lib/currency_plugin.rb

@@ -6,5 +6,4 @@ require 'yaml'
 
 require 'killbill'
 
-require 'currency_plugin/properties'
 require 'currency_plugin/api'

data/lib/currency_plugin/api.rb

@@ -9,32 +9,25 @@ module Killbill
   module CurrencyPlugin
     class DefaultPlugin < Killbill::Plugin::Currency
 
-
-      def self.initialize!(conf_dir=File.expand_path('../../', File.dirname(__FILE__)))
-
-        config_file = "#{conf_dir}/currency.yml"
-
-        @@config = Killbill::CurrencyPlugin::Properties.new(config_file)
-        @@config.parse!
-
-        if defined?(JRUBY_VERSION)
-          # See https://github.com/jruby/activerecord-jdbc-adapter/issues/302
-          require 'jdbc/mysql'
-          Jdbc::MySQL.load_driver(:require) if Jdbc::MySQL.respond_to?(:load_driver)
-        end
-
-        ActiveRecord::Base.establish_connection(@@config[:database])
+      def self.initialize!
+        require 'active_record'
+        require 'active_record/bogacs'
+        require 'arjdbc'
+
+        ::ActiveRecord::ConnectionAdapters::ConnectionHandler.connection_pool_class = ::ActiveRecord::Bogacs::FalsePool
+        db_config = {
+            :adapter              => :mysql,
+            # See KillbillActivator#KILLBILL_OSGI_JDBC_JNDI_NAME
+            :data_source          => Java::JavaxNaming::InitialContext.new.lookup('killbill/osgi/jdbc'),
+            # Since AR-JDBC 1.4, to disable session configuration
+            :configure_connection => false
+        }
+        ActiveRecord::Base.establish_connection(db_config)
       end
 
-      def initialize()
-        @raise_exception = false
-        super()
-      end
-
-
       def start_plugin
         super
-        DefaultPlugin.initialize! @conf_dir
+        DefaultPlugin.initialize!
       end
 
       # return DB connections to the Pool if required
@@ -60,7 +53,6 @@ module Killbill
       end
 
       def get_current_rates(base_currency, options = {})
-
         base_latest = Killbill::CurrencyPlugin::CurrencyUpdate.latest_base_currency(base_currency)
         if base_latest.nil? || base_latest.size == 0
           return []
@@ -70,7 +62,6 @@ module Killbill
       end
 
       def get_rates(base_currency, conversion_date, options = {})
-
         (Killbill::CurrencyPlugin::CurrencyUpdate.historical_base_currencies(base_currency) || []).each do |e|
           if Time.at(e.conversion_date) <= Time.at(conversion_date)
             return get_rates_for_currency_update(e.id, base_currency, e.conversion_date)

data/pom.xml

@@ -27,7 +27,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>killbill-currency-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.0</version>
+    <version>3.0.0</version>
     <name>killbill-currency-plugin</name>
     <description></description>
     <scm>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-currency-plugin
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -159,7 +159,6 @@ files:
 - lib/currency_plugin/api.rb
 - lib/currency_plugin/models/currency_rate.rb
 - lib/currency_plugin/models/currency_update.rb
-- lib/currency_plugin/properties.rb
 - pom.xml
 - release.sh
 - spec/currency_plugin/api_spec.rb
@@ -187,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.6
 signing_key:
 specification_version: 4
 summary: Default Currency Plugin.

data/lib/currency_plugin/properties.rb

@@ -1,24 +0,0 @@
-module Killbill::CurrencyPlugin
-  class Properties
-    def initialize(file = 'currency.yml')
-      @config_file = Pathname.new(file).expand_path
-    end
-
-    def parse!
-      raise "#{@config_file} is not a valid file" unless @config_file.file?
-      @config = YAML.load_file(@config_file.to_s)
-      validate!
-    end
-
-    def [](key)
-      @config[key]
-    end
-
-    private
-
-    def validate!
-      raise "Bad configuration for CurrencyPlugin plugin. Config is #{@config.inspect}" if @config.blank? ||
-                                                                                          @config[:database].blank?
-    end
-  end
-end