kanaui 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b509920c148aef35ccf0bffbe38b935b669a35ff
-  data.tar.gz: e5d121e521e55c1c3f882f7f0bbfd576c961a7e9
+  metadata.gz: 44408c840e86c3b09c99de32d8562b6f6cb11f8b
+  data.tar.gz: b4c65299ff506937976f193d337701969e0cba65
 SHA512:
-  metadata.gz: e8ebbb2db468390719e6c125880f483382f2cfd61ca4256128409c7dfa89aa11b367d3f6b5bdc039897c81de3fd627007348ff2c86e82096e94392c4c7f47b4d
-  data.tar.gz: bc6c3397d0fa1f6192f81cf85c199934126c4a42283791ec8e6ec7b0b8e31dc7678804dc5c288474713f22a9ccad7dac089967a2a6fed42440b5edb83956bc81
+  metadata.gz: a1fd5e4063dea83305ead4baa1e6b60d9c532d86a4518067c2a2995709fab84df428c266f0a2d5a96222f5729bc8d3f7336d9036046b8d222fc2e4bd0dcb6e7f
+  data.tar.gz: b62394e70ab37f0d418930846d288e8da1fec047dc9ad37a35cdaa0b5be8c9d6801aa54a84073e7c3d9ed8c131379e76265dc72ea2a972eb1f41e566559931ee

data/README.md

@@ -12,7 +12,8 @@ Kill Bill compatibility
 | Kanaui version | Kill Bill version |
 | -------------: | ----------------: |
 | 0.4.y          | 0.16.z            |
-| 0.5.y          | 0.18.z            |
+| 0.5.y          | 0.18.z (Rails 4)  |
+| 0.6.y          | 0.18.z (Rails 5)  |
 
 Getting Started
 ===============
@@ -34,15 +35,18 @@ KillBillClient.api_key = 'bob'
 KillBillClient.api_secret = 'lazar'
 ```
 
-Running Kanaui
---------------
+Testing
+-------
 
-You can run Kanaui locally by using the test/dummy app provided:
+To run the dummy app:
 
 ```
-bundle install
-cd test/dummy
-export RAILS_ENV=development
-bundle install
-rails server
+rails s
+```
+
+
+To run tests:
+
+```
+rails t
 ```

data/app/assets/javascripts/application.js

@@ -6,7 +6,6 @@
 //
 //= require js-routes
 //= require log4javascript
-//= require moment
 //= require spin
 //= require jquery
 //= require jquery_ujs

data/app/assets/stylesheets/application.css

@@ -6,6 +6,7 @@
  *= require bootstrap-datepicker3
  *= require dataTables/jquery.dataTables
  *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
+ *= require font-awesome
  *= require bootstrap_and_overrides
  *= require kanaui/kanaui
 */

data/app/assets/stylesheets/bootstrap_and_overrides.css

@@ -1,9 +1,5 @@
 /*
  *= require twitter-bootstrap-static/bootstrap
- *
- * Use Font Awesome icons (default)
- * To use Glyphicons sprites instead of Font Awesome, replace with "require twitter-bootstrap-static/sprites"
- *= require twitter-bootstrap-static/fontawesome
 */
 
 /* Override Bootstrap 3 font locations */

data/app/controllers/kanaui/dashboard_controller.rb

@@ -24,15 +24,21 @@ module Kanaui
       if query.present? || params[:start_date].blank? || params[:end_date].blank?
         # TODO Make metrics configurable
         name = query.present? ? "#{params[:name]}#{query}^metric:count" : params[:name]
-        redirect_to dashboard_index_path(:start_date => @start_date,
-                                         :end_date => @end_date,
-                                         :name => name,
-                                         :smooth => params[:smooth],
-                                         :sql_only => params[:sql_only],
-                                         :format => params[:format]) and return
+        query_params = {:start_date => @start_date,
+                        :end_date => @end_date,
+                        :name => name,
+                        :smooth => params[:smooth],
+                        :sql_only => params[:sql_only],
+                        :format => params[:format]}
+
+        # Test only
+        query_params[:fake] = params[:fake] unless params[:fake].blank?
+        query_params[:type] = params[:type] unless params[:type].blank?
+
+        redirect_to dashboard_index_path(query_params) and return
       end
 
-      render
+      params.permit!
     end
 
     # Not used anymore as reports are pulled from index

data/app/views/kanaui/dashboard/index.html.erb

@@ -35,7 +35,7 @@
             </li>
           <% end %>
         <% @reports.each do |r| %>
-          <% link = kanaui_engine.dashboard_index_path(params.merge(:name => r['reportName'])) %>
+          <% link = kanaui_engine.dashboard_index_path(params.to_h.merge(:name => r['reportName'])) %>
           <li class="nav-element <%= params[:name] == r['reportName'] ? 'current' : '' %>">
             <%= link_to r['reportPrettyName'], link, :class => "truncate-text", title: r['reportName'].titleize %>
           </li>
@@ -53,17 +53,17 @@
         <%= @raw_name.titleize %>
       </h2>
       <div id="loading-spinner"></div>
-      <div id="chartAnchor" data-reports-path="<%= kanaui_engine.reports_path(params) %>"></div>
+      <div id="chartAnchor" data-reports-path="<%= kanaui_engine.reports_path(params.to_h) %>"></div>
       <div id="date-controls" style="display: none;">
         <ul class="nav nav-pills nav-justified">
           <% @available_start_dates.each do |key, value| %>
-            <li><%= link_to key, kanaui_engine.dashboard_index_path(params.merge(:start_date => value)) %></li>
+            <li><%= link_to key, kanaui_engine.dashboard_index_path(params.to_h.merge(:start_date => value)) %></li>
           <% end %>
         </ul>
       </div>
       <hr>
       <div class="pull-right">
-        <%= link_to 'Download raw data', kanaui_engine.reports_path(params.merge(:format => 'csv')), class: 'btn btn-default' %>
+        <%= link_to 'Download raw data', kanaui_engine.reports_path(params.to_h.merge(:format => 'csv')), class: 'btn btn-default' %>
       </div>
       <a class="btn btn-default" role="button" data-toggle="collapse" href="#advanced-controls" aria-expanded="false" aria-controls="advanced-controls">
         Advanced controls
@@ -75,22 +75,22 @@
               <% at_least_two_months = params[:start_date].blank? || params[:end_date].blank? || (params[:end_date].to_date.beginning_of_month - 1.month > params[:start_date].to_date) %>
               <% at_least_two_weeks = params[:start_date].blank? || params[:end_date].blank? || (params[:end_date].to_date.beginning_of_week - 1.week > params[:start_date].to_date) %>
               <% if params[:smooth] != 'AVERAGE_WEEKLY' && at_least_two_weeks %>
-                <li><%= link_to 'Weekly average', kanaui_engine.dashboard_index_path(params.merge(:smooth => 'AVERAGE_WEEKLY')) %></li>
+                <li><%= link_to 'Weekly average', kanaui_engine.dashboard_index_path(params.to_h.merge(:smooth => 'AVERAGE_WEEKLY')) %></li>
               <% end %>
               <% if params[:smooth] != 'AVERAGE_MONTHLY' && at_least_two_months %>
-                <li><%= link_to 'Monthly average', kanaui_engine.dashboard_index_path(params.merge(:smooth => 'AVERAGE_MONTHLY')) %></li>
+                <li><%= link_to 'Monthly average', kanaui_engine.dashboard_index_path(params.to_h.merge(:smooth => 'AVERAGE_MONTHLY')) %></li>
               <% end %>
               <% if params[:smooth] != 'SUM_WEEKLY' && at_least_two_weeks %>
-                <li><%= link_to 'Weekly sum', kanaui_engine.dashboard_index_path(params.merge(:smooth => 'SUM_WEEKLY')) %></li>
+                <li><%= link_to 'Weekly sum', kanaui_engine.dashboard_index_path(params.to_h.merge(:smooth => 'SUM_WEEKLY')) %></li>
               <% end %>
               <% if params[:smooth] != 'SUM_MONTHLY' && at_least_two_months %>
-                <li><%= link_to 'Monthly sum', kanaui_engine.dashboard_index_path(params.merge(:smooth => 'SUM_MONTHLY')) %></li>
+                <li><%= link_to 'Monthly sum', kanaui_engine.dashboard_index_path(params.to_h.merge(:smooth => 'SUM_MONTHLY')) %></li>
               <% end %>
             <% end %>
             <% filter_fields = ((@report['schema'] || {})['fields'] || []).select { |field| !field['distinctValues'].blank? && field['dataType'] =~ /char/ } # To ignore tenant_record_id %>
             <% unless filter_fields.empty? %>
               <li>Slicing & Dicing:
-                <%= form_tag kanaui_engine.dashboard_index_path(params), :method => :get, :class => 'form-horizontal' do %>
+                <%= form_tag kanaui_engine.dashboard_index_path(params.to_h), :method => :get, :class => 'form-horizontal' do %>
                     <input name="start_date" type="hidden" value="<%= @start_date %>">
                     <input name="end_date" type="hidden" value="<%= @end_date %>">
                     <input name="name" type="hidden" value="<%= @raw_name %>">
@@ -132,7 +132,7 @@
                 <pre><%= params[:name] -%></pre>
               </li>
           <% end %>
-            <li><%= link_to 'SQL query', kanaui_engine.reports_path(params.merge(:sql_only => true)) %></li>
+            <li><%= link_to 'SQL query', kanaui_engine.reports_path(params.to_h.merge(:sql_only => true)) %></li>
           </ul>
         </div>
       </div>

data/lib/kanaui/engine.rb

@@ -4,11 +4,13 @@
 # We need to explicitly require all of our dependencies listed in kanaui.gemspec
 #
 # See also https://github.com/carlhuda/bundler/issues/49
+require 'js-routes'
 require 'jquery-rails'
 require 'jquery-datatables-rails'
+require 'font-awesome-rails'
+require 'twitter-bootstrap-rails'
 require 'bootstrap-datepicker-rails'
 require 'd3_rails'
-require 'momentjs-rails'
 require 'spinjs-rails'
 require 'killbill_client'
 

data/lib/kanaui/version.rb

@@ -1,3 +1,3 @@
 module Kanaui
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/test/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/test/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../config/application', __dir__)
+require_relative '../config/boot'
+require 'rails/commands'

data/test/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/test/dummy/bin/setup

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
+  # end
+
+  puts "\n== Preparing database =="
+  system! 'bin/rails db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/test/dummy/bin/update

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/test/dummy/bin/yarn

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+VENDOR_PATH = File.expand_path('..', __dir__)
+Dir.chdir(VENDOR_PATH) do
+  begin
+    exec "yarnpkg #{ARGV.join(" ")}"
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end

data/test/dummy/config/application.rb

@@ -1,58 +1,26 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
-require 'rails/all'
-Bundler.require(*Rails.groups)
-require "kanaui"
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'rails/test_unit/railtie'
+require 'sprockets/railtie'
 
-require "jquery-rails"
-require "twitter-bootstrap-rails"
-require "d3_rails"
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
 
-require "js-routes"
+#
+# Required to load the Kanaui engine into the dummy app
+#
+require File.expand_path('../../../../lib/kanaui.rb', __FILE__)
 
 module Dummy
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.1
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
-
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable escaping HTML in JSON.
-    config.active_support.escape_html_entities_in_json = true
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
   end
 end
-

data/test/dummy/config/boot.rb

@@ -1,10 +1,3 @@
-require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-if File.exist?(gemfile)
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-end
-
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/test/dummy/config/environment.rb

@@ -1,5 +1,5 @@
-# Load the rails application
-require File.expand_path('../application', __FILE__)
+# Load the Rails application.
+require_relative 'application'
 
-# Initialize the rails application
-Dummy::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!

data/test/dummy/config/environments/development.rb

@@ -1,34 +1,54 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  if Rails.root.join('tmp/caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
 
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
+    config.cache_store = :null_store
+  end
 
-  # Print deprecation notices to the Rails logger
+  # Don't care if the mailer can't send.
+  # config.action_mailer.raise_delivery_errors = false
+
+  # config.action_mailer.perform_caching = false
+
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations.
+  # config.active_record.migration_error = :page_load
 
-  #config.assets.paths << "#{Rails}/vendor/assets/fonts"
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
 
-  # Do not compress assets
-  config.assets.compress = false
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true
 
-  # Expands the lines which load the assets
-  config.assets.debug = false
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 
-  config.eager_load = false
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end