data_tables 0.1.25 → 0.1.26

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGI0NDY4ZTExOTU0MmI0NmUzYzEwNWQzYzZmYzliZWI1ODVkM2I1MA==
+    ZTg0MjU2ZmY4MjlmY2JjOTQwZDVkYjQ3YTRmNDBmNWM3ZDcwMzUyMg==
   data.tar.gz: !binary |-
-    MGFiMzQ1NjBkMjAyZDcyMzcxNWQ3MWNjNTc3NWUxNDcwNWIyYTQxMg==
+    MGNkMTc2Mjg2NDNhMTMzYWEwNTc4NDJkNTVlNjNmMTNiZGYyZTU3ZA==
 SHA512:
   metadata.gz: !binary |-
-    OWFkNTE1ZmY5NzVhMWYyYjkwZTEwZjY1MzYzYjk1YWMxMDRhMzRmNDg2MTli
-    Yjg1NGU1YThlOGJlYjMzODI3NWIzZmUzMDE4ODQyNDUwZDYzYTM1ZThmNjlj
-    NGNiYjM1ZGExOTdlY2YwYzc5NzM0ODlhZDU1NjI1MzdkNDIzNzQ=
+    NjczMWUzZTc4NDNkZmE2MjRlNjViNWVlMDZjZDBhZmMyNmMwY2Q4YTUxZWFm
+    OTU2OWFmNTAxNGNjOWU2NjJmMmM3YWJjODNjZTc2ZmQ3YmVjODU0Yjc0Nzlj
+    ZWNhNDlhYzAzYTU4NDE5ZWY0MzJmYjYyYmM1MGJjNzZmNDdiNzc=
   data.tar.gz: !binary |-
-    YzNjOTRjNmMzNmY3NGE2MzI4ZTU5M2I4MjFjZGVjZDY3NDU0YTkzMDRhNTYz
-    ZjBlY2ZmZDI2Nzg5NjY5NmZkYzU5NDQzYzhkOTEyMGU2YjY3NmFlNDZiNzYw
-    Y2U0NjA1ZmUwYWU3YzFmMTc4M2RhOTA4MDA0OTUxZWE3YzE5Yjk=
+    MThiNjRlMzg1MGU2Yjg1MjU1ZDllYTM2MGM4OTA5NmVkMmM0OWZkNzIyODg3
+    ZDY5OWE4MmUyMDNjOGMxYjZlZWI5ZGE4NTNiZTA3YzM3N2U0ZjAyNGUzODY5
+    NjM5NWJlZjlhNzUzNGZmZDY5NzhhYTVhMTM0OTRkODk0NDY2Zjc=

data/data_tables.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'data_tables'
-  s.version     = '0.1.25'
+  s.version     = '0.1.26'
   s.date        = Time.now.strftime("%Y-%m-%d")
   s.summary     = "Rails friendly interface into DataTables"
   s.description = "DataTables for Rails"

data/lib/data_tables.rb

@@ -402,24 +402,46 @@ module DataTablesController
   # gets the value for a column and row
   def datatables_instance_get_value(instance, column)
     if column[:special]
-      special = column[:special]
-
-      if special[:method]
-        return method(special[:method].to_sym).call(instance)
-      elsif special[:eval]
-        proc = lambda { obj = instance; binding }
-        return Kernel.eval(special[:eval], proc.call)
-      end
+      get_instance_special_value(instance, column[:special])
     elsif column[:attribute]
-      val = instance.send(column[:attribute].to_sym)
-      if !val.blank? || val == false
-        trans = I18n.t(val.to_s.to_sym, :default => val.to_s)
-        return trans.class == String ? trans : val.to_s
-      else
-        return ''
+      begin
+      get_instance_value(instance.send("#{column[:attribute]}"))
+      rescue ArgumentError => error
+        handle_argument_error(error, instance, column)
       end
+    else
+      return "value not found"
+    end
+  end
+
+  def get_instance_special_value(instance, special)
+    if special[:method]
+      return method(special[:method].to_sym).call(instance)
+    elsif special[:eval]
+      proc = lambda { obj = instance; binding }
+      return Kernel.eval(special[:eval], proc.call)
+    end
+  end
+
+  def get_instance_value(value)
+    if !value.blank? || value == false
+      trans = I18n.t(value.to_s.to_sym, :default => value.to_s)
+      return trans.class == String ? trans : value.to_s
+    else
+      return ''
+    end
+  end
+
+  def handle_argument_error(error, instance, column)
+    if error.message.include? "UTF-8"
+      invalid_sequence = instance.send("#{column[:attribute]}").bytes.to_a
+      logger.warn("[datatables] Error: #{instance.class.name} for "+
+                  "id #{instance.id}, column #{column[:attribute]}: " +
+                  "Invalid UTF8 sequence is [#{invalid_sequence.join(", ")}]")
+      return ''
+    else
+      raise
     end
-    return "value not found"
   end
 
   def datatable_source(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_tables
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Duane Compton
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec