kaui 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a70faa01f0b175623fe4193632ac3e9f1cd64442
-  data.tar.gz: c3257458ed844df34f244fee6137646129bfc311
+  metadata.gz: 3f5da37e2d8165a6c2c89ead5c48533481ac6c81
+  data.tar.gz: 5869633c618869d65bdd3a2c10a2cddec24ae499
 SHA512:
-  metadata.gz: b87e8fb8edb7c0600836d4656e78d8648c6c2097d9e38d066d2b91a48554cf7af7d25d18319c091cbca0d5ecd0a284f73961bc26d3090aa114e6535fddb44ce7
-  data.tar.gz: adcdb96bf73e373660f3ebc74b770200fa660a81eb7b66cc4eaf24c632d84e010bffa091a25242e40a30e9e1f3bd389f99888b7d41aa540d601f95ed6aa1dcee
+  metadata.gz: 430649a0642308886a6b93fa5e833470096f4f976af8c9a4ec41f851350a81a1f98bb7af8deca21e60e4afe592ffde6c7b968cce386f6b9149c1d72a5cb963bd
+  data.tar.gz: fb7a3088bfa85b4672a80ce863ed6ac4ed7db1fe75731a0103cca5823c5b733dd469e56a56c0508f9f72483d7c86547798154529645127aa8e52e385314e248e

data/.travis.yml

@@ -5,7 +5,6 @@ notifications:
     - kill-bill-commits@googlegroups.com
 
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - ruby-head
@@ -19,9 +18,9 @@ jdk:
 
 before_script:
   - mysql -e 'create database kaui_test;'
+  - RAILS_ENV=test bundle exec rake db:migrate
 
 script:
-  - pushd test/dummy && RAILS_ENV=test bundle exec rake db:migrate --trace && RAILS_ENV=test bundle exec rake db:test:prepare && popd
   - bundle exec rake test:units
 
 matrix:
@@ -30,7 +29,7 @@ matrix:
     - rvm: jruby-head
 
 env:
-  - MYSQL_PASSWORD=''
+  - MYSQL_PASSWORD='' MYSQL_USER='travis'
 
 #force travis to use only 'bundle install' instead of 'bundle install --deployments'
 bundler_args: ''

data/Gemfile.lock

@@ -1,157 +1,210 @@
 PATH
   remote: .
   specs:
-    kaui (0.9.0)
+    kaui (0.10.0)
       cancan (~> 1.6.10)
       carmen-rails (~> 1.0.0)
       d3_rails (~> 3.2.8)
-      devise (~> 3.0.2)
+      devise (~> 3.4.1)
+      jquery-datatables-rails (~> 3.3.0)
       jquery-rails (~> 3.0.4)
       killbill-client (~> 0.13.0)
-      money-rails (~> 0.8.1)
-      rails (~> 3.2.14)
+      money-rails (~> 1.3.0)
+      protected_attributes (~> 1.0.6)
+      rails (~> 4.2.0)
+      sass-rails (~> 5.0.2)
       symmetric-encryption (~> 3.6.0)
-      twitter-bootstrap-rails (~> 2.2.8)
+      twitter-bootstrap-rails (~> 3.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.21)
-      actionpack (= 3.2.21)
-      mail (~> 2.5.4)
-    actionpack (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-      builder (~> 3.0.0)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.21)
-      activesupport (= 3.2.21)
-      builder (~> 3.0.0)
-    activerecord (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-    activesupport (3.2.21)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
     bcrypt (3.1.10)
-    bcrypt-ruby (3.1.5)
-      bcrypt (>= 3.1.3)
-    builder (3.0.4)
+    builder (3.2.2)
     cancan (1.6.10)
     carmen (1.0.2)
       activesupport (>= 3.0.0)
     carmen-rails (1.0.1)
       carmen (~> 1.0.0)
       rails
+    coderay (1.1.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     d3_rails (3.2.8)
       railties (>= 3.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (3.0.4)
-      bcrypt-ruby (~> 3.0)
+    devise (3.4.1)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
+      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     docile (1.1.5)
     erubis (2.7.0)
     execjs (2.5.2)
     fakeweb (1.3.0)
-    hike (1.2.3)
-    i18n (0.6.11)
-    journey (1.0.4)
+    ffi (1.9.8-java)
+    globalid (0.3.5)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    jquery-datatables-rails (3.3.0)
+      actionpack (>= 3.1)
+      jquery-rails
+      railties (>= 3.1)
+      sass-rails
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.2)
+    json (1.8.3)
     killbill-client (0.13.0)
       json (>= 1.2.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    money (5.1.1)
-      i18n (~> 0.6.0)
-    money-rails (0.8.1)
+    loofah (2.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
+    mime-types (2.6.1)
+    mini_portile (0.6.2)
+    minitest (5.7.0)
+    monetize (1.1.0)
+      money (~> 6.5.0)
+    money (6.5.1)
+      i18n (>= 0.6.4, <= 0.7.0)
+    money-rails (1.3.0)
       activesupport (>= 3.0)
-      money (~> 5.1.0)
+      monetize (~> 1.1.0)
+      money (~> 6.5.0)
       railties (>= 3.0)
     multi_json (1.10.1)
     mysql2 (0.3.18)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
-    polyglot (0.3.5)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
+    protected_attributes (1.0.9)
+      activemodel (>= 4.0.1, < 5.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry (0.10.1-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
+    pry-rails (0.3.4)
+      pry (>= 0.9.10)
+    rack (1.6.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.21)
-      actionmailer (= 3.2.21)
-      actionpack (= 3.2.21)
-      activerecord (= 3.2.21)
-      activeresource (= 3.2.21)
-      activesupport (= 3.2.21)
-      bundler (~> 1.0)
-      railties (= 3.2.21)
-    railties (3.2.21)
-      actionpack (= 3.2.21)
-      activesupport (= 3.2.21)
-      rack-ssl (~> 1.3.2)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    simplecov (0.9.2)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
+    sass (3.4.14)
+    sass-rails (5.0.3)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.6.0)
+    spoon (0.0.4)
+      ffi
+    sprockets (3.2.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.10)
+    sprockets-rails (2.3.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     symmetric-encryption (3.6.0)
       coercible (>= 1.0.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    twitter-bootstrap-rails (2.2.8)
-      actionpack (>= 3.1)
-      execjs
-      rails (>= 3.1)
-      railties (>= 3.1)
-    tzinfo (0.3.44)
+    twitter-bootstrap-rails (3.2.0)
+      actionpack (~> 4.1)
+      execjs (~> 2.2)
+      rails (~> 4.1)
+      railties (~> 4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     warden (1.2.3)
       rack (>= 1.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   fakeweb (~> 1.3)
   kaui!
   mysql2
+  pry-rails
   rake (>= 0.8.7)
   simplecov
-  sqlite3

data/app/assets/javascripts/application.js

@@ -6,8 +6,11 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require dataTables/jquery.dataTables
+//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
+//= require dataTables/jquery.dataTables
 //= require d3
 //= require twitter/bootstrap
-//= require jquery.dataTables.min
 //= require kaui/bootstrap-tweaks
 //= require kaui/validation
+//= require kaui/datatables-tweaks

data/app/assets/javascripts/kaui/bootstrap-tweaks.js

@@ -28,7 +28,7 @@ function makeDataTable(tableObj) {
     }
   }
   tableObj.dataTable({
-    "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>",
+    "sDom": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
     "sPaginationType": "bootstrap",
     "oLanguage": {
       "sLengthMenu": "_MENU_ records per page"

data/app/assets/javascripts/kaui/datatables-tweaks.js

@@ -0,0 +1,3 @@
+$(document).on('init.dt', function(){
+  $('.dataTables_paginate').find('ul').addClass('pagination');
+});

data/app/assets/stylesheets/application.css

@@ -4,4 +4,6 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
  *= require_tree .
+ *= require dataTables/jquery.dataTables
+ *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
 */

data/app/assets/stylesheets/bootstrap_and_overrides.css

@@ -5,44 +5,3 @@
   To use Glyphicons sprites instead of Font Awesome, replace with "require twitter-bootstrap-static/sprites"
   =require twitter-bootstrap-static/fontawesome
   */
-
-/* Fixing corners on nav */
-.kauiNav .navbar-inner {
-  border-radius:         0;
-  -moz-border-radius:    0;
-  -webkit-border-radius: 0;
-}
-
-/* Moving pagination to right side of page */
-.pagination {
-  margin: 0;
-}
-.pagination ul {
-  float: right;
-}
-
-/* Moving search to right side of page */
-.dataTables_filter label {
-  float: right;
-}
-
-.dataTables_length select {
-  width: auto;
-}
-
-/* Removing header margin */
-.pageHeader {
-  margin: 0 0 20px 0;
-  line-height: 30px;
-}
-
-/* Removing form action background and border */
-.form-actions {
-  background: none;
-  border: none;
-}
-
-/** New account page **/
-.groupWrapper {
-  margin: 0;
-}

data/app/assets/stylesheets/datatables.scss

@@ -0,0 +1,14 @@
+table.dataTable thead th {
+  position: relative;
+}
+
+table.dataTable thead th,
+table.dataTable tbody td{
+  vertical-align: middle;
+}
+
+table.dataTable thead th.sorting:after,
+table.dataTable thead th.sorting_asc:after,
+table.dataTable thead th.sorting_desc:after {
+  content: '' !important;
+}

data/app/assets/stylesheets/layout.scss

@@ -0,0 +1,19 @@
+.navbar{
+  border-radius: 0;
+}
+
+.top_navbar{
+  li{
+    display: inline-block;
+
+    a{
+      color: #B3B3B3;
+      &:hover { color: black; }
+    }
+  }
+}
+
+.main-footer{
+  min-height: 50px;
+  margin-top: 100px;
+}

data/app/controllers/kaui/account_timelines_controller.rb

@@ -32,13 +32,7 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
     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
+    load_invoices_for_timeline
 
     if params.has_key?(:external_key)
       @selected_bundle = @bundle_names[params[:external_key]]
@@ -51,13 +45,11 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
     @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)
+  def load_invoices_for_timeline
+    all_invoices = @account.invoices(true, options_for_klient)
+    return {} if all_invoices.nil? || all_invoices.empty?
 
-    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
+    # Convert into Kaui::Invoice to benefit from additional methods xxx_to_money
+    @invoices_by_id = all_invoices.inject({}) {|hsh, invoice| hsh[invoice.invoice_id] = Kaui::Invoice.build_from_raw_invoice(invoice); hsh}
   end
 end

data/app/controllers/kaui/sessions_controller.rb

@@ -14,5 +14,8 @@ module Kaui
       Kaui.tenant_home_path.call
     end
 
+    def after_sign_out_path_for(resource)
+      kaui_path
+    end
   end
 end

data/app/controllers/kaui/subscriptions_controller.rb

@@ -11,10 +11,10 @@ class Kaui::SubscriptionsController < Kaui::EngineController
 
     begin
       if @subscription.product_category == 'ADD_ON'
-        @bundle       = Kaui::Bundle::find_by_id(@subscription.bundle_id, options_for_klient)
-        plans_details = Kaui::Catalog::available_addons(@base_product_name, options_for_klient)
+        @bundle       = Kaui::Bundle.find_by_id(@subscription.bundle_id, options_for_klient)
+        plans_details = Kaui::Catalog.available_addons(@base_product_name, options_for_klient)
       else
-        plans_details = Kaui::Catalog::available_base_plans(options_for_klient)
+        plans_details = Kaui::Catalog.available_base_plans(options_for_klient)
       end
       @plans = plans_details.map { |p| p.plan }
     rescue => e
@@ -28,10 +28,10 @@ class Kaui::SubscriptionsController < Kaui::EngineController
 
     begin
       if @subscription.product_category == 'ADD_ON'
-        @bundle       = Kaui::Bundle::find_by_id(@subscription.bundle_id, options_for_klient)
-        plans_details = Kaui::Catalog::available_addons(params[:base_product_name], options_for_klient)
+        @bundle       = Kaui::Bundle.find_by_id(@subscription.bundle_id, options_for_klient)
+        plans_details = Kaui::Catalog.available_addons(params[:base_product_name], options_for_klient)
       else
-        plans_details = Kaui::Catalog::available_base_plans(options_for_klient)
+        plans_details = Kaui::Catalog.available_base_plans(options_for_klient)
       end
 
       plan_details                 = plans_details.find { |p| p.plan == params[:plan_name] }
@@ -39,7 +39,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
       @subscription.product_name   = plan_details.product
       @subscription.price_list     = plan_details.price_list
 
-      @subscription = @subscription.create(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+      @subscription = @subscription.create(current_user.kb_username, params[:reason], params[:comment], nil, false, options_for_klient)
       redirect_to bundle_path(@subscription.bundle_id), :notice => 'Subscription was successfully created'
     rescue => e
       @plans            = plans_details.nil? ? [] : plans_details.map { |p| p.plan }
@@ -79,7 +79,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
     billing_policy      = params[:policy] unless params[:policy].blank?
     wait_for_completion = params[:wait_for_completion] == '1'
 
-    subscription = Kaui::Subscription.new(:subscription_id => params[:id])
+    subscription = Kaui::Subscription.find_by_id(params[:id], options_for_klient)
 
     begin
       plans_details    = Kaui::Catalog::available_base_plans(options_for_klient)

data/app/models/kaui/ability.rb

@@ -33,9 +33,7 @@ module Kaui
       #
       to_be_model, action = permission.split(':')
       # Currently the only actions implemented for overdue and catalog (upload_config) are those implemented at the tenant level:
-      if to_be_model == 'tenant' ||
-          to_be_model == 'overdue' ||
-          to_be_model == 'catalog'
+      if ['tenant', 'overdue', 'catalog'].include?(to_be_model)
         to_be_model = 'admin_tenant'
       end
       if to_be_model == 'entitlement'

data/app/models/kaui/allowed_user.rb

@@ -2,7 +2,12 @@ module Kaui
   class AllowedUser < ActiveRecord::Base
     attr_accessible :kb_username, :description
 
-    has_many :kaui_allowed_user_tenants, :class_name => 'Kaui::AllowedUserTenant', :foreign_key => 'kaui_allowed_user_id'
-    has_many :kaui_tenants, :through => :kaui_allowed_user_tenants, :source => :kaui_tenant, :uniq => true
+    has_many :kaui_allowed_user_tenants,
+      :class_name => 'Kaui::AllowedUserTenant',
+      :foreign_key => 'kaui_allowed_user_id'
+
+    has_many :kaui_tenants, -> { uniq },
+      :through => :kaui_allowed_user_tenants,
+      :source => :kaui_tenant
   end
 end

data/app/models/kaui/invoice.rb

@@ -1,5 +1,26 @@
 class Kaui::Invoice < KillBillClient::Model::Invoice
 
+  def self.build_from_raw_invoice(raw_invoice)
+    # There is probably a meta-programming trick to avoid writing that copy ctor by hand...
+    result = Kaui::Invoice.new
+    result.amount = raw_invoice.amount
+    result.currency = raw_invoice.currency
+    result.credit_adj = raw_invoice.credit_adj
+    result.refund_adj = raw_invoice.refund_adj
+    result.invoice_id = raw_invoice.invoice_id
+    result.invoice_date = raw_invoice.invoice_date
+    result.target_date = raw_invoice.target_date
+    result.invoice_number = raw_invoice.invoice_number
+    result.balance = raw_invoice.balance
+    result.account_id = raw_invoice.account_id
+    result.external_bundle_keys = raw_invoice.external_bundle_keys
+    result.credits = raw_invoice.credits
+    result.items = raw_invoice.items
+    result.audit_logs = raw_invoice.audit_logs
+    result
+  end
+
+
   [:amount, :balance, :credits].each do |type|
     define_method "#{type}_to_money" do
       Kaui::Base.to_money(send(type), currency)

data/app/views/kaui/account_emails/_account_emails_table.html.erb

@@ -6,5 +6,5 @@
     <% end %>
     <br/>
   <% end %>
-  <%= link_to 'Add/Remove', kaui_engine.account_email_path(account_id), :class => 'btn btn-mini' %>
+  <%= link_to 'Add/Remove', kaui_engine.account_email_path(account_id), :class => 'btn btn-xs' %>
 </dd>