effective_datatables 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96df2e08f32b87a62ce043e3760697cb7439d134
-  data.tar.gz: e053c8993e6f151086fe31e1daeb4a24b984f17a
+  metadata.gz: 58e4a1ee916c1766e2d3d2be61ffe2607d92c0d4
+  data.tar.gz: b796116f649e7ca0711d7436f50b587d12c47576
 SHA512:
-  metadata.gz: 1b3b944e79218ff0a5ae54d6080be055e4b15c14da25337b2d6400efc8a1703839b41c25a4dafb8759a645ea8f5dc9a015b4fed5545c416f76802c5711436efe
-  data.tar.gz: dfb15a2aceb2d3615c7cae86453fd5ed8e2e10eae999ed9672aa5923dde2798d1ae4a1e04a7451b4ba67383418d0da662238c0c23c9582b079dfd644595c0a14
+  metadata.gz: 1bcd2435e64b3576f7568f126791a77e6c5da1de4a26244b8f290ce4f9d03f43037d23075b7f932e21a3c288a8049c4a0fd9b3b4ec314f1c0498f37edd7f4734
+  data.tar.gz: 5286e5530da18eaea928e8fae7311be484778b6be2694e1d0855c69c61cda7ba74efaa4b62e3fd79e8c7f44d2dbdf50d1b5bd6278ba202052403b3526dc6b518

data/README.md

@@ -593,6 +593,14 @@ aggregate :average_as_percentage do |values, column|
 end
 ```
 
+You can also override an individual columns aggregate calculation as follows:
+
+```ruby
+col :created_at, label: 'Created' do |post|
+  time_ago_in_words(post.created_at)
+end.aggregate { |values, column| distance_of_time_in_words(values.min, values.max) }
+```
+
 In the above example, `values` is an Array containing all row's values for one column at a time.
 
 ## filters

data/app/assets/stylesheets/effective_datatables/_overrides.scss

@@ -147,7 +147,7 @@ table.dataTable.dtr-inline.collapsed > tbody > tr:not(.child) > th:first-child {
 }
 
 // Column specific adjustments
-table.dataTable tbody {
+table.dataTable {
   td.col-price { text-align: right; }
   td.col-right { text-align: right; }
 
@@ -162,5 +162,4 @@ table.dataTable tbody {
   td {
     p { margin-bottom: 0px; }
   }
-
 }

data/app/helpers/effective_datatables_private_helper.rb

@@ -69,6 +69,7 @@ module EffectiveDatatablesPrivateHelper
         wrapper_html: wrapper_html,
         input_group: false,
         input_html: input_html,
+        date_linked: false,
         input_js: { useStrict: true, keepInvalid: true }
         # Keep invalid format like "2015-11" so we can still search by year, month or day
     when :select, :boolean

data/app/models/effective/datatable_column.rb

@@ -12,6 +12,10 @@ module Effective
       self[:name]
     end
 
+    def aggregate(&block)
+      @attributes[:aggregate] = block; self
+    end
+
     def format(&block)
       @attributes[:format] = block; self
     end

data/app/models/effective/datatable_column_tool.rb

@@ -40,7 +40,7 @@ module Effective
     end
 
     def order_column(collection, direction, column, sql_column)
-      Rails.logger.info "COLUMN TOOL: order_column #{column.to_s} #{direction} #{sql_column}"
+      Rails.logger.info "COLUMN TOOL: order_column #{column.to_s} #{direction} #{sql_column}" if EffectiveDatatables.debug
 
       if column[:sql_as_column]
         collection.order("#{sql_column} #{datatable.resource.sql_direction(direction)}")
@@ -73,7 +73,7 @@ module Effective
     end
 
     def search_column(collection, value, column, sql_column)
-      Rails.logger.info "COLUMN TOOL: search_column #{column.to_s} #{value} #{sql_column}"
+      Rails.logger.info "COLUMN TOOL: search_column #{column.to_s} #{value} #{sql_column}" if EffectiveDatatables.debug
 
       Effective::Resource.new(collection)
         .search(column[:name], value, as: column[:as], fuzzy: column[:search][:fuzzy], sql_column: sql_column)

data/app/models/effective/datatable_value_tool.rb

@@ -37,7 +37,7 @@ module Effective
     end
 
     def order_column(collection, direction, column, index)
-      Rails.logger.info "VALUE TOOL: order_column :#{column.to_s} :#{direction} #{index}"
+      Rails.logger.info "VALUE TOOL: order_column :#{column.to_s} :#{direction} #{index}" if EffectiveDatatables.debug
 
       if direction == :asc
         collection.sort! do |x, y|
@@ -69,7 +69,7 @@ module Effective
     end
 
     def search_column(collection, value, column, index)
-      Rails.logger.info "VALUE TOOL: search_column #{column.to_s} #{value} #{index}"
+      Rails.logger.info "VALUE TOOL: search_column #{column.to_s} #{value} #{index}" if EffectiveDatatables.debug
 
       fuzzy = column[:search][:fuzzy]
       term = Effective::Attribute.new(column[:as]).parse(value, name: column[:name])

data/app/models/effective/effective_datatable/compute.rb

@@ -81,6 +81,8 @@ module Effective
         cols = collection.transpose
 
         _aggregates.map do |_, aggregate|
+          aggregate[:labeled] = false
+
           columns.map do |name, opts|
             next if state[:visible][name] == false && datatables_ajax_request?
 
@@ -88,44 +90,43 @@ module Effective
 
             if state[:visible][name] == false
               BLANK
+            elsif [:bulk_actions, :actions].include?(opts[:as])
+              BLANK
+            elsif values.length == 0
+              BLANK
+            elsif opts[:aggregate]
+              dsl_tool.instance_exec(values, columns[name], &opts[:aggregate])
             elsif aggregate[:compute]
               dsl_tool.instance_exec(values, columns[name], &aggregate[:compute])
             else
               format_column(aggregate_column(values, opts, aggregate), opts)
-            end
+            end || BLANK
           end.compact
         end
       end
 
       def aggregate_column(values, column, aggregate)
-        labeled = false
         length = values.length
         values = values.reject { |value| value.nil? }
 
-        if [:bulk_actions, :actions].include?(column[:as]) || length == 0
-          return BLANK
-        end
-
         case aggregate[:name]
         when :total
-          if values.all? { |value| value.kind_of?(Numeric) }
+          if [:percentage].include?(column[:as])
+            BLANK
+          elsif values.all? { |value| value.kind_of?(Numeric) }
             values.sum
           elsif values.all? { |value| value == true || value == false }
-            "#{values.count { |val| val == true }} / #{values.count { |val| val == false}}"
-          elsif !labeled
-            labeled = aggregate[:label]
-          elsif values.any? { |value| value.kind_of?(String) == false }
-            "#{values.flatten.count} total"
+            "#{values.count { |val| val == true }} • #{values.count { |val| val == false}}"
+          elsif aggregate[:labeled] == false
+            aggregate[:labeled] = aggregate[:label]
           end
         when :average
           if values.all? { |value| value.kind_of?(Numeric) }
             values.sum / [length, 1].max
           elsif values.all? { |value| value == true || value == false }
             values.count { |val| val == true } >= (length / 2) ? true : false
-          elsif !labeled
-            labeled = aggregate[:label]
-          elsif values.any? { |value| value.kind_of?(String) == false }
-            '-'
+          elsif aggregate[:labeled] == false
+            aggregate[:labeled] = aggregate[:label]
           end
         else
           raise 'not implemented'

data/app/models/effective/effective_datatable/format.rb

@@ -54,12 +54,15 @@ module Effective
       def format_column(value, column)
         return if value.nil?
 
+        unless column[:as] == :email
+          return value if value.kind_of?(String)
+        end
+
         case column[:as]
         when :boolean
           case value
           when true   ; 'Yes'
           when false  ; 'No'
-          when String ; value
           end
         when :currency
           view.number_to_currency(value)
@@ -85,13 +88,11 @@ module Effective
           case value
           when Integer    ; "#{value}%"
           when Numeric    ; view.number_to_percentage(value * 100, precision: 2)
-          when String     ; value
           end
         when :price
           case value
           when Integer    ; view.number_to_currency(value / 100.0) # an Integer representing the number of cents
           when Numeric    ; view.number_to_currency(value)
-          when String     ; value
           end
         else
           value.to_s

data/config/effective_datatables.rb

@@ -38,4 +38,7 @@ EffectiveDatatables.setup do |config|
     destroy: true,
   }
 
+  # Log search/sort information to the console
+  config.debug = true
+
 end

data/lib/effective_datatables.rb

@@ -8,6 +8,7 @@ module EffectiveDatatables
 
   mattr_accessor :default_length
   mattr_accessor :actions_column # A Hash
+  mattr_accessor :debug
 
   def self.setup
     yield self

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.0.8'.freeze
+  VERSION = '3.0.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails