killbill-litle 1.0.14 → 1.1.0

data/README.md

@@ -98,7 +98,9 @@ The plugin expects a `litle.yml` configuration file containing the following:
   :username: 'your-username'
   # Optional, if you are using PayPage
   :secure_page_url: 'litle-secure-page-url'
-  :paypage_id: 'litle-paypage-id'
+  :paypage_id:
+    :USD: 'litle-paypage-id-USD'
+    :EUR: 'litle-paypage-id-EURO'
   :log_file: '/var/tmp/litle.log'
   # Switch to false for production
   :test: true

data/VERSION

@@ -1 +1 @@
-1.0.14
+1.1.0

data/lib/litle/api.rb

@@ -1,7 +1,7 @@
 module Killbill::Litle
   class PaymentPlugin < Killbill::Plugin::Payment
     def start_plugin
-      Killbill::Litle.initialize! @logger, @conf_dir
+      Killbill::Litle.initialize! @logger, @conf_dir, @kb_apis
       @gateway = Killbill::Litle.gateway
 
       super
@@ -113,7 +113,39 @@ module Killbill::Litle
     end
 
     def reset_payment_methods(kb_account_id, payment_methods)
-      # No-op
+      return if payment_methods.nil?
+
+      litle_pms = LitlePaymentMethod.from_kb_account_id(kb_account_id.to_s)
+
+      payment_methods.delete_if do |payment_method_info_plugin|
+        should_be_deleted = false
+        litle_pms.each do |litle_pm|
+          # Do litle_pm and payment_method_info_plugin represent the same Litle payment method?
+          if litle_pm.external_payment_method_id == payment_method_info_plugin.external_payment_method_id
+            # Do we already have a kb_payment_method_id?
+            if litle_pm.kb_payment_method_id == payment_method_info_plugin.payment_method_id.to_s
+              should_be_deleted = true
+              break
+            elsif litle_pm.kb_payment_method_id.nil?
+              # We didn't have the kb_payment_method_id - update it
+              litle_pm.kb_payment_method_id = payment_method_info_plugin.payment_method_id.to_s
+              should_be_deleted = litle_pm.save
+              break
+            # Otherwise the same token points to 2 different kb_payment_method_id. This should never happen,
+            # but we cowardly will insert a second row below
+            end
+          end
+        end
+
+        should_be_deleted
+      end
+
+      # The remaining elements in payment_methods are not in our table (this should never happen?!)
+      payment_methods.each do |payment_method_info_plugin|
+        LitlePaymentMethod.create :kb_account_id => payment_method_info_plugin.account_id.to_s,
+                                  :kb_payment_method_id => payment_method_info_plugin.payment_method_id.to_s,
+                                  :litle_token => payment_method_info_plugin.external_payment_method_id
+      end
     end
 
     private

data/lib/litle/config/application.rb

@@ -9,14 +9,30 @@ helpers do
   def plugin
     Killbill::Litle::PrivatePaymentPlugin.instance
   end
+
+  def required_parameter!(parameter_name, parameter_value, message='must be specified!')
+    halt 400, "#{parameter_name} #{message}" if parameter_value.blank?
+  end
 end
 
 # http://127.0.0.1:9292/plugins/killbill-litle
 get '/plugins/killbill-litle' do
+  kb_account_id = request.GET['kb_account_id']
+  required_parameter! :kb_account_id, kb_account_id
+
+  secure_page_url = Killbill::Litle.config[:litle][:secure_page_url]
+  required_parameter! :secure_page_url, secure_page_url, 'is not configured'
+
+  # Allow currency override if needed
+  currency = request.GET['currency'] || plugin.get_currency(kb_account_id)
+  paypage_id = Killbill::Litle.config[:litle][:paypage_id][currency.to_sym]
+  required_parameter! :paypage_id, paypage_id, "is not configured for currency #{currency.to_sym}"
+
   locals = {
-      :secure_page_url => Killbill::Litle.config[:litle][:secure_page_url],
-      :paypage_id => Killbill::Litle.config[:litle][:paypage_id],
-      :kb_account_id => request.GET['kb_account_id'] || '1',
+      :currency => currency,
+      :secure_page_url => secure_page_url,
+      :paypage_id => paypage_id,
+      :kb_account_id => kb_account_id,
       :merchant_txn_id => request.GET['merchant_txn_id'] || '1',
       :order_id => request.GET['order_id'] || '1',
       :report_group => request.GET['report_group'] || 'Default Report Group',
@@ -30,7 +46,10 @@ post '/plugins/killbill-litle/checkout' do
   kb_account_id = request.POST['kb_account_id']
   response_paypage_registration_id = request.POST['response_paypage_registration_id']
 
-  halt 400, "kb_account_id and response_paypage_registration_id must be specified!" if kb_account_id.blank? or response_paypage_registration_id.blank?
+  {
+      :kb_account_id => kb_account_id,
+      :response_paypage_registration_id => response_paypage_registration_id
+  }.each { |k, v| required_parameter! k, v }
 
   pm = plugin.register_token! kb_account_id, response_paypage_registration_id
   redirect "/plugins/killbill-litle/1.0/pms/#{pm.id}"

data/lib/litle/config/configuration.rb

@@ -4,11 +4,13 @@ module Killbill::Litle
   mattr_reader :logger
   mattr_reader :config
   mattr_reader :gateway
+  mattr_reader :kb_apis
   mattr_reader :initialized
   mattr_reader :test
 
-  def self.initialize!(logger=Logger.new(STDOUT), conf_dir=File.expand_path('../../../', File.dirname(__FILE__)))
+  def self.initialize!(logger=Logger.new(STDOUT), conf_dir=File.expand_path('../../../', File.dirname(__FILE__)), kb_apis = nil)
     @@logger = logger
+    @@kb_apis = kb_apis
 
     config_file = "#{conf_dir}/litle.yml"
     @@config = Properties.new(config_file)
@@ -28,4 +30,4 @@ module Killbill::Litle
 
     @@initialized = true
   end
-end
+end

data/lib/litle/models/litle_payment_method.rb

@@ -16,6 +16,8 @@ module Killbill::Litle
                     :zip,
                     :country
 
+    alias_attribute :external_payment_method_id, :litle_token
+
     def self.from_kb_account_id(kb_account_id)
       find_all_by_kb_account_id_and_is_deleted(kb_account_id, false)
     end
@@ -34,12 +36,8 @@ module Killbill::Litle
     end
 
     def to_payment_method_response
-      external_payment_method_id = litle_token
-      # No concept of default payment method in Litle
-      is_default = false
-
       properties = []
-      properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, "token", litle_token)
+      properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'token', litle_token)
 
       Killbill::Plugin::Model::PaymentMethodPlugin.new(external_payment_method_id,
                                                        is_default,
@@ -60,13 +58,14 @@ module Killbill::Litle
     end
 
     def to_payment_method_info_response
-      external_payment_method_id = litle_token
-      # No concept of default payment method in Litle
-      is_default = false
-
       Killbill::Plugin::Model::PaymentMethodInfoPlugin.new(kb_account_id, kb_payment_method_id, is_default, external_payment_method_id)
     end
 
+    def is_default
+      # No concept of default payment method in Litle
+      false
+    end
+
     def cc_name
       if cc_first_name and cc_last_name
         "#{cc_first_name} #{cc_last_name}"

data/lib/litle/private_api.rb

@@ -14,6 +14,14 @@ module Killbill::Litle
       end
     end
 
+    def get_currency(kb_account_id_s)
+      kb_account_id = Killbill::Plugin::Model::UUID.new(kb_account_id_s)
+      account = kb_apis.get_account_by_id(kb_account_id)
+      account.currency.enum
+    rescue Killbill::Plugin::JKillbillApi::APINotAvailableError
+      'USD'
+    end
+
     private
 
     def save_response(litle_response, api_call)
@@ -34,5 +42,10 @@ module Killbill::Litle
       # The logger should have been configured when the plugin started
       Killbill::Litle.logger
     end
+
+    def kb_apis
+      # The logger should have been configured when the plugin started
+      Killbill::Litle.kb_apis
+    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.14</version>
+    <version>1.1.0</version>
     <name>litle-plugin</name>
     <url>http://github.com/killbill/killbill-litle-plugin</url>
     <description>Plugin for accessing Litle as a payment gateway</description>

data/spec/litle/base_plugin_spec.rb

@@ -8,10 +8,11 @@ describe Killbill::Litle::PaymentPlugin do
 :litle:
   :merchant_id: 'merchant_id'
   :password: 'password'
+# As defined by spec_helper.rb
 :database:
   :adapter: 'sqlite3'
-  :database: 'shouldntmatter.db'
-eos
+  :database: 'test.db'
+      eos
       file.close
 
       @plugin = Killbill::Litle::PaymentPlugin.new
@@ -23,7 +24,53 @@ eos
     end
   end
 
-  it "should start and stop correctly" do
+  it 'should start and stop correctly' do
     @plugin.stop_plugin
   end
+
+  it 'should reset payment methods' do
+    kb_account_id = '129384'
+
+    @plugin.get_payment_methods(kb_account_id, false, nil).size.should == 0
+    verify_pms kb_account_id, 0
+
+    # Create a pm with a kb_payment_method_id
+    Killbill::Litle::LitlePaymentMethod.create :kb_account_id => kb_account_id,
+                                               :kb_payment_method_id => 'kb-1',
+                                               :litle_token => 'litle-1'
+    verify_pms kb_account_id, 1
+
+    # Add some in KillBill and reset
+    payment_methods = []
+    # Random order... Shouldn't matter...
+    payment_methods << Killbill::Plugin::Model::PaymentMethodInfoPlugin.new(kb_account_id, 'kb-3', false, 'litle-3')
+    payment_methods << Killbill::Plugin::Model::PaymentMethodInfoPlugin.new(kb_account_id, 'kb-2', false, 'litle-2')
+    payment_methods << Killbill::Plugin::Model::PaymentMethodInfoPlugin.new(kb_account_id, 'kb-4', false, 'litle-4')
+    @plugin.reset_payment_methods kb_account_id, payment_methods
+    verify_pms kb_account_id, 4
+
+    # Add a payment method without a kb_payment_method_id
+    Killbill::Litle::LitlePaymentMethod.create :kb_account_id => kb_account_id,
+                                               :litle_token => 'litle-5'
+    @plugin.get_payment_methods(kb_account_id, false, nil).size.should == 5
+
+    # Verify we can match it
+    payment_methods << Killbill::Plugin::Model::PaymentMethodInfoPlugin.new(kb_account_id, 'kb-5', false, 'litle-5')
+    @plugin.reset_payment_methods kb_account_id, payment_methods
+    verify_pms kb_account_id, 5
+
+    @plugin.stop_plugin
+  end
+
+  private
+
+  def verify_pms(kb_account_id, size)
+    pms = @plugin.get_payment_methods(kb_account_id, false, nil)
+    pms.size.should == size
+    pms.each do |pm|
+      pm.account_id.should == kb_account_id
+      pm.is_default.should == false
+      pm.external_payment_method_id.should == 'litle-' + pm.payment_method_id.split('-')[1]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill-litle
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.1.0
   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-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill