kaui 2.1.0 → 3.0.1

data/db/migrate/20130812155313_devise_create_kaui_users.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 class DeviseCreateKauiUsers < ActiveRecord::Migration[5.0]
   def change
-    unless table_exists?(:kaui_users)
-      create_table(:kaui_users) do |t|
-        # From Kill Bill
-        t.string :kb_username,  :null => false
-        t.string :kb_session_id,  :null => true
-        t.timestamps
-      end
+    return if table_exists?(:kaui_users)
 
-      add_index :kaui_users, [:kb_username], :unique => true
+    create_table(:kaui_users) do |t|
+      # From Kill Bill
+      t.string :kb_username,  null: false
+      t.string :kb_session_id, null: true
+      t.timestamps
     end
+
+    add_index :kaui_users, [:kb_username], unique: true
   end
 end

data/db/migrate/20150109214021_create_kaui_tenants.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 class CreateKauiTenants < ActiveRecord::Migration[5.0]
   def change
-    unless table_exists?(:kaui_tenants)
-      create_table :kaui_tenants do |t|
-        t.string :name
-        t.string :kb_tenant_id
-        t.string :api_key
-        t.string :encrypted_api_secret
+    return if table_exists?(:kaui_tenants)
+
+    create_table :kaui_tenants do |t|
+      t.string :name
+      t.string :kb_tenant_id
+      t.string :api_key
+      t.string :encrypted_api_secret
 
-        t.timestamps
-      end
+      t.timestamps
     end
   end
 end

data/db/migrate/20150112232813_create_kaui_allowed_users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateKauiAllowedUsers < ActiveRecord::Migration[5.0]
   def change
     unless table_exists?(:kaui_allowed_users)
@@ -7,17 +9,17 @@ class CreateKauiAllowedUsers < ActiveRecord::Migration[5.0]
         t.timestamps
       end
 
-      add_index :kaui_allowed_users, [:kb_username], :unique => true
+      add_index :kaui_allowed_users, [:kb_username], unique: true
     end
 
-    unless table_exists?(:kaui_allowed_user_tenants)
-      create_table :kaui_allowed_user_tenants do |t|
-        t.belongs_to :kaui_allowed_user
-        t.belongs_to :kaui_tenant
-        t.timestamps null: false
-      end
+    return if table_exists?(:kaui_allowed_user_tenants)
 
-      add_index :kaui_allowed_user_tenants, [:kaui_allowed_user_id, :kaui_tenant_id], :unique => true, :name => 'kaui_allowed_user_tenants_uniq'
+    create_table :kaui_allowed_user_tenants do |t|
+      t.belongs_to :kaui_allowed_user
+      t.belongs_to :kaui_tenant
+      t.timestamps null: false
     end
+
+    add_index :kaui_allowed_user_tenants, %i[kaui_allowed_user_id kaui_tenant_id], unique: true, name: 'kaui_allowed_user_tenants_uniq'
   end
 end

data/lib/generators/kaui/install/install_generator.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'kaui/version'
 
 module Kaui
   class InstallGenerator < Rails::Generators::Base
-    class_option :lib_name, :type => :string, :default => 'kaui'
+    class_option :lib_name, type: :string, default: 'kaui'
 
     def self.source_paths
-      paths = self.superclass.source_paths
+      paths = superclass.source_paths
       paths << File.expand_path('../templates', "../../#{__FILE__}")
       paths << File.expand_path('../templates', "../#{__FILE__}")
-      paths << File.expand_path('../templates', __FILE__)
+      paths << File.expand_path('templates', __dir__)
       paths.flatten
     end
 
@@ -18,7 +20,7 @@ module Kaui
     end
 
     def config_kaui_yml
-      create_file "config/kaui.yml" do
+      create_file 'config/kaui.yml' do
         settings = { 'version' => Kaui::VERSION }
 
         settings.to_yaml
@@ -26,43 +28,44 @@ module Kaui
     end
 
     def additional_tweaks
-      return unless File.exists? 'public/robots.txt'
-      append_file "public/robots.txt", <<-ROBOTS
-User-agent: *
-Disallow: /kaui
+      return unless File.exist? 'public/robots.txt'
+
+      append_file 'public/robots.txt', <<~ROBOTS
+        User-agent: *
+        Disallow: /kaui
       ROBOTS
     end
 
     def setup_assets
       @lib_name = 'kaui'
-      %w{javascripts stylesheets images}.each do |path|
+      %w[javascripts stylesheets images].each do |path|
         empty_directory "app/assets/#{path}/kaui"
       end
 
-      template "app/assets/javascripts/kaui/all.js"
-      template "app/assets/stylesheets/kaui/all.css"
+      template 'app/assets/javascripts/kaui/all.js'
+      template 'app/assets/stylesheets/kaui/all.css'
     end
 
     def update_routes
-      insert_into_file File.join('config', 'routes.rb'), :after => "Application.routes.draw do\n" do
-        %Q{
+      insert_into_file File.join('config', 'routes.rb'), after: "Application.routes.draw do\n" do
+        %(
   # This line mounts Kaui's routes at the root of your application.
   # If you're mounting this engine into an existing application, change it to e.g.
   # mount Kaui::Engine, :at => '/kaui', :as => "kaui_engine"
   #
   # Don't modify the :as => "kaui_engine" option though.
   mount Kaui::Engine, :at => '/', :as => "kaui_engine"
-        }
+        )
       end
     end
 
     def complete
-      unless options[:quiet]
-        puts "*" * 50
-        puts "Kaui has been installed successfully. You're all ready to go!"
-        puts " "
-        puts "Enjoy!"
-      end
+      return if options[:quiet]
+
+      puts '*' * 50
+      puts "Kaui has been installed successfully. You're all ready to go!"
+      puts ' '
+      puts 'Enjoy!'
     end
   end
 end

data/lib/generators/kaui/install/templates/config/initializers/kaui.rb

@@ -1,3 +1,5 @@
-# Configure Kaui Preferences
+# frozen_string_literal: true
+
 Kaui.config do |config|
+  # Configure Kaui Preferences
 end

data/lib/kaui/engine.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 # Dependencies
 #
 # Sigh. Rails autoloads the gems specified in the Gemfile and nothing else.
 # We need to explicitly require all of our dependencies listed in kaui.gemspec
 #
 # See also https://github.com/carlhuda/bundler/issues/49
+
 require 'js-routes'
 require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'jquery-datatables-rails'
-require 'font-awesome-rails'
-require 'twitter-bootstrap-rails'
+require 'font-awesome-sass'
+require 'bootstrap-sass'
 require 'bootstrap-datepicker-rails'
-require 'less-rails'
 require 'json'
 require 'money-rails'
 require 'killbill_client'
@@ -21,13 +23,23 @@ require 'cancan'
 require 'country_select'
 require 'concurrent'
 require 'mustache-js-rails'
+require 'nokogiri'
+require 'time'
+require 'd3-rails'
+require 'spinjs-rails'
+require 'popper_js'
 
 module Kaui
   class Engine < ::Rails::Engine
     isolate_namespace Kaui
+    config.autoload_once_paths = %W[
+      #{root}/app/controllers
+      #{root}/app/helpers
+      #{root}/app/models
+    ]
 
-    initializer 'kaui_engine.action_controller' do |app|
-      ActiveSupport.on_load :action_controller do
+    initializer 'kaui_engine.action_controller', before: :load_config_initializers do |_app|
+      ActiveSupport.on_load :action_controller_base do
         helper Kaui::Engine.helpers
       end
 

data/lib/kaui/installer/installer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbconfig'
 require 'active_support/core_ext/string'
 require 'thor'
@@ -5,31 +7,30 @@ require 'thor/group'
 require 'kaui/version'
 
 module KauiCmd
-
   class Installer < Thor::Group
     include Thor::Actions
 
     desc 'Install Kaui inside an existing rails project'
 
-    argument :app_path, :type => :string, :desc => 'rails app_path', :default => '.'
+    argument :app_path, type: :string, desc: 'rails app_path', default: '.'
 
-    class_option :version, :type => :string, :desc => 'Kaui Version to use'
+    class_option :version, type: :string, desc: 'Kaui Version to use'
 
-    class_option :edge, :type => :boolean
+    class_option :edge, type: :boolean
 
-    class_option :path, :type => :string, :desc => 'Kaui gem path'
-    class_option :git, :type => :string, :desc => 'Kaui gem git url'
-    class_option :ref, :type => :string, :desc => 'Kaui gem git ref'
-    class_option :branch, :type => :string, :desc => 'Kaui gem git branch'
-    class_option :tag, :type => :string, :desc => 'Kaui gem git tag'
+    class_option :path, type: :string, desc: 'Kaui gem path'
+    class_option :git, type: :string, desc: 'Kaui gem git url'
+    class_option :ref, type: :string, desc: 'Kaui gem git ref'
+    class_option :branch, type: :string, desc: 'Kaui gem git branch'
+    class_option :tag, type: :string, desc: 'Kaui gem git tag'
 
-    class_option :skip_bundle, :type => :boolean, :desc => "Don't run bundle install"
+    class_option :skip_bundle, type: :boolean, desc: "Don't run bundle install"
 
     def verify_rails
-      unless rails_project?
-        say "#{@app_path} is not a rails project."
-        exit 1
-      end
+      return if rails_project?
+
+      say "#{@app_path} is not a rails project."
+      exit 1
     end
 
     def prepare_options
@@ -55,28 +56,28 @@ module KauiCmd
     def add_gems
       inside @app_path do
         gem :kaui, @kaui_gem_options
-        run 'bundle install', :capture => true unless options[:skip_bundle]
+        run 'bundle install', capture: true unless options[:skip_bundle]
       end
     end
 
     def initialize_kaui
       inside @app_path do
-        run "rails generate kaui:install", :verbose => false
+        run 'rails generate kaui:install', verbose: false
       end
     end
 
     private
 
-      def rails_project?
-        File.exists?(File.join(@app_path, 'script', 'rails')) || File.exists?(File.join(@app_path, 'bin', 'rails'))
-      end
+    def rails_project?
+      File.exist?(File.join(@app_path, 'script', 'rails')) || File.exist?(File.join(@app_path, 'bin', 'rails'))
+    end
 
-      def gem(name, gem_options={})
-        say_status :gemfile, name
-        parts = ["'#{name}'"]
-        parts << ["'#{gem_options.delete(:version)}'"] if gem_options[:version]
-        gem_options.each { |key, value| parts << ":#{key} => '#{value}'" }
-        append_file 'Gemfile', "gem #{parts.join(', ')}\n", :verbose => false
-      end
+    def gem(name, gem_options = {})
+      say_status :gemfile, name
+      parts = ["'#{name}'"]
+      parts << ["'#{gem_options.delete(:version)}'"] if gem_options[:version]
+      gem_options.each { |key, value| parts << ":#{key} => '#{value}'" }
+      append_file 'Gemfile', "gem #{parts.join(', ')}\n", verbose: false
+    end
   end
 end

data/lib/kaui/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Kaui
-  VERSION = '2.1.0'
+  VERSION = '3.0.1'
 end

data/lib/kaui.rb

@@ -1,10 +1,11 @@
-#lib_dir = File.expand_path("..", __FILE__)
-#$LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
+# frozen_string_literal: true
 
-require "kaui/engine"
+# lib_dir = File.expand_path("..", __FILE__)
+# $LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 
-module Kaui
+require 'kaui/engine'
 
+module Kaui
   mattr_accessor :home_path
   mattr_accessor :tenant_home_path
   mattr_accessor :new_user_session_path
@@ -46,16 +47,16 @@ module Kaui
 
   mattr_accessor :disable_sign_up_link
 
-  self.home_path = lambda { Kaui::Engine.routes.url_helpers.home_path }
-  self.tenant_home_path = lambda { Kaui::Engine.routes.url_helpers.tenants_path }
+  self.home_path = -> { Kaui::Engine.routes.url_helpers.home_path }
+  self.tenant_home_path = -> { Kaui::Engine.routes.url_helpers.tenants_path }
 
   self.bundle_details_partial = 'kaui/bundles/bundle_details'
 
-  self.pretty_account_identifier = lambda { |account| account.name.presence || account.email.presence || Kaui::UuidHelper.truncate_uuid(account.external_key) }
-  self.bundle_key_display_string =  lambda {|bundle_key| bundle_key }
-  self.creditcard_plugin_name =  lambda { '__EXTERNAL_PAYMENT__' }
+  self.pretty_account_identifier = ->(account) { account.name.presence || account.email.presence || Kaui::UuidHelper.truncate_uuid(account.external_key) }
+  self.bundle_key_display_string = ->(bundle_key) { bundle_key }
+  self.creditcard_plugin_name =  -> { '__EXTERNAL_PAYMENT__' }
 
-  self.account_search_columns = lambda do |account=nil, view_context=nil|
+  self.account_search_columns = lambda do |account = nil, view_context = nil|
     [
       ['External key', 'Balance'],
       [
@@ -65,13 +66,13 @@ module Kaui
     ]
   end
 
-  self.invoice_search_columns = lambda do |invoice=nil, view_context=nil|
+  self.invoice_search_columns = lambda do |invoice = nil, view_context = nil|
     default_label = 'label-info'
     default_label = 'label-default' if invoice&.status == 'DRAFT'
     default_label = 'label-success' if invoice&.status == 'COMMITTED'
     default_label = 'label-danger' if invoice&.status == 'VOID'
     [
-      ['Date', 'Status'],
+      %w[Date Status],
       [
         invoice&.invoice_date,
         invoice.nil? || view_context.nil? ? nil : view_context.content_tag(:span, invoice.status, class: ['label', default_label])
@@ -79,13 +80,13 @@ module Kaui
     ]
   end
 
-  self.account_invoices_columns = lambda do |invoice=nil, view_context=nil|
+  self.account_invoices_columns = lambda do |invoice = nil, view_context = nil|
     default_label = 'label-info'
     default_label = 'label-default' if invoice&.status == 'DRAFT'
     default_label = 'label-success' if invoice&.status == 'COMMITTED'
     default_label = 'label-danger' if invoice&.status == 'VOID'
     [
-      ['Date', 'Amount', 'Balance', 'Status'],
+      %w[Date Amount Balance Status],
       [
         invoice&.invoice_date,
         invoice.nil? || view_context.nil? ? nil : view_context.humanized_money_with_symbol(invoice.amount_to_money),
@@ -95,7 +96,7 @@ module Kaui
     ]
   end
 
-  self.customer_invoice_link = lambda { |invoice, ctx| ctx.link_to 'View customer invoice html', ctx.kaui_engine.show_html_invoice_path(invoice.invoice_id), :class => 'btn', :target => '_blank' }
+  self.customer_invoice_link = ->(invoice, ctx) { ctx.link_to 'View customer invoice html', ctx.kaui_engine.show_html_invoice_path(invoice.invoice_id), class: 'btn', target: '_blank' }
 
   self.demo_mode = false
 
@@ -153,14 +154,14 @@ module Kaui
 
   # Default URLs
   self.gateways_urls = {
-      'killbill-adyen' => 'https://ca-test.adyen.com/ca/ca/accounts/showTx.shtml?txType=Payment&pspReference=FIRST_PAYMENT_REFERENCE_ID',
-      'killbill-cybersource' => 'https://ebctest.cybersource.com/ebctest/transactionsearch/TransactionSearchDetailsLoad.do?requestId=FIRST_PAYMENT_REFERENCE_ID',
-      'killbill-stripe' => 'https://dashboard.stripe.com/test/payments/FIRST_PAYMENT_REFERENCE_ID'
+    'killbill-adyen' => 'https://ca-test.adyen.com/ca/ca/accounts/showTx.shtml?txType=Payment&pspReference=FIRST_PAYMENT_REFERENCE_ID',
+    'killbill-cybersource' => 'https://ebctest.cybersource.com/ebctest/transactionsearch/TransactionSearchDetailsLoad.do?requestId=FIRST_PAYMENT_REFERENCE_ID',
+    'killbill-stripe' => 'https://dashboard.stripe.com/test/payments/FIRST_PAYMENT_REFERENCE_ID'
   }
 
   self.disable_sign_up_link = true
 
-  def self.is_user_assigned_valid_tenant?(user, session)
+  def self.user_assigned_valid_tenant?(user, session)
     #
     # If those are set in config initializer then we bypass the check
     # For multi-tenant production deployment, those should not be set!
@@ -177,16 +178,16 @@ module Kaui
     au = Kaui::AllowedUser.find_by_kb_username(user.kb_username)
     return false if au.nil?
 
-    return au.kaui_tenants.select { |t| t.kb_tenant_id == session[:kb_tenant_id] }.first
+    au.kaui_tenants.select { |t| t.kb_tenant_id == session[:kb_tenant_id] }.first
   end
 
   def self.current_tenant_user_options(user, session)
     kb_tenant_id = session[:kb_tenant_id]
     user_tenant = Kaui::Tenant.find_by_kb_tenant_id(kb_tenant_id) if kb_tenant_id
     result = {
-        :username => user.kb_username,
-        :password => user.password,
-        :session_id => user.kb_session_id,
+      username: user.kb_username,
+      password: user.password,
+      session_id: user.kb_session_id
     }
     if user_tenant
       result[:api_key] = user_tenant.api_key
@@ -195,21 +196,18 @@ module Kaui
     result
   end
 
-
-
-
-  def self.config(&block)
+  def self.config
     {
-      :layout => layout || 'kaui/layouts/kaui_application',
+      layout: layout || 'kaui/layouts/kaui_application'
     }
   end
 end
 
 # ruby-1.8 compatibility
 module Kernel
-  def define_singleton_method(*args, &block)
+  def define_singleton_method(*args, &)
     class << self
       self
-    end.send(:define_method, *args, &block)
+    end.send(:define_method, *args, &)
   end
 end

data/lib/tasks/kaui_tasks.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # desc "Explaining what the task does"
 # task :kaui do
 #   # Task goes here