killbill-litle 1.0.2 → 1.0.3

data/Jarfile

@@ -1,3 +1,3 @@
-jar 'com.ning.billing:killbill-api', '0.1.63'
-jar 'com.ning.billing:killbill-util:tests', '0.1.63'
+jar 'com.ning.billing:killbill-api', '0.1.78'
+jar 'com.ning.billing:killbill-util:tests', '0.1.78'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/README.md

@@ -4,4 +4,42 @@
 killbill-litle-plugin
 =====================
 
-Plugin to use Litle & Co. as a gateway
+Plugin to use Litle & Co. as a gateway.
+
+Requirements
+------------
+
+The plugin needs a database. The latest version of the schema can be found here: https://raw.github.com/killbill/killbill-litle-plugin/master/db/ddl.sql.
+
+
+Configuration
+-------------
+
+The plugin expects a `litle.yml` configuration file containing the following:
+
+```
+:litle:
+  :merchant_id: 'your-merchant-id'
+  :password: 'your-password'
+  :username: 'your-username'
+  # Optional, if you are using PayPage
+  :secure_page_url: 'litle-secure-page-url'
+  :paypage_id: 'litle-paypage-id'
+  :log_file: '/var/tmp/litle.log'
+  # Switch to false for production
+  :test: true
+
+:database:
+  :adapter: 'sqlite3'
+  :database: 'test.db'
+# For MySQL
+#  :adapter: 'jdbc'
+#  :username: 'your-username'
+#  :password: 'your-password'
+#  :driver: 'com.mysql.jdbc.Driver'
+#  :url: 'jdbc:mysql://127.0.0.1:3306/your-database'
+```
+
+By default, the plugin will look at the plugin directory root (where `killbill.properties` is located) to find this file.
+Alternatively, set the Kill Bill system property `-Dcom.ning.billing.osgi.bundles.jruby.conf.dir=/my/directory` to specify another location.
+

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/db/ddl.sql

@@ -0,0 +1,55 @@
+CREATE TABLE `litle_payment_methods` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `kb_account_id` varchar(255) NOT NULL,
+  `kb_payment_method_id` varchar(255) DEFAULT NULL,
+  `litle_token` varchar(255) NOT NULL,
+  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `litle_transactions` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `litle_response_id` int(11) NOT NULL,
+  `api_call` varchar(255) NOT NULL,
+  `kb_payment_id` varchar(255) NOT NULL,
+  `litle_txn_id` varchar(255) NOT NULL,
+  `amount_in_cents` int(11) NOT NULL,
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `litle_responses` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `api_call` varchar(255) NOT NULL,
+  `kb_payment_id` varchar(255) DEFAULT NULL,
+  `message` varchar(255) DEFAULT NULL,
+  `authorization` varchar(255) DEFAULT NULL,
+  `fraud_review` tinyint(1) DEFAULT NULL,
+  `test` tinyint(1) DEFAULT NULL,
+  `params_litleonelineresponse_message` varchar(255) DEFAULT NULL,
+  `params_litleonelineresponse_response` varchar(255) DEFAULT NULL,
+  `params_litleonelineresponse_version` varchar(255) DEFAULT NULL,
+  `params_litleonelineresponse_xmlns` varchar(255) DEFAULT NULL,
+  `params_litleonelineresponse_saleresponse_customer_id` varchar(255) DEFAULT NULL,
+  `params_litleonelineresponse_saleresponse_id` varchar(255) DEFAULT NULL,
+  `params_litleonelineresponse_saleresponse_report_group` varchar(255) DEFAULT NULL,
+  `params_litleonelineresponse_saleresponse_litle_txn_id` varchar(255) DEFAULT NULL,
+  `params_litleonelineresponse_saleresponse_order_id` varchar(255) DEFAULT NULL,
+  `params_litleonelineresponse_saleresponse_response` varchar(255) DEFAULT NULL,
+  `params_litleonelineresponse_saleresponse_response_time` varchar(255) DEFAULT NULL,
+  `params_litleonelineresponse_saleresponse_message` varchar(255) DEFAULT NULL,
+  `params_litleonelineresponse_saleresponse_auth_code` varchar(255) DEFAULT NULL,
+  `avs_result_code` varchar(255) DEFAULT NULL,
+  `avs_result_message` varchar(255) DEFAULT NULL,
+  `avs_result_street_match` varchar(255) DEFAULT NULL,
+  `avs_result_postal_match` varchar(255) DEFAULT NULL,
+  `cvv_result_code` varchar(255) DEFAULT NULL,
+  `cvv_result_message` varchar(255) DEFAULT NULL,
+  `success` tinyint(1) DEFAULT NULL,
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

data/killbill-litle.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 1.0.13'
-  s.add_dependency 'activemerchant', '~> 1.31.1'
+  s.add_dependency 'killbill', '~> 1.0.16'
+  s.add_dependency 'activemerchant', '~> 2.0.0'
   s.add_dependency 'activerecord', '~> 3.2.1'
   s.add_dependency 'sinatra', '~> 1.3.4'
   # LitleOnline gem dependencies

data/lib/litle/api.rb

@@ -1,7 +1,7 @@
 module Killbill::Litle
   class PaymentPlugin < Killbill::Plugin::Payment
     def start_plugin
-      Killbill::Litle.initialize! "#{@root}/litle.yml", @logger
+      Killbill::Litle.initialize! @logger, @conf_dir
       @gateway = Killbill::Litle.gateway
 
       super
@@ -15,6 +15,11 @@ module Killbill::Litle
     end
 
     def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount_in_cents, currency, 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
+      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
@@ -25,16 +30,14 @@ module Killbill::Litle
       token = get_token(kb_payment_method_id)
 
       # Go to Litle
-      litle_response = @gateway.purchase amount_in_cents, token, options
+      litle_response = @gateway.purchase amount_in_cents, ActiveMerchant::Billing::LitleGateway::LitleCardToken.new(:token => token), options
       response = save_response_and_transaction litle_response, :charge, kb_payment_id, amount_in_cents
 
       response.to_payment_response
     end
 
     def process_refund(kb_account_id, kb_payment_id, amount_in_cents, currency, options = {})
-      # Find one successful charge which amount is at least the amount we are trying to refund
-      litle_transaction = LitleTransaction.where("litle_transactions.amount_in_cents >= ?", amount_in_cents).find_last_by_api_call_and_kb_payment_id(:charge, kb_payment_id)
-      raise "Unable to find Litle transaction id for payment #{kb_payment_id}" if litle_transaction.nil?
+      litle_transaction = LitleTransaction.find_candidate_transaction_for_refund(kb_payment_id, amount_in_cents)
 
       # Set a default report group
       options[:merchant] ||= report_group_for_currency(currency)
@@ -55,12 +58,13 @@ module Killbill::Litle
       litle_transaction.litle_response.to_payment_response
     end
 
-    def add_payment_method(kb_account_id, kb_payment_method_id, payment_method_props, set_default, options = {})
+    def add_payment_method(kb_account_id, kb_payment_method_id, payment_method_props, set_default=true, options = {})
       # Set a default report group
       options[:merchant] ||= report_group_for_account(kb_account_id)
 
-      cc = ActiveMerchant::Billing::CreditCard.new(:number => payment_method_props.value_string('number'), :description => kb_payment_method_id)
-      litle_response = @gateway.store cc, options
+      # TODO Add support for real credit cards
+      token = (payment_method_props.properties.find { |kv| kv.key == 'paypageRegistrationId' }).value
+      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
@@ -81,15 +85,11 @@ module Killbill::Litle
     private
 
     def report_group_for_account(kb_account_id)
-=begin
-      account = account_user_api.get_account_by_id(kb_account_id)
-      currency = account.get_currency
+      account = @kb_apis.get_account_by_id(kb_account_id)
+      currency = account.currency
       report_group_for_currency(currency)
-    rescue APINotAvailableError
+    rescue Killbill::Plugin::JKillbillApi::APINotAvailableError
       "Default Report Group"
-=end
-      # STEPH hack until we support making API calls-- with context
-      report_group_for_currency('USD')
     end
 
     def report_group_for_currency(currency)
@@ -108,7 +108,7 @@ module Killbill::Litle
       response = LitleResponse.from_response(api_call, kb_payment_id, litle_response)
       response.save!
 
-      if response.success and !response.litle_txn_id.blank?
+      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)
         @logger.debug "Recorded transaction: #{transaction.inspect}"

data/lib/litle/config/application.rb

@@ -20,19 +20,19 @@ get '/plugins/killbill-litle' do
     :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',
+    :success_page => params[:successPage] || '/plugins/killbill-litle/checkout',
+    :failure_page => params[:failurePage]
   }
   erb :paypage, :views => File.expand_path(File.dirname(__FILE__) + '/../views'), :locals => locals
 end
 
 post '/plugins/killbill-litle/checkout' do
-  data = request.POST
+  data = request.body.read
 
-  begin
-    pm = plugin.register_token! data['kb_account_id'], data['response_paypage_registration_id']
-    redirect "/plugins/killbill-litle/1.0/pms/#{pm.id}"
-  rescue => e
-    halt 500, {'Content-Type' => 'text/plain'}, "Error: #{e}"
-  end
+  halt 400, "kb_account_id and response_paypage_registration_id must be specified!" if data['kb_account_id'].blank? or data['response_paypage_registration_id'].blank?
+
+  pm = plugin.register_token! data['kb_account_id'], data['response_paypage_registration_id']
+  redirect "/plugins/killbill-litle/1.0/pms/#{pm.id}"
 end
 
 # curl -v http://127.0.0.1:9292/plugins/killbill-litle/1.0/pms/1
@@ -51,4 +51,4 @@ get '/plugins/killbill-litle/1.0/transactions/:id', :provides => 'json' do
   else
     status 404
   end
-end
+end

data/lib/litle/config/configuration.rb

@@ -7,9 +7,10 @@ module Killbill::Litle
   mattr_reader :initialized
   mattr_reader :test
 
-  def self.initialize!(config_file='litle.yml', logger=Logger.new(STDOUT))
+  def self.initialize!(logger=Logger.new(STDOUT), conf_dir=File.expand_path('../../../', File.dirname(__FILE__)))
     @@logger = logger
 
+    config_file = "#{conf_dir}/litle.yml"
     @@config = Properties.new(config_file)
     @@config.parse!
     @@test = @@config[:litle][:test]

data/lib/litle/models/litle_payment_method.rb

@@ -26,7 +26,7 @@ module Killbill::Litle
       # No extra information is stored in Litle
       properties = []
 
-      Killbill::Plugin::PaymentMethodResponse.new external_payment_method_id, is_default, properties
+      Killbill::Plugin::Model::PaymentMethodPlugin.new(external_payment_method_id, is_default, properties, "CreditCard", nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
     end
   end
 end

data/lib/litle/models/litle_response.rb

@@ -41,7 +41,9 @@ module Killbill::Litle
         nil
       else
         # Litle seems to return the precision sometimes along with the txnId (e.g. 053499651324799+19)
-        ("%f" % potential_litle_txn_id.split('+')[0]).to_i
+        # And sometimes it adds a ;credit
+        # TODO Figure out WTF is going on here
+        ("%f" % potential_litle_txn_id.split(';')[0].split('+')[0]).to_i
       end
     end
 
@@ -77,30 +79,39 @@ module Killbill::Litle
     end
 
     def to_payment_response
-      to_killbill_response Killbill::Plugin::PaymentResponse
+      to_killbill_response :payment
     end
 
     def to_refund_response
-      to_killbill_response Killbill::Plugin::RefundResponse
+      to_killbill_response :refund
     end
 
     private
 
-    def to_killbill_response(klass)
+    def to_killbill_response(type)
       if litle_transaction.nil?
         amount_in_cents = nil
         created_date = created_at
+        first_payment_reference_id = nil
+        second_payment_reference_id = nil
       else
         amount_in_cents = litle_transaction.amount_in_cents
         created_date = litle_transaction.created_at
+        first_payment_reference_id = litle_transaction.litle_txn_id
+        second_payment_reference_id = litle_transaction.id.to_s
       end
 
       effective_date = params_litleonelineresponse_saleresponse_response_time || created_date
-      status = message == 'Approved' ? Killbill::Plugin::PaymentStatus::SUCCESS : Killbill::Plugin::PaymentStatus::ERROR
-      gateway_error = params_litleonelineresponse_saleresponse_message
+      gateway_error = message || params_litleonelineresponse_saleresponse_message
       gateway_error_code = params_litleonelineresponse_saleresponse_response
 
-      klass.new(amount_in_cents, created_date, effective_date, status, gateway_error, gateway_error_code)
+      if type == :payment
+        status = success ? Killbill::Plugin::Model::PaymentPluginStatus.new(:PROCESSED) : Killbill::Plugin::Model::PaymentPluginStatus.new(:ERROR)
+        Killbill::Plugin::Model::PaymentInfoPlugin.new(amount_in_cents, created_date, effective_date, status, gateway_error, gateway_error_code, first_payment_reference_id, second_payment_reference_id)
+      else
+        status = success ? Killbill::Plugin::Model::RefundPluginStatus.new(:PROCESSED) : Killbill::Plugin::Model::RefundPluginStatus.new(:ERROR)
+        Killbill::Plugin::Model::RefundInfoPlugin.new(amount_in_cents, created_date, effective_date, status, gateway_error, gateway_error_code, first_payment_reference_id)
+      end
     end
 
     def self.extract(response, key1, key2=nil, key3=nil)

data/lib/litle/models/litle_transaction.rb

@@ -9,5 +9,22 @@ module Killbill::Litle
       raise "Killbill payment mapping to multiple Litle transactions for payment #{kb_payment_id}" if litle_transactions.size > 1
       litle_transactions[0]
     end
+
+    def self.find_candidate_transaction_for_refund(kb_payment_id, amount_in_cents)
+      # Find one successful charge which amount is at least the amount we are trying to refund
+      litle_transactions = LitleTransaction.where("litle_transactions.amount_in_cents >= ?", amount_in_cents)
+                                           .find_all_by_api_call_and_kb_payment_id(:charge, kb_payment_id)
+      raise "Unable to find Litle transaction id for payment #{kb_payment_id}" if litle_transactions.size == 0
+
+      # We have candidates, but we now need to make sure we didn't refund more than for the specified amount
+      amount_refunded_in_cents = Killbill::Litle::LitleTransaction.where("api_call = ? and kb_payment_id = ?", :refund, kb_payment_id)
+                                                                  .sum("amount_in_cents")
+
+      amount_left_to_refund_in_cents = -amount_refunded_in_cents
+      litle_transactions.map { |transaction| amount_left_to_refund_in_cents += transaction.amount_in_cents }
+      raise "Amount #{amount_in_cents} too large to refund for payment #{kb_payment_id}" if amount_left_to_refund_in_cents < amount_in_cents
+
+      litle_transactions.first
+    end
   end
 end

data/lib/litle/views/paypage.erb

@@ -2,11 +2,29 @@
 <html>
   <head>
     <title>Pay Page Checkout</title>
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
     <script src="<%= secure_page_url %>/LitlePayPage/litle-api.js" type="text/javascript"></script>
     <script>
     $(document).ready(
       function() {
+        function handleError(errorMessage) {
+          <% if failure_page %>
+            var form = document.createElement("form");
+            form.setAttribute("method", "post");
+            form.setAttribute("action", "<%= failure_page %>");
+
+            var hiddenField = document.createElement("input");
+            hiddenField.setAttribute("type", "hidden");
+            hiddenField.setAttribute("name", "errorMessage");
+            hiddenField.setAttribute("value", errorMessage);
+            form.appendChild(hiddenField);
+
+            document.body.appendChild(form);
+            form.submit();
+          <% else %>
+            alert(errorMessage);
+          <% end %>
+        }
+
         function setLitleResponseFields(response) {
           document.getElementById('response_code').value = response.response;
           document.getElementById('response_message').value = response.message;
@@ -21,34 +39,34 @@
         }
 
         function timeoutOnLitle() {
-          alert("We are experiencing technical difficulties. Please try your query again later.");
+          handleError("We are experiencing technical difficulties. Please try your query again later.");
         }
 
         function onErrorAfterLitle(response) {
           setLitleResponseFields(response);
           if (response.response == '871') {
-            alert("Invalid card number. Check and retry. (Not Mod10)");
+            handleError("Invalid card number. Check and retry. (Not Mod10)");
           }
           else if (response.response == '872') {
-            alert("Invalid card number. Check and retry. (Too short)");
+            handleError("Invalid card number. Check and retry. (Too short)");
           }
           else if (response.response == '873') {
-            alert("Invalid card number. Check and retry. (Too long)");
+            handleError("Invalid card number. Check and retry. (Too long)");
           }
           else if (response.response == '874') {
-            alert("Invalid card number. Check and retry. (Not a number)");
+            handleError("Invalid card number. Check and retry. (Not a number)");
           }
           else if (response.response == '875') {
-            alert("We are experiencing technical difficulties. Please try your query again later.");
+            handleError("We are experiencing technical difficulties. Please try your query again later.");
           }
           else if (response.response == '876') {
-            alert("Invalid card number. Check and retry. (Failure from Server)");
+            handleError("Invalid card number. Check and retry. (Failure from Server)");
           }
           else if (response.response == '880') {
-            alert("Invalid report group. Check and retry. (Failure from Server)");
+            handleError("Invalid report group. Check and retry. (Failure from Server)");
           }
           else if (response.response == '889') {
-            alert("We are experiencing technical difficulties. Please try your query again later.");
+            handleError("We are experiencing technical difficulties. Please try your query again later.");
           }
           return false;
         }
@@ -81,8 +99,7 @@
     </script>
   </head>
   <body>
-    <h2>Checkout Form</h2>
-    <form method="post" id="form_checkout" name="form_checkout" action="/plugins/killbill-litle/checkout">
+    <form method="post" id="form_checkout" name="form_checkout" action="<%= success_page %>">
       <input type="hidden" id="kb_account_id" name="kb_account_id" value="<%= kb_account_id %>"/>
 
       <input type="hidden" id="request_paypage_id" name="request_paypage_id" value="<%= paypage_id %>"/>
@@ -99,7 +116,7 @@
         <tr><td>&nbsp;</td></tr>
         <tr><td></td><td align="right">
           <script>
-          document.write('<button type="button" id="submitId" onclick="callLitle()">Check out with Pay Page</button>');
+          document.write('<button type="button" id="submitId" onclick="callLitle()">Check out</button>');
           </script>
           <noscript>
             <button type="button" id="submitId">Enable JavaScript!</button>
@@ -118,8 +135,8 @@
   </body>
   <script>
   function callLitle() {
-    if(typeof sendToLitle != 'function') {
-      alert("We are experiencing technical difficulties. Please try your query again later (API unavailable).");
+    if (typeof sendToLitle != 'function') {
+      handleError("We are experiencing technical difficulties. Please try your query again later (API unavailable).");
     }
   }
   </script>

data/pom.xml

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

data/release.sh

@@ -1,4 +1,20 @@
+set -e
+
 VERSION=`grep -E '<version>([0-9]+\.[0-9]+\.[0-9]+)</version>' pom.xml | sed 's/[\t \n]*<version>\(.*\)<\/version>[\t \n]*/\1/'`
+if [ "$VERSION" != "$(cat $PWD/VERSION)" ]; then
+  echo "Unable to release: make sure the versions in pom.xml and VERSION match"
+  exit 1
+fi
+
+echo "Cleaning up"
+rake killbill:clean ; rake build
+
+echo "Pushing the gem to Rubygems"
+rake release
+
+echo "Building artifact"
+rake killbill:package
+
 ARTIFACT="$PWD/pkg/killbill-litle-$VERSION.tar.gz"
 echo "Pushing $ARTIFACT to Maven Central"
 mvn gpg:sign-and-deploy-file \

data/spec/litle/base_plugin_spec.rb

@@ -15,8 +15,8 @@ eos
       file.close
 
       @plugin = Killbill::Litle::PaymentPlugin.new
-      @plugin.root = File.dirname(file)
       @plugin.logger = Logger.new(STDOUT)
+      @plugin.conf_dir = File.dirname(file)
 
       # Start the plugin here - since the config file will be deleted
       @plugin.start_plugin

data/spec/litle/integration_spec.rb

@@ -3,11 +3,27 @@ require 'logger'
 
 ActiveMerchant::Billing::Base.mode = :test
 
+
+
+class KillbillApiWithFakeGetAccountById < Killbill::Plugin::KillbillApi
+
+  def initialize(japi_proxy)
+    super(japi_proxy)
+  end
+
+  # Returns an account where we specify the currency for the report group
+  def get_account_by_id(id)
+    Killbill::Plugin::Model::Account.new(id, nil, nil, nil, nil, nil, 1, nil, 1, 'USD', nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, false, true)
+  end
+end
+
 describe Killbill::Litle::PaymentPlugin do
   before(:each) do
     @plugin = Killbill::Litle::PaymentPlugin.new
-    @plugin.root = File.expand_path(File.dirname(__FILE__) + '../../../')
+    kb_apis = KillbillApiWithFakeGetAccountById.new(nil)
+    @plugin.kb_apis = kb_apis
     @plugin.logger = Logger.new(STDOUT)
+    @plugin.conf_dir = File.expand_path(File.dirname(__FILE__) + '../../../')
     @plugin.start_plugin
   end
 
@@ -38,8 +54,8 @@ describe Killbill::Litle::PaymentPlugin do
     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.amount_in_cents.should == amount_in_cents
-    payment_response.status.should == Killbill::Plugin::PaymentStatus::SUCCESS
+    payment_response.amount.should == amount_in_cents
+    payment_response.status.should == Killbill::Plugin::Model::PaymentPluginStatus.new(:PROCESSED)
 
     # Verify our table directly
     response = Killbill::Litle::LitleResponse.find_by_api_call_and_kb_payment_id :charge, kb_payment_id
@@ -49,15 +65,15 @@ describe Killbill::Litle::PaymentPlugin do
     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.amount_in_cents.should == amount_in_cents
-    payment_response.status.should == Killbill::Plugin::PaymentStatus::SUCCESS
+    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
 
     refund_response = @plugin.process_refund pm.kb_account_id, kb_payment_id, amount_in_cents, currency
-    refund_response.amount_in_cents.should == amount_in_cents
-    refund_response.status.should == Killbill::Plugin::PaymentStatus::SUCCESS
+    refund_response.amount.should == amount_in_cents
+    refund_response.status.should == Killbill::Plugin::Model::RefundPluginStatus.new(:PROCESSED)
 
     # Verify our table directly
     response = Killbill::Litle::LitleResponse.find_by_api_call_and_kb_payment_id :refund, kb_payment_id
@@ -69,8 +85,8 @@ describe Killbill::Litle::PaymentPlugin do
     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.amount_in_cents.should == second_amount_in_cents
-    payment_response.status.should == Killbill::Plugin::PaymentStatus::SUCCESS
+    payment_response.amount.should == second_amount_in_cents
+    payment_response.status.should == Killbill::Plugin::Model::PaymentPluginStatus.new(:PROCESSED)
   end
 
   private
@@ -78,8 +94,16 @@ describe Killbill::Litle::PaymentPlugin do
   def create_payment_method
     kb_account_id = SecureRandom.uuid
     kb_payment_method_id = SecureRandom.uuid
-    # litle tokens are between 13 and 25 characters long
-    litle_token = "17283748291029384756"
-    Killbill::Litle::LitlePaymentMethod.create :kb_account_id => kb_account_id, :kb_payment_method_id => kb_payment_method_id, :litle_token => litle_token
+
+    # 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)
+
+    pm = Killbill::Litle::LitlePaymentMethod.from_kb_payment_method_id kb_payment_method_id
+    pm.kb_account_id.should == kb_account_id
+    pm.kb_payment_method_id.should == kb_payment_method_id
+    pm.litle_token.should_not be_nil
+    pm
   end
 end

metadata

@@ -2,14 +2,14 @@
 name: killbill-litle
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-05-21 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.13
+        version: 1.0.16
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.13
+        version: 1.0.16
     none: false
   prerelease: false
   type: :runtime
@@ -33,13 +33,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.1
+        version: 2.0.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.1
+        version: 2.0.0
     none: false
   prerelease: false
   type: :runtime
@@ -217,6 +217,7 @@ files:
 - Rakefile
 - VERSION
 - config.ru
+- db/ddl.sql
 - db/schema.rb
 - killbill-litle.gemspec
 - killbill.properties