killbill 1.0.15 → 1.0.16

data/Jarfile

@@ -1,3 +1,5 @@
-jar 'com.ning.billing:killbill-api', '0.1.76-SNAPSHOT'
-jar 'com.ning.billing:killbill-util:tests', '0.1.76-SNAPSHOT'
+jar 'com.ning.billing:killbill-api', '0.1.77-SNAPSHOT'
+jar 'com.ning.billing:killbill-util:tests', '0.1.77-SNAPSHOT'
+jar 'com.ning.billing:killbill-api', '0.1.76'
+jar 'com.ning.billing:killbill-util:tests', '0.1.76'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/VERSION

@@ -1 +1 @@
-1.0.15
+1.0.16

data/lib/killbill.rb

@@ -1,36 +1,91 @@
 begin
   require 'java'
 
-  KILLBILL_APIS = %w(
+  # Add method snake_case to String as early as possible so all classes below can use it
+  class String
+     def snake_case
+       return downcase if match(/\A[A-Z]+\z/)
+       gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+       gsub(/([a-z])([A-Z])/, '\1_\2').
+       downcase
+     end
+  end
+
+
+  #
+  # The Killbill Java APIs imported into that jruby bridge
+  #
+  IMPORT_KILLBILL_APIS = %w(
     com.ning.billing.account.api.AccountUserApi
-    com.ning.billing.analytics.api.sanity.AnalyticsSanityApi
-    com.ning.billing.analytics.api.user.AnalyticsUserApi
     com.ning.billing.catalog.api.CatalogUserApi
-    com.ning.billing.entitlement.api.migration.EntitlementMigrationApi
-    com.ning.billing.entitlement.api.timeline.EntitlementTimelineApi
-    com.ning.billing.entitlement.api.transfer.EntitlementTransferApi
     com.ning.billing.entitlement.api.user.EntitlementUserApi
-    com.ning.billing.invoice.api.InvoiceMigrationApi
     com.ning.billing.invoice.api.InvoicePaymentApi
     com.ning.billing.invoice.api.InvoiceUserApi
     com.ning.billing.overdue.OverdueUserApi
     com.ning.billing.payment.api.PaymentApi
-    com.ning.billing.tenant.api.TenantUserApi
-    com.ning.billing.usage.api.UsageUserApi
-    com.ning.billing.util.api.AuditUserApi
     com.ning.billing.util.api.CustomFieldUserApi
-    com.ning.billing.util.api.ExportUserApi
     com.ning.billing.util.api.TagUserApi
     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
-    KILLBILL_APIS.each { |api| java_import api }
+    IMPORT_KILLBILL_APIS.each { |api| java_import api }
   rescue NameError
     # killbill-api should be provided by the JRuby OSGI bundle. We default to using JBundler for development purposes only
     begin
       require 'jbundler'
-      KILLBILL_APIS.each { |api| java_import api }
+      IMPORT_KILLBILL_APIS.each { |api| java_import api }
       warn 'Using JBundler to load killbill-api (see .jbundler/classpath.rb). This should only happen in development mode!'
     rescue LoadError => e
       warn 'Unable to load killbill-api. For development purposes, use JBundler (create the following Jarfile: http://git.io/eobYXA and run: `bundle install && jbundle install\')'
@@ -44,5 +99,6 @@ rescue LoadError => e
   warn "You need JRuby to run Killbill plugins #{e}"
 end
 
+require 'killbill/gen/require_gen'
 require 'killbill/notification'
 require 'killbill/payment'

data/lib/killbill/creator.rb

@@ -1,3 +1,9 @@
+require 'java'
+
+require 'killbill/jkillbill_api'
+require 'killbill/killbill_api'
+
+include Java
 
 module Killbill
   module Plugin
@@ -9,9 +15,17 @@ module Killbill
         @target_class_name = target_class_name
       end
 
-      def create(*args)
+      def create(services)
+         japi_proxy = JKillbillApi.new(@target_class_name, services)
+
+         kb_apis = KillbillApi.new(japi_proxy)
          real_class = class_from_string
-          args.nil? ? real_class.new : real_class.new(*args)
+         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
       end
 
       private

data/lib/killbill/enum.rb

@@ -0,0 +1,72 @@
+module Killbill
+  module Plugin
+
+    module Enum
+
+      class NameValuePair
+        attr_reader :label, :value
+
+        def initialize(label, value)
+          @label = label
+          @value = value
+        end
+
+        def first
+          @label
+        end
+
+        def last
+          @value
+        end
+      end
+
+      def const_missing(key)
+        @enum_hash[key]
+      end
+
+      def add_enum(key, value)
+        @enum_hash ||= {}
+        @enum_hash[key] = NameValuePair.new(value, key.to_s)
+      end
+
+      def each
+        @enum_hash.values.sort { |v1, v2| v1.label <=> v2.label }.each do |k|
+          yield(k)
+        end
+      end
+
+      def collect
+        @enum_hash.values.sort { |v1, v2| v1.label <=> v2.label }.collect do |k|
+          yield(k)
+        end
+      end
+
+      def each_with_index
+        @enum_hash.values.sort { |v1, v2| v1.label <=> v2.label }.each_with_index do |k, i|
+          yield(k, i)
+        end
+      end
+
+      def enums
+        @enum_hash.keys
+      end
+
+      def enum_values
+        @enum_hash.values
+      end
+
+      def get_enum_hash
+        @enum_hash
+      end
+
+      def find_by_key(key)
+        @enum_hash[key.upcase.to_sym]
+      end
+
+      def size
+        @enum_hash.keys.size
+      end
+    end
+  end
+end
+

data/lib/killbill/gen/account.rb

@@ -0,0 +1,43 @@
+
+#
+# Ruby classes automatically generated from java classes-- don't edit
+#
+module Killbill
+  module Plugin
+    module Model
+
+      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
+        end
+      end
+    end
+  end
+end

data/lib/killbill/gen/account_data.rb

@@ -0,0 +1,39 @@
+
+#
+# Ruby classes automatically generated from java classes-- don't edit
+#
+module Killbill
+  module Plugin
+    module Model
+
+      class AccountData
+
+        include com.ning.billing.account.api.AccountData
+
+        attr_reader :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(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)
+          @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
+        end
+      end
+    end
+  end
+end

data/lib/killbill/gen/account_email.rb

@@ -0,0 +1,25 @@
+
+#
+# Ruby classes automatically generated from java classes-- don't edit
+#
+module Killbill
+  module Plugin
+    module Model
+
+      class AccountEmail
+
+        include com.ning.billing.account.api.AccountEmail
+
+        attr_reader :id, :created_date, :updated_date, :account_id, :email
+
+        def initialize(id, created_date, updated_date, account_id, email)
+          @id = id
+          @created_date = created_date
+          @updated_date = updated_date
+          @account_id = account_id
+          @email = email
+        end
+      end
+    end
+  end
+end

data/lib/killbill/gen/audit_log.rb

@@ -0,0 +1,28 @@
+
+#
+# Ruby classes automatically generated from java classes-- don't edit
+#
+module Killbill
+  module Plugin
+    module Model
+
+      class AuditLog
+
+        include com.ning.billing.util.audit.AuditLog
+
+        attr_reader :id, :created_date, :updated_date, :change_type, :user_name, :reason_code, :user_token, :comment
+
+        def initialize(id, created_date, updated_date, change_type, user_name, reason_code, user_token, comment)
+          @id = id
+          @created_date = created_date
+          @updated_date = updated_date
+          @change_type = change_type
+          @user_name = user_name
+          @reason_code = reason_code
+          @user_token = user_token
+          @comment = comment
+        end
+      end
+    end
+  end
+end

data/lib/killbill/gen/blocking_state.rb

@@ -0,0 +1,32 @@
+
+#
+# Ruby classes automatically generated from java classes-- don't edit
+#
+module Killbill
+  module Plugin
+    module Model
+
+      class BlockingState
+
+        include com.ning.billing.junction.api.BlockingState
+
+        attr_reader :id, :created_date, :updated_date, :blocked_id, :state_name, :type, :timestamp, :is_block_change, :is_block_entitlement, :is_block_billing, :description, :service
+
+        def initialize(id, created_date, updated_date, blocked_id, state_name, type, timestamp, is_block_change, is_block_entitlement, is_block_billing, description, service)
+          @id = id
+          @created_date = created_date
+          @updated_date = updated_date
+          @blocked_id = blocked_id
+          @state_name = state_name
+          @type = type
+          @timestamp = timestamp
+          @is_block_change = is_block_change
+          @is_block_entitlement = is_block_entitlement
+          @is_block_billing = is_block_billing
+          @description = description
+          @service = service
+        end
+      end
+    end
+  end
+end

data/lib/killbill/gen/call_context.rb

@@ -0,0 +1,29 @@
+
+#
+# Ruby classes automatically generated from java classes-- don't edit
+#
+module Killbill
+  module Plugin
+    module Model
+
+      class CallContext
+
+        include com.ning.billing.util.callcontext.CallContext
+
+        attr_reader :tenant_id, :user_token, :user_name, :call_origin, :user_type, :reason_code, :comments, :created_date, :updated_date
+
+        def initialize(tenant_id, user_token, user_name, call_origin, user_type, reason_code, comments, created_date, updated_date)
+          @tenant_id = tenant_id
+          @user_token = user_token
+          @user_name = user_name
+          @call_origin = call_origin
+          @user_type = user_type
+          @reason_code = reason_code
+          @comments = comments
+          @created_date = created_date
+          @updated_date = updated_date
+        end
+      end
+    end
+  end
+end

data/lib/killbill/gen/call_origin.rb

@@ -0,0 +1,34 @@
+
+#
+# Ruby classes automatically generated from java classes-- don't edit
+#
+module Killbill
+  module Plugin
+    module Model
+
+      class CallOrigin
+
+        @@admissible_values  = [:INTERNAL, :EXTERNAL, :TEST]
+        attr_reader :enum
+
+        def initialize(value)
+          raise ArgumentError.new("Enum CallOrigin does not have such value : #{value}") if ! CallOrigin.is_admissible_value?(value)
+          @enum = value
+        end
+
+        def ==(other)
+          return false if other.nil?
+          self.enum == other.enum
+        end
+
+        def self.is_admissible_value?(value)
+          @@admissible_values.include?(value)
+        end
+
+        def self.admissible_values
+          @@admissible_values
+        end
+      end
+    end
+  end
+end