killbill 1.7.1 → 1.8.0

data/Jarfile

@@ -1,5 +1,6 @@
-jar 'com.ning.billing:killbill-api', '0.7.1'
-jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.5.0'
-jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.5.0'
-jar 'com.ning.billing:killbill-util:tests', '0.6.17'
+jar 'com.ning.billing:killbill-api', '0.7.2'
+jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.6.0'
+jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.6.0'
+jar 'com.ning.billing.plugin:killbill-plugin-api-currency', '0.6.0'
+jar 'com.ning.billing:killbill-util:tests', '0.7.0'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/NEWS

@@ -1,3 +1,6 @@
+1.8.0
+    Currency plugin support
+
 1.7.1
     Bug fix in enumerator_iterator
     Make log level adjustable

data/VERSION

@@ -1 +1 @@
-1.7.1
+1.8.0

data/gen_config/plugin_api.conf

@@ -1,6 +1,7 @@
 -i
 file:///PATH_TO_REPO/killbill-plugin-api/payment/src/main/java,
 file:///PATH_TO_REPO/killbill-plugin-api/notification/src/main/java,
+file:///PATH_TO_REPO/killbill-plugin-api/currency/src/main/java,
 file:///PATH_TO_REPO/killbill-api/src/main/java/
 -o
 /tmp/output
@@ -8,7 +9,8 @@ file:///PATH_TO_REPO/killbill-api/src/main/java/
 JRUBY_PLUGIN
 -q
 com.ning.billing.payment.plugin.api,
-com.ning.billing.notification.plugin.api
+com.ning.billing.notification.plugin.api,
+com.ning.billing.currency.plugin.api
 -m
 JRUBY_PLUGIN_API
 

data/lib/killbill/currency.rb

@@ -0,0 +1,32 @@
+require 'killbill/plugin'
+
+module Killbill
+  module Plugin
+    class Currency < PluginBase
+
+      class OperationUnsupportedError < NotImplementedError
+      end
+
+      def get_base_currencies(options = {})
+        raise OperationUnsupportedError
+      end
+
+      def get_latest_conversion_date(base_currency, options = {})
+        raise OperationUnsupportedError
+      end
+
+      def get_conversion_dates(base_currency, options = {})
+        raise OperationUnsupportedError
+      end
+
+      def get_current_rates(base_currency, options = {})
+        raise OperationUnsupportedError
+      end
+
+      def get_rates(base_currency, conversion_date, options = {})
+        raise OperationUnsupportedError
+      end
+
+    end
+  end
+end

data/lib/killbill/gen/plugin-api/currency_plugin_api.rb

@@ -0,0 +1,185 @@
+###################################################################################
+#                                                                                 #
+#                   Copyright 2010-2013 Ning, Inc.                                #
+#                                                                                 #
+#      Ning 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 Api
+
+      java_package 'com.ning.billing.currency.plugin.api'
+      class CurrencyPluginApi < JPlugin
+
+        include com.ning.billing.currency.plugin.api.CurrencyPluginApi
+
+        def initialize(real_class_name, services = {})
+          super(real_class_name, services)
+        end
+
+        java_signature 'Java::java.util.Set getBaseCurrencies()'
+        def get_base_currencies()
+        begin
+          res = @delegate_plugin.get_base_currencies()
+          # conversion for res [type = java.util.Set]
+          tmp = java.util.TreeSet.new
+          (res || []).each do |m|
+            # conversion for m [type = com.ning.billing.catalog.api.Currency]
+            m = Java::com.ning.billing.catalog.api.Currency.value_of("#{m.to_s}") unless m.nil?
+            tmp.add(m)
+          end
+          res = tmp
+          return res
+        rescue Exception => e
+          message = "Failure in get_base_currencies: #{e}"
+          unless e.backtrace.nil?
+            message = "#{message}\n#{e.backtrace.join("\n")}"
+          end
+          logger.warn message
+          raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("get_base_currencies failure", e.message)
+        ensure
+          @delegate_plugin.after_request
+        end
+      end
+
+      java_signature 'Java::org.joda.time.DateTime getLatestConversionDate(Java::com.ning.billing.catalog.api.Currency)'
+      def get_latest_conversion_date(baseCurrency)
+
+        # conversion for baseCurrency [type = com.ning.billing.catalog.api.Currency]
+        baseCurrency = baseCurrency.to_s.to_sym unless baseCurrency.nil?
+        begin
+          res = @delegate_plugin.get_latest_conversion_date(baseCurrency)
+          # conversion for res [type = org.joda.time.DateTime]
+          if !res.nil?
+            res =  (res.kind_of? Time) ? DateTime.parse(res.to_s) : res
+            res = Java::org.joda.time.DateTime.new(res.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+          return res
+        rescue Exception => e
+          message = "Failure in get_latest_conversion_date: #{e}"
+          unless e.backtrace.nil?
+            message = "#{message}\n#{e.backtrace.join("\n")}"
+          end
+          logger.warn message
+          raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("get_latest_conversion_date failure", e.message)
+        ensure
+          @delegate_plugin.after_request
+        end
+      end
+
+      java_signature 'Java::java.util.SortedSet getConversionDates(Java::com.ning.billing.catalog.api.Currency)'
+      def get_conversion_dates(baseCurrency)
+
+        # conversion for baseCurrency [type = com.ning.billing.catalog.api.Currency]
+        baseCurrency = baseCurrency.to_s.to_sym unless baseCurrency.nil?
+        begin
+          res = @delegate_plugin.get_conversion_dates(baseCurrency)
+          # conversion for res [type = java.util.SortedSet]
+          tmp = java.util.TreeSet.new
+          (res || []).each do |m|
+            # conversion for m [type = org.joda.time.DateTime]
+            if !m.nil?
+              m =  (m.kind_of? Time) ? DateTime.parse(m.to_s) : m
+              m = Java::org.joda.time.DateTime.new(m.to_s, Java::org.joda.time.DateTimeZone::UTC)
+            end
+            tmp.add(m)
+          end
+          res = tmp
+          return res
+        rescue Exception => e
+          message = "Failure in get_conversion_dates: #{e}"
+          unless e.backtrace.nil?
+            message = "#{message}\n#{e.backtrace.join("\n")}"
+          end
+          logger.warn message
+          raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("get_conversion_dates failure", e.message)
+        ensure
+          @delegate_plugin.after_request
+        end
+      end
+
+      java_signature 'Java::java.util.Set getCurrentRates(Java::com.ning.billing.catalog.api.Currency)'
+      def get_current_rates(baseCurrency)
+
+        # conversion for baseCurrency [type = com.ning.billing.catalog.api.Currency]
+        baseCurrency = baseCurrency.to_s.to_sym unless baseCurrency.nil?
+        begin
+          res = @delegate_plugin.get_current_rates(baseCurrency)
+          # conversion for res [type = java.util.Set]
+          tmp = java.util.TreeSet.new
+          (res || []).each do |m|
+            # conversion for m [type = com.ning.billing.currency.plugin.api.Rate]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          res = tmp
+          return res
+        rescue Exception => e
+          message = "Failure in get_current_rates: #{e}"
+          unless e.backtrace.nil?
+            message = "#{message}\n#{e.backtrace.join("\n")}"
+          end
+          logger.warn message
+          raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("get_current_rates failure", e.message)
+        ensure
+          @delegate_plugin.after_request
+        end
+      end
+
+      java_signature 'Java::java.util.Set getRates(Java::com.ning.billing.catalog.api.Currency, Java::org.joda.time.DateTime)'
+      def get_rates(baseCurrency, conversionDate)
+
+        # conversion for baseCurrency [type = com.ning.billing.catalog.api.Currency]
+        baseCurrency = baseCurrency.to_s.to_sym unless baseCurrency.nil?
+
+        # conversion for conversionDate [type = org.joda.time.DateTime]
+        if !conversionDate.nil?
+          fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time
+          str = fmt.print(conversionDate)
+          conversionDate = DateTime.iso8601(str)
+        end
+        begin
+          res = @delegate_plugin.get_rates(baseCurrency, conversionDate)
+          # conversion for res [type = java.util.Set]
+          tmp = java.util.TreeSet.new
+          (res || []).each do |m|
+            # conversion for m [type = com.ning.billing.currency.plugin.api.Rate]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          res = tmp
+          return res
+        rescue Exception => e
+          message = "Failure in get_rates: #{e}"
+          unless e.backtrace.nil?
+            message = "#{message}\n#{e.backtrace.join("\n")}"
+          end
+          logger.warn message
+          raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("get_rates failure", e.message)
+        ensure
+          @delegate_plugin.after_request
+        end
+      end
+    end
+  end
+end
+end

data/lib/killbill/gen/plugin-api/rate.rb

@@ -0,0 +1,88 @@
+###################################################################################
+#                                                                                 #
+#                   Copyright 2010-2013 Ning, Inc.                                #
+#                                                                                 #
+#      Ning 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 'com.ning.billing.currency.plugin.api'
+      class Rate
+
+        include com.ning.billing.currency.plugin.api.Rate
+
+        attr_accessor :base_currency, :currency, :value, :conversion_date
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for base_currency [type = com.ning.billing.catalog.api.Currency]
+          @base_currency = Java::com.ning.billing.catalog.api.Currency.value_of("#{@base_currency.to_s}") unless @base_currency.nil?
+
+          # conversion for currency [type = com.ning.billing.catalog.api.Currency]
+          @currency = Java::com.ning.billing.catalog.api.Currency.value_of("#{@currency.to_s}") unless @currency.nil?
+
+          # conversion for value [type = java.math.BigDecimal]
+          if @value.nil?
+            @value = java.math.BigDecimal::ZERO
+          else
+            @value = java.math.BigDecimal.new(@value.to_s)
+          end
+
+          # conversion for conversion_date [type = org.joda.time.DateTime]
+          if !@conversion_date.nil?
+            @conversion_date =  (@conversion_date.kind_of? Time) ? DateTime.parse(@conversion_date.to_s) : @conversion_date
+            @conversion_date = Java::org.joda.time.DateTime.new(@conversion_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for base_currency [type = com.ning.billing.catalog.api.Currency]
+          @base_currency = j_obj.base_currency
+          @base_currency = @base_currency.to_s.to_sym unless @base_currency.nil?
+
+          # conversion for currency [type = com.ning.billing.catalog.api.Currency]
+          @currency = j_obj.currency
+          @currency = @currency.to_s.to_sym unless @currency.nil?
+
+          # conversion for value [type = java.math.BigDecimal]
+          @value = j_obj.value
+          @value = @value.nil? ? 0 : BigDecimal.new(@value.to_s)
+
+          # conversion for conversion_date [type = org.joda.time.DateTime]
+          @conversion_date = j_obj.conversion_date
+          if !@conversion_date.nil?
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time
+            str = fmt.print(@conversion_date)
+            @conversion_date = DateTime.iso8601(str)
+          end
+          self
+        end
+
+      end
+    end
+  end
+end

data/lib/killbill/gen/plugin-api/require_gen.rb

@@ -28,5 +28,7 @@ require 'killbill/gen/plugin-api/payment_plugin_api'
 require 'killbill/gen/plugin-api/payment_plugin_api_exception'
 require 'killbill/gen/plugin-api/ext_bus_event'
 require 'killbill/gen/plugin-api/notification_plugin_api'
+require 'killbill/gen/plugin-api/currency_plugin_api'
+require 'killbill/gen/plugin-api/rate'
 require 'killbill/gen/plugin-api/payment_info_plugin'
 require 'killbill/gen/plugin-api/refund_info_plugin'

data/lib/killbill.rb

@@ -59,3 +59,4 @@ require 'killbill/gen/api/require_gen'
 require 'killbill/gen/plugin-api/require_gen'
 require 'killbill/notification'
 require 'killbill/payment'
+require 'killbill/currency'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
   prerelease:
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.4
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.4
     none: false
@@ -31,13 +31,13 @@ dependencies:
   name: tzinfo
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.37
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.37
     none: false
@@ -47,13 +47,13 @@ dependencies:
   name: jbundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.3
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.3
     none: false
@@ -63,13 +63,13 @@ dependencies:
   name: rack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
     none: false
@@ -79,13 +79,13 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
     none: false
@@ -95,13 +95,13 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
     none: false
@@ -113,8 +113,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Jarfile
 - NEWS
@@ -126,6 +126,7 @@ files:
 - killbill.gemspec
 - lib/killbill.rb
 - lib/killbill/creator.rb
+- lib/killbill/currency.rb
 - lib/killbill/gen/api/account.rb
 - lib/killbill/gen/api/account_api_exception.rb
 - lib/killbill/gen/api/account_data.rb
@@ -215,12 +216,14 @@ files:
 - lib/killbill/gen/api/tenant_user_api.rb
 - lib/killbill/gen/api/unit.rb
 - lib/killbill/gen/api/usage_user_api.rb
+- lib/killbill/gen/plugin-api/currency_plugin_api.rb
 - lib/killbill/gen/plugin-api/ext_bus_event.rb
 - lib/killbill/gen/plugin-api/notification_plugin_api.rb
 - lib/killbill/gen/plugin-api/payment_info_plugin.rb
 - lib/killbill/gen/plugin-api/payment_method_info_plugin.rb
 - lib/killbill/gen/plugin-api/payment_plugin_api.rb
 - lib/killbill/gen/plugin-api/payment_plugin_api_exception.rb
+- lib/killbill/gen/plugin-api/rate.rb
 - lib/killbill/gen/plugin-api/refund_info_plugin.rb
 - lib/killbill/gen/plugin-api/require_gen.rb
 - lib/killbill/http_servlet.rb
@@ -249,23 +252,24 @@ licenses:
 - Apache License (2.0)
 post_install_message:
 rdoc_options:
-- --exclude
-- .
+- "--exclude"
+- "."
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       segments:
       - 0
-      version: '0'
+      version: !binary |-
+        MA==
       hash: 2
   none: false
 requirements: