effective_datatables 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0cbbbfb201841f1a9e49d34525f20769fc53397
-  data.tar.gz: b362424906465b500b750d761386aa82ad0bf530
+  metadata.gz: af9c292325c6b762e373141abc1423733b680e07
+  data.tar.gz: 90eae3479c8852b652b45a050b0cd25e002e2ab8
 SHA512:
-  metadata.gz: bea6151ccc549cbb1a40dd86de6540461d265844dd7dc6621701ca573f13664ef5f3a0339b01f6f79df15b05acf8bbba60b45f3cafad8068da131af4e003fed9
-  data.tar.gz: f5d8a60fddb6e2aa73f2e4ff7124aba97ae723a57c144a091fd61c21c6113fc295e5a1abdf469f310a2bec46e30d2a24b08a3baa374dc5d9d412fbbf1b5aaccd
+  metadata.gz: adcafc661510d837fe435defab4fce2078c07a203ad2edc815a3af94926e9798934f06979656fd5ff4e7b359dbc2c2a5c0941f29793e8e791d448a39ae0b65fd
+  data.tar.gz: 663e67d4613b20b1d925b0166d8feae2f27750ad3771941a64c893c4f2f85a4d8120ddab46b7d3fc3640b2807ab040c8b32500d981966a97c6120be283803595

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

@@ -3,6 +3,7 @@
 module Effective
   module EffectiveDatatable
     module Rendering
+      BLANK = ''.freeze
 
       def finalize(collection) # Override me if you like
         collection
@@ -50,6 +51,7 @@ module Effective
           col = self.arrayize(col)
         end
 
+        self.format(col)
         col = self.finalize(col)
       end
 
@@ -104,7 +106,7 @@ module Effective
         collection.each_with_index.map do |obj, index|
           (display_table_columns || table_columns).map do |name, opts|
             if opts[:visible] == false
-              ''
+              BLANK
             elsif opts[:partial]
               rendered[name][index]
             elsif opts[:block]
@@ -112,60 +114,77 @@ module Effective
             elsif opts[:proc]
               view.instance_exec(obj, collection, self, &opts[:proc])
             elsif opts[:type] == :belongs_to
-              (obj.send(name) rescue nil).to_s
+              (obj.send(name) rescue nil)
             elsif opts[:type] == :belongs_to_polymorphic
-              (obj.send(name) rescue nil).to_s
+              (obj.send(name) rescue nil)
             elsif opts[:type] == :has_many
-              objs = (obj.send(name).map { |x| x.to_s }.sort rescue [])
-              objs.length == 1 ? objs.first : (opts[:sentence] ? objs.to_sentence : objs.join('<br>'))
+              (obj.send(name).to_a rescue [])
             elsif opts[:type] == :obfuscated_id
               (obj.send(:to_param) rescue nil).to_s
             elsif opts[:type] == :effective_roles
               (obj.send(:roles) rescue []).join(', ')
+            elsif obj.kind_of?(Array) # Array backed collection
+              obj[opts[:array_index]]
             else
-              # Normal value, but we still may want to format it
-              value = (obj.send(name) rescue (obj[name] rescue (obj[opts[:array_index]] rescue nil)))
-
-              case opts[:type]
-              when :datetime
-                value.strftime(EffectiveDatatables.datetime_format) rescue nil
-              when :date
-                value.strftime(EffectiveDatatables.date_format) rescue nil
-              when :price
-                # This is an integer value, "number of cents"
-                value ||= 0
-                raise 'column type: price expects an Integer representing the number of cents' unless value.kind_of?(Integer)
-                number_to_currency(value / 100.0)
-              when :currency
-                number_to_currency(value || 0)
-              when :integer
-                if EffectiveDatatables.integer_format.kind_of?(Symbol)
-                  view.instance_exec { public_send(EffectiveDatatables.integer_format, value) }
-                elsif EffectiveDatatables.integer_format.respond_to?(:call)
-                  view.instance_exec { EffectiveDatatables.integer_format.call(value) }
-                else
-                  value
-                end
-              when :boolean
-                if EffectiveDatatables.boolean_format == :yes_no && value == true
-                  'Yes'
-                elsif EffectiveDatatables.boolean_format == :yes_no && value == false
-                  'No'
-                else
-                  value
-                end
-              when :string
-                if name == 'email' && value.present?
-                  mail_to(value)
+              (obj.send(name) rescue (obj[name] rescue nil))
+            end
+          end
+        end
+      end
+
+      def format(collection)
+        collection.each do |row|
+          (display_table_columns || table_columns).each_with_index do |(name, opts), index|
+            value = row[index]
+            next if value == nil || value == BLANK || opts[:visible] == false
+            next if opts[:block] || opts[:partial] || opts[:proc]
+
+            case opts[:type]
+            when :belongs_to, :belongs_to_polymorphic
+              row[index] = value.to_s
+            when :has_many
+              if value.kind_of?(Array)
+                if value.length == 0
+                  row[index] = BLANK
+                elsif value.length == 1
+                  row[index] = value.first.to_s
+                elsif opts[:sentence]
+                  row[index] = value.map { |v| v.to_s }.to_sentence
                 else
-                  value
+                  row[index] = value.map { |v| v.to_s }.join('<br>')
                 end
-              else # Other col_type
-                value
               end
+            when :datetime
+              row[index] = value.strftime(EffectiveDatatables.datetime_format) rescue BLANK
+            when :date
+              row[index] = value.strftime(EffectiveDatatables.date_format) rescue BLANK
+            when :price
+              # This is an integer value, "number of cents"
+              raise 'column type: price expects an Integer representing the number of cents' unless value.kind_of?(Integer)
+              row[index] = number_to_currency(value / 100.0)
+            when :currency
+              row[index] = number_to_currency(value || 0)
+            when :integer
+              if EffectiveDatatables.integer_format.kind_of?(Symbol)
+                row[index] = view.instance_exec { public_send(EffectiveDatatables.integer_format, value) }
+              elsif EffectiveDatatables.integer_format.respond_to?(:call)
+                row[index] = view.instance_exec { EffectiveDatatables.integer_format.call(value) }
+              end
+            when :boolean
+              if EffectiveDatatables.boolean_format == :yes_no && value == true
+                row[index] = 'Yes'
+              elsif EffectiveDatatables.boolean_format == :yes_no && value == false
+                row[index] = 'No'
+              end
+            when :string
+              row[index] = mail_to(value) if name == 'email'
+            else
+              ; # Nothing
             end
           end
         end
+
+        collection
       end
 
     end # / Rendering

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.1.7'.freeze
+  VERSION = '2.1.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails