killbill 3.1.11 → 3.1.12

data/spec/killbill/helpers/test_schema.rb

@@ -32,6 +32,7 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "kb_payment_id",             :null => false
     t.string   "kb_payment_transaction_id", :null => false
     t.string   "transaction_type",          :null => false
+    t.string   "payment_processor_account_id"
     t.string   "txn_id"
     t.integer  "amount_in_cents"
     t.string   "currency"
@@ -48,6 +49,7 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "kb_payment_id"
     t.string   "kb_payment_transaction_id"
     t.string   "transaction_type"
+    t.string   "payment_processor_account_id"
     t.string   "message"
     t.string   "authorization"
     t.boolean  "fraud_review"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 3.1.11
+  version: 3.1.12
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -94,18 +94,60 @@ dependencies:
         version: 1.3.7
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: actionview
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: activemerchant
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.42.0
+        version: 1.44.1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.44.1
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: offsite_payments
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.42.0
+        version: 2.0.1
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -286,6 +328,7 @@ files:
 - lib/killbill/gen/api/custom_field_api_exception.rb
 - lib/killbill/gen/api/custom_field_user_api.rb
 - lib/killbill/gen/api/database_export_output_stream.rb
+- lib/killbill/gen/api/dry_run_arguments.rb
 - lib/killbill/gen/api/duration.rb
 - lib/killbill/gen/api/entitlement.rb
 - lib/killbill/gen/api/entitlement_ao_status_dry_run.rb
@@ -317,10 +360,8 @@ files:
 - lib/killbill/gen/api/payment.rb
 - lib/killbill/gen/api/payment_api.rb
 - lib/killbill/gen/api/payment_api_exception.rb
-- lib/killbill/gen/api/payment_attempt.rb
 - lib/killbill/gen/api/payment_gateway_api.rb
 - lib/killbill/gen/api/payment_method.rb
-- lib/killbill/gen/api/payment_method_kv_info.rb
 - lib/killbill/gen/api/payment_method_plugin.rb
 - lib/killbill/gen/api/payment_options.rb
 - lib/killbill/gen/api/payment_transaction.rb
@@ -340,6 +381,7 @@ files:
 - lib/killbill/gen/api/recurring.rb
 - lib/killbill/gen/api/refund.rb
 - lib/killbill/gen/api/require_gen.rb
+- lib/killbill/gen/api/rolled_up_unit.rb
 - lib/killbill/gen/api/rolled_up_usage.rb
 - lib/killbill/gen/api/security_api_exception.rb
 - lib/killbill/gen/api/static_catalog.rb
@@ -349,6 +391,7 @@ files:
 - lib/killbill/gen/api/subscription_bundle.rb
 - lib/killbill/gen/api/subscription_bundle_timeline.rb
 - lib/killbill/gen/api/subscription_event.rb
+- lib/killbill/gen/api/subscription_usage_record.rb
 - lib/killbill/gen/api/tag.rb
 - lib/killbill/gen/api/tag_api_exception.rb
 - lib/killbill/gen/api/tag_definition.rb
@@ -363,11 +406,11 @@ files:
 - lib/killbill/gen/api/tier.rb
 - lib/killbill/gen/api/tiered_block.rb
 - lib/killbill/gen/api/unit.rb
+- lib/killbill/gen/api/unit_usage_record.rb
 - lib/killbill/gen/api/usage.rb
+- lib/killbill/gen/api/usage_record.rb
 - lib/killbill/gen/api/usage_user_api.rb
-- lib/killbill/gen/plugin-api/billing_address.rb
 - lib/killbill/gen/plugin-api/currency_plugin_api.rb
-- lib/killbill/gen/plugin-api/customer.rb
 - lib/killbill/gen/plugin-api/ext_bus_event.rb
 - lib/killbill/gen/plugin-api/gateway_notification.rb
 - lib/killbill/gen/plugin-api/hosted_payment_page_form_descriptor.rb
@@ -408,9 +451,12 @@ files:
 - spec/killbill/gen_conversions_spec.rb
 - spec/killbill/helpers/configuration_spec.rb
 - spec/killbill/helpers/connection_spec.rb
+- spec/killbill/helpers/killbill_spec_helper_spec.rb
 - spec/killbill/helpers/payment_method_spec.rb
 - spec/killbill/helpers/payment_plugin_spec.rb
+- spec/killbill/helpers/private_payment_plugin_spec.rb
 - spec/killbill/helpers/response_spec.rb
+- spec/killbill/helpers/streamy_result_set_spec.rb
 - spec/killbill/helpers/test_schema.rb
 - spec/killbill/helpers/transaction_spec.rb
 - spec/killbill/helpers/utils_spec.rb
@@ -460,9 +506,12 @@ test_files:
 - spec/killbill/gen_conversions_spec.rb
 - spec/killbill/helpers/configuration_spec.rb
 - spec/killbill/helpers/connection_spec.rb
+- spec/killbill/helpers/killbill_spec_helper_spec.rb
 - spec/killbill/helpers/payment_method_spec.rb
 - spec/killbill/helpers/payment_plugin_spec.rb
+- spec/killbill/helpers/private_payment_plugin_spec.rb
 - spec/killbill/helpers/response_spec.rb
+- spec/killbill/helpers/streamy_result_set_spec.rb
 - spec/killbill/helpers/test_schema.rb
 - spec/killbill/helpers/transaction_spec.rb
 - spec/killbill/helpers/utils_spec.rb

data/lib/killbill/gen/api/payment_attempt.rb

@@ -1,117 +0,0 @@
-###################################################################################
-#                                                                                 #
-#                   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 'org.killbill.billing.payment.api'
-      class PaymentAttempt
-
-        include org.killbill.billing.payment.api.PaymentAttempt
-
-        attr_accessor :id, :created_date, :updated_date, :effective_date, :gateway_error_code, :gateway_error_msg, :payment_status
-
-        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 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 effective_date [type = org.joda.time.DateTime]
-          if !@effective_date.nil?
-            @effective_date =  (@effective_date.kind_of? Time) ? DateTime.parse(@effective_date.to_s) : @effective_date
-            @effective_date = Java::org.joda.time.DateTime.new(@effective_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
-          end
-
-          # conversion for gateway_error_code [type = java.lang.String]
-          @gateway_error_code = @gateway_error_code.to_s unless @gateway_error_code.nil?
-
-          # conversion for gateway_error_msg [type = java.lang.String]
-          @gateway_error_msg = @gateway_error_msg.to_s unless @gateway_error_msg.nil?
-
-          # conversion for payment_status [type = org.killbill.billing.payment.api.PaymentStatus]
-          @payment_status = Java::org.killbill.billing.payment.api.PaymentStatus.value_of("#{@payment_status.to_s}") unless @payment_status.nil?
-          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 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_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
-            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_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
-            str = fmt.print(@updated_date)
-            @updated_date = DateTime.iso8601(str)
-          end
-
-          # conversion for effective_date [type = org.joda.time.DateTime]
-          @effective_date = j_obj.effective_date
-          if !@effective_date.nil?
-            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
-            str = fmt.print(@effective_date)
-            @effective_date = DateTime.iso8601(str)
-          end
-
-          # conversion for gateway_error_code [type = java.lang.String]
-          @gateway_error_code = j_obj.gateway_error_code
-
-          # conversion for gateway_error_msg [type = java.lang.String]
-          @gateway_error_msg = j_obj.gateway_error_msg
-
-          # conversion for payment_status [type = org.killbill.billing.payment.api.PaymentStatus]
-          @payment_status = j_obj.payment_status
-          @payment_status = @payment_status.to_s.to_sym unless @payment_status.nil?
-          self
-        end
-
-      end
-    end
-  end
-end

data/lib/killbill/gen/api/payment_method_kv_info.rb

@@ -1,71 +0,0 @@
-###################################################################################
-#                                                                                 #
-#                   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 PaymentMethodKVInfo
-
-
-        attr_accessor :key, :value, :is_updatable
-
-        def initialize()
-        end
-
-        def to_java()
-          # conversion for key [type = java.lang.String]
-          @key = @key.to_s unless @key.nil?
-
-          # conversion for value [type = java.lang.Object]
-          @value = @value.to_s unless @value.nil?
-
-          # conversion for is_updatable [type = java.lang.Boolean]
-          @is_updatable = @is_updatable.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_updatable)
-          Java::org.killbill.billing.payment.api.PaymentMethodKVInfo.new(@key, @value, @is_updatable)
-        end
-
-        def to_ruby(j_obj)
-          # conversion for key [type = java.lang.String]
-          @key = j_obj.key
-
-          # conversion for value [type = java.lang.Object]
-          @value = j_obj.value
-
-          # conversion for is_updatable [type = java.lang.Boolean]
-          @is_updatable = j_obj.is_updatable
-          if @is_updatable.nil?
-            @is_updatable = false
-          else
-            tmp_bool = (@is_updatable.java_kind_of? java.lang.Boolean) ? @is_updatable.boolean_value : @is_updatable
-            @is_updatable = tmp_bool ? true : false
-          end
-          self
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,85 +0,0 @@
-###################################################################################
-#                                                                                 #
-#                   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 'org.killbill.billing.payment.plugin.api'
-      class BillingAddress
-
-        include org.killbill.billing.payment.plugin.api.BillingAddress
-
-        attr_accessor :city, :address1, :address2, :state, :zip, :country
-
-        def initialize()
-        end
-
-        def to_java()
-          # conversion for city [type = java.lang.String]
-          @city = @city.to_s unless @city.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 state [type = java.lang.String]
-          @state = @state.to_s unless @state.nil?
-
-          # conversion for zip [type = java.lang.String]
-          @zip = @zip.to_s unless @zip.nil?
-
-          # conversion for country [type = java.lang.String]
-          @country = @country.to_s unless @country.nil?
-          self
-        end
-
-        def to_ruby(j_obj)
-          # conversion for city [type = java.lang.String]
-          @city = j_obj.city
-
-          # conversion for address1 [type = java.lang.String]
-          @address1 = j_obj.address1
-
-          # conversion for address2 [type = java.lang.String]
-          @address2 = j_obj.address2
-
-          # conversion for state [type = java.lang.String]
-          @state = j_obj.state
-
-          # conversion for zip [type = java.lang.String]
-          @zip = j_obj.zip
-
-          # conversion for country [type = java.lang.String]
-          @country = j_obj.country
-          self
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,73 +0,0 @@
-###################################################################################
-#                                                                                 #
-#                   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 'org.killbill.billing.payment.plugin.api'
-      class Customer
-
-        include org.killbill.billing.payment.plugin.api.Customer
-
-        attr_accessor :first_name, :last_name, :email, :phone
-
-        def initialize()
-        end
-
-        def to_java()
-          # conversion for first_name [type = java.lang.String]
-          @first_name = @first_name.to_s unless @first_name.nil?
-
-          # conversion for last_name [type = java.lang.String]
-          @last_name = @last_name.to_s unless @last_name.nil?
-
-          # conversion for email [type = java.lang.String]
-          @email = @email.to_s unless @email.nil?
-
-          # conversion for phone [type = java.lang.String]
-          @phone = @phone.to_s unless @phone.nil?
-          self
-        end
-
-        def to_ruby(j_obj)
-          # conversion for first_name [type = java.lang.String]
-          @first_name = j_obj.first_name
-
-          # conversion for last_name [type = java.lang.String]
-          @last_name = j_obj.last_name
-
-          # conversion for email [type = java.lang.String]
-          @email = j_obj.email
-
-          # conversion for phone [type = java.lang.String]
-          @phone = j_obj.phone
-          self
-        end
-
-      end
-    end
-  end
-end