kaui 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dfe42ad2548ff670bed0e9282f8b311156d2e5e
-  data.tar.gz: 9b06404c20ea0f49392971aa3c93eb75ce51e5de
+  metadata.gz: 69a715b46b207b1b61efdab90449e98406488d87
+  data.tar.gz: eba301b72bc6957f3b6d6342ea07ba89f5d8c8c1
 SHA512:
-  metadata.gz: a1039d8c8b644990de6ac798aa5ebea4e8f0cda5d548d742103eba5ff2a9bcc34d353f5299d48afa080f699cb212816d822f2758fe08046542da726062bcec15
-  data.tar.gz: 67b84718f67dda80b67de237483d406fee007b9f1baca451d79836d624e3633dcae3bf325af25509b8db2286fa2b7dddd8bc81dcd382e19d551f0d0f70767200
+  metadata.gz: b5ec35de209aef18aeb38a4d13267b782a8aab0bfac3f2aca76c6dc0c9f8654286b191fd497bf1df3f9a8847838cae908d588c0ce8b7a14f4931adc23157aebc
+  data.tar.gz: 1a3ae67d11058beaa7b49f401e7763a4e0e31996e178393f36ff4a833f4fbff77ec57c583cd09beb84b29862741a1b53687b12044eff5cb34b5fcd46c3d39024

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    kaui (0.7.0)
+    kaui (0.7.1)
       cancan (~> 1.6.10)
       carmen-rails (~> 1.0.0)
       d3_rails (~> 3.2.8)
       devise (~> 3.0.2)
       jquery-rails (~> 3.0.4)
-      killbill-client (~> 0.7.3)
+      killbill-client (~> 0.8.1)
       money-rails (~> 0.8.1)
       rails (~> 3.2.14)
 
@@ -69,8 +69,8 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
-    killbill-client (0.7.3)
-      json (~> 1.8.0)
+    killbill-client (0.8.1)
+      json (>= 1.2.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -126,7 +126,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.40)
+    tzinfo (0.3.41)
     unicode_utils (1.4.0)
     warden (1.2.3)
       rack (>= 1.0)

data/app/controllers/kaui/payment_methods_controller.rb

@@ -51,6 +51,7 @@ class Kaui::PaymentMethodsController < Kaui::EngineController
     @expiration_year            = params[:expiration_year]
     @expiration_month           = params[:expiration_month]
     @credit_card_number         = params[:credit_card_number]
+    @verification_value         = params[:verification_value]
     @address1                   = params[:address1]
     @address2                   = params[:address2]
     @city                       = params[:city]
@@ -58,23 +59,26 @@ class Kaui::PaymentMethodsController < Kaui::EngineController
     @state                      = params[:state]
     @country                    = params[:country]
 
+    # Magic from lib/killbill/helpers/active_merchant/payment_plugin.rb
     @payment_method.plugin_info = {
-        'type'              => 'CreditCard',
-        'ccType'            => @card_type,
-        'ccName'            => @card_holder_name,
-        'ccExpirationMonth' => @expiration_month,
-        'ccExpirationYear'  => @expiration_year,
-        'ccLast4'           => @credit_card_number[-4, 4],
-        'address1'          => @address1,
-        'address2'          => @address2,
-        'city'              => @city,
-        'country'           => @country,
-        'zip'               => @postal_code,
-        'state'             => @state
+        'type'                => 'CreditCard',
+        'ccType'              => @card_type,
+        'ccFirstName'         => @card_holder_name,
+        'ccLastName'          => @card_holder_name,
+        'ccExpirationMonth'   => @expiration_month,
+        'ccExpirationYear'    => @expiration_year,
+        'ccNumber'            => @credit_card_number,
+        'ccVerificationValue' => @verification_value,
+        'address1'            => @address1,
+        'address2'            => @address2,
+        'city'                => @city,
+        'country'             => @country,
+        'zip'                 => @postal_code,
+        'state'               => @state
     }
 
     begin
-      @payment_method = @payment_method.create(current_user.kb_username, @reason, @comment, options_for_klient)
+      @payment_method = @payment_method.create(@payment_method.is_default, current_user.kb_username, @reason, @comment, options_for_klient)
       redirect_to payment_method_path(@payment_method.payment_method_id), :notice => 'Payment method was successfully created'
     rescue => e
       flash.now[:error] = "Error while creating payment method: #{as_string(e)}"

data/kaui.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'jquery-rails', '~> 3.0.4'
   s.add_dependency 'money-rails', '~> 0.8.1'
   s.add_dependency 'd3_rails', '~> 3.2.8'
-  s.add_dependency 'killbill-client', '~> 0.7.3'
+  s.add_dependency 'killbill-client', '~> 0.8.1'
   s.add_dependency 'devise', '~> 3.0.2'
   s.add_dependency 'cancan', '~> 1.6.10'
   s.add_dependency 'carmen-rails', '~> 1.0.0'

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/test/killbill_test_helper.rb

@@ -31,6 +31,11 @@ module Kaui
       @cba               = create_cba(@invoice_item.invoice_id, @account, @tenant)
       @paid_invoice_item = create_charge(@account, @tenant)
       @payment           = create_payment(@paid_invoice_item, @account, @tenant)
+
+      KillBillClient.api_key = @tenant.api_key
+      KillBillClient.api_secret = @tenant.api_secret
+      KillBillClient.username = USERNAME
+      KillBillClient.password = PASSWORD
     end
 
     # Return a new test account
@@ -78,7 +83,7 @@ module Kaui
       account = create_account(tenant, username, password, user, reason, comment) if account.nil?
 
       payment_method = Kaui::PaymentMethod.new(:account_id => account.account_id, :plugin_name => '__EXTERNAL_PAYMENT__', :is_default => set_default)
-      payment_method.create(user, reason, comment, build_options(tenant, username, password))
+      payment_method.create(true, user, reason, comment, build_options(tenant, username, password))
     end
 
     # Return the created external charge
@@ -124,7 +129,12 @@ module Kaui
       tenant.api_key    = api_key
       tenant.api_secret = api_secret
 
-      tenant.create(user, reason, comment, build_options)
+      tenant = tenant.create(user, reason, comment, build_options)
+
+      # Re-hydrate the secret, which is not returned
+      tenant.api_secret = api_secret
+
+      tenant
     end
 
     def build_options(tenant = nil, username = USERNAME, password = PASSWORD)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement