killbill-litle 1.0.6 → 1.0.8

data/.gitignore

@@ -34,3 +34,6 @@ litle.yml
 test.db
 
 target
+pom.xml.asc
+
+.idea/

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.8

data/killbill-litle.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 1.0.16'
+  s.add_dependency 'killbill', '~> 1.0.17'
   s.add_dependency 'activemerchant', '~> 2.0.0'
   s.add_dependency 'activerecord', '~> 3.2.1'
   s.add_dependency 'sinatra', '~> 1.3.4'

data/lib/litle/api.rb

@@ -14,15 +14,15 @@ module Killbill::Litle
       ActiveRecord::Base.connection.close
     end
 
-    def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount_in_cents, currency, options = {})
+    def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount_in_cents, currency, call_context, options = {})
       # If the payment was already made, just return the status
       # TODO Should we set the Litle Id field to check for dups (https://www.litle.com/mc-secure/DupeChecking_V1.2.pdf)?
-      litle_transaction = LitleTransaction.from_kb_payment_id(kb_payment_id) rescue nil
+      litle_transaction = LitleTransaction.from_kb_payment_id(kb_payment_id.to_s) rescue nil
       return litle_transaction.litle_response.to_payment_response unless litle_transaction.nil?
 
       # Required argument
       # Note! The field is limited to 25 chars, so we convert the UUID (in hex) to base64
-      options[:order_id] ||= Utils.compact_uuid kb_payment_id
+      options[:order_id] ||= Utils.compact_uuid kb_payment_id.to_s
 
       # Set a default report group
       options[:merchant] ||= report_group_for_currency(currency)
@@ -36,8 +36,8 @@ module Killbill::Litle
       response.to_payment_response
     end
 
-    def process_refund(kb_account_id, kb_payment_id, amount_in_cents, currency, options = {})
-      litle_transaction = LitleTransaction.find_candidate_transaction_for_refund(kb_payment_id, amount_in_cents)
+    def process_refund(kb_account_id, kb_payment_id, amount_in_cents, currency, call_context, options = {})
+      litle_transaction = LitleTransaction.find_candidate_transaction_for_refund(kb_payment_id.to_s, amount_in_cents)
 
       # Set a default report group
       options[:merchant] ||= report_group_for_currency(currency)
@@ -49,16 +49,16 @@ module Killbill::Litle
       response.to_refund_response
     end
 
-    def get_payment_info(kb_account_id, kb_payment_id, options = {})
+    def get_payment_info(kb_account_id, kb_payment_id, tenant_context, options = {})
       # We assume the payment is immutable in Litle and only look at our tables since there
       # doesn't seem to be a Litle API to fetch details for a given transaction.
       # TODO How can we support Authorization/Sale Recycling?
-      litle_transaction = LitleTransaction.from_kb_payment_id(kb_payment_id)
+      litle_transaction = LitleTransaction.from_kb_payment_id(kb_payment_id.to_s)
 
       litle_transaction.litle_response.to_payment_response
     end
 
-    def add_payment_method(kb_account_id, kb_payment_method_id, payment_method_props, set_default=true, options = {})
+    def add_payment_method(kb_account_id, kb_payment_method_id, payment_method_props, set_default, call_context, options = {})
       # Set a default report group
       options[:merchant] ||= report_group_for_account(kb_account_id)
 
@@ -67,19 +67,23 @@ module Killbill::Litle
       litle_response = @gateway.store token, options
       response = save_response_and_transaction litle_response, :add_payment_method
 
-      LitlePaymentMethod.create :kb_account_id => kb_account_id, :kb_payment_method_id => kb_payment_method_id, :litle_token => response.litle_token
+      if response.success
+        LitlePaymentMethod.create :kb_account_id => kb_account_id.to_s, :kb_payment_method_id => kb_payment_method_id.to_s, :litle_token => response.litle_token
+      else
+        raise response.message
+      end
     end
 
-    def delete_payment_method(kb_account_id, kb_payment_method_id, options = {})
-      LitlePaymentMethod.mark_as_deleted! kb_payment_method_id
+    def delete_payment_method(kb_account_id, kb_payment_method_id, call_context, options = {})
+      LitlePaymentMethod.mark_as_deleted! kb_payment_method_id.to_s
     end
 
-    def get_payment_method_detail(kb_account_id, kb_payment_method_id, options = {})
-      LitlePaymentMethod.from_kb_payment_method_id(kb_payment_method_id).to_payment_method_response
+    def get_payment_method_detail(kb_account_id, kb_payment_method_id, tenant_context, options = {})
+      LitlePaymentMethod.from_kb_payment_method_id(kb_payment_method_id.to_s).to_payment_method_response
     end
 
