kaui 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9dda6885d003eff4164274878c7dd5e0781cf4d
-  data.tar.gz: a19b25d1af270e4b3355df0a5ac33d117e5e1a95
+  metadata.gz: 44e6088db793de66aab1c622dac27f3ae50c8d8a
+  data.tar.gz: 1c33caaa564cc276412f6e7ca9cc721421c2ecff
 SHA512:
-  metadata.gz: 0c22f0940c23cb17f5afa93c937da47ced42edd855b218b14de02eb4cb4d8ed3e9ff6996075e8ce8a53f51f1a08aadc8f72e51da69f748ceda923c0b298de51d
-  data.tar.gz: 5fbcc849e2de8d1125b903f259a11df802dc5aba6597d9c744267ead7b80cf39896694f43a48712e4433c04e0ebd1e99c17efe5144a0651843c45fc39067e526
+  metadata.gz: c7d1fd9ea17cca4ecaab91417b0119d87f4d99d17a2ffd660c83208d2c7385d5d5ff37350ee76b4d0d4ae33ee90a638e65c94f1eb4dbc5e9b58b7d0727ff1d42
+  data.tar.gz: b07a484c935a30a48388e3a20047f4b494430559fb27ad917459a69e5588c184be03de1ada2b270da563322102d06bae3c727dde61a0b70128545047b52b8ea6

data/.gitignore

@@ -8,3 +8,5 @@ test/dummy/.sass-cache
 .idea
 sandbox
 foo
+# Local testing credentials
+config/initializers/killbill_client.rb

data/Gemfile.lock

@@ -1,12 +1,14 @@
 PATH
   remote: .
   specs:
-    kaui (0.2.6)
-      d3_rails (~> 2.10.3)
-      jquery-rails (~> 2.0)
-      killbill-client (~> 0.1.3)
-      money-rails (~> 0.5.0)
-      rails (~> 3.2.3)
+    kaui (0.3.0)
+      cancan (~> 1.6.10)
+      d3_rails (~> 3.2.8)
+      devise (~> 3.0.2)
+      jquery-rails (~> 3.0.4)
+      killbill-client (~> 0.2.0)
+      money-rails (~> 0.8.1)
+      rails (~> 3.2.14)
       rest-client (~> 1.6.7)
 
 GEM
@@ -40,31 +42,38 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.2)
+    bcrypt-ruby (3.1.1)
     builder (3.0.4)
-    d3_rails (2.10.3)
+    cancan (1.6.10)
+    d3_rails (3.2.8)
       railties (>= 3.1.0)
+    devise (3.0.3)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      warden (~> 1.2.3)
     erubis (2.7.0)
     hike (1.2.3)
-    i18n (0.6.4)
+    i18n (0.6.5)
     journey (1.0.4)
-    jquery-rails (2.3.0)
+    jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
-    killbill-client (0.1.3)
+    killbill-client (0.2.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.23)
-    money (5.0.0)
-      i18n (~> 0.4)
-      json
-    money-rails (0.5.0)
-      activesupport (~> 3.0)
-      money (~> 5.0.0)
-      railties (~> 3.0)
+    mime-types (1.24)
+    money (5.1.1)
+      i18n (~> 0.6.0)
+    money-rails (0.8.1)
+      activesupport (>= 3.0)
+      money (~> 5.1.0)
+      railties (>= 3.0)
     multi_json (1.7.9)
     mysql2 (0.3.13)
+    orm_adapter (0.4.0)
     polyglot (0.3.3)
     rack (1.4.5)
     rack-cache (1.2)
@@ -98,12 +107,15 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.8)
     thor (0.18.1)
     tilt (1.4.1)
-    treetop (1.4.14)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
+    warden (1.2.3)
+      rack (>= 1.0)
 
 PLATFORMS
   ruby
@@ -111,3 +123,4 @@ PLATFORMS
 DEPENDENCIES
   kaui!
   mysql2
+  sqlite3

data/README.md

