killbill 1.0.19 → 1.1.1

data/spec/killbill/jnotification_spec.rb

@@ -6,20 +6,34 @@ describe Killbill::Plugin::JNotification do
 
   before(:all) do
     logger = ::Logger.new(STDOUT)
+
+    puts "**************************************************  1 ************************************"
     @jnotification =  Killbill::Plugin::JNotification.new("Killbill::Plugin::NotificationTest", { "logger" => logger })
+    puts "**************************************************  2 ************************************"
+
   end
 
 
   it "should_test_on_event_ok" do
 
+    puts "**************************************************  3 ************************************"
+
     object_type = Java::com.ning.billing.ObjectType::INVOICE
-    event_type = Java::com.ning.billing.beatrix.bus.api.ExtBusEventType::INVOICE_CREATION
+    event_type = Java::com.ning.billing.notification.plugin.api.ExtBusEventType::INVOICE_CREATION
     uuid = java.util.UUID.random_uuid
 
+    puts "**************************************************  4 ************************************"
+
     event = Java::com.ning.billing.mock.api.MockExtBusEvent.new(event_type, object_type, uuid, uuid, uuid)
+
+    puts "**************************************************  5 ************************************"
+
     @jnotification.on_event(event)
     @jnotification.on_event(event)
     @jnotification.on_event(event)
+
+    puts "**************************************************  6 ************************************"
+
     @jnotification.delegate_plugin.counter.should == 3
   end
 end

data/spec/killbill/jpayment_spec.rb

@@ -22,8 +22,10 @@ describe Killbill::Plugin::JPayment do
   it "should_test_charge_ok" do
     output = @jpayment.process_payment(@kb_account_id, @kb_payment_id, @kb_payment_method_id, @amount, @currency)
     output.amount.should be_an_instance_of java.math.BigDecimal
-    output.amount.to_s.should == "50.00";
-    output.status.should be_an_instance_of Java::com.ning.billing.payment.plugin.api.PaymentPluginStatus
+    output.amount.compare_to(@amount).should == 0
+
+    puts "#{output.status.class}"
+    output.status.java_kind_of?(Java::com.ning.billing.payment.plugin.api.PaymentPluginStatus).should == true
     output.status.to_s.should == "PROCESSED"
   end
 
@@ -35,11 +37,12 @@ describe Killbill::Plugin::JPayment do
   it "should_test_get_payment_info_ok" do
     output = @jpayment.get_payment_info(@kb_account_id, @kb_payment_method_id)
     output.amount.should be_an_instance_of java.math.BigDecimal
-    output.amount.to_s.should == "0.00";
-    output.status.should be_an_instance_of Java::com.ning.billing.payment.plugin.api.PaymentPluginStatus
+    output.amount.compare_to(java.math.BigDecimal.new(0)).should == 0
+    output.status.java_kind_of?(Java::com.ning.billing.payment.plugin.api.PaymentPluginStatus).should == true
     output.status.to_s.should == "PROCESSED"
   end
 
+
   it "should_test_get_payment_info_exception" do
     @jpayment.delegate_plugin.send(:raise_exception_on_next_calls)
     lambda { @jpayment.get_payment_info(@kb_account_id, @kb_payment_method_id) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
@@ -48,11 +51,12 @@ describe Killbill::Plugin::JPayment do
   it "should_test_refund_ok" do
     output = @jpayment.process_refund(@kb_account_id, @kb_payment_method_id, @amount, @currency)
     output.amount.should be_an_instance_of java.math.BigDecimal
-    output.amount.to_s.should == "50.00";
-    output.status.should be_an_instance_of Java::com.ning.billing.payment.plugin.api.RefundPluginStatus
+    output.amount.compare_to(@amount).should == 0
+    output.status.java_kind_of?(Java::com.ning.billing.payment.plugin.api.RefundPluginStatus).should == true
     output.status.to_s.should == "PROCESSED"
   end
 
+
   it "should_test_refund_exception" do
     @jpayment.delegate_plugin.send(:raise_exception_on_next_calls)
     lambda { @jpayment.process_refund(@kb_account_id, @kb_payment_method_id, @amount, @currency) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
@@ -78,8 +82,8 @@ describe Killbill::Plugin::JPayment do
 
   it "should_test_get_payment_method_detail_ok" do
     output = @jpayment.get_payment_method_detail(@kb_account_id, @kb_payment_method_id)
-    output.external_payment_method_id.should be_an_instance_of java.lang.String
-    output.external_payment_method_id.should == "foo"
+    #output.external_payment_method_id.should be_an_instance_of java.lang.String
+    output.external_payment_method_id.should == "external_payment_method_id"
   end
 
   it "should_test_get_payment_method_detail_exception" do

data/spec/killbill/killbillapi_spec.rb

@@ -1,11 +1,8 @@
 require 'spec_helper'
-
-require 'killbill/jkillbill_api'
+require 'date'
 require 'killbill/killbill_api'
 
 require 'killbill/gen/account_data'
-require 'killbill/gen/currency'
-require 'killbill/gen/date_time_zone'
 
 
 
@@ -13,37 +10,42 @@ describe Killbill::Plugin do
 
   before(:each) do
     @account_user_api_mock = MockAccountUserApi.new
-    @japi_proxy = Killbill::Plugin::JKillbillApi.new("foo", {:account_user_api => @account_user_api_mock})
-    @kb_apis = Killbill::Plugin::KillbillApi.new(@japi_proxy)
-    @account = Killbill::Plugin::Model::AccountData.new("external_key", "name", 3, "email", 1, Killbill::Plugin::Model::Currency.new(:USD), nil, Killbill::Plugin::Model::DateTimeZone.new(:UTC), "locale", "address1", nil,
-"company_name", "city", "state_or_province", "postal_code", "country", "phone", true, false)
+    @kb_apis = Killbill::Plugin::KillbillApi.new("foo", {:account_user_api => @account_user_api_mock})
+    @account = Killbill::Plugin::Model::AccountData.new
+    @account.external_key="external_key"
+    @account.name="name"
+    @account.first_name_length=3
+    @account.email="email"
+    @account.bill_cycle_day_local=1
+    @account.currency=:USD
+    @account.locale="locale"
+    @account.address1="address1"
+    @account.time_zone=:UTC
+    @account.city="San Francisco"
+
+    @context = @kb_apis.create_context
   end
 
   it 'should test create/get_account_by_id' do
 
-    account_created = @kb_apis.create_account(@account)
+    account_user_api = @kb_apis.account_user_api
+    account_created = account_user_api.create_account(@account, @context)
     account_created.should be_an_instance_of Killbill::Plugin::Model::Account
-
-    account_fetched = @kb_apis.get_account_by_id(account_created.id)
+    account_fetched = account_user_api.get_account_by_id(account_created.id, @context)
     account_fetched.should be_an_instance_of Killbill::Plugin::Model::Account
-    account_fetched.id.should be_an_instance_of Killbill::Plugin::Model::UUID
-    account_fetched.id.to_s.should == account_created.id.to_s
+    account_fetched.id.should be_an_instance_of String
+    account_fetched.id.should == account_created.id
     account_fetched.external_key.should == "external_key"
     account_fetched.name.should == "name"
     account_fetched.first_name_length.should == 3
     account_fetched.email.should == "email"
     account_fetched.bill_cycle_day_local.should == 1
-    account_fetched.currency.should == Killbill::Plugin::Model::Currency.new(:USD)
+    account_fetched.currency.should == :USD
     account_fetched.locale.should == "locale"
     account_fetched.address1.should == "address1"
     account_fetched.address2.should == nil
-    account_fetched.time_zone.should == Killbill::Plugin::Model::DateTimeZone.new(:UTC)
-    account_fetched.company_name.should == "company_name"
-    account_fetched.city.should == "city"
-    account_fetched.state_or_province.should == "state_or_province"
-    account_fetched.postal_code.should == "postal_code"
-    account_fetched.country.should == "country"
-    account_fetched.phone.should == "phone"
+    #account_fetched.time_zone.should be_an_instance_of TZInfo::Timezone (seemes to return TZInfo::LinkedTimezone instead)
+    account_fetched.time_zone.to_s.should == :UTC.to_s
   end
 
 end

data/spec/killbill/payment_plugin_spec.rb

@@ -9,15 +9,7 @@ describe Killbill::Plugin::Payment do
     @kb_payment_id = SecureRandom.uuid
     @amount_in_cents = rand(100000)
     @currency = 'USD'
-    @call_context = Killbill::Plugin::Model::CallContext.new(SecureRandom.uuid,
-                                                             'token',
-                                                             'rspec tester',
-                                                             'TEST',
-                                                             'user',
-                                                             'testing',
-                                                             'this is from a test',
-                                                             Time.now,
-                                                             Time.now)
+    @call_context = Killbill::Plugin::Model::CallContext.new
 
     @payment_method = Hash.new(:credit_card => SecureRandom.uuid)
     @kb_payment_method_id = SecureRandom.uuid

data/spec/killbill/payment_test.rb

@@ -12,7 +12,10 @@ module Killbill
         if @raise_exception
           raise StandardError.new("Test exception")
         else
-          Killbill::Plugin::Model::PaymentInfoPlugin.new(amount_in_cents, DateTime.now, DateTime.now, Killbill::Plugin::Model::PaymentPluginStatus.new(:PROCESSED), "gateway_error", "gateway_error_code", nil, nil)
+          res = Killbill::Plugin::Model::PaymentInfoPlugin.new
+          res.amount=amount_in_cents
+          res.status=:PROCESSED
+          res
         end
       end
 
@@ -20,7 +23,10 @@ module Killbill
         if @raise_exception
           raise StandardError.new("Test exception")
         else
-          Killbill::Plugin::Model::PaymentInfoPlugin.new(0, DateTime.now, DateTime.now, Killbill::Plugin::Model::PaymentPluginStatus.new(:PROCESSED), "gateway_error", "gateway_error_code", nil, nil)
+          res = Killbill::Plugin::Model::PaymentInfoPlugin.new
+          res.amount=0
+          res.status=:PROCESSED
+          res
         end
       end
 
@@ -28,7 +34,10 @@ module Killbill
         if @raise_exception
           raise StandardError.new("Test exception")
         else
-          Killbill::Plugin::Model::RefundInfoPlugin.new(5000, DateTime.now, DateTime.now, Killbill::Plugin::Model::RefundPluginStatus.new(:PROCESSED), "gateway_error", "gateway_error_code", nil)
+          res = Killbill::Plugin::Model::RefundInfoPlugin.new
+          res.amount=50
+          res.status=:PROCESSED
+          res
         end
       end
 
@@ -48,7 +57,9 @@ module Killbill
         if @raise_exception
           raise StandardError.new("Test exception")
         else
-          Killbill::Plugin::Model::PaymentMethodPlugin.new("foo", true, [], nil, "type", "cc_name", "cc_type", "cc_expiration_month", "cc_expiration_year", "cc_last4", "address1", "address2", "city", "state", "zip", "country")
+          res = Killbill::Plugin::Model::PaymentMethodPlugin.new
+          res.external_payment_method_id="external_payment_method_id"
+          res
         end
       end
 
@@ -62,7 +73,12 @@ module Killbill
         if @raise_exception
           raise StandardError.new("Test exception")
         else
-          [Killbill::Plugin::Model::PaymentMethodInfoPlugin.new(kb_account_id, kb_account_id, true, "external_payment_method_id")]
+          res = Killbill::Plugin::Model::PaymentMethodInfoPlugin.new
+          res.account_id=kb_account_id
+          res.payment_method_id=kb_account_id
+          res.is_default=true
+          res.external_payment_method_id="dfdf"
+          [res]
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.1.1
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbundler
@@ -17,13 +17,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
     none: false
   prerelease: false
   type: :development
@@ -91,6 +91,22 @@ dependencies:
     none: false
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  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
+  prerelease: false
+  type: :development
 description: Base classes to write plugins.
 email: killbilling-users@googlegroups.com
 executables: []
@@ -109,45 +125,103 @@ files:
 - lib/killbill/creator.rb
 - lib/killbill/enum.rb
 - lib/killbill/gen/account.rb
+- lib/killbill/gen/account_api_exception.rb
 - lib/killbill/gen/account_data.rb
 - lib/killbill/gen/account_email.rb
-- lib/killbill/gen/audit_log.rb
+- lib/killbill/gen/account_service.rb
+- lib/killbill/gen/account_user_api.rb
+- lib/killbill/gen/audit_user_api.rb
+- lib/killbill/gen/beatrix_service.rb
+- lib/killbill/gen/billing_exception_base.rb
+- lib/killbill/gen/blockable.rb
+- lib/killbill/gen/blocking_api_exception.rb
 - lib/killbill/gen/blocking_state.rb
 - lib/killbill/gen/call_context.rb
-- lib/killbill/gen/call_origin.rb
-- lib/killbill/gen/currency.rb
+- lib/killbill/gen/catalog.rb
+- lib/killbill/gen/catalog_api_exception.rb
+- lib/killbill/gen/catalog_service.rb
+- lib/killbill/gen/catalog_user_api.rb
+- lib/killbill/gen/column_info.rb
+- lib/killbill/gen/control_tag.rb
+- lib/killbill/gen/currency_value_null.rb
 - lib/killbill/gen/custom_field.rb
-- lib/killbill/gen/date_time_zone.rb
+- lib/killbill/gen/custom_field_api_exception.rb
+- lib/killbill/gen/custom_field_user_api.rb
+- lib/killbill/gen/database_export_output_stream.rb
+- lib/killbill/gen/default_mutable_account_data.rb
+- lib/killbill/gen/duration.rb
+- lib/killbill/gen/entitlement_service.rb
+- lib/killbill/gen/entitlement_user_api.rb
+- lib/killbill/gen/entitlement_user_api_exception.rb
+- lib/killbill/gen/entity.rb
+- lib/killbill/gen/entity_persistence_exception.rb
+- lib/killbill/gen/export_user_api.rb
 - lib/killbill/gen/ext_bus_event.rb
-- lib/killbill/gen/ext_bus_event_type.rb
+- lib/killbill/gen/external_bus.rb
+- lib/killbill/gen/illegal_plan_change.rb
+- lib/killbill/gen/international_price.rb
+- lib/killbill/gen/invalid_config_exception.rb
 - lib/killbill/gen/invoice.rb
+- lib/killbill/gen/invoice_api_exception.rb
+- lib/killbill/gen/invoice_creation_event.rb
 - lib/killbill/gen/invoice_item.rb
+- lib/killbill/gen/invoice_migration_api.rb
+- lib/killbill/gen/invoice_notifier.rb
 - lib/killbill/gen/invoice_payment.rb
-- lib/killbill/gen/invoice_payment_type.rb
-- lib/killbill/gen/object_type.rb
+- lib/killbill/gen/invoice_payment_api.rb
+- lib/killbill/gen/invoice_service.rb
+- lib/killbill/gen/invoice_user_api.rb
+- lib/killbill/gen/junction_api.rb
+- lib/killbill/gen/limit.rb
+- lib/killbill/gen/listing.rb
+- lib/killbill/gen/migration_account_data.rb
+- lib/killbill/gen/migration_plan.rb
+- lib/killbill/gen/mutable_account_data.rb
+- lib/killbill/gen/no_op_payment_plugin_api.rb
 - lib/killbill/gen/payment.rb
+- lib/killbill/gen/payment_api.rb
+- lib/killbill/gen/payment_api_exception.rb
 - lib/killbill/gen/payment_attempt.rb
 - lib/killbill/gen/payment_info_plugin.rb
+- lib/killbill/gen/payment_method.rb
 - lib/killbill/gen/payment_method_info_plugin.rb
 - lib/killbill/gen/payment_method_kv_info.rb
 - lib/killbill/gen/payment_method_plugin.rb
-- lib/killbill/gen/payment_plugin_status.rb
+- lib/killbill/gen/payment_plugin_api.rb
+- lib/killbill/gen/payment_plugin_api_exception.rb
+- lib/killbill/gen/payment_service.rb
+- lib/killbill/gen/plan.rb
+- lib/killbill/gen/plan_change_result.rb
+- lib/killbill/gen/plan_phase.rb
+- lib/killbill/gen/plan_phase_specifier.rb
+- lib/killbill/gen/plan_specifier.rb
+- lib/killbill/gen/price.rb
+- lib/killbill/gen/price_list.rb
+- lib/killbill/gen/price_list_set.rb
+- lib/killbill/gen/product.rb
+- lib/killbill/gen/record_id_api.rb
 - lib/killbill/gen/refund.rb
 - lib/killbill/gen/refund_info_plugin.rb
-- lib/killbill/gen/refund_plugin_status.rb
 - lib/killbill/gen/require_gen.rb
+- lib/killbill/gen/static_catalog.rb
 - lib/killbill/gen/subscription.rb
 - lib/killbill/gen/subscription_bundle.rb
-- lib/killbill/gen/subscription_source_type.rb
-- lib/killbill/gen/subscription_state.rb
+- lib/killbill/gen/subscription_status_dry_run.rb
+- lib/killbill/gen/subscription_transition.rb
 - lib/killbill/gen/tag.rb
+- lib/killbill/gen/tag_api_exception.rb
 - lib/killbill/gen/tag_definition.rb
+- lib/killbill/gen/tag_definition_api_exception.rb
+- lib/killbill/gen/tag_user_api.rb
+- lib/killbill/gen/tenant.rb
+- lib/killbill/gen/tenant_api_exception.rb
 - lib/killbill/gen/tenant_context.rb
-- lib/killbill/gen/user_type.rb
-- lib/killbill/gen/uuid.rb
+- lib/killbill/gen/tenant_data.rb
+- lib/killbill/gen/tenant_kv.rb
+- lib/killbill/gen/tenant_service.rb
+- lib/killbill/gen/tenant_user_api.rb
+- lib/killbill/gen/unit.rb
 - lib/killbill/http_servlet.rb
-- lib/killbill/jconverter.rb
-- lib/killbill/jkillbill_api.rb
 - lib/killbill/jnotification.rb
 - lib/killbill/jpayment.rb
 - lib/killbill/jplugin.rb
@@ -159,7 +233,6 @@ files:
 - lib/killbill/rake_task.rb
 - spec/killbill/base_plugin_spec.rb
 - spec/killbill/config_test.ru
-- spec/killbill/jconverter_spec.rb
 - spec/killbill/jnotification_spec.rb
 - spec/killbill/jpayment_spec.rb
 - spec/killbill/killbill_integration_spec.rb
@@ -196,7 +269,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
         MA==
       hash: 2
   none: false
-requirements: []
+requirements:
+- jar 'com.ning.billing:killbill-api'
+- jar 'com.ning.billing:killbill-util:tests'
 rubyforge_project:
 rubygems_version: 1.8.24
 signing_key:
@@ -205,7 +280,6 @@ summary: Framework to write Kill Bill plugins in Ruby.
 test_files:
 - spec/killbill/base_plugin_spec.rb
 - spec/killbill/config_test.ru
-- spec/killbill/jconverter_spec.rb
 - spec/killbill/jnotification_spec.rb
 - spec/killbill/jpayment_spec.rb
 - spec/killbill/killbill_integration_spec.rb

data/lib/killbill/gen/audit_log.rb

@@ -1,28 +0,0 @@
-
-#
-# 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