clark_kent 0.9.1 → 0.9.2

data/app/assets/javascripts/simple_inheritance.js

@@ -0,0 +1,65 @@
+/* Simple JavaScript Inheritance
+ * By John Resig http://ejohn.org/
+ * MIT Licensed.
+ */
+// Inspired by base2 and Prototype
+if(typeof Class == 'undefined'){
+  (function(){
+    var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
+    // The base Class implementation (does nothing)
+    this.Class = function(){};
+    
+    // Create a new Class that inherits from this class
+    Class.extend = function(prop) {
+      var _super = this.prototype;
+      
+      // Instantiate a base class (but only create the instance,
+      // don't run the init constructor)
+      initializing = true;
+      var prototype = new this();
+      initializing = false;
+      
+      // Copy the properties over onto the new prototype
+      for (var name in prop) {
+        // Check if we're overwriting an existing function
+        prototype[name] = typeof prop[name] == "function" && 
+          typeof _super[name] == "function" && fnTest.test(prop[name]) ?
+          (function(name, fn){
+            return function() {
+              var tmp = this._super;
+              
+              // Add a new ._super() method that is the same method
+              // but on the super-class
+              this._super = _super[name];
+              
+              // The method only need to be bound temporarily, so we
+              // remove it when we're done executing
+              var ret = fn.apply(this, arguments);        
+              this._super = tmp;
+              
+              return ret;
+            };
+          })(name, prop[name]) :
+          prop[name];
+      }
+      
+      // The dummy class constructor
+      function Class() {
+        // All construction is actually done in the init method
+        if ( !initializing && this.init )
+          this.init.apply(this, arguments);
+      }
+      
+      // Populate our constructed prototype object
+      Class.prototype = prototype;
+      
+      // Enforce the constructor to be what we expect
+      Class.prototype.constructor = Class;
+
+      // And make this class extendable
+      Class.extend = arguments.callee;
+      
+      return Class;
+    };
+  })();  
+}

data/app/controllers/clark_kent/report_columns_controller.rb

@@ -38,7 +38,7 @@ class ClarkKent::ReportColumnsController < ClarkKent::ApplicationController
 
   def destroy
     @report_column.destroy
-    render nothing: true
+    head :ok
   end
 
   protected

data/app/controllers/clark_kent/report_emails_controller.rb

@@ -29,7 +29,7 @@ class ClarkKent::ReportEmailsController < ClarkKent::ApplicationController
 
   def destroy
     @report_email.destroy
-    render nothing: true
+    head :ok
   end
 
   protected

data/app/controllers/clark_kent/report_filters_controller.rb

@@ -30,7 +30,7 @@ class ClarkKent::ReportFiltersController < ClarkKent::ApplicationController
 
   def destroy
     @report_filter.destroy
-    render nothing: true
+    head :ok
   end
 
   protected

data/app/controllers/clark_kent/reports_controller.rb

@@ -19,6 +19,7 @@ class ClarkKent::ReportsController < ClarkKent::ApplicationController
     if @report.errors.empty?
       render action: :edit
     else
+      puts @report.errors.full_messages
       render action: :new, status: :conflict
     end
   end

data/app/controllers/clark_kent/user_report_emails_controller.rb

@@ -32,7 +32,7 @@ class ClarkKent::UserReportEmailsController < ClarkKent::ApplicationController
 
   def destroy
     @user_report_email.destroy
-    render nothing: true
+    head :ok
   end
 
   def prepare_user_report_email

data/app/views/clark_kent/reports/_edit.html.erb

@@ -1,7 +1,7 @@
 <div class="ih-row">
   <%= simple_form_for @report, html: @report.persisted? ? ajax_form_hash( '#report_info_container' ) : {} do |f| %>
     <div class="ih-span one-quarter">
-      <%= f.input :name %>
+      <%= f.input :name, minlength: false %>
     </div>
     <div class="ih-span one-quarter">
       <%= f.input :resource_type,
@@ -18,7 +18,9 @@
           label: false, include_blank: false %>
       </div>
       <div class="ih-row" <%= revealer_target_attrs("sharing_options") %>>
-        <%= f.input :sharing_scope_id, as: :hidden, input_html: {value: current_user.id}, wrapper_html: revealer_option("sharing_options", trigger: ClarkKent.user_class_name).merge(id: "sharing_options_#{ClarkKent.user_class_name}") %>
+            <%= ClarkKent.user_class_name %>
+
+        <%= f.input :sharing_scope_id, as: :hidden, input_html: {value: current_user.id, data: {foo: ClarkKent.user_class_name}}, wrapper_html: revealer_option("sharing_options", trigger: ClarkKent.user_class_name).merge(id: "sharing_options_#{ClarkKent.user_class_name}") %>
         <% ClarkKent::SharingScopeKind.custom_for_user(current_user).each do |sharing_scope_kind| %>
           <% if sharing_scope_kind.associated_containers_for(current_user).respond_to? :each %>
             <%= f.input :sharing_scope_id, collection: sharing_scope_kind.associated_containers_for(current_user), label: false, include_blank: false,

data/app/views/clark_kent/reports/_print_report.html.erb

@@ -1,5 +1,5 @@
 <% if rows %>
-  <% if rows.total_count > rows.count(:id) %>
+  <% if rows.total_count > 50 %>
     <%= link_to 'Print',
                 'javascript:void(0)',
                 onclick: "$('#print_report_modal').modal('show');",

data/lib/clark_kent/version.rb

@@ -1,3 +1,3 @@
 module ClarkKent
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/lib/clark_kent.rb

@@ -12,12 +12,12 @@ module ClarkKent
   end
 
   def self.config(options)
-    @@resource_options = options[:resource_options].map{|option_hash| ClarkKent::ResourceOption.new option_hash}
+    @@resource_options = options[:resource_options].map{|option_hash| ClarkKent::ResourceOption.new option_hash} if options.has_key? :resource_options
     @@user_class_name = options[:user_class_name]
     @@bucket_name     = options[:bucket_name]
     @@other_sharing_scopes = options[:other_sharing_scopes]
     base_controller_name = options[:base_controller_name]
-    @@base_controller = base_controller_name.constantize
+    @@base_controller = base_controller_name.constantize if base_controller_name.present?
     @@custom_report_links = options[:custom_report_links] || []
   end
 

data/test/clark_kent_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class ClarkKentTest < ActiveSupport::TestCase
-  test ".bucket_name is configurable" do
+  it ".bucket_name is configurable" do
     ClarkKent.config(:bucket_name => "trololo")
     assert_match "trololo", ClarkKent.bucket_name
   end

data/test/controllers/clark_kent/report_columns_controller_test.rb

@@ -1,26 +1,23 @@
 require 'test_helper'
 
 class ClarkKent::ReportColumnsControllerTest < ControllerTest
-
+  include Rails.application.routes.mounted_helpers
   let(:report) {ClarkKent::Report.first}
 
-  setup do
-    @routes = ClarkKent::Engine.routes
-  end
-
   it "should create a report column" do
-    xhr :post, :create, params: {report_column: {report_id: report.id, column_name: 'user_name'}}
+    post clark_kent.report_columns_path(report_column: {report_id: report.id, column_name: 'user_name'}), xhr: true
     assert_response :success
   end
 
   it "should reject a report column with no column_name" do
-    xhr :post, :create, params: {report_column: {report_id: report.id}}
+    post clark_kent.report_columns_path(report_column: {report_id: report.id}), xhr: true
     assert_response :conflict
     @response.body.must_match /can[^t]*t be blank/
   end
 
   it "should reject a report column with unusable sort" do
-    xhr :post, :create, params: {report_column: {report_id: report.id, column_name: 'user_name', report_sort: 'ascending'}}
+    post clark_kent.report_columns_path( report_column: {
+          report_id: report.id, column_name: 'user_name', report_sort: 'ascending'} ), xhr: true
     assert_response :conflict
     @response.body.must_match 'This column is not sortable.'
   end

data/test/controllers/clark_kent/report_filters_controller_test.rb

@@ -1,30 +1,30 @@
 require 'test_helper'
 
 class ClarkKent::ReportFiltersControllerTest < ControllerTest
+  include Rails.application.routes.mounted_helpers
 
   setup do
-    @routes = ClarkKent::Engine.routes
     @report = ClarkKent::Report.first
     @report_email = @report.report_emails.create(when_to_send: 'Monday', name: 'Owner Arrival')
     @current_user = User.first
   end
 
   test "it should create a report filter" do
-    post :create, params: {report_filter: {filterable_id: @report.id, filterable_type: "ClarkKent::Report", filter_name: "user_email", filter_value: "taproot@gmail.com"}}
+    post clark_kent.report_filters_path(report_filter: {filterable_id: @report.id, filterable_type: "ClarkKent::Report", filter_name: "user_email", filter_value: "taproot@gmail.com"})
     assert_response :success
     report_filter = ClarkKent::ReportFilter.order(id: :desc).first
     report_filter.type.must_equal 'ClarkKent::ReportStringFilter'
   end
 
   test "it should create an object report filter" do
-    post :create, params: {report_filter: {filterable_id: @report.id, filterable_type: "ClarkKent::Report", filter_name: "user_id", filter_value: @current_user.id}}
+    post clark_kent.report_filters_path(report_filter: {filterable_id: @report.id, filterable_type: "ClarkKent::Report", filter_name: "user_id", filter_value: @current_user.id})
     assert_response :success
     report_filter = ClarkKent::ReportFilter.order(id: :desc).first
     report_filter.type.must_equal 'ClarkKent::ReportObjectFilter'
   end
 
   test "it should create a date report filter" do
-  post :create, params: {report_filter: {filterable_id: @report_email.id, filterable_type: "ClarkKent::Report", filter_name: 'created_at', duration: 'week', kind_of_day: 'Monday', offset: 'last_week'}}
+    post clark_kent.report_filters_path(report_filter: {filterable_id: @report_email.id, filterable_type: "ClarkKent::Report", filter_name: 'created_at', duration: 'week', kind_of_day: 'Monday', offset: 'last_week'})
     assert_response :success
     report_filter = ClarkKent::ReportFilter.order(id: :desc).first
     report_filter.type.must_equal 'ClarkKent::ReportDateFilter'
@@ -32,37 +32,37 @@ class ClarkKent::ReportFiltersControllerTest < ControllerTest
 
   test "should get the edit form for a string filter" do
     filter = @report_email.report_filters.create(type: 'ClarkKent::ReportStringFilter', filter_name: "user_email", filter_value: "taproot@gmail.com")
-    get :edit, params: {id: filter.id}
+    get clark_kent.edit_report_filter_path(filter.id)
     assert_response :success
   end
 
   test "should get the edit form for an object filter" do
     filter = @report_email.report_filters.create(type: 'ClarkKent::ReportObjectFilter', filter_name: "user_id", filter_value: @current_user.id)
-    get :edit, params: {id: filter.id}
+    get clark_kent.edit_report_filter_path(filter.id)
     assert_response :success
   end
 
   test "should get the edit form for a date filter" do
     filter = @report_email.report_filters.create(type: 'ClarkKent::ReportDateFilter', filter_name: 'created_at', duration: 'week', kind_of_day: 'Monday', offset: 'last_week')
-    get :edit, params: {id: filter.id}
+    get clark_kent.edit_report_filter_path(filter.id)
     assert_response :success
   end
 
   test "should get the show view for a string filter" do
     filter = @report_email.report_filters.create(type: 'ClarkKent::ReportStringFilter', filter_name: "user_email", filter_value: "taproot@gmail.com")
-    get :show, params: {id: filter.id}
+    get clark_kent.report_filter_path(filter.id)
     assert_response :success
   end
 
   test "should get the show view for an object filter" do
     filter = @report_email.report_filters.create(type: 'ClarkKent::ReportObjectFilter', filter_name: "user_id", filter_value: @current_user.id)
-    get :show, params: {id: filter.id}
+    get clark_kent.report_filter_path(filter.id)
     assert_response :success
   end
 
   test "should get the show view for a date filter" do
     filter = @report_email.report_filters.create(type: 'ClarkKent::ReportDateFilter', filter_name: 'created_at', duration: 'week', kind_of_day: 'Monday', offset: 'last_week')
-    get :show, params: {id: filter.id}
+    get clark_kent.report_filter_path(filter.id)
     assert_response :success
   end
 end

data/test/controllers/clark_kent/reports_controller_test.rb

@@ -1,31 +1,30 @@
 require 'test_helper'
 
 class ClarkKent::ReportsControllerTest < ControllerTest
+  include Rails.application.routes.mounted_helpers
 
   let(:report) {ClarkKent::Report.first}
   let(:current_user) {User.first}
 
   setup do
-    @routes = ClarkKent::Engine.routes
     @report_email = report.report_emails.create(when_to_send: 'Monday', name: 'Owner Arrival')
   end
 
   it "should get index" do
-    get :index, params: {current_user_id: current_user.id}
+    get clark_kent.reports_path(current_user_id: current_user.id)
     assert_response :success
   end
 
   it "should get new" do
-    get :new, params: {current_user_id: current_user.id}
+    get clark_kent.new_report_path(current_user_id: current_user.id)
     assert_response :success
   end
 
   it "should create report" do
-    post :create, params:
-      {report: {
+    post clark_kent.reports_path(report: {
             name: 'delete me', resource_type: report.resource_type,
             sharing_scope_id: report.sharing_scope_id, sharing_scope_type: report.sharing_scope_type },
-            current_user_id: current_user.id}
+            current_user_id: current_user.id)
     report = ClarkKent::Report.find_by(name: 'delete me')
     report.wont_be_nil
     report.destroy
@@ -33,11 +32,10 @@ class ClarkKent::ReportsControllerTest < ControllerTest
   end
 
   it "should render errors during creation" do
-    post :create, params:
-      {report: {
+    post clark_kent.reports_path(report: {
             name: 'delete me', resource_type: '',
             sharing_scope_id: report.sharing_scope_id, sharing_scope_type: report.sharing_scope_type },
-            current_user_id: current_user.id}
+            current_user_id: current_user.id)
     report = ClarkKent::Report.find_by(name: 'delete me')
     report.must_be_nil
     assert_response :conflict
@@ -45,42 +43,42 @@ class ClarkKent::ReportsControllerTest < ControllerTest
   end
 
   it "should show report" do
-    get :show, params: {id: report, current_user_id: current_user.id}
+    get clark_kent.report_path(id: report, current_user_id: current_user.id)
     assert_response :success
   end
 
   it "should show report results" do
-    get :show, params: {id: report, current_user_id: current_user.id, run_report: true, created_at_until: Date.today.strftime("%m/%d/%Y"), created_at_from: Date.yesterday}
+    get clark_kent.report_path(id: report, current_user_id: current_user.id, run_report: true, created_at_until: Date.today.strftime("%m/%d/%Y"), created_at_from: Date.yesterday)
     assert_response :success
     @response.body.must_match 'Guitar strings'
   end
 
   it "should show report run errors" do
-    get :show, params: {id: report, current_user_id: current_user.id, run_report: true}
+    get clark_kent.report_path(id: report, current_user_id: current_user.id, run_report: true)
     assert_response :success
     @response.body.must_match 'At least one date range is required.'
   end
 
   it "should get edit" do
-    get :edit, params: {id: report, current_user_id: current_user.id}
+    get clark_kent.edit_report_path(id: report, current_user_id: current_user.id)
     assert_response :success
   end
 
   it "should update report" do
-    patch :update, params: {id: report,
+    patch clark_kent.report_path(id: report,
           report: {
             name: report.name, resource_type: report.resource_type,
             sharing_scope_id: report.sharing_scope_id, sharing_scope_type: report.sharing_scope_type },
-          current_user_id: current_user.id}
+          current_user_id: current_user.id)
     assert_response :success
   end
 
   it "should destroy report" do
     report = ClarkKent::Report.create(name: 'delete me', resource_type: 'Order')
     assert_difference('ClarkKent::Report.count', -1) do
-      delete :destroy, params: {id: report, current_user_id: current_user.id}
+      delete clark_kent.report_path(id: report, current_user_id: current_user.id)
     end
 
-    assert_redirected_to reports_path
+    assert_redirected_to clark_kent.reports_path
   end
 end

data/test/dummy/app/assets/javascripts/application.js

@@ -10,4 +10,7 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require_tree .
+//= require jquery
+//= require simple_inheritance
+//= require hooch
+//= require thin_man

data/test/dummy/app/views/layouts/application.html.erb

@@ -2,10 +2,10 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= stylesheet_link_tag "clark_kent/application.css" %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'clark_kent/application' %>
+  <%= stylesheet_link_tag    'application', media: 'all' unless Rails.env.test? %>
+  <%= stylesheet_link_tag "clark_kent/application.css" unless Rails.env.test? %>
+  <%= javascript_include_tag 'application' unless Rails.env.test? %>
+  <%= javascript_include_tag 'clark_kent/application' unless Rails.env.test? %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/test/dummy/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
 
-  mount ClarkKent::Engine => "/reports"
+  mount ClarkKent::Engine => "/reports", as: 'clark_kent'
 
   resources :orders, only: [:show]
 end