effective_datatables 3.3.8 → 3.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbae61797a7b6084534c427e079daab64a41b582
-  data.tar.gz: 7f405c39bdd5cb5d85dee540afc0ff068f3a0723
+  metadata.gz: ce69b43f6120213c50308b64411d9a070a4ada51
+  data.tar.gz: 379f3c71489e71380bac3affad255c535e6474de
 SHA512:
-  metadata.gz: 15df55789b6ad8ef5e27cb042f988042705ce5530f34198b17bd8de62013c18e1f8ea2c30227f5081b82e33fdfd9f69e83c3f14d61b8af0bab70409273a12bfa
-  data.tar.gz: b854e4df72d2bd1f13a837bc2c5ba588cd6f9a2d6c9757dd43e5cbb0395ecd013ac4eb1db2f388b75ffe6c5743aff0c1136aac1b13565105c4ac737e32064ec5
+  metadata.gz: 79a6f609f33333ce5310309fd3f7a4439837217b08feec9ec3351fead3b237b5c2da33d163c5c9fe09c413be19dd74f899b343dbf9da33c0d45de42559322e3f
+  data.tar.gz: bf7cf430ce6fa63d37fb8d7a1c87d6e3a7d2e0a0c9f00d5012028625cf4f02364d38e32cf1ac0baf88c03d3a0d2a3b556f244d65fa5ec452cc6b94e19abe14be

data/app/assets/javascripts/effective_datatables/initialize.js.coffee

@@ -52,7 +52,7 @@ initializeDataTables = ->
       dom: "<'row'<'col-sm-12'B>><'row'<'col-sm-12'tr>><'row'<'col-sm-6 dataTables_entries'il><'col-sm-6'p>>"
       iDisplayLength: datatable.data('display-length')
       language: { 'lengthMenu': '&nbsp;with _MENU_ per page'}
-      lengthMenu: [[10, 25, 50, 100, 250, 500, 9999999], ['10', '25', '50', '100', '250', '500', 'All']]
+      lengthMenu: [[5, 10, 25, 50, 100, 250, 500, 9999999], ['5', '10', '25', '50', '100', '250', '500', 'All']]
       order: datatable.data('display-order')
       processing: true
       responsive: true

data/app/models/effective/datatable_value_tool.rb

@@ -175,7 +175,7 @@ module Effective
       if column[:format]
         datatable.dsl_tool.instance_exec(obj, row, &column[:format])
       elsif column[:partial]
-        raise 'unsupported'
+        obj.to_s
       elsif obj.respond_to?(column[:name])
         obj.send(column[:name])
       elsif column[:as] == :time && obj.respond_to?(:strftime)

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

@@ -88,7 +88,7 @@ module Effective
         end
       end
 
-      def aggregate(collection)
+      def aggregate(collection, raw: false) # raw values
         cols = collection.transpose
 
         _aggregates.map do |_, aggregate|
@@ -109,6 +109,8 @@ module Effective
               dsl_tool.instance_exec(values, columns[name], &opts[:aggregate])
             elsif aggregate[:compute]
               dsl_tool.instance_exec(values, columns[name], &aggregate[:compute])
+            elsif raw
+              aggregate_column(values, opts, aggregate)
             else
               format_column(aggregate_column(values, opts, aggregate), opts)
             end || BLANK
@@ -133,7 +135,7 @@ module Effective
           end
         when :average
           if values.all? { |value| value.kind_of?(Numeric) }
-            values.sum / [length, 1].max
+            values.sum / ([length, 1].max)
           elsif values.all? { |value| value == true || value == false }
             values.count { |val| val == true } >= (length / 2) ? true : false
           elsif aggregate[:labeled] == false

data/app/models/effective/effective_datatable/dsl/datatable.rb

@@ -11,7 +11,7 @@ module Effective
         end
 
         def length(length)
-          raise 'length must be 10, 25, 50, 100, 250, 500, :all' unless [10, 25, 50, 100, 250, 500, :all].include?(length)
+          raise 'length must be 5, 10, 25, 50, 100, 250, 500, :all' unless [5, 10, 25, 50, 100, 250, 500, :all].include?(length)
           datatable.state[:length] ||= (length == :all ? 9999999 : length)
         end
 

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

@@ -36,7 +36,7 @@ module Effective
             value = row[index]
 
             row[index] = (
-              if opts[:format] && opts[:as] == :actions
+              if opts[:format] && rendered.key?(name)
                 dsl_tool.instance_exec(value, row, rendered[name][row_index], &opts[:format])
               elsif opts[:format]
                 dsl_tool.instance_exec(value, row, &opts[:format])

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.3.8'.freeze
+  VERSION = '3.3.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.3.8
+  version: 3.3.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails