kaui 0.6.6 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4dfe42ad2548ff670bed0e9282f8b311156d2e5e
+  data.tar.gz: 9b06404c20ea0f49392971aa3c93eb75ce51e5de
+SHA512:
+  metadata.gz: a1039d8c8b644990de6ac798aa5ebea4e8f0cda5d548d742103eba5ff2a9bcc34d353f5299d48afa080f699cb212816d822f2758fe08046542da726062bcec15
+  data.tar.gz: 67b84718f67dda80b67de237483d406fee007b9f1baca451d79836d624e3633dcae3bf325af25509b8db2286fa2b7dddd8bc81dcd382e19d551f0d0f70767200

data/.gitignore

@@ -10,3 +10,5 @@ sandbox
 foo
 # Local testing credentials
 config/initializers/killbill_client.rb
+coverage
+.DS_Store

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    kaui (0.6.6)
+    kaui (0.7.0)
       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.6.1)
+      killbill-client (~> 0.7.3)
       money-rails (~> 0.8.1)
       rails (~> 3.2.14)
-      rest-client (~> 1.6.7)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.16)
-      actionpack (= 3.2.16)
+    actionmailer (3.2.19)
+      actionpack (= 3.2.19)
       mail (~> 2.5.4)
-    actionpack (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
+    actionpack (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -27,24 +27,31 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.16)
-      activesupport (= 3.2.16)
+    activemodel (3.2.19)
+      activesupport (= 3.2.19)
       builder (~> 3.0.0)
-    activerecord (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
+    activerecord (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
-    activesupport (3.2.16)
+    activeresource (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
+    activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
-    bcrypt-ruby (3.1.2)
+    bcrypt (3.1.7)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
     builder (3.0.4)
     cancan (1.6.10)
+    carmen (1.0.1)
+      unicode_utils (~> 1.4.0)
+    carmen-rails (1.0.1)
+      carmen (~> 1.0.0)
+      rails
     d3_rails (3.2.8)
       railties (>= 3.1.0)
     devise (3.0.4)
@@ -52,16 +59,17 @@ GEM
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
       warden (~> 1.2.3)
+    docile (1.1.5)
     erubis (2.7.0)
     fakeweb (1.3.0)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.6.11)
     journey (1.0.4)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
-    killbill-client (0.6.1)
+    killbill-client (0.7.3)
       json (~> 1.8.0)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -73,28 +81,28 @@ GEM
       activesupport (>= 3.0)
       money (~> 5.1.0)
       railties (>= 3.0)
-    multi_json (1.8.4)
+    multi_json (1.9.2)
     mysql2 (0.3.13)
     orm_adapter (0.5.0)
-    polyglot (0.3.3)
+    polyglot (0.3.5)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.3)
+    rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.16)
-      actionmailer (= 3.2.16)
-      actionpack (= 3.2.16)
-      activerecord (= 3.2.16)
-      activeresource (= 3.2.16)
-      activesupport (= 3.2.16)
+    rails (3.2.19)
+      actionmailer (= 3.2.19)
+      actionpack (= 3.2.19)
+      activerecord (= 3.2.19)
+      activeresource (= 3.2.19)
+      activesupport (= 3.2.19)
       bundler (~> 1.0)
-      railties (= 3.2.16)
-    railties (3.2.16)
-      actionpack (= 3.2.16)
-      activesupport (= 3.2.16)
+      railties (= 3.2.19)
+    railties (3.2.19)
+      actionpack (= 3.2.19)
+      activesupport (= 3.2.19)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -102,20 +110,24 @@ GEM
     rake (10.1.1)
     rdoc (3.12.2)
       json (~> 1.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    simplecov (0.9.0)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.8)
-    thor (0.18.1)
+    thor (0.19.1)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
+    tzinfo (0.3.40)
+    unicode_utils (1.4.0)
     warden (1.2.3)
       rack (>= 1.0)
 
@@ -126,4 +138,6 @@ DEPENDENCIES
   fakeweb (~> 1.3)
   kaui!
   mysql2
+  rake (>= 0.8.7)
+  simplecov
   sqlite3

data/README.md

@@ -28,6 +28,9 @@ name of the logged-in user. This is used by Killbill for auditing purposes.
 
 Finally, Killbill server needs to be running for Kaui to fetch its information. Set the `KILLBILL_URL`
 variable to point to your existing Killbill installation (e.g. http://killbill.company.com:8080).
+The default login credentials are admin/password.  Users, Credentials, Roles and Permissions are 
+passed through to Kill Bill. It uses Basic Auth by default, but the backend is pluggable (LDAP, 
+ActiveDirectory, etc.).
 
 
 Multi-Tenancy
@@ -36,6 +39,7 @@ Multi-Tenancy
 If you are using Kaui against a single tenant, specify your api key and secret in ```config/initializers/killbill_client.rb```:
 
 ```
+KillBillClient.url = 'http://127.0.0.1:8080/'
 KillBillClient.api_key = 'bob'
 KillBillClient.api_secret = 'lazar'
 ```
@@ -59,6 +63,7 @@ Run the tests:
 > cd ../..
 > rake test
 
+Note: functional and integration tests require an instance of Kill Bill to test against.
 
 Development
 ===========

data/Rakefile

@@ -5,7 +5,7 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks

data/app/controllers/kaui/account_emails_controller.rb

@@ -1,54 +1,36 @@
-module Kaui
-  class AccountEmailsController < EngineController
-    # GET /account_emails/1
-    # GET /account_emails/1.json
-    def show
-      @account_id = params[:id]
-      @account_emails = AccountEmail.where({ :account_id => @account_id }, options_for_klient)
+class Kaui::AccountEmailsController < Kaui::EngineController
 
-      respond_to do |format|
-        format.html # show.html.erb
-        format.json { render :json => @account_email }
-      end
-    end
-
-    # GET /account_emails/new
-    # GET /account_emails/new.json
-    def new
-      @account_email = AccountEmail.new(:account_id => params[:account_id])
+  def show
+    @account_id     = params[:id]
+    @account_emails = Kaui::AccountEmail.find_all_sorted_by_account_id(@account_id, 'NONE', options_for_klient)
+  end
 
-      respond_to do |format|
-        format.html # new.html.erb
-        format.json { render :json => @account_email }
-      end
-    end
+  def new
+    @account_email = Kaui::AccountEmail.new(:account_id => params[:account_id])
+  end
 
-    # POST /account_emails
-    # POST /account_emails.json
-    def create
-      @account_email = AccountEmail.new(params[:account_email])
+  def create
+    @account_email = Kaui::AccountEmail.new(params[:account_email])
 
-      respond_to do |format|
-        if @account_email.save(current_user, params[:reason], params[:comment], options_for_klient)
-          format.html { redirect_to kaui_engine.account_email_path(@account_email), :notice => 'Account email was successfully created.' }
-          format.json { render :json => @account_email, :status => :created, :location => @account_email }
-        else
-          format.html { render :action => "new" }
-          format.json { render :json => @account_email.errors, :status => :unprocessable_entity }
-        end
-      end
+    account = Kaui::Account.new(:account_id => @account_email.account_id)
+    begin
+      account.add_email(@account_email.email, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+      redirect_to account_email_path(account.account_id), :notice => 'Account email was successfully added'
+    rescue => e
+      flash.now[:error] = "Error while adding the email: #{as_string(e)}"
+      render :action => :new
     end
+  end
 
-    # DELETE /account_emails/1
-    # DELETE /account_emails/1.json
-    def destroy
-      @account_email = AccountEmail.where({ :account_id => params[:id], :email => params[:email] }, options_for_klient)
-      @account_email.destroy(current_user, params[:reason], params[:comment], options_for_klient)
+  def destroy
+    account = Kaui::Account.new(:account_id => params[:id])
 
-      respond_to do |format|
-        format.html { redirect_to kaui_engine.account_email_path(params[:id]) }
-        format.json { head :no_content }
-      end
+    begin
+      account.remove_email(params[:email], current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+      redirect_to account_email_path(account.account_id), :notice => 'Account email was successfully deleted'
+    rescue => e
+      flash.now[:error] = "Error while deleting account email: #{as_string(e)}"
+      render :action => :show, :id => account.account_id
     end
   end
 end

data/app/controllers/kaui/account_tags_controller.rb

@@ -1,59 +1,47 @@
 class Kaui::AccountTagsController < Kaui::EngineController
 
   def show
-    account_id = params[:account_id]
+    account_id_or_key = params[:account_id]
 
-    if account_id.present?
-      begin
-        @tags = Kaui::KillbillHelper::get_tags_for_account(account_id, true, "FULL", options_for_klient)
-        @account = Kaui::KillbillHelper::get_account(account_id, false, false, options_for_klient)
-      rescue => e
-        flash.now[:error] = "Error while getting tags: #{as_string(e)}"
-      end
-    else
-      flash.now[:error] = "No account id given"
+    begin
+      @account = Kaui::Account::find_by_id_or_key(account_id_or_key, false, false, options_for_klient)
+      @tags    = @account.tags(true, 'FULL', options_for_klient).sort { |tag_a, tag_b| tag_a <=> tag_b }
+    rescue => e
+      flash[:error] = "Error while getting tags: #{as_string(e)}"
+      redirect_to :back
     end
   end
 
   def edit
-    @account_id = params[:account_id]
+    account_id_or_key = params[:account_id]
+
     begin
-      @available_tags = Kaui::TagDefinition.all_for_account(options_for_klient).sort
-      @account = Kaui::KillbillHelper::get_account(@account_id, false, false, options_for_klient)
-      @tag_names = Kaui::KillbillHelper::get_tags_for_account(@account.account_id, false, "NONE", options_for_klient).map { |tag| tag.tag_definition_name }
+      @account        = Kaui::Account::find_by_id_or_key(account_id_or_key, false, false, options_for_klient)
+      @tag_names      = (@account.tags(false, 'NONE', options_for_klient).map { |tag| tag.tag_definition_name }).sort
+      @available_tags = Kaui::TagDefinition.all_for_account(options_for_klient)
     rescue => e
-      flash.now[:error] = "Error while editing tags: #{as_string(e)}"
+      flash[:error] = "Error while editing tags: #{as_string(e)}"
+      redirect_to kaui_engine.account_tags_path(:account_id => account_id_or_key)
     end
   end
 
   def update
-    begin
-      current_tags = Kaui::KillbillHelper::get_tags_for_account(params[:account_id], false, "NONE", options_for_klient).map { |tag| tag.tag_definition_id }
-
-      new_tags = []
-      params.each do |tag, tag_name|
-        tag_info = tag.split('_')
-        next if tag_info.size != 2 or tag_info[0] != 'tag'
-        new_tags << tag_info[1]
-      end
-
-      # Find tags to remove
-      tags_to_remove = []
-      current_tags.each do |current_tag_definition_id|
-        tags_to_remove << current_tag_definition_id unless new_tags.include?(current_tag_definition_id)
-      end
+    account_id = params[:account_id]
 
-      # Find tags to add
-      tags_to_add = []
-      new_tags.each do |new_tag_definition_id|
-        tags_to_add << new_tag_definition_id unless current_tags.include?(new_tag_definition_id)
-      end
+    tags = []
+    params.each do |tag, tag_name|
+      tag_info = tag.split('_')
+      next if tag_info.size != 2 or tag_info[0] != 'tag'
+      tags << tag_info[1]
+    end
 
-      Kaui::KillbillHelper::remove_tags_for_account(params[:account_id], tags_to_remove, current_user, params[:reason], params[:comment], options_for_klient) unless tags_to_remove.empty?
-      Kaui::KillbillHelper::add_tags_for_account(params[:account_id], tags_to_add, current_user, params[:reason], params[:comment], options_for_klient) unless tags_to_add.empty?
+    begin
+      account = Kaui::Account.new(:account_id => account_id)
+      account.set_tags(tags, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+      redirect_to kaui_engine.account_tags_path(:account_id => account_id), :notice => 'Account tags successfully set'
     rescue => e
       flash[:error] = "Error while updating tags: #{as_string(e)}"
+      redirect_to kaui_engine.account_tags_path(:account_id => account_id)
     end
-    redirect_to kaui_engine.account_path(params[:account_id])
   end
 end

data/app/controllers/kaui/account_timelines_controller.rb

@@ -1,66 +1,63 @@
 class Kaui::AccountTimelinesController < Kaui::EngineController
+
   def index
-    if params[:account_id].present?
-      redirect_to kaui_engine.account_timeline_path(params[:account_id])
-    end
   end
 
   def show
     @account_id = params[:id]
-    unless @account_id.present?
-      flash[:notice] = "No id given"
-      redirect_to :back
-      return
-    end
+
     begin
-      @account = Kaui::KillbillHelper::get_account(@account_id, false, false, options_for_klient)
-      @timeline = Kaui::KillbillHelper::get_account_timeline(@account_id, "MINIMAL", options_for_klient)
+      @account  = Kaui::Account.find_by_id(@account_id, false, false, options_for_klient)
+      @timeline = Kaui::AccountTimeline.find_by_account_id(@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
-      return
+      render :action => :index and return
     end
 
-    @invoices_by_id = {}
-    @bundle_names = {}
-    unless @timeline.nil?
-      @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, true, "NONE", options_for_klient)
-          rescue => 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)
-              @bundle_names[bundle_key] = Kaui.bundle_key_display_string.call(bundle_key)
-            end
-          end
-        end
-      end
-      @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, true, "NONE", options_for_klient)
-          rescue => 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)
-              @bundle_names[bundle_key] = Kaui.bundle_key_display_string.call(bundle_key)
-            end
-          end
-        end
-      end
-      @timeline.bundles.each do |bundle|
-        unless @bundle_names.has_key?(bundle.external_key)
-          @bundle_names[bundle.external_key] = Kaui.bundle_key_display_string.call(bundle.external_key)
-        end
+    # Lookup all bundle names
+    @bundle_names               = {}
+    @bundle_names_by_invoice_id = {}
+    @bundle_keys_by_invoice_id  = {}
+    @timeline.bundles.each do |bundle|
+      load_bundle_name_for_timeline(bundle.external_key)
+    end
+    @timeline.invoices.each do |invoice|
+      @bundle_names_by_invoice_id[invoice.invoice_id] = Set.new
+      @bundle_keys_by_invoice_id[invoice.invoice_id]  = Set.new
+      (invoice.bundle_keys || '').split(',').each do |bundle_key|
+        load_bundle_name_for_timeline(bundle_key)
+        @bundle_names_by_invoice_id[invoice.invoice_id] << @bundle_names[bundle_key]
+        @bundle_keys_by_invoice_id[invoice.invoice_id] << bundle_key
       end
+    end
 
-      if params.has_key?(:external_key)
-        @selected_bundle = @bundle_names[params[:external_key]]
-      end
+    # Lookup all invoices
+    @invoices_by_id = {}
+    @timeline.payments.each do |payment|
+      load_invoice_id_for_timeline(payment.target_invoice_id)
+    end
+    @timeline.invoices.each do |invoice|
+      load_invoice_id_for_timeline(invoice.invoice_id)
+    end
+
+    if params.has_key?(:external_key)
+      @selected_bundle = @bundle_names[params[:external_key]]
+    end
+  end
+
+  private
+
+  def load_bundle_name_for_timeline(bundle_key)
+    @bundle_names[bundle_key] ||= Kaui.bundle_key_display_string.call(bundle_key)
+  end
+
+  def load_invoice_id_for_timeline(invoice_id)
+    return if invoice_id.blank? or @invoices_by_id.has_key?(invoice_id)
+
+    begin
+      @invoices_by_id[invoice_id] = Kaui::Invoice.find_by_id_or_number(invoice_id, true, 'NONE', options_for_klient)
+    rescue => e
+      flash.now[:error] = "Could not get invoice information for the timeline #{@account_id}: #{as_string(e)}"
     end
   end
 end