clark_kent 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea08eca7b36b019e73199ff6a74672024c788687
-  data.tar.gz: 1d2966c55b6e1f6ba3eedd5ca0d340be91359821
+  metadata.gz: e63c1a037abbf2c2830ddad357e7239cfae00ca2
+  data.tar.gz: a3514ad0db2d2cd9e9a8020f78aea5e52ef9c011
 SHA512:
-  metadata.gz: 89328622596263860bade995ec001e20454eccd838a57b954beb19df9125385dd2a251fe73909c50b84e62e71e9e793c2312ea267dda1aa57747c62fdeed7d68
-  data.tar.gz: d71ee68a2f3f4089dad1bae18d3dace7a4574636d9191f68c6674e8493ebbd299ac8b91818e255775baec36768303890b650695d994a9a35bfdd10f7e41f540d
+  metadata.gz: ff06a601a8d74cd2de05815fb42635cd0325061112a9912fb25bd5350696c62b11bda5a25c4aad481c1b6b3cbe9d0f13d50268d38a1c0f62f8f4cdc9da6b9393
+  data.tar.gz: 8df55e3b836dd8f92b85535ef963a6354ba4a8b040092e7668687cd3745fe9d4039cba721dcd8fea1fbe7e38a95b043aa98f76209b436cf41595b73869c0c0f0

data/app/controllers/clark_kent/report_filters_controller.rb

@@ -1,6 +1,6 @@
 class ClarkKent::ReportFiltersController < ClarkKent::ApplicationController
-  before_filter :prepare_report_filter
-  before_filter :prepare_report, :prepare_filters
+  before_action :prepare_report_filter
+  before_action :prepare_report, :prepare_filters
 
   def new
     @report_filter = ClarkKent::ReportFilter.new(filterable_id: @filterable.id, filterable_type: @filterable.class.name)

data/app/controllers/clark_kent/reports_controller.rb

@@ -1,6 +1,6 @@
 class ClarkKent::ReportsController < ClarkKent::ApplicationController
   require 'csv'
-  before_filter :get_these_params, :prepare_filters
+  before_action :get_these_params, :prepare_filters
 
   def set_manage_tab
     @manage_tab = 'reports'

data/app/models/clark_kent/report_column.rb

@@ -8,6 +8,8 @@ module ClarkKent
 
 		scope :sorted, -> { order("clark_kent_report_columns.column_order") }
 
+    validates_with ReportColumnValidator
+    
 		def report_sort_pretty
 			{'ascending' => 'A->Z','descending' => 'Z->A'}[self.report_sort]
 		end
@@ -21,6 +23,10 @@ module ClarkKent
 			report.column_options_for(self.column_name.to_sym).summarizable
 		end
 
+    def sortable?
+      config_options.order_sql.present?
+    end
+
 		def calculator
 			('ClarkKent::' + summary_method.camelcase + 'Calculator').constantize
 		end
@@ -29,16 +35,20 @@ module ClarkKent
       column_name
     end
 
+    def config_options
+      report.column_options_for(self.name.to_sym)
+    end
+
     def link
-      report.column_options_for(self.name.to_sym).link
+      config_options.link
     end
 
     def time_zone_column
-      report.column_options_for(self.name.to_sym).time_zone_column
+      config_options.time_zone_column
     end
 
     def time_format
-      report.column_options_for(self.name.to_sym).time_format
+      config_options.time_format
     end
 	end
 

data/app/models/clark_kent/reportable.rb

@@ -163,7 +163,7 @@ module ClarkKent
 			  	order_column, order_direction = match_value.split('-')
 			  end
 				column_info = column_options_for(order_column.to_sym)
-				if column_info.respond_to? :order_sql
+				if column_info.respond_to?(:order_sql) && column_info.order_sql.present?
 				  order_sql = column_info.order_sql
 			  	order_sql = "#{order_sql} #{order_direction}"
 			  	query = query.order(order_sql)

data/app/validators/clark_kent/report_column_validator.rb

@@ -0,0 +1,7 @@
+module ClarkKent
+  class ReportColumnValidator < ActiveModel::Validator
+    def validate(record)
+      record.errors[:report_sort] << "This column is not sortable." unless record.sortable?
+    end
+  end
+end

data/app/views/clark_kent/report_columns/_form.html.erb

@@ -33,7 +33,7 @@
       <% end %>
     </div>
     <div class="ih-span one-fifth">
