effective_datatables 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fc9e9351d92c350ba462d3d498ac744e5422743
-  data.tar.gz: 69033f7a735e3deb1767dcfb2be6244a74ba82dd
+  metadata.gz: 61fdda73bca46f3fac6996b85d4e000db3ac6f9b
+  data.tar.gz: e91cba908d1a30b568e02a1d02ae91d6733c879e
 SHA512:
-  metadata.gz: bfeb36dfa0868c1512aef194015dcb02d7aa3070ba5ee26c2c5fbffd08b6e055db7f561781d07e79f5d2865c12e559a6f599d38a30c9d2320f4d438497400559
-  data.tar.gz: cba723e4415e992bac1590ab1cd4596217b8095fe7b5ee866cef3418b55f89f2b8e30ad1b2389a5fefc19b5a6efe309c05accd8a36dbf06cedd8b739bc4a9d51
+  metadata.gz: 0b8d01ab1792f45495e72d1e8e046b63334dfb221f552dea25c15ba4b268e881f4825cdfc0287ca23939e82c2335bb6ba278fce1141de6efa404b351eb2c1dc2
+  data.tar.gz: 695a6922a5232b08f97ff8de268fc93725f6a12301db020229f707cc100a37067f6db172474c690394c2eb276cdfa4f9f6717c58b555c0318d8bbcb4f37eeef2

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

@@ -106,34 +106,40 @@ 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]
-              view.instance_exec(obj, collection, self, &opts[:block])
-            elsif opts[:proc]
-              view.instance_exec(obj, collection, self, &opts[:proc])
-            elsif opts[:type] == :belongs_to
-              (obj.send(name) rescue nil)
-            elsif opts[:type] == :belongs_to_polymorphic
-              (obj.send(name) rescue nil)
-            elsif opts[:type] == :has_many
-              (obj.send(name).map { |obj| obj.to_s }.join('<br>') rescue BLANK)
-            elsif opts[:type] == :has_and_belongs_to_many
-              (obj.send(name).map { |obj| obj.to_s }.join('<br>') rescue BLANK)
-            elsif opts[:type] == :bulk_actions_column
-              BLANK
-            elsif opts[:type] == :obfuscated_id
-              (obj.send(:to_param) rescue nil).to_s
-            elsif opts[:type] == :effective_address
-              (Array(obj.send(name)) rescue [])
-            elsif opts[:type] == :effective_roles
-              (obj.send(:roles) rescue [])
-            elsif obj.kind_of?(Array) # Array backed collection
-              obj[opts[:array_index]]
-            else
-              (obj.send(name) rescue (obj[name] rescue nil))
+            begin
+              if opts[:visible] == false
+                BLANK
+              elsif opts[:partial]
+                rendered[name][index]
+              elsif opts[:block]
+                view.instance_exec(obj, collection, self, &opts[:block])
+              elsif opts[:proc]
+                view.instance_exec(obj, collection, self, &opts[:proc])
+              elsif opts[:type] == :belongs_to
+                (obj.send(name) rescue nil)
+              elsif opts[:type] == :belongs_to_polymorphic
+                (obj.send(name) rescue nil)
+              elsif opts[:type] == :has_many
+                (obj.send(name).map { |obj| obj.to_s }.join('<br>') rescue BLANK)
+              elsif opts[:type] == :has_and_belongs_to_many
+                (obj.send(name).map { |obj| obj.to_s }.join('<br>') rescue BLANK)
+              elsif opts[:type] == :bulk_actions_column
+                BLANK
+              elsif opts[:type] == :year
+                obj.send(name).try(:year)
+              elsif opts[:type] == :obfuscated_id
+                (obj.send(:to_param) rescue nil).to_s
+              elsif opts[:type] == :effective_address
+                (Array(obj.send(name)) rescue [])
+              elsif opts[:type] == :effective_roles
+                (obj.send(:roles) rescue [])
+              elsif obj.kind_of?(Array) # Array backed collection
+                obj[opts[:array_index]]
+              else
+                obj.send(name)
+              end
+            rescue => e
+              obj.try(:[], name)
             end
           end
         end

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.3.3'.freeze
+  VERSION = '2.3.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,11 +180,7 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -213,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord
@@ -241,11 +237,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html

data/spec/dummy/log/development.log

@@ -1,17 +0,0 @@
-Connecting to database specified by database.yml
-   (0.4ms)  select sqlite_version(*)
-   (3.5ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (2.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-   (38.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-Connecting to database specified by database.yml
-   (1.6ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-Connecting to database specified by database.yml
-   (0.1ms)  select sqlite_version(*)
-   (2.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-Connecting to database specified by database.yml
-   (1.9ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-   (0.1ms)  select sqlite_version(*)
-   (2.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (2.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-   (0.1ms)  SELECT version FROM "schema_migrations"
-   (2.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')

data/spec/dummy/log/test.log

@@ -1 +0,0 @@
-Connecting to database specified by database.yml