-    def get_payment_methods(kb_account_id, refresh_from_gateway = false, options = {})
-      LitlePaymentMethod.from_kb_account_id(kb_account_id).collect { |pm| pm.to_payment_method_response }
+    def get_payment_methods(kb_account_id, refresh_from_gateway, call_context, options = {})
+      LitlePaymentMethod.from_kb_account_id(kb_account_id.to_s).collect { |pm| pm.to_payment_method_response }
     end
 
     private
@@ -93,24 +97,23 @@ module Killbill::Litle
     end
 
     def report_group_for_currency(currency)
-      "Report Group for #{currency}"
+      "Report Group for #{currency.respond_to?(:enum) ? currency.enum : currency.to_s}"
     end
 
-
     def get_token(kb_payment_method_id)
-      LitlePaymentMethod.from_kb_payment_method_id(kb_payment_method_id).litle_token
+      LitlePaymentMethod.from_kb_payment_method_id(kb_payment_method_id.to_s).litle_token
     end
 
     def save_response_and_transaction(litle_response, api_call, kb_payment_id=nil, amount_in_cents=0)
       @logger.warn "Unsuccessful #{api_call}: #{litle_response.message}" unless litle_response.success?
 
       # Save the response to our logs
-      response = LitleResponse.from_response(api_call, kb_payment_id, litle_response)
+      response = LitleResponse.from_response(api_call, kb_payment_id.to_s, litle_response)
       response.save!
 
       if response.success and !kb_payment_id.blank? and !response.litle_txn_id.blank?
         # Record the transaction
-        transaction = response.create_litle_transaction!(:amount_in_cents => amount_in_cents, :api_call => api_call, :kb_payment_id => kb_payment_id, :litle_txn_id => response.litle_txn_id)
+        transaction = response.create_litle_transaction!(:amount_in_cents => amount_in_cents, :api_call => api_call, :kb_payment_id => kb_payment_id.to_s, :litle_txn_id => response.litle_txn_id)
         @logger.debug "Recorded transaction: #{transaction.inspect}"
       end
       response

data/lib/litle/private_api.rb

@@ -6,8 +6,12 @@ module Killbill::Litle
       litle_response = gateway.store paypage_registration_id, options
       response = save_response litle_response, :register_token
 
-      # Create the payment method (not associated to a Killbill payment method yet)
-      LitlePaymentMethod.create! :kb_account_id => kb_account_id, :kb_payment_method_id => nil, :litle_token => response.litle_token
+      if response.success
+        # Create the payment method (not associated to a Killbill payment method yet)
+        LitlePaymentMethod.create! :kb_account_id => kb_account_id, :kb_payment_method_id => nil, :litle_token => response.litle_token
+      else
+        raise response.message
+      end
     end
 
     private
@@ -31,4 +35,4 @@ module Killbill::Litle
       Killbill::Litle.logger
     end
   end
-end
+end

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.ning.killbill.ruby</groupId>
     <artifactId>litle-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.6</version>
+    <version>1.0.8</version>
     <name>litle-plugin</name>
     <scm>
         <connection>scm:git:git://github.com/killbill/killbill-litle-plugin.git</connection>

data/spec/litle/integration_spec.rb

@@ -3,8 +3,6 @@ require 'logger'
 
 ActiveMerchant::Billing::Base.mode = :test
 
-
-
 class KillbillApiWithFakeGetAccountById < Killbill::Plugin::KillbillApi
 
   def initialize(japi_proxy)
@@ -19,6 +17,16 @@ end
 
 describe Killbill::Litle::PaymentPlugin do
   before(:each) do
+    @call_context = Killbill::Plugin::Model::CallContext.new(SecureRandom.uuid,
+                                                             'token',
+                                                             'rspec tester',
+                                                             'TEST',
+                                                             'user',
+                                                             'testing',
+                                                             'this is from a test',
+                                                             Time.now,
+                                                             Time.now)
+
     @plugin = Killbill::Litle::PaymentPlugin.new
     kb_apis = KillbillApiWithFakeGetAccountById.new(nil)
     @plugin.kb_apis = kb_apis
@@ -34,17 +42,17 @@ describe Killbill::Litle::PaymentPlugin do
   it "should be able to create and retrieve payment methods" do
     pm = create_payment_method
 
-    pms = @plugin.get_payment_methods(pm.kb_account_id)
+    pms = @plugin.get_payment_methods(pm.kb_account_id, false, @call_context)
     pms.size.should == 1
     pms[0].external_payment_method_id.should == pm.litle_token
 
-    pm_details = @plugin.get_payment_method_detail(pm.kb_account_id, pm.kb_payment_method_id)
+    pm_details = @plugin.get_payment_method_detail(pm.kb_account_id, pm.kb_payment_method_id, @call_context)
     pm_details.external_payment_method_id.should == pm.litle_token
 