@@ -30,6 +30,19 @@ Finally, Killbill server needs to be running for Kaui to fetch its information.
 variable to point to your existing Killbill installation (e.g. http://killbill.company.com:8080).
 
 
+Multi-Tenancy
+-------------
+
+If you are using Kaui against a single tenant, specify your api key and secret in ```config/initializers/killbill_client.rb```:
+
+```
+KillBillClient.api_key = 'bob'
+KillBillClient.api_secret = 'lazar'
+```
+
+Sharing a Kaui instance across multiple tenants is not supported yet (you need to spawn one instance per tenant).
+
+
 Running tests
 -------------
 

data/app/controllers/kaui/account_tags_controller.rb

@@ -5,13 +5,12 @@ class Kaui::AccountTagsController < Kaui::EngineController
 
     if account_id.present?
       begin
-        tags = Kaui::KillbillHelper::get_tags_for_account(account_id)
+        @tags = Kaui::KillbillHelper::get_tags_for_account(account_id, options_for_klient)
       rescue => e
-        flash[:error] = "Error while getting tags: #{as_string(e)}"
-
+        flash.now[:error] = "Error while getting tags: #{as_string(e)}"
       end
     else
-      flash[:error] = "No account id given"
+      flash.now[:error] = "No account id given"
     end
   end
 
@@ -19,16 +18,16 @@ class Kaui::AccountTagsController < Kaui::EngineController
     @account_id = params[:account_id]
     begin
       @available_tags = Kaui::TagDefinition.all_for_account.sort
-      @account = Kaui::KillbillHelper::get_account(@account_id)
-      @tag_names = Kaui::KillbillHelper::get_tags_for_account(@account.account_id).map { |tag| tag.tag_definition_name }
+      @account = Kaui::KillbillHelper::get_account(@account_id, false, false, options_for_klient)
+      @tag_names = Kaui::KillbillHelper::get_tags_for_account(@account.account_id, options_for_klient).map { |tag| tag.tag_definition_name }
     rescue => e
-      flash[:error] = "Error while editing tags: #{as_string(e)}"
+      flash.now[:error] = "Error while editing tags: #{as_string(e)}"
     end
   end
 
   def update
     begin
-      current_tags = Kaui::KillbillHelper::get_tags_for_account(params[:account_id]).map { |tag| tag.tag_definition_id }
+      current_tags = Kaui::KillbillHelper::get_tags_for_account(params[:account_id], options_for_klient).map { |tag| tag.tag_definition_id }
 
       new_tags = []
       params.each do |tag, tag_name|
@@ -49,8 +48,8 @@ class Kaui::AccountTagsController < Kaui::EngineController
         tags_to_add << new_tag_definition_id unless current_tags.include?(new_tag_definition_id)
       end
 
-      Kaui::KillbillHelper::remove_tags_for_account(params[:account_id], tags_to_remove) unless tags_to_remove.empty?
-      Kaui::KillbillHelper::add_tags_for_account(params[:account_id], tags_to_add) unless tags_to_add.empty?
+      Kaui::KillbillHelper::remove_tags_for_account(params[:account_id], tags_to_remove, options_for_klient) unless tags_to_remove.empty?
+      Kaui::KillbillHelper::add_tags_for_account(params[:account_id], tags_to_add, options_for_klient) unless tags_to_add.empty?
     rescue => e
       flash[:error] = "Error while updating tags: #{as_string(e)}"
     end

data/app/controllers/kaui/account_timelines_controller.rb

@@ -13,8 +13,8 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
       return
     end
     begin
-      @account = Kaui::KillbillHelper::get_account(@account_id)
-      @timeline = Kaui::KillbillHelper::get_account_timeline(@account_id)
+      @account = Kaui::KillbillHelper::get_account(@account_id, false, false, options_for_klient)
+      @timeline = Kaui::KillbillHelper::get_account_timeline(@account_id, "MINIMAL", options_for_klient)
     rescue => e
       flash[:error] = "Could not load the account timeline for #{@account_id}: #{as_string(e)}"
       redirect_to :action => :index
@@ -27,9 +27,9 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
       @timeline.payments.each do |payment|
         if payment.invoice_id.present? && payment.payment_id.present?
           begin
-            @invoices_by_id[payment.invoice_id] = Kaui::KillbillHelper::get_invoice(payment.invoice_id)
+            @invoices_by_id[payment.invoice_id] = Kaui::KillbillHelper::get_invoice(payment.invoice_id, true, options_for_klient)
           rescue => e
-            flash[:error] = "Could not get invoice information for the timeline #{@account_id}: #{as_string(e)}"
+            flash.now[:error] = "Could not get invoice information for the timeline #{@account_id}: #{as_string(e)}"
           end
           payment.bundle_keys.split(",").each do |bundle_key|
             unless @bundle_names.has_key?(bundle_key)
@@ -41,9 +41,9 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
       @timeline.invoices.each do |invoice|
         if invoice.invoice_id.present? && !@invoices_by_id.has_key?(invoice.invoice_id)
           begin
-            @invoices_by_id[invoice.invoice_id] = Kaui::KillbillHelper::get_invoice(invoice.invoice_id)
+            @invoices_by_id[invoice.invoice_id] = Kaui::KillbillHelper::get_invoice(invoice.invoice_id, true, options_for_klient)
           rescue => e
-            flash[:error] = "Could not get invoice information for the timeline #{@account_id}: #{as_string(e)}"
+            flash.now[:error] = "Could not get invoice information for the timeline #{@account_id}: #{as_string(e)}"
           end
           invoice.bundle_keys.split(",").each do |bundle_key|
             unless @bundle_names.has_key?(bundle_key)

data/app/controllers/kaui/accounts_controller.rb

@@ -6,49 +6,50 @@ class Kaui::AccountsController < Kaui::EngineController
   end
 
   def show
-    key = params[:id]
-    if key.present?
+    @key = params[:id]
+    if @key.present?
       # Remove extra whitespaces
-      key.strip!
+      @key.strip!
 
       begin
-        @account = Kaui::KillbillHelper::get_account_by_key_with_balance_and_cba(key)
+        @account = Kaui::KillbillHelper::get_account_by_key_with_balance_and_cba(@key, options_for_klient)
       rescue URI::InvalidURIError => e
-        flash[:error] = "Error while retrieving the account for #{key}: #{e.message}"
+        flash.now[:error] = "Error while retrieving the account for #{@key}: #{e.message}"
         render :action => :index and return
       rescue => e
-        flash[:error] = "Error while retrieving the account for #{key}: #{as_string(e)}"
+        flash.now[:error] = "Error while retrieving the account for #{@key}: #{as_string(e)}"
         render :action => :index and return
       end
 
       if @account.present? and @account.is_a? Kaui::Account
         begin
-          @tags = Kaui::KillbillHelper::get_tags_for_account(@account.account_id).sort
-          @account_emails = Kaui::AccountEmail.where(:account_id => @account.account_id)
+          @tags = Kaui::KillbillHelper::get_tags_for_account(@account.account_id, options_for_klient).sort
+          @account_emails = Kaui::AccountEmail.where({ :account_id => @account.account_id }, options_for_klient)
 
-          @payment_methods = Kaui::KillbillHelper::get_non_external_payment_methods(@account.account_id)
-          @bundles = Kaui::KillbillHelper::get_bundles(@account.account_id)
+          @payment_methods = Kaui::KillbillHelper::get_non_external_payment_methods(@account.account_id, options_for_klient)
+          @bundles = Kaui::KillbillHelper::get_bundles(@account.account_id, options_for_klient)
 
           @overdue_state_by_bundle_id = {}
           @subscriptions_by_bundle_id = {}
 
           @bundles.each do |bundle|
-            @overdue_state_by_bundle_id[bundle.bundle_id] = Kaui::KillbillHelper::get_overdue_state_for_bundle(bundle.bundle_id)
+            @overdue_state_by_bundle_id[bundle.bundle_id] = Kaui::KillbillHelper::get_overdue_state_for_bundle(bundle.bundle_id, options_for_klient)
 
-            subscriptions = Kaui::KillbillHelper::get_subscriptions_for_bundle(bundle.bundle_id)
+            subscriptions = Kaui::KillbillHelper::get_subscriptions_for_bundle(bundle.bundle_id, options_for_klient)
             if subscriptions.present?
               @subscriptions_by_bundle_id[bundle.bundle_id.to_s] = (@subscriptions_by_bundle_id[bundle.bundle_id.to_s] || []) + subscriptions
             end
           end
         rescue => e
-          flash[:error] = "Error while retrieving account information for account: #{as_string(e)}"
+          flash.now[:error] = "Error while retrieving account information for account: #{as_string(e)}"
+          render :action => :index
         end
       else
-        flash[:error] = "Account #{@account_id} not found: #{@account}"
+        flash.now[:error] = "Account #{@account_id} not found: #{@account}"
         render :action => :index
       end
     else
-      flash[:error] = "No id given"
+      flash.now[:error] = "No id given"
     end
   end
 
@@ -56,9 +57,9 @@ class Kaui::AccountsController < Kaui::EngineController
     @account_id = params[:id]
     if @account_id.present?
       begin
-        @payment_methods = Kaui::KillbillHelper::get_non_external_payment_methods(@account_id)
+        @payment_methods = Kaui::KillbillHelper::get_non_external_payment_methods(@account_id, options_for_klient)
       rescue => e
-        flash[:error] = "Error while getting payment methods: #{as_string(e)}"
+        flash.now[:error] = "Error while getting payment methods: #{as_string(e)}"
       end
       unless @payment_methods.is_a?(Array)
         flash[:notice] = "No payment methods for account_id '#{@account_id}'"
@@ -66,16 +67,16 @@ class Kaui::AccountsController < Kaui::EngineController
         return
       end
     else
-      flash[:notice] = "No account_id given"
+      flash.now[:notice] = "No account_id given"
     end
   end
 
   def add_payment_method
     account_id = params[:id]
     begin
-      @account = Kaui::KillbillHelper::get_account(account_id)
+      @account = Kaui::KillbillHelper::get_account(account_id, false, false, options_for_klient)
     rescue => e
-      flash[:error] = "Error while adding payment methods: #{as_string(e)}"
+      flash.now[:error] = "Error while adding payment methods: #{as_string(e)}"
     end
     if @account.nil?
       flash[:error] = "Account not found for id #{account_id}"
@@ -88,7 +89,7 @@ class Kaui::AccountsController < Kaui::EngineController
   def do_add_payment_method
     account_id = params[:id]
     # Needed in the failure case scenario
-    @account = Kaui::KillbillHelper::get_account(account_id)
+    @account = Kaui::KillbillHelper::get_account(account_id, false, false, options_for_klient)
 
     # Implementation example using standard credit card fields
     @card_type = params[:card_type]
@@ -126,11 +127,11 @@ class Kaui::AccountsController < Kaui::EngineController
     }
 
     begin
-      Kaui::KillbillHelper::add_payment_method(@is_default == 1, payment_method, current_user, @reason, @comment)
-      flash[:info] = 'Payment method created'
+      Kaui::KillbillHelper::add_payment_method(@is_default == 1, payment_method, current_user, @reason, @comment, options_for_klient)
+      flash[:notice] = 'Payment method created'
       redirect_to kaui_engine.account_timeline_path(account_id)
     rescue => e
-      flash[:error] = "Error while adding payment method: #{as_string(e)}"
+      flash.now[:error] = "Error while adding payment method: #{as_string(e)}"
       render "kaui/payment_methods/new"
     end
   end
@@ -140,7 +141,7 @@ 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, current_user, params[:reason], params[:comment])
+        @payment_methods = Kaui::KillbillHelper::set_payment_method_as_default(@account_id, @payment_method_id, current_user, params[:reason], params[:comment], options_for_klient)
       rescue => e
         flash[:error] = "Error while setting payment method as default #{@payment_method_id}: #{as_string(e)}"
       end
@@ -152,7 +153,7 @@ class Kaui::AccountsController < Kaui::EngineController
 
   def toggle_email_notifications
     begin
-      @account = Kaui::KillbillHelper::update_email_notifications(params[:id], params[:is_notified])
+      @account = Kaui::KillbillHelper::update_email_notifications(params[:id], params[:is_notified], options_for_klient)
       flash[:notice] = "Email preferences updated"
     rescue => e
       flash[:error] = "Error while switching email notifications #{invoice_id}: #{as_string(e)}"
