kaui 0.2.2 → 0.2.3

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 
 notifications:
   email:
-    - ri-dev@ning.com
+    - killbilling-dev@googlegroups.com
 
 rvm:
   - 1.9.3

data/Gemfile

@@ -1,21 +1,3 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem "rails", "~> 3.2.3"
-gem 'rest-client', '~> 1.6.7'
-gem 'money-rails', '~> 0.5.0'
-gem 'd3_rails', '~> 2.10.0'
-
-group :development, :test do
-  # jquery-rails is used by the dummy application
-  gem "jquery-rails"
-
-  if defined?(JRUBY_VERSION)
-    gem "jruby-openssl", "~> 0.7.7"
-
-    gem 'activerecord-jdbc-adapter', '~> 1.2.2'
-    gem 'activerecord-jdbcmysql-adapter', '~> 1.2.2'
-    gem 'jdbc-mysql', :require => false
-  else
-    gem 'mysql2'
-  end
-end
+gemspec

data/Gemfile.lock

@@ -1,51 +1,62 @@
+PATH
+  remote: .
+  specs:
+    kaui (0.2.3)
+      d3_rails (~> 2.10.3)
+      jquery-rails (~> 2.0)
+      killbill-client (~> 0.1.1)
+      money-rails (~> 0.5.0)
+      rails (~> 3.2.3)
+      rest-client (~> 1.6.7)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
+    actionmailer (3.2.9)
+      actionpack (= 3.2.9)
       mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
+    activeresource (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
-    d3_rails (2.10.0)
+    builder (3.0.4)
+    d3_rails (2.10.3)
       railties (>= 3.1.0)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    jquery-rails (2.0.2)
-      railties (>= 3.2.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.0)
-    json (1.7.0-java)
+    i18n (0.6.4)
+    journey (1.0.4)
+    jquery-rails (2.2.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.0)
+    killbill-client (0.1.1)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
+    mime-types (1.23)
     money (5.0.0)
       i18n (~> 0.4)
       json
@@ -53,55 +64,52 @@ GEM
       activesupport (~> 3.0)
       money (~> 5.0.0)
       railties (~> 3.0)
-    multi_json (1.3.4)
+    multi_json (1.7.4)
     mysql2 (0.3.11)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
+    rails (3.2.9)
+      actionmailer (= 3.2.9)
+      actionpack (= 3.2.9)
+      activerecord (= 3.2.9)
+      activeresource (= 3.2.9)
+      activesupport (= 3.2.9)
       bundler (~> 1.0)
-      railties (= 3.2.3)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
+      railties (= 3.2.9)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.37)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  d3_rails (~> 2.10.0)
-  jquery-rails
-  money-rails (~> 0.5.0)
+  kaui!
   mysql2
-  rails (~> 3.2.3)
-  rest-client (~> 1.6.7)

data/app/controllers/kaui/accounts_controller.rb

@@ -86,11 +86,8 @@ class Kaui::AccountsController < Kaui::EngineController
 
   def do_add_payment_method
     account_id = params[:id]
-    begin
-      @account = Kaui::KillbillHelper::get_account(account_id)
-    rescue => e
-      flash[:error] = "Error while adding payment method: #{as_string(e)}"
-    end
+    # Needed in the failure case scenario
+    @account = Kaui::KillbillHelper::get_account(account_id)
 
     # Implementation example using standard credit card fields
     @card_type = params[:card_type]
@@ -108,35 +105,31 @@ class Kaui::AccountsController < Kaui::EngineController
     @reason = params[:reason]
     @comment = params[:comment]
 
-    if @account.present?
-      properties = [ Kaui::PluginInfoProperty.new('key' => 'type', 'value' => 'CreditCard'),
-                     Kaui::PluginInfoProperty.new('key' => 'cardType', 'value' => @card_type),
-                     Kaui::PluginInfoProperty.new('key' => 'cardHolderName', 'value' => @card_holder_name),
-                     Kaui::PluginInfoProperty.new('key' => 'expirationDate', 'value' => "#{@expiration_year}-#{@expiration_month}"),
-                     Kaui::PluginInfoProperty.new('key' => 'maskNumber', 'value' => @credit_card_number),
-                     Kaui::PluginInfoProperty.new('key' => 'address1', 'value' => @address1),
-                     Kaui::PluginInfoProperty.new('key' => 'address2', 'value' => @address2),
-                     Kaui::PluginInfoProperty.new('key' => 'city', 'value' => @city),
-                     Kaui::PluginInfoProperty.new('key' => 'country', 'value' => @country),
-                     Kaui::PluginInfoProperty.new('key' => 'postalCode', 'value' => @postal_code),
-                     Kaui::PluginInfoProperty.new('key' => 'state', 'value' => @state) ]
-
-      plugin_info = Kaui::PluginInfo.new('properties' => properties)
-      payment_method = Kaui::PaymentMethod.new('accountId' => @account.account_id,
-                                               'isDefault' => @is_default == 1,
-                                               'pluginName' => Kaui.creditcard_plugin_name.call,
-                                               'pluginInfo' => plugin_info)
+    payment_method = KillBillClient::Model::PaymentMethod.new
+    payment_method.account_id = account_id
+    payment_method.plugin_name = params[:plugin_name] || Kaui.creditcard_plugin_name.call
+    payment_method.plugin_info = {
+        'type' => 'CreditCard',
+        'cardType' => @card_type,
+        'cardHolderName' => @card_holder_name,
+        'expirationDate' => "#{@expiration_year}-#{@expiration_month}",
+        'maskNumber' => @credit_card_number,
+        'address1' => @address1,
+        'address2' => @address2,
+        'city' => @city,
+        'country' => @country,
+        'postalCode' => @postal_code,
+        'state' => @state
+    }
 
-      begin
-        Kaui::KillbillHelper::add_payment_method(payment_method, current_user, @reason, @comment)
-        flash[:info] = "Payment method created"
-        redirect_to kaui_engine.account_timeline_path(@account.account_id)
-        return
-      rescue => e
-        flash[:error] = "Error while adding payment method #{invoice_id}: #{as_string(e)}"
-      end
+    begin
+      Kaui::KillbillHelper::add_payment_method(@is_default == 1, payment_method, current_user, @reason, @comment)
+      flash[:info] = 'Payment method created'
+      redirect_to kaui_engine.account_timeline_path(account_id)
+    rescue => e
+      flash[:error] = "Error while adding payment method: #{as_string(e)}"
+      render "kaui/payment_methods/new"
     end
-    render "kaui/payment_methods/new"
   end
 
   def set_default_payment_method
@@ -144,12 +137,12 @@ class Kaui::AccountsController < Kaui::EngineController
     @payment_method_id = params[:payment_method_id]
     if @account_id.present? && @payment_method_id.present?
       begin
-        @payment_methods = Kaui::KillbillHelper::set_payment_method_as_default(@account_id, @payment_method_id)
+        @payment_methods = Kaui::KillbillHelper::set_payment_method_as_default(@account_id, @payment_method_id, current_user, params[:reason], params[:comment])
       rescue => e
-        flash[:error] = "Error while setting payment method as default #{invoice_id}: #{as_string(e)}"
+        flash[:error] = "Error while setting payment method as default #{@payment_method_id}: #{as_string(e)}"
       end
     else
-      flash[:notice] = "No account_id or payment_method_id given"
+      flash[:notice] = 'No account_id or payment_method_id given'
     end
     redirect_to :back
   end

data/app/controllers/kaui/engine_controller.rb

@@ -12,7 +12,7 @@ class Kaui::EngineController < ApplicationController
 
   protected
 
-    def get_layout
-      layout ||= Kaui.config[:layout]
-    end
+  def get_layout
+    layout ||= Kaui.config[:layout]
+  end
 end

data/app/controllers/kaui/payment_methods_controller.rb

@@ -1,20 +1,36 @@
 require 'kaui/killbill_helper'
 
 class Kaui::PaymentMethodsController < Kaui::EngineController
+  def index
+    if params[:account_id]
+      begin
+        @payment_methods = Kaui::KillbillHelper.get_payment_methods params[:account_id]
+        render :show
+      rescue => e
+        flash.now[:error] = "Error while retrieving payment method for account #{params[:id]}: #{as_string(e)}"
+      end
+    end
+  end
+
   def show
-    # TODO: show payment method details
+    @payment_methods = []
+    begin
+      @payment_methods << Kaui::KillbillHelper.get_payment_method(params[:id])
+    rescue => e
+      flash.now[:error] = "Error while retrieving payment method #{params[:id]}: #{as_string(e)}"
+    end
   end
 
   def destroy
     payment_method_id = params[:id]
     if payment_method_id.present?
       begin
-        Kaui::KillbillHelper.delete_payment_method(payment_method_id, params[:set_auto_pay_off])
+        Kaui::KillbillHelper.delete_payment_method(payment_method_id, params[:set_auto_pay_off], current_user, params[:reason], params[:comment])
       rescue => e
         flash[:error] = "Error while deleting payment method #{payment_method_id}: #{as_string(e)}"
       end
     else
-      flash[:notice] = "Did not get the payment method id"
+      flash[:notice] = 'Did not get the payment method id'
     end
     redirect_to :back
   end

data/app/helpers/kaui/killbill_helper.rb

@@ -1,3 +1,5 @@
+require 'killbill_client'
+
 module Kaui
   module KillbillHelper
 
@@ -6,7 +8,7 @@ module Kaui
       Rails.logger.info "Performing #{method} request to #{url}"
       begin
         response = RestClient.send(method.to_sym, url, *args)
-        data = { :code => response.code }
+        data = {:code => response.code}
         if response.code < 300 && response.body.present?
           if response.headers[:content_type] =~ /application\/json.*/
             data[:json] = JSON.parse(response.body)
@@ -25,7 +27,7 @@ module Kaui
       if response.nil? || response[:json].nil?
         arity == :single ? nil : []
       elsif block_given?
-        arity == :single ? yield(response[:json]) : response[:json].collect {|item| yield(item) }
+        arity == :single ? yield(response[:json]) : response[:json].collect { |item| yield(item) }
       else
         response[:json]
       end
@@ -52,17 +54,17 @@ module Kaui
 
     def self.get_account_timeline(account_id)
       data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/timeline?audit=MINIMAL"
-      process_response(data, :single) {|json| Kaui::AccountTimeline.new(json) }
+      process_response(data, :single) { |json| Kaui::AccountTimeline.new(json) }
     end
 
     def self.get_account(account_id, with_balance = false, with_balance_and_cba = false)
       data = call_killbill :get, "/1.0/kb/accounts/#{account_id}?accountWithBalance=#{with_balance}&accountWithBalanceAndCBA=#{with_balance_and_cba}"
-      process_response(data, :single) {|json| Kaui::Account.new(json) }
+      process_response(data, :single) { |json| Kaui::Account.new(json) }
     end
 
     def self.get_account_by_external_key(external_key, with_balance = false, with_balance_and_cba = false)
       data = call_killbill :get, "/1.0/kb/accounts?externalKey=#{external_key}&accountWithBalance=#{with_balance}&accountWithBalanceAndCBA=#{with_balance_and_cba}"
-      process_response(data, :single) {|json| Kaui::Account.new(json) }
+      process_response(data, :single) { |json| Kaui::Account.new(json) }
     end
 
     def self.get_account_by_bundle_id(bundle_id)
@@ -95,7 +97,7 @@ module Kaui
     end
 
     def self.update_email_notifications(account_id, is_notified, current_user = nil, reason = nil, comment = nil)
-      email_data = { :isNotifiedForInvoices => is_notified }
+      email_data = {:isNotifiedForInvoices => is_notified}
       call_killbill :put,
                     "/1.0/kb/accounts/#{account_id}/emailNotifications",
                     ActiveSupport::JSON.encode(email_data, :root => false),
@@ -118,17 +120,17 @@ module Kaui
 
     def self.get_bundles(account_id)
       data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/bundles"
-      process_response(data, :multiple) {|json| Kaui::Bundle.new(json) }
+      process_response(data, :multiple) { |json| Kaui::Bundle.new(json) }
     end
 
     def self.get_bundle_by_external_key(account_id, external_key)
       data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/bundles?externalKey=#{external_key}"
-      process_response(data, :single) {|json| Kaui::Bundle.new(json) }
+      process_response(data, :single) { |json| Kaui::Bundle.new(json) }
     end
 
     def self.get_bundle(bundle_id)
       data = call_killbill :get, "/1.0/kb/bundles/#{bundle_id}"
-      process_response(data, :single) {|json| Kaui::Bundle.new(json) }
+      process_response(data, :single) { |json| Kaui::Bundle.new(json) }
     end
 
     def self.transfer_bundle(bundle_id, new_account_id, cancel_immediately = false, transfer_addons = true, current_user = nil, reason = nil, comment = nil)
@@ -145,7 +147,7 @@ module Kaui
 
     def self.get_subscriptions_for_bundle(bundle_id)
       data = call_killbill :get, "/1.0/kb/bundles/#{bundle_id}/subscriptions"
-      process_response(data, :multiple) {|json| Kaui::Subscription.new(json) }
+      process_response(data, :multiple) { |json| Kaui::Subscription.new(json) }
     end
 
     def self.get_subscriptions(account_id)
@@ -159,7 +161,7 @@ module Kaui
 
     def self.get_subscription(subscription_id)
       data = call_killbill :get, "/1.0/kb/subscriptions/#{subscription_id}"
-      process_response(data, :single) {|json| Kaui::Subscription.new(json) }
+      process_response(data, :single) { |json| Kaui::Subscription.new(json) }
     end
 
     def self.create_subscription(subscription, current_user = nil, reason = nil, comment = nil)
@@ -235,7 +237,7 @@ module Kaui
 
     def self.get_invoice(invoice_id)
       data = call_killbill :get, "/1.0/kb/invoices/#{invoice_id}?withItems=true"
-      process_response(data, :single) {|json| Kaui::Invoice.new(json) }
+      process_response(data, :single) { |json| Kaui::Invoice.new(json) }
     end
 
     def self.get_invoice_item(invoice_id, invoice_item_id)
@@ -307,14 +309,14 @@ module Kaui
     def self.get_available_addons(base_product_name)
       data = call_killbill :get, "/1.0/kb/catalog/availableAddons?baseProductName=#{base_product_name}"
       if data.has_key?(:json)
-        data[:json].inject({}) {|catalog_hash, item| catalog_hash.merge!(item["planName"] => item) }
+        data[:json].inject({}) { |catalog_hash, item| catalog_hash.merge!(item["planName"] => item) }
       end
     end
 
     def self.get_available_base_plans()
       data = call_killbill :get, "/1.0/kb/catalog/availableBasePlans"
       if data.has_key?(:json)
-        data[:json].inject({}) {|catalog_hash, item| catalog_hash.merge!(item["planName"] => item) }
+        data[:json].inject({}) { |catalog_hash, item| catalog_hash.merge!(item["planName"] => item) }
       end
     end
 
@@ -327,18 +329,18 @@ module Kaui
 
     def self.get_payments(invoice_id)
       data = call_killbill :get, "/1.0/kb/invoices/#{invoice_id}/payments"
-      response_data = process_response(data, :multiple) {|json| Kaui::Payment.new(json) }
+      response_data = process_response(data, :multiple) { |json| Kaui::Payment.new(json) }
       return response_data
     end
 
     def self.pay_all_invoices(account_id, external = false, current_user = nil, reason = nil, comment = nil)
       call_killbill :post,
