clark_kent 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 850ed846818d8897924c6cd76e106f85e6e110f7
-  data.tar.gz: 7b65fde1b3ccae2a9ecc3100303ab69becff2b6d
+  metadata.gz: 7a5cb2db96ead480ab3da69947c4adb9d3d224d6
+  data.tar.gz: 1ea114b60fb78c8b7e8aed2484fc908345df6ee9
 SHA512:
-  metadata.gz: 899afb286e6e2939fc8597b93fd1d6c261e47ee1bf5bfed928317bcb0b2b18308f7357c0168fa1f9c47655510c1767609de94789e11aa44753412e1a370b00e5
-  data.tar.gz: dde2e535cea8a86fde691e299aae03fd85ca219d61f654bfe23ec571eda0a06bebae263d7633ab18ccdc55813c621aa8bc30a19871629e018da9e7789227e065
+  metadata.gz: 8c46a94dfc0fead2b2c8ca15ae1e8b4db836a870749812ad43033f722e0dfbd812e1d3c4e6796735b12ad944e7349efedd9ea8e5c11241b895cfcc1720b1c0a8
+  data.tar.gz: c2008aeaca8c54ce0d9c644c7acd9ddaa5050c44320e05da0f5a5bd20d86256fb9340d004b5f93a6fe66a3512f8925f72112bc015428b1834cfcc6e3eb983412

data/app/controllers/clark_kent/report_filters_controller.rb

@@ -50,7 +50,7 @@ class ClarkKent::ReportFiltersController < ClarkKent::ApplicationController
 
   def report_filter_params
     if @report_filter
-      these_params = params[@report_filter.class.name.underscore]
+      these_params = params[@report_filter.class.name.underscore.gsub(/.*\//,'')]
     else
       these_params = params[:report_filter]
     end

data/app/helpers/clark_kent/application_helper.rb

@@ -33,9 +33,9 @@ module ClarkKent
       (value =~ /\d/) && (value =~ /\./) && !(value =~ /[a-zA-Z]/)
     end
 
-    def display_for_value(value, column_name=nil)
+    def display_for_value(value, column=nil)
       ##TODO, genericize this link display. link info must come from model config.
-      return link_to(value, main_app.edit_manage_reservation_path(value)) if column_name == 'reservation_id'
+      return link_to(value, main_app.send(column.link, id: value)) if column.try(:link) && value.present?
       return value.join(', ') if value.is_a? Array
       return value.to_formatted_s(:datepicker) if value.is_a? Date
       return number_to_currency(value) if value.is_a? Float or value.is_a? BigDecimal or is_decimal?(value)
@@ -67,5 +67,13 @@ module ClarkKent
                 onclick: raw(onclick_str)
       end
     end
+
+    def collection_for(report_filter,name)
+      if report_filter.filterable.collection_for(name).is_a? Symbol
+        @filter_collections.send(report_filter.filterable.collection_for(name))
+      else
+        report_filter.filterable.collection_for(name)
+      end
+    end
   end
 end

data/app/models/clark_kent/report.rb

@@ -20,7 +20,6 @@ module ClarkKent
     validates :sharing_scope_id, presence: true, if: ->(r) { r.sharing_scope_type.present? }
 
     def self.send_report_to_s3(report_id, params)
-      params = params
       report_class = params['report_class'].constantize if params['report_class']
       report_class ||= ::ClarkKent::Report
       reportable = report_class.find(report_id)
@@ -114,35 +113,35 @@ module ClarkKent
     def arel_includes
       self.report_columns.map{|column|
         column_info = self.column_options_for(column.column_name)
-        column_info.includes if column_info.respond_to? :includes
+        column_info.includes
         }.compact
     end
 
     def arel_joins
       self.report_columns.map{|column|
         column_info = self.column_options_for(column.column_name)
-        column_info.joins if column_info.respond_to? :joins
+        column_info.joins
         }.compact
     end
 
     def extra_scopes
       self.report_columns.map{|column|
         column_info = self.column_options_for(column.column_name)
-        column_info.extra_scopes if column_info.respond_to? :extra_scopes
+        column_info.extra_scopes
         }.flatten.compact
     end
 
     def extra_filters
       self.report_columns.map{|column|
         column_info = self.column_options_for(column.column_name)
-        column_info.where if column_info.respond_to? :where
+        column_info.where
         }.flatten.compact
     end
 
     def groups
       self.report_columns.map{|column|
         column_info = self.column_options_for(column.column_name)
-        column_info.group if column_info.respond_to? :group
+        column_info.group
         }.flatten.compact
     end
 
@@ -158,27 +157,30 @@ module ClarkKent
       @selects = []
       self.report_columns.each do |report_column|
         column_option = self.column_options_for(report_column.column_name)
-        @selects.push column_option.custom_select if column_option.respond_to? :custom_select
+        @selects.push column_option.custom_select
       end
       self.report_filters.each do |report_filter|
-        column_option = self.column_options_for(report_filter.filter_name)
-        @selects.push column_option.custom_select if column_option.respond_to? :custom_select
+        column_option = self.column_options_for(report_filter.filter_name.to_sym)
+        @selects.push column_option.custom_select if column_option.present?
       end
       @selects
     end
 
-
     def filter_options_for(filter_name)
       self.resource_class::REPORT_FILTER_OPTIONS.detect{|filter| filter.param == filter_name}
     end
 
+    def column_options
+      @column_options ||= self.resource_class::REPORT_COLUMN_OPTIONS
+    end
+
     def column_options_for(column_name)
-      if self.resource_class::REPORT_COLUMN_OPTIONS.has_key? column_name.to_sym
-        self.resource_class::REPORT_COLUMN_OPTIONS[column_name.to_sym]
+      if column_options.any?{|co| co.name == column_name.to_sym}
+        column_options.detect{|co| co.name == column_name.to_sym}
       else
         column_name = column_name.to_s.split('_')[0..-2].join('_')
-        if self.resource_class::REPORT_COLUMN_OPTIONS.has_key? column_name.to_sym
-          self.resource_class::REPORT_COLUMN_OPTIONS[column_name.to_sym]
+        if column_options.any?{|co| co.name ==  column_name.to_sym}
+          column_options.detect{|co| co.name == column_name.to_sym}
         end
       end
     end
@@ -220,11 +222,11 @@ module ClarkKent
     ## This is the set of columns not chosed to use in the report. These are the ones available to add
     ## when updating a report.
     def available_columns
-      self.resource_class::REPORT_COLUMN_OPTIONS.keys.reject{|column| self.report_columns.pluck(:column_name).include? column.to_s}
+      column_options.reject{|column| self.report_columns.pluck(:column_name).include? column.name.to_s}
     end
 
     def sortable?(column)
-      !!(self.column_options_for(column.column_name).respond_to? :order_sql)
+      self.column_options_for(column.column_name).order_sql.present?
     end
 
     def sharing_scope_pretty

data/app/models/clark_kent/report_column.rb

@@ -18,13 +18,20 @@ module ClarkKent
 		end
 
 		def summarizable?
-			report.column_options_for(self.column_name).summarizable
+			report.column_options_for(self.column_name.to_sym).summarizable
 		end
 
 		def calculator
 			('ClarkKent::' + summary_method.camelcase + 'Calculator').constantize
 		end
 
+    def name
+      column_name
+    end
+
+    def link
+      report.column_options_for(self.name.to_sym).link
+    end
 	end
 
 	class AbstractCalculator

data/app/models/clark_kent/report_config.rb

@@ -16,9 +16,13 @@ module ClarkKent
     end
   end
   class ReportColumnConfig
-    attr_accessor :custom_select, :order_sql, :summarizable
+    attr_accessor :name, :order_sql, :custom_select, :link, :summarizable, :includes, :joins, :extra_scopes, :where, :group
     def initialize params = {}
       params.each { |key, value| send "#{key}=", value }
     end
+
+    def id
+      name
+    end
   end
 end

data/app/models/clark_kent/reportable.rb

@@ -72,16 +72,17 @@ module ClarkKent
 	          arel_method_name = self.arel_method_for(param_type)
 		        if arel_method_name.present?
 		          query = self.send(arel_method_name, query, param_type, param_value)
-		          report_column_options = report.column_options_for(param_type)
-		          if(report_column_options.respond_to? :joins) && (@joins.exclude? report_column_options.joins)
-		          	@joins.push report_column_options.joins
-		          end
-							if(report_column_options.respond_to? :includes) && (@includes.exclude? report_column_options.includes)
-								@includes.push report_column_options.includes
-		          end
-		          if (count == false) && (report_column_options.respond_to? :custom_select) && (@selects.exclude? report_column_options.custom_select)
-		          	@selects.push report_column_options.custom_select
-		          end
+		          if report_column_options = column_options_for(param_type)
+			          if(report_column_options.joins.present?) && (@joins.exclude? report_column_options.joins)
+			          	@joins.push report_column_options.joins
+			          end
+								if(report_column_options.includes.present?) && (@includes.exclude? report_column_options.includes)
+									@includes.push report_column_options.includes
+			          end
+			          if (count == false) && (report_column_options.custom_select.present?) && (@selects.exclude? report_column_options.custom_select)
+			          	@selects.push report_column_options.custom_select
+			          end
+			        end
 		        end
 		      end
 		    end
@@ -115,6 +116,10 @@ module ClarkKent
 
 		  end
 
+		  def column_options_for(column_name)
+				self::REPORT_COLUMN_OPTIONS.detect{|co| column_name == co.name}
+		  end
+
 		  def arel_method_for(param_type)
 		    method_name = self::AREL_METHODS[param_type.to_s]
 		    method_name ||= "#{param_type}_arel" if self.respond_to? "#{param_type}_arel"
@@ -153,7 +158,7 @@ module ClarkKent
 			  else
 			  	order_column, order_direction = match_value.split('-')
 			  end
-				column_info = self::REPORT_COLUMN_OPTIONS[order_column.to_sym]
+				column_info = column_options_for(order_column.to_sym)
 				if column_info.respond_to? :order_sql
 				  order_sql = column_info.order_sql
 			  	order_sql = "#{order_sql} #{order_direction}"

data/app/models/clark_kent/sharing_scope_kind.rb

@@ -49,10 +49,7 @@ module ClarkKent
     def self.select_options_for_user(user)
       sharing_scope_options = {}
       self.all.each do |sharing_scope_kind|
-        puts sharing_scope_kind.to_yaml
         if custom.exclude?(sharing_scope_kind) || has_some(sharing_scope_kind.associated_containers_for(user))
-          puts sharing_scope_kind.class_name
-          puts sharing_scope_kind.human_name
           sharing_scope_options[sharing_scope_kind.human_name] = sharing_scope_kind.class_name
         end
       end
@@ -76,7 +73,6 @@ module ClarkKent
       else
         @human_name = @class_name.humanize
       end
-      puts @human_name
       @human_name
     end
 

data/app/views/clark_kent/report_filters/_object_filter_edit.html.erb

@@ -1 +1 @@
-<%= f.input :filter_value, collection: @filter_collections.send(report_filter.filterable.collection_for(name)) %>
+<%= f.input :filter_value, collection: collection_for(report_filter, name) %>

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

@@ -1,6 +1,6 @@
 <h1><%= @report.name %></h1>
 <%= link_to "&larr; back to report index".html_safe, reports_url, id: 'report_index' %>
-
+<%= controller_name %>
 <% if @errors %>
 	<div class="error">
 		<%= @errors %>
@@ -33,7 +33,7 @@
 			<% @rows.each do |row| %>
 				<tr>
 					<% @report.report_columns.each do |column| %>
-						<td><%= display_for_value(row[column.column_name], column.column_name) %></td>
+						<td><%= display_for_value(row[column.column_name], column) %></td>
 					<% end %>
 				</tr>
 			<% end if @rows.present? %>

data/lib/clark_kent/version.rb

@@ -1,3 +1,3 @@
 module ClarkKent
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/test/controllers/clark_kent/reports_controller_test.rb

@@ -39,6 +39,7 @@ module ClarkKent
     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
       assert_response :success
+      assert_not_nil assigns(:rows)
       @response.body.must_match 'Guitar strings'
     end
 

data/test/dummy/app/controllers/orders_controller.rb

@@ -0,0 +1,5 @@
+class OrdersController < ApplicationController
+  def show
+    @order = Order.find(params[:id])
+  end
+end

data/test/dummy/app/models/reporting/order.rb

@@ -23,17 +23,17 @@ module Reporting
     ]
 
     # These are the available column options for building reports from this resource
-    REPORT_COLUMN_OPTIONS ||= {
-      user_name: column_config(
+    REPORT_COLUMN_OPTIONS ||= [
+      column_config(name: :user_name,
         custom_select: "
         (SELECT u.name
           FROM users u
           WHERE u.id = orders.user_id)
         as user_name"),
-      id: column_config(order_sql: 'orders.id'),
-      amount: column_config(order_sql: 'orders.amount', summarizable: true),
-      description: column_config(order_sql: 'orders.description')
-    }
+      column_config(name: :id, order_sql: 'orders.id', link: :order_path),
+      column_config(name: :amount, order_sql: 'orders.amount', summarizable: true),
+      column_config(name: :description, order_sql: 'orders.description')
+    ]
 
     def self.included(base)
       base.extend ClassMethods

data/test/dummy/app/views/orders/show.html.erb

@@ -0,0 +1,14 @@
+<table>
+<tr>
+<td>id</td>
+<td><%= @order.id %></td>
+</tr>
+<tr>
+<td>amount</td>
+<td><%= @order.amount %></td>
+</tr>
+<tr>
+<td>user</td>
+<td><%= @order.user.name %></td>
+</tr>
+</table>

data/test/dummy/config/routes.rb

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