@@ -162,7 +163,7 @@ class Kaui::AccountsController < Kaui::EngineController
 
   def pay_all_invoices
     begin
-      @account = Kaui::KillbillHelper::pay_all_invoices(params[:id], false, current_user, params[:reason], params[:comment])
+      @account = Kaui::KillbillHelper::pay_all_invoices(params[:id], false, current_user, params[:reason], params[:comment], options_for_klient)
       flash[:notice] = "Successfully triggered a payment for all unpaid invoices"
     rescue => e
       flash[:error] = "Error while triggering payments: #{as_string(e)}"

data/app/controllers/kaui/analytics_controller.rb

@@ -3,7 +3,7 @@ module Kaui
     def index
       @slugs = []
       begin
-        catalog = Kaui::KillbillHelper::get_full_catalog()
+        catalog = Kaui::KillbillHelper::get_full_catalog(options_for_klient)
         catalog['products'].each do |product|
           product['plans'].each do |plan|
             name = plan['name']
@@ -22,8 +22,8 @@ module Kaui
     def account_snapshot
       # params[:account_id] can either be a uuid or an external key
       begin
-        @account = Kaui::KillbillHelper::get_account_by_key(params[:account_id])
-        @snapshot = Kaui::KillbillHelper::get_account_snapshot(@account.account_id)
+        @account = Kaui::KillbillHelper::get_account_by_key(params[:account_id], false, false, options_for_klient)
+        @snapshot = Kaui::KillbillHelper::get_account_snapshot(@account.account_id, options_for_klient)
       rescue => e
         flash[:error] = "Error while retrieving account snapshot: #{as_string(e)}"
         redirect_to :analytics
@@ -32,7 +32,7 @@ module Kaui
 
     def refresh_account
       begin
-        Kaui::KillbillHelper::refresh_account(params[:account_id])
+        Kaui::KillbillHelper::refresh_account(params[:account_id], options_for_klient)
         flash[:notice] = "Account successfully refreshed!"
       rescue => e
         flash[:error] = "Error while refreshing account: #{as_string(e)}"
@@ -57,7 +57,7 @@ module Kaui
 
     def sanity
       begin
-        @sanity = Kaui::KillbillHelper::check_analytics_sanity
+        @sanity = Kaui::KillbillHelper::check_analytics_sanity(options_for_klient)
       rescue => e
         flash[:error] = "Error while checking Analytics sanity: #{as_string(e)}"
         redirect_to :analytics

data/app/controllers/kaui/bundle_tags_controller.rb

@@ -4,36 +4,36 @@ class Kaui::BundleTagsController < Kaui::EngineController
     bundle_id = params[:id]
     if bundle_id.present?
       begin
-        tags = Kaui::KillbillHelper::get_tags_for_bundle(bundle_id)
+        tags = Kaui::KillbillHelper::get_tags_for_bundle(bundle_id, options_for_klient)
       rescue => e
-        flash[:error] = "Error while retrieving tags information: #{as_string(e)}"
+        flash.now[:error] = "Error while retrieving tags information: #{as_string(e)}"
       end
     else
-      flash[:error] = "No account id given"
+      flash.now[:error] = "No account id given"
     end
   end
 
   def edit
     @bundle_id = params[:bundle_id]
     begin
-      @available_tags = Kaui::KillbillHelper::get_tag_definitions.sort {|tag_a, tag_b| tag_a.name.downcase <=> tag_b.name.downcase }
+      @available_tags = Kaui::KillbillHelper::get_tag_definitions(options_for_klient).sort {|tag_a, tag_b| tag_a.name.downcase <=> tag_b.name.downcase }
 
-      @bundle = Kaui::KillbillHelper::get_bundle(@bundle_id)
-      @tags = Kaui::KillbillHelper::get_tags_for_bundle(@bundle_id)
+      @bundle = Kaui::KillbillHelper::get_bundle(@bundle_id, options_for_klient)
+      @tags = Kaui::KillbillHelper::get_tags_for_bundle(@bundle_id, options_for_klient)
     rescue => e
-      flash[:error] = "Error while retrieving tags information: #{as_string(e)}"
+      flash.now[:error] = "Error while retrieving tags information: #{as_string(e)}"
     end
   end
 
   def update
     begin
-      bundle = Kaui::KillbillHelper::get_bundle(params[:bundle_id])
+      bundle = Kaui::KillbillHelper::get_bundle(params[:bundle_id], options_for_klient)
       tags = params[:tags]
 
-      Kaui::KillbillHelper::set_tags_for_bundle(bundle.bundle_id, tags)
+      Kaui::KillbillHelper::set_tags_for_bundle(bundle.bundle_id, tags, options_for_klient)
       redirect_to Kaui.bundle_home_path.call(bundle.bundle_id)
     rescue => e
-      flash[:error] = "Error while updating tags: #{as_string(e)}"
+      flash.now[:error] = "Error while updating tags: #{as_string(e)}"
     end
   end