-    @plugin.delete_payment_method(pm.kb_account_id, pm.kb_payment_method_id)
+    @plugin.delete_payment_method(pm.kb_account_id, pm.kb_payment_method_id, @call_context)
 
-    @plugin.get_payment_methods(pm.kb_account_id).size.should == 0
-    lambda { @plugin.get_payment_method_detail(pm.kb_account_id, pm.kb_payment_method_id) }.should raise_error RuntimeError
+    @plugin.get_payment_methods(pm.kb_account_id, false, @call_context).size.should == 0
+    lambda { @plugin.get_payment_method_detail(pm.kb_account_id, pm.kb_payment_method_id, @call_context) }.should raise_error RuntimeError
   end
 
   it "should be able to charge and refund" do
@@ -53,7 +61,7 @@ describe Killbill::Litle::PaymentPlugin do
     currency = 'USD'
     kb_payment_id = SecureRandom.uuid
 
-    payment_response = @plugin.process_payment pm.kb_account_id, kb_payment_id, pm.kb_payment_method_id, amount_in_cents, currency
+    payment_response = @plugin.process_payment pm.kb_account_id, kb_payment_id, pm.kb_payment_method_id, amount_in_cents, currency, @call_context
     payment_response.amount.should == amount_in_cents
     payment_response.status.should == Killbill::Plugin::Model::PaymentPluginStatus.new(:PROCESSED)
 
@@ -64,14 +72,14 @@ describe Killbill::Litle::PaymentPlugin do
     response.message.should == "Approved"
     response.params_litleonelineresponse_saleresponse_order_id.should == Killbill::Litle::Utils.compact_uuid(kb_payment_id)
 
-    payment_response = @plugin.get_payment_info pm.kb_account_id, kb_payment_id
+    payment_response = @plugin.get_payment_info pm.kb_account_id, kb_payment_id, @call_context
     payment_response.amount.should == amount_in_cents
     payment_response.status.should == Killbill::Plugin::Model::PaymentPluginStatus.new(:PROCESSED)
 
     # Check we cannot refund an amount greater than the original charge
-    lambda { @plugin.process_refund pm.kb_account_id, kb_payment_id, amount_in_cents + 1, currency }.should raise_error RuntimeError
+    lambda { @plugin.process_refund pm.kb_account_id, kb_payment_id, amount_in_cents + 1, currency, @call_context }.should raise_error RuntimeError
 
-    refund_response = @plugin.process_refund pm.kb_account_id, kb_payment_id, amount_in_cents, currency
+    refund_response = @plugin.process_refund pm.kb_account_id, kb_payment_id, amount_in_cents, currency, @call_context
     refund_response.amount.should == amount_in_cents
     refund_response.status.should == Killbill::Plugin::Model::RefundPluginStatus.new(:PROCESSED)
 
@@ -84,7 +92,7 @@ describe Killbill::Litle::PaymentPlugin do
     second_amount_in_cents = 29471
     second_kb_payment_id = SecureRandom.uuid
 
-    payment_response = @plugin.process_payment pm.kb_account_id, second_kb_payment_id, pm.kb_payment_method_id, second_amount_in_cents, currency
+    payment_response = @plugin.process_payment pm.kb_account_id, second_kb_payment_id, pm.kb_payment_method_id, second_amount_in_cents, currency, @call_context
     payment_response.amount.should == second_amount_in_cents
     payment_response.status.should == Killbill::Plugin::Model::PaymentPluginStatus.new(:PROCESSED)
   end
@@ -98,7 +106,7 @@ describe Killbill::Litle::PaymentPlugin do
     # Generate a token in Litle
     paypage_registration_id = '123456789012345678901324567890abcdefghi'
     info = Killbill::Plugin::Model::PaymentMethodPlugin.new nil, nil, [Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, "paypageRegistrationId", paypage_registration_id)], nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil
-    payment_method = @plugin.add_payment_method(kb_account_id, kb_payment_method_id, info)
+    payment_method = @plugin.add_payment_method(kb_account_id, kb_payment_method_id, info, true, @call_context)
 
     pm = Killbill::Litle::LitlePaymentMethod.from_kb_payment_method_id kb_payment_method_id
     pm.kb_account_id.should == kb_account_id

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: killbill-litle
 version: !ruby/object:Gem::Version
+  version: 1.0.8
   prerelease:
-  version: 1.0.6
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -17,13 +17,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.16
+        version: 1.0.17
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.16
+        version: 1.0.17
     none: false
   prerelease: false
   type: :runtime
@@ -260,9 +260,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2
       version: !binary |-
         MA==
+      hash: 2
   none: false
 requirements: []
 rubyforge_project: