killbill 1.0.19 → 1.1.1

data/Jarfile

@@ -1,3 +1,5 @@
-jar 'com.ning.billing:killbill-api', '0.1.80'
-jar 'com.ning.billing:killbill-util:tests', '0.1.80'
+jar 'com.ning.billing:killbill-api', '0.3.0'
+jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.2.4'
+jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.2.4'
+jar 'com.ning.billing:killbill-util:tests', '0.2.6-SNAPSHOT'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/VERSION

@@ -1 +1 @@
-1.0.19
+1.1.1

data/killbill.gemspec

@@ -22,13 +22,14 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_development_dependency 'jbundler', '~> 0.4.1'
+  s.add_development_dependency 'jbundler', '~> 0.4.3'
   s.add_development_dependency 'rack', '>= 1.5.2'
   s.add_development_dependency 'rake', '>= 0.8.7'
   s.add_development_dependency 'rspec', '~> 2.12.0'
   s.add_development_dependency 'sinatra', '~> 1.3.4'
+  s.add_development_dependency 'tzinfo', '~> 0.3.37'
 
-#  s.requirements << "jar 'com.ning.billing:killbill-api'"
+  s.requirements << "jar 'com.ning.billing:killbill-api'"
   # For testing only
-#  s.requirements << "jar 'com.ning.billing:killbill-util:tests'"
+  s.requirements << "jar 'com.ning.billing:killbill-util:tests'"
 end

data/lib/killbill.rb

@@ -9,6 +9,12 @@ begin
        gsub(/([a-z])([A-Z])/, '\1_\2').
        downcase
      end
+
+     def to_class
+       self.split('::').inject(Kernel) do |mod, class_name|
+         mod.const_get(class_name)
+       end
+     end
   end
 
 
@@ -28,57 +34,6 @@ begin
     javax.servlet.http.HttpServlet
   )
 
-  #
-  # The Killbill ruby APIs exported for all the ruby plugins
-  #
-  EXPORT_KILLBILL_API = %w(
-    createAccount
-    updateAccount
-    getAccountById
-    getBundleFromId
-    getSubscriptionFromId
-    getBundlesForAccount
-    getSubscriptionsForBundle
-    getBaseSubscription
-    createBundleForAccount
-    createSubscription
-    getNextBillingDate
-    getAllInvoicesByAccount
-    getInvoice
-    getInvoicePayments
-    getInvoicePaymentForAttempt
-    getRemainingAmountPaid
-    getChargebacksByAccountId
-    getAccountIdFromInvoicePaymentId
-    getChargebacksByPaymentId
-    getChargebackById
-    getInvoicesByAccount
-    getAccountBalance
-    getAccountCBA
-    getInvoice
-    getUnpaidInvoicesByAccountId
-    getOverdueStateFor
-    getAccountRefunds
-    getPaymentRefunds
-    getInvoicePayments
-    getAccountPayments
-    getPayment
-    getPaymentMethods
-    getPaymentMethodById
-    addCustomFields
-    getCustomFieldsForAccount
-    getTagDefinitions
-    createTagDefinition
-    deleteTagDefinition
-    getTagDefinition
-    getTagDefinitions
-    addTags
-    addTag
-    removeTags
-    removeTag
-    getTagsForAccount
-  ).collect { |e| e.snake_case }
-
   begin
     IMPORT_KILLBILL_APIS.each { |api| java_import api }
   rescue NameError
@@ -99,6 +54,7 @@ rescue LoadError => e
   warn "You need JRuby to run Killbill plugins #{e}"
 end
 
+require 'tzinfo'
 require 'killbill/gen/require_gen'
 require 'killbill/notification'
 require 'killbill/payment'

data/lib/killbill/creator.rb

@@ -1,6 +1,5 @@
 require 'java'
 
-require 'killbill/jkillbill_api'
 require 'killbill/killbill_api'
 
 include Java
@@ -16,25 +15,18 @@ module Killbill
       end
 
       def create(services)
-         japi_proxy = JKillbillApi.new(@target_class_name, services)
-
-         kb_apis = KillbillApi.new(japi_proxy)
-         real_class = class_from_string
-         plugin_delegate = real_class.new
-         plugin_delegate.root = services["root"]
-         plugin_delegate.logger = services["logger"]
-         plugin_delegate.conf_dir = services["conf_dir"]
-         plugin_delegate.kb_apis = kb_apis
-         plugin_delegate
+        real_class = @target_class_name.to_class
+
+        plugin_delegate = real_class.new
+        plugin_delegate.root = services.delete("root")
+        plugin_delegate.logger = services.delete("logger")
+        plugin_delegate.conf_dir = services.delete("conf_dir")
+        # At this point we removed everything from the map which is not API, so we can build the APIs
+        kb_apis = KillbillApi.new(@target_class_name, services)
+        plugin_delegate.kb_apis = kb_apis
+        plugin_delegate
       end
 
-      private
-
-      def class_from_string()
-        @target_class_name.split('::').inject(Kernel) do |mod, class_name|
-          mod.const_get(class_name)
-        end
-      end
 
     end
   end

data/lib/killbill/gen/account.rb

@@ -1,42 +1,223 @@
+###################################################################################
+#                                                                                 #
+#                   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.                                                         #
+#                                                                                 #
+###################################################################################
+
 
 #
-# Ruby classes automatically generated from java classes-- don't edit
+#                       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.account.api'
       class Account
 
         include com.ning.billing.account.api.Account
 
-        attr_reader :id, :blocking_state, :created_date, :updated_date, :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
-
-        def initialize(id, blocking_state, created_date, updated_date, 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)
-          @id = id
-          @blocking_state = blocking_state
-          @created_date = created_date
-          @updated_date = updated_date
-          @external_key = external_key
-          @name = name
-          @first_name_length = first_name_length
-          @email = email
-          @bill_cycle_day_local = bill_cycle_day_local
-          @currency = currency
-          @payment_method_id = payment_method_id
-          @time_zone = time_zone
-          @locale = locale
-          @address1 = address1
-          @address2 = address2
-          @company_name = company_name
-          @city = city
-          @state_or_province = state_or_province
-          @postal_code = postal_code
-          @country = country
-          @phone = phone
-          @is_migrated = is_migrated
-          @is_notified_for_invoices = is_notified_for_invoices
+        attr_accessor :id, :blocking_state, :created_date, :updated_date, :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
+
+        def initialize()
         end
+
+        def to_java()
+          # conversion for id [type = java.util.UUID]
+          @id = java.util.UUID.fromString(@id.to_s) unless @id.nil?
+
+          # conversion for blocking_state [type = com.ning.billing.junction.api.BlockingState]
+          @blocking_state = @blocking_state.to_java unless @blocking_state.nil?
+
+          # conversion for created_date [type = org.joda.time.DateTime]
+          if !@created_date.nil?
+            @created_date =  (@created_date.kind_of? Time) ? DateTime.parse(@created_date.to_s) : @created_date
+            @created_date = Java::org.joda.time.DateTime.new(@created_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+
+          # conversion for updated_date [type = org.joda.time.DateTime]
+          if !@updated_date.nil?
+            @updated_date =  (@updated_date.kind_of? Time) ? DateTime.parse(@updated_date.to_s) : @updated_date
+            @updated_date = Java::org.joda.time.DateTime.new(@updated_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+
+          # conversion for external_key [type = java.lang.String]
+          @external_key = @external_key.to_s unless @external_key.nil?
+
+          # conversion for name [type = java.lang.String]
+          @name = @name.to_s unless @name.nil?
+
+          # conversion for first_name_length [type = java.lang.Integer]
+          @first_name_length = @first_name_length
+
+          # conversion for email [type = java.lang.String]
+          @email = @email.to_s unless @email.nil?
+
+          # conversion for bill_cycle_day_local [type = java.lang.Integer]
+          @bill_cycle_day_local = @bill_cycle_day_local
+
+          # 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 payment_method_id [type = java.util.UUID]
+          @payment_method_id = java.util.UUID.fromString(@payment_method_id.to_s) unless @payment_method_id.nil?
+
+          # conversion for time_zone [type = org.joda.time.DateTimeZone]
+          if !@time_zone.nil?
+            @time_zone = Java::org.joda.time.DateTimeZone.forID((@time_zone.respond_to?(:identifier) ? @time_zone.identifier : @time_zone.to_s))
+          end
+
+          # conversion for locale [type = java.lang.String]
+          @locale = @locale.to_s unless @locale.nil?
+
+          # conversion for address1 [type = java.lang.String]
+          @address1 = @address1.to_s unless @address1.nil?
+
+          # conversion for address2 [type = java.lang.String]
+          @address2 = @address2.to_s unless @address2.nil?
+
+          # conversion for company_name [type = java.lang.String]
+          @company_name = @company_name.to_s unless @company_name.nil?
+
+          # conversion for city [type = java.lang.String]
+          @city = @city.to_s unless @city.nil?
+
+          # conversion for state_or_province [type = java.lang.String]
+          @state_or_province = @state_or_province.to_s unless @state_or_province.nil?
+
+          # conversion for postal_code [type = java.lang.String]
+          @postal_code = @postal_code.to_s unless @postal_code.nil?
+
+          # conversion for country [type = java.lang.String]
+          @country = @country.to_s unless @country.nil?
+
+          # conversion for phone [type = java.lang.String]
+          @phone = @phone.to_s unless @phone.nil?
+
+          # conversion for is_migrated [type = java.lang.Boolean]
+          @is_migrated = @is_migrated.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_migrated)
+
+          # 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)
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for id [type = java.util.UUID]
+          @id = j_obj.id
+          @id = @id.nil? ? nil : @id.to_s
+
+          # conversion for blocking_state [type = com.ning.billing.junction.api.BlockingState]
+          @blocking_state = j_obj.blocking_state
+          @blocking_state = Killbill::Plugin::Model::BlockingState.new.to_ruby(@blocking_state) unless @blocking_state.nil?
+
+          # conversion for created_date [type = org.joda.time.DateTime]
+          @created_date = j_obj.created_date
+          if !@created_date.nil?
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time
+            str = fmt.print(@created_date)
+            @created_date = DateTime.iso8601(str)
+          end
+
+          # conversion for updated_date [type = org.joda.time.DateTime]
+          @updated_date = j_obj.updated_date
+          if !@updated_date.nil?
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time
+            str = fmt.print(@updated_date)
+            @updated_date = DateTime.iso8601(str)
+          end
+
+          # conversion for external_key [type = java.lang.String]
+          @external_key = j_obj.external_key
+
+          # conversion for name [type = java.lang.String]
+          @name = j_obj.name
+
+          # conversion for first_name_length [type = java.lang.Integer]
+          @first_name_length = j_obj.first_name_length
+
+          # conversion for email [type = java.lang.String]
+          @email = j_obj.email
+
+          # conversion for bill_cycle_day_local [type = java.lang.Integer]
+          @bill_cycle_day_local = j_obj.bill_cycle_day_local
+
+          # 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 payment_method_id [type = java.util.UUID]
+          @payment_method_id = j_obj.payment_method_id
+          @payment_method_id = @payment_method_id.nil? ? nil : @payment_method_id.to_s
+
+          # conversion for time_zone [type = org.joda.time.DateTimeZone]
+          @time_zone = j_obj.time_zone
+          if !@time_zone.nil?
+            @time_zone = TZInfo::Timezone.get(@time_zone.get_id)
+          end
+
+          # conversion for locale [type = java.lang.String]
+          @locale = j_obj.locale
+
+          # conversion for address1 [type = java.lang.String]
+          @address1 = j_obj.address1
+
+          # conversion for address2 [type = java.lang.String]
+          @address2 = j_obj.address2
+
+          # conversion for company_name [type = java.lang.String]
+          @company_name = j_obj.company_name
+
+          # conversion for city [type = java.lang.String]
+          @city = j_obj.city
+
+          # conversion for state_or_province [type = java.lang.String]
+          @state_or_province = j_obj.state_or_province
+
+          # conversion for postal_code [type = java.lang.String]
+          @postal_code = j_obj.postal_code
+
+          # conversion for country [type = java.lang.String]
+          @country = j_obj.country
+
+          # conversion for phone [type = java.lang.String]
+          @phone = j_obj.phone
+
+          # conversion for is_migrated [type = java.lang.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
+
+          # conversion for is_notified_for_invoices [type = java.lang.Boolean]
+          @is_notified_for_invoices = j_obj.is_notified_for_invoices
+          if @is_notified_for_invoices.nil?
+            @is_notified_for_invoices = false
+          else
+            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
+          self
+        end
+
       end
     end
   end

data/lib/killbill/gen/account_api_exception.rb

@@ -0,0 +1,66 @@
+###################################################################################
+#                                                                                 #
+#                   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
+
+      class AccountApiException
+
+
+        attr_accessor :message, :cause, :code
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for message [type = java.lang.String]
+          @message = @message.to_s unless @message.nil?
+
+          # conversion for cause [type = java.lang.Throwable]
+          @cause = @cause.to_s unless cause.nil?
+
+          # conversion for code [type = int]
+          @code = @code
+          Java::com.ning.billing.account.api.AccountApiException.new(@message, @cause, @code)
+        end
+
+        def to_ruby(j_obj)
+          # conversion for message [type = java.lang.String]
+          @message = j_obj.message
+
+          # conversion for cause [type = java.lang.Throwable]
+          @cause = j_obj.cause
+          @cause = @cause.to_s unless @cause.nil?
+
+          # conversion for code [type = int]
+          @code = j_obj.code
+          self
+        end
+
+      end
+    end
+  end
+end