-      <% unless report_column.report.sort_column.present? and report_column.report.sort_column != report_column %>
+      <% if report_column.report.sort_column.blank? || report_column.report.sort_column == report_column %>
         <%= f.input :report_sort, collection: [['A->Z','ascending'],['Z->A','descending']], include_blank: true %>
       <% end %>
     </div>

data/lib/clark_kent/version.rb

@@ -1,3 +1,3 @@
 module ClarkKent
-  VERSION = "0.7.1"
+  VERSION = "0.8.1"
 end

data/test/controllers/clark_kent/report_filters_controller_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
-describe ClarkKent::ReportFiltersController do
+class ClarkKent::ReportFiltersControllerTest < ControllerTest
+
   setup do
     @routes = ClarkKent::Engine.routes
     @report = ClarkKent::Report.first
@@ -9,21 +10,21 @@ describe ClarkKent::ReportFiltersController do
   end
 
   test "it should create a report filter" do
-    post :create, report_filter: {filterable_id: @report.id, filterable_type: "ClarkKent::Report", filter_name: "user_email", filter_value: "taproot@gmail.com"}
+    post :create, params: {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, report_filter: {filterable_id: @report.id, filterable_type: "ClarkKent::Report", filter_name: "user_id", filter_value: @current_user.id}
+    post :create, params: {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, 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 :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'}}
     assert_response :success
     report_filter = ClarkKent::ReportFilter.order(id: :desc).first
     report_filter.type.must_equal 'ClarkKent::ReportDateFilter'
@@ -31,37 +32,37 @@ describe ClarkKent::ReportFiltersController do
 
   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, id: filter.id
+    get :edit, params: {id: 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, id: filter.id
+    get :edit, params: {id: 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, id: filter.id
+    get :edit, params: {id: 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, id: filter.id
+    get :show, params: {id: 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, id: filter.id
+    get :show, params: {id: 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, id: filter.id
+    get :show, params: {id: filter.id}
     assert_response :success
   end
 end

data/test/controllers/clark_kent/reports_controller_test.rb

@@ -1,71 +1,72 @@
 require 'test_helper'
 
-describe ClarkKent::ReportsController do
+class ClarkKent::ReportsControllerTest < ControllerTest
+
+  let(:report) {ClarkKent::Report.first}
+  let(:current_user) {User.first}
+
   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
+    @report_email = report.report_emails.create(when_to_send: 'Monday', name: 'Owner Arrival')
   end
 
-  test "should get index" do
-    get :index, current_user_id: @current_user.id
+  it "should get index" do
+    get :index, params: {current_user_id: current_user.id}
     assert_response :success
   end
 
-  test "should get new" do
-    get :new, current_user_id: @current_user.id
+  it "should get new" do
+    get :new, params: {current_user_id: current_user.id}
     assert_response :success
   end
 
-  test "should create report" do
-    post :create,
-      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
+  it "should create report" do
+    post :create, params:
+      {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}
     report = ClarkKent::Report.find_by(name: 'delete me')
     report.wont_be_nil
     report.destroy
     assert_response :success
   end
 
-  test "should show report" do
-    get :show, id: @report, current_user_id: @current_user.id
+  it "should show report" do
+    get :show, params: {id: report, current_user_id: current_user.id}
     assert_response :success
   end
 
-  test "should show report results" do
-    get :show, id: @report, current_user_id: @current_user.id, run_report: true, created_at_until: Date.today, created_at_from: Date.yesterday
+  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, created_at_from: Date.yesterday}
     assert_response :success
-    assert_not_nil assigns(:rows)
     @response.body.must_match 'Guitar strings'
   end
 
-  test "should show report run errors" do
-    get :show, id: @report, current_user_id: @current_user.id, run_report: true
+  it "should show report run errors" do
+    get :show, params: {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
 
-  test "should get edit" do
-    get :edit, id: @report, current_user_id: @current_user.id
+  it "should get edit" do
+    get :edit, params: {id: report, current_user_id: current_user.id}
     assert_response :success
   end
 
-  test "should update report" do
-    patch :update, 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
+  it "should update report" do
+    patch :update, params: {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}
     assert_response :success
   end
 
-  test "should destroy report" do
+  it "should destroy report" do
     report = ClarkKent::Report.create(name: 'delete me', resource_type: 'Order')
     assert_difference('ClarkKent::Report.count', -1) do
-      delete :destroy, id: report, current_user_id: @current_user.id
+      delete :destroy, params: {id: report, current_user_id: current_user.id}
     end
 
     assert_redirected_to reports_path