-                     "/1.0/kb/invoices/payments?externalPayment=#{external}",
-                     ActiveSupport::JSON.encode({:accountId => account_id}, :root => false),
-                     :content_type => "application/json",
-                     "X-Killbill-CreatedBy" => current_user,
-                     "X-Killbill-Reason" => extract_reason_code(reason),
-                     "X-Killbill-Comment" => "#{comment}"
+                    "/1.0/kb/invoices/payments?externalPayment=#{external}",
+                    ActiveSupport::JSON.encode({:accountId => account_id}, :root => false),
+                    :content_type => "application/json",
+                    "X-Killbill-CreatedBy" => current_user,
+                    "X-Killbill-Reason" => extract_reason_code(reason),
+                    "X-Killbill-Comment" => "#{comment}"
     end
 
     def self.create_payment(payment, external, current_user = nil, reason = nil, comment = nil)
@@ -351,24 +353,19 @@ module Kaui
         payment_data.delete(:chargebacks)
         payment_data.delete(:audit_logs)
         call_killbill :post,
-                       "/1.0/kb/invoices/#{payment.invoice_id}/payments?externalPayment=#{external}",
-                       ActiveSupport::JSON.encode(payment_data, :root => false),
-                       :content_type => "application/json",
-                       "X-Killbill-CreatedBy" => current_user,
-                       "X-Killbill-Reason" => extract_reason_code(reason),
-                       "X-Killbill-Comment" => "#{comment}"
+                      "/1.0/kb/invoices/#{payment.invoice_id}/payments?externalPayment=#{external}",
+                      ActiveSupport::JSON.encode(payment_data, :root => false),
+                      :content_type => "application/json",
+                      "X-Killbill-CreatedBy" => current_user,
+                      "X-Killbill-Reason" => extract_reason_code(reason),
+                      "X-Killbill-Comment" => "#{comment}"
       end
     end
 
     ############## PAYMENT METHOD ##############
 
-    def self.delete_payment_method(payment_method_id, set_auto_pay_off = false,  current_user = nil, reason = nil, comment = nil)
-      set_auto_pay_off_param = "?deleteDefaultPmWithAutoPayOff=true" if set_auto_pay_off
-      call_killbill :delete,
-                    "/1.0/kb/paymentMethods/#{payment_method_id}#{set_auto_pay_off_param}",
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => "#{reason}",
-                    "X-Killbill-Comment" => "#{comment}"
+    def self.delete_payment_method(payment_method_id, set_auto_pay_off = false, current_user = nil, reason = nil, comment = nil)
+      KillBillClient::Model::PaymentMethod.destroy payment_method_id, set_auto_pay_off, current_user, reason, comment
     end
 
     def self.get_non_external_payment_methods(account_id)
@@ -376,34 +373,19 @@ module Kaui
     end
 
     def self.get_payment_methods(account_id)
-      data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/paymentMethods?withPluginInfo=true"
-      process_response(data, :multiple) {|json| Kaui::PaymentMethod.new(json) }
+      KillBillClient::Model::PaymentMethod.find_all_by_account_id account_id, true
     end
 
     def self.get_payment_method(payment_method_id)
-      data = call_killbill :get, "/1.0/kb/paymentMethods/#{payment_method_id}?withPluginInfo=true"
-      process_response(data, :single) {|json| Kaui::PaymentMethod.new(json) }
+      KillBillClient::Model::PaymentMethod.find_by_id payment_method_id, true
     end
 
     def self.set_payment_method_as_default(account_id, payment_method_id, current_user = nil, reason = nil, comment = nil)
-      call_killbill :put,
-                    "/1.0/kb/accounts/#{account_id}/paymentMethods/#{payment_method_id}/setDefault",
-                    "",
-                    :content_type => :json,
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => extract_reason_code(reason),
-                    "X-Killbill-Comment" => "#{comment}"
+      KillBillClient::Model::PaymentMethod.set_default payment_method_id, account_id, current_user, reason, comment
     end
 
-    def self.add_payment_method(payment_method, current_user = nil, reason = nil, comment = nil)
-      payment_method_data = Kaui::Refund.camelize(payment_method.to_hash)
-        call_killbill :post,
-                      "/1.0/kb/accounts/#{payment_method.account_id}/paymentMethods?isDefault=#{payment_method.is_default}",
-                      ActiveSupport::JSON.encode(payment_method_data, :root => false),
-                      :content_type => :json,
-                      "X-Killbill-CreatedBy" => current_user,
-                      "X-Killbill-Reason" => extract_reason_code(reason),
-                      "X-Killbill-Comment" => "#{comment}"
+    def self.add_payment_method(is_default, payment_method, current_user = nil, reason = nil, comment = nil)
+      payment_method.create is_default, current_user, reason, comment
     end
 
     ############## REFUND ##############
@@ -415,7 +397,7 @@ module Kaui
 
     def self.get_refunds_for_payment(payment_id)
       data = call_killbill :get, "/1.0/kb/payments/#{payment_id}/refunds"
-      process_response(data, :multiple) {|json| Kaui::Refund.new(json) }
+      process_response(data, :multiple) { |json| Kaui::Refund.new(json) }
     end
 
     def self.create_refund(payment_id, refund, current_user = nil, reason = nil, comment = nil)
@@ -436,7 +418,7 @@ module Kaui
 
     def self.get_chargebacks_for_payment(payment_id)
       data = call_killbill :get, "/1.0/kb/chargebacks/payments/#{payment_id}"
-      process_response(data, :multiple) {|json| Kaui::Chargeback.new(json) }
+      process_response(data, :multiple) { |json| Kaui::Chargeback.new(json) }
     end
 
     def self.create_chargeback(chargeback, current_user = nil, reason = nil, comment = nil)
@@ -580,5 +562,23 @@ module Kaui
       data = call_killbill :get, "/1.0/kb/analytics/sanity"
       process_response(data, :single) { |json| Kaui::AnalyticsSanity.new(json) }
     end
+
+    def self.before_all
+      methods.each do |method_name|
+        method = method(method_name)
+        (
+        class << self;
+          self
+        end
+        ).instance_eval {
+          define_method(method_name) do |*args, &block|
+            yield
+            method.call(*args, &block)
+          end
+        }
+      end
+    end
+
+    before_all { KillBillClient.url = Kaui.killbill_finder.call }
   end
 end

data/app/views/kaui/payment_methods/_payment_methods_table.html.erb

@@ -3,41 +3,47 @@
 </div>
 <table class="table table-condensed table-striped">
   <thead>
-    <tr>
-      <th>Type</th>
-      <th>Card Type</th>
-      <th>Account Name</th>
-      <th>Mask Number / Baid</th>
-      <th>Expiration Date</th>
-      <th>Default Method</th>
-      <th>Actions</th>
-    </tr>
+  <tr>
+    <th>Plugin</th>
+    <th>External id</th>
+    <th>Plugin info</th>
+    <th>Default Method</th>
+    <th>Actions</th>
+  </tr>
   </thead>
   <tbody>
-    <% if payment_methods.present? && !payment_methods.nil? %>
+  <% if payment_methods.present? && !payment_methods.nil? %>
       <% payment_methods.each do |payment_method| %>
-        <tr>
-          <td><%= payment_method.type %></a></td>
-          <td><%= payment_method.card_type %></a></td>
-          <td><%= payment_method.card_holder_name %><%= payment_method.email %></a></td>
-          <td><%= payment_method.mask_number %><%= payment_method.baid %></td>
-          <td><%= payment_method.expiration_dt %></td>
-          <td>
-            <% if payment_method.is_default %>
-              <i class="icon-ok"></i>
-            <% else %>
-              <%= link_to "Make Default", kaui_engine.set_default_payment_method_account_path(payment_method.account_id, :params => { :payment_method_id => payment_method.payment_method_id }), :method => :put, :confirm => "Are you sure you want to make this payment method default?", :class => "btn btn-mini" %>
-            <% end %>
-          </td>
-          <td>
-            <% if payment_method.is_default %>
-              <%= link_to "Delete", kaui_engine.payment_method_path(payment_method.payment_method_id, :params => { :set_auto_pay_off => "true" }), :method => :delete, :confirm => "Are you sure you want to delete this payment method?", :class => "btn btn-mini" %>
-            <% else %>
-              <%= link_to "Delete", kaui_engine.payment_method_path(payment_method.payment_method_id), :method => :delete, :confirm => "Are you sure you want to delete this payment method?", :class => "btn btn-mini" %>
-            <% end %>
-          </td>
-        </tr>
+          <tr>
+            <td><%= payment_method.plugin_name %></a></td>
+            <td>
+              <%= payment_method.plugin_info.external_payment_id unless payment_method.plugin_info.blank? %>
+            </td>
+            <td>
+              <% unless payment_method.plugin_info.blank? and payment_method.plugin_info.properties.blank? %>
+                  <ul>
+                    <% payment_method.plugin_info.properties.each do |property| %>
+                        <li><%= property.key %>: <%= property.value %></li>
+                    <% end %>
+                  </ul>
+              <% end %>
+            </td>
+            <td>
+              <% if payment_method.is_default %>
+                  <i class="icon-ok"></i>
+              <% else %>
+                  <%= link_to "Make Default", kaui_engine.set_default_payment_method_account_path(payment_method.account_id, :params => {:payment_method_id => payment_method.payment_method_id}), :method => :put, :confirm => "Are you sure you want to make this payment method default?", :class => "btn btn-mini" %>
+              <% end %>
+            </td>
+            <td>
+              <% if payment_method.is_default %>
+                  <%= link_to "Delete", kaui_engine.payment_method_path(payment_method.payment_method_id, :params => {:set_auto_pay_off => "true"}), :method => :delete, :confirm => "Are you sure you want to delete this payment method?", :class => "btn btn-mini" %>
+              <% else %>
+                  <%= link_to "Delete", kaui_engine.payment_method_path(payment_method.payment_method_id), :method => :delete, :confirm => "Are you sure you want to delete this payment method?", :class => "btn btn-mini" %>
+              <% end %>
+            </td>
+          </tr>
       <% end %>
-    <% end %>
+  <% end %>
   </tbody>
-</table>
+</table>

data/app/views/kaui/payment_methods/index.html.erb

@@ -1,14 +1,15 @@
 <%= form_tag payment_methods_path, :class => "form-horizontal", :method => :get do %>
-  <fieldset>
-    <legend>Please enter account id</legend>
-    <div class="control-group">
-      <label class="control-label" for="account_id">Account</label>
-      <div class="controls">
-        <%= text_field_tag 'account_id', nil, :class => "input-xlarge", :id => "account_id" %>
+    <fieldset>
+      <legend>Please enter account id</legend>
+      <div class="control-group">
+        <label class="control-label" for="account_id">Account</label>
+
+        <div class="controls">
+          <%= text_field_tag 'account_id', nil, :class => "input-xlarge", :id => "account_id" %>
+        </div>
       </div>
-    </div>
-    <div class="form-actions">
-      <%= button_tag "Search", :class =>"btn btn-primary" %>
-    </div>
-  </fieldset>
+      <div class="form-actions">
+        <%= button_tag "Search", :class => "btn btn-primary" %>
+      </div>
+    </fieldset>
 <% end %>

data/app/views/kaui/payment_methods/show.html.erb

@@ -1 +1 @@
-<%= render :partial => 'payment_methods_table' %>
+<%= render :partial => 'payment_methods_table', :locals => {:payment_methods => @payment_methods} %>

data/app/views/kaui/payments/_payments_table.html.erb

@@ -22,7 +22,7 @@
           <td><%= format_date(payment.effective_date, @account.timezone).html_safe if payment.effective_date.present? %></td>
           <td><%= humanized_money_with_symbol payment.amount_to_money %> (<%= payment.currency %>)</td>
           <td><%= humanized_money_with_symbol payment.paid_amount_to_money %> (<%= payment.currency %>)</td>
-          <td><%= "#{@payment_methods[payment.payment_id].type} #{@payment_methods[payment.payment_id].card_type} #{@payment_methods[payment.payment_id].mask_number}" if @payment_methods.present? and @payment_methods[payment.payment_id].present? %></td>
+          <td><%= "#{@payment_methods[payment.payment_id].plugin_info.type} #{@payment_methods[payment.payment_id].plugin_info.cc_type} #{@payment_methods[payment.payment_id].plugin_info.cc_last4}" if @payment_methods.present? and @payment_methods[payment.payment_id].present? and @payment_methods[payment.payment_id].plugin_info.present? %></td>
           <td><%= payment.ext_first_payment_id_ref %> <%= " / " if payment.ext_second_payment_id_ref.present? %> <%= payment.ext_second_payment_id_ref %></td>
           <td><%= payment.retry_count %></td>
           <td><%= payment.status %> <%=  payment.gateway_error_code unless payment.status == 'SUCCESS' %> <%= payment.gateway_error_msg %></td>

data/config/routes.rb

@@ -37,7 +37,7 @@ Kaui::Engine.routes.draw do
 
   resources :payments, :only => [ :create, :new, :index, :show ]
 
-  resources :payment_methods, :only => [ :show, :destroy ]
+  resources :payment_methods, :only => [ :index, :show, :destroy ]
 
   resources :refunds, :only => [ :index, :show, :create, :new ]
 

data/kaui.gemspec

@@ -1,27 +1,39 @@
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 
-# Maintain your gem's version:
-require "kaui/version"
+require 'kaui/version'
 
-# Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.name        = "kaui"
-  s.version     = Kaui::VERSION
-  s.authors     = ["Alena Dudzinskaya"]
-  s.email       = ["alenad@glam.com"]
-  s.homepage    = "https://github.com/killbill/killbill-admin-ui"
-  s.summary     = "Killbill Admin UI plugin"
-  s.description = "Rails UI plugin for Killbill administration."
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.bindir        = 'bin'
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.name = 'kaui'
+  s.version = Kaui::VERSION
+  s.summary = 'Killbill Admin UI plugin'
+  s.description = 'Rails UI plugin for Killbill administration.'
+
+  s.required_ruby_version = '>= 1.8.7'
+
+  s.license = 'Apache License (2.0)'
+
+  s.author = 'Killbill core team'
+  s.email = 'killbilling-users@googlegroups.com'
+  s.homepage = 'http://www.killbilling.org'
+
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.bindir = 'bin'
+  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = %w(lib)
 
   s.add_dependency 'rails', '~> 3.2.3'
   s.add_dependency 'jquery-rails', '~> 2.0'
   s.add_dependency 'rest-client', '~> 1.6.7'
   s.add_dependency 'money-rails', '~> 0.5.0'
   s.add_dependency 'd3_rails', '~> 2.10.3'
+  s.add_dependency 'killbill-client', '~> 0.1.1'
+
+  if defined?(JRUBY_VERSION)
+    s.add_development_dependency 'activerecord-jdbc-adapter', '~> 1.2.2'
+    s.add_development_dependency 'activerecord-jdbcmysql-adapter', '~> 1.2.2'
+    #s.add_development_dependency 'jdbc-mysql', :require => false
+  else
+    s.add_development_dependency 'mysql2'
+  end
 end

data/lib/kaui/engine.rb

@@ -9,6 +9,7 @@ require 'd3_rails'
 require 'json'
 require 'money-rails'
 require 'rest_client'
+require 'killbill_client'
 
 module Kaui
   class Engine < ::Rails::Engine

data/lib/kaui/error_helper.rb

@@ -1,10 +1,10 @@
-require 'rest_client'
-
 module Kaui
   module ErrorHelper
     def as_string(e)
       if e.is_a?(RestClient::Exception)
         "#{e.message} #{e.response}".split(/\n/).take(5).join("\n")
+      elsif e.is_a?(KillBillClient::API::ResponseError)
+        "Error #{e.response.code}: #{e.response.message}"
       else
         e.message
       end

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/kaui.rb

@@ -19,7 +19,7 @@ module Kaui
   self.bundle_home_path = lambda {|bundle_id| Kaui::Engine.routes.url_helpers.bundle_path(:id => bundle_id) }
   self.invoice_home_path = lambda {|invoice_id| Kaui::Engine.routes.url_helpers.invoice_path(:id => invoice_id) }
   self.bundle_key_display_string =  lambda {|bundle_key| bundle_key }
-  self.creditcard_plugin_name =  lambda { nil }
+  self.creditcard_plugin_name =  lambda { '__EXTERNAL_PAYMENT__' }
 
   def self.config(&block)
     # TODO

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
-- Alena Dudzinskaya
+- Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,9 +91,40 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.10.3
+- !ruby/object:Gem::Dependency
+  name: killbill-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails UI plugin for Killbill administration.
-email:
-- alenad@glam.com
+email: killbilling-users@googlegroups.com
 executables:
 - kaui
 extensions: []
@@ -162,9 +193,6 @@ files:
 - app/models/kaui/overdue_state.rb
 - app/models/kaui/payment.rb
 - app/models/kaui/payment_attempt.rb
-- app/models/kaui/payment_method.rb
-- app/models/kaui/plugin_info.rb
-- app/models/kaui/plugin_info_property.rb
 - app/models/kaui/product.rb
 - app/models/kaui/refund.rb
 - app/models/kaui/subscription.rb
@@ -309,7 +337,6 @@ files:
 - test/unit/helpers/kaui/home_helper_test.rb
 - test/unit/helpers/kaui/invoices_helper_test.rb
 - test/unit/helpers/kaui/payments_helper_test.rb
-- test/unit/helpers/kaui/plugin_infos_helper_test.rb
 - test/unit/helpers/kaui/refunds_helper_test.rb
 - test/unit/kaui/account_test.rb
 - test/unit/kaui/base_test.rb
@@ -317,9 +344,6 @@ files:
 - test/unit/kaui/invoice_item_test.rb
 - test/unit/kaui/invoice_test.rb
 - test/unit/kaui/overdue_state_test.rb
-- test/unit/kaui/payment_method_test.rb
-- test/unit/kaui/plugin_info_property_test.rb
-- test/unit/kaui/plugin_info_test.rb
 - test/unit/kaui/refund_test.rb
 - test/unit/kaui/tag_definition_test.rb
 - test/unit/model_test.rb
@@ -330,8 +354,9 @@ files:
 - vendor/assets/javascripts/js/jquery.dataTables.v1.9.3.min.js
 - vendor/assets/stylesheets/css/bootstrap-datepicker.cd46d38.css
 - vendor/assets/stylesheets/css/bootstrap.v2.2.1.min.css
-homepage: https://github.com/killbill/killbill-admin-ui
-licenses: []
+homepage: http://www.killbilling.org
+licenses:
+- Apache License (2.0)
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -341,16 +366,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 451527317018567128
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3422084026111820071
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -422,7 +447,6 @@ test_files:
 - test/unit/helpers/kaui/home_helper_test.rb
 - test/unit/helpers/kaui/invoices_helper_test.rb
 - test/unit/helpers/kaui/payments_helper_test.rb
-- test/unit/helpers/kaui/plugin_infos_helper_test.rb
 - test/unit/helpers/kaui/refunds_helper_test.rb
 - test/unit/kaui/account_test.rb
 - test/unit/kaui/base_test.rb
@@ -430,9 +454,6 @@ test_files:
 - test/unit/kaui/invoice_item_test.rb
 - test/unit/kaui/invoice_test.rb
 - test/unit/kaui/overdue_state_test.rb
-- test/unit/kaui/payment_method_test.rb
-- test/unit/kaui/plugin_info_property_test.rb
-- test/unit/kaui/plugin_info_test.rb
 - test/unit/kaui/refund_test.rb
 - test/unit/kaui/tag_definition_test.rb
 - test/unit/model_test.rb

data/app/models/kaui/payment_method.rb

@@ -1,36 +0,0 @@
-class Kaui::PaymentMethod < Kaui::Base
-  define_attr :account_id
-  define_attr :is_default
-  define_attr :payment_method_id
-  define_attr :plugin_name
-
-  has_one :plugin_info, Kaui::PluginInfo
-
-  def card_type
-    plugin_info.property("cardType") if plugin_info.present?
-  end
-
-  def type
-    plugin_info.property("type") if plugin_info.present?
-  end
-
-  def mask_number
-    plugin_info.property("maskNumber") if plugin_info.present?
-  end
-
-  def card_holder_name
-    plugin_info.property("cardHolderName") if plugin_info.present?
-  end
-
-  def expiration_dt
-    plugin_info.property("expirationDate") if plugin_info.present?
-  end
-
-  def baid
-    plugin_info.property("baid") if plugin_info.present?
-  end
-
-  def email
-    plugin_info.property("email") if plugin_info.present?
-  end
-end

data/app/models/kaui/plugin_info.rb

@@ -1,10 +0,0 @@
-class Kaui::PluginInfo < Kaui::Base
-  define_attr :external_payment_id
-
-  has_many :properties, Kaui::PluginInfoProperty
-
-  def property(key)
-    prop = properties.find { |prop| prop.key == key } unless properties.nil?
-    prop.value unless prop.nil?
-  end
-end

data/app/models/kaui/plugin_info_property.rb

@@ -1,5 +0,0 @@
-class Kaui::PluginInfoProperty < Kaui::Base
-  define_attr :key
-  define_attr :value
-  define_attr :is_updatable
-end

data/test/unit/helpers/kaui/plugin_infos_helper_test.rb

@@ -1,20 +0,0 @@
-require 'test_helper'
-
-module Kaui::PluginInfosHelperTest
-  @@plugin_info_keys = [:accountId, :type, :cardHolderName, :cardType, :expirationDate, :maskNumber,
-                        :address1, :address2, :city, :postalCode, :state, :country]
-
-  def plugin_info_properies
-    properties = []
-    @@plugin_info_keys.each do |key|
-      as_json = plugin_info_properties("plugin_info_property_#{key.to_s}".to_sym)
-      properties << Kaui::PluginInfoProperty.new(as_json).to_hash
-    end
-    properties
-  end
-
-  def create_plugin_info(plugin_info_json)
-    plugin_info_json["properties"] = plugin_info_properies
-    Kaui::PluginInfo.new(plugin_info_json)
-  end
-end

data/test/unit/kaui/payment_method_test.rb

@@ -1,26 +0,0 @@
-require 'test_helper'
-
-class Kaui::PaymentMethodTest < ActiveSupport::TestCase
-  fixtures :payment_methods, :plugin_infos, :plugin_info_properties
-
-  include Kaui::PluginInfosHelperTest
-
-  test "can serialize from json" do
-    as_json = plugin_infos(:plugin_info_for_pierre)
-    plugin_info = create_plugin_info(as_json)
-
-    as_json = payment_methods(:payment_method_for_pierre)
-    as_json["pluginInfo"] = plugin_info
-    payment_method = Kaui::PaymentMethod.new(as_json)
-
-    assert_equal as_json["accountId"], payment_method.account_id
-    assert_equal as_json["isDefault"], payment_method.is_default
-    assert_equal as_json["paymentMethodId"], payment_method.payment_method_id
-    assert_equal as_json["pluginName"], payment_method.plugin_name
-    @@plugin_info_keys.each_with_index do |key, i|
-      assert_equal plugin_info_properies[i]["key"], payment_method.plugin_info.properties[i].key
-      assert_equal plugin_info_properies[i]["value"], payment_method.plugin_info.properties[i].value
-      assert_equal plugin_info_properies[i]["is_updatable"], payment_method.plugin_info.properties[i].is_updatable
-    end
-  end
-end

data/test/unit/kaui/plugin_info_property_test.rb

@@ -1,20 +0,0 @@
-require 'test_helper'
-
-class Kaui::PluginInfoPropertyTest < ActiveSupport::TestCase
-  fixtures :plugin_info_properties
-
-  keys = [:accountId, :type, :cardHolderName, :cardType, :expirationDate, :maskNumber,
-          :address1, :address2, :city, :postalCode, :state, :country]
-
-  test "can serialize from json" do
-    keys.each do |key|
-      as_json = plugin_info_properties("plugin_info_property_#{key.to_s}".to_sym)
-      plugin_info_property = Kaui::PluginInfoProperty.new(as_json)
-
-      assert_equal as_json["isUpdatable"], plugin_info_property.is_updatable
-      assert_equal as_json["key"], plugin_info_property.key
-      assert_equal key.to_s, plugin_info_property.key
-      assert_equal as_json["value"], plugin_info_property.value
-    end
-  end
-end

data/test/unit/kaui/plugin_info_test.rb

@@ -1,19 +0,0 @@
-require 'test_helper'
-
-class Kaui::PluginInfoTest < ActiveSupport::TestCase
-  fixtures :plugin_infos, :plugin_info_properties
-
-  include Kaui::PluginInfosHelperTest
-
-  test "can serialize from json" do
-    as_json = plugin_infos(:plugin_info_for_pierre)
-    plugin_info = create_plugin_info(as_json)
-
-    assert_equal as_json["externalPaymentId"], plugin_info.external_payment_id
-    @@plugin_info_keys.each_with_index do |key, i|
-      assert_equal plugin_info_properies[i]["key"], plugin_info.properties[i].key
-      assert_equal plugin_info_properies[i]["value"], plugin_info.properties[i].value
-      assert_equal plugin_info_properies[i]["is_updatable"], plugin_info.properties[i].is_updatable
-    end
-  end
-end