effective_datatables 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86c4a4ce9bbbe51c5b6a37624ab041e0150130a7
-  data.tar.gz: 5601231c343b39b14aeb87b5e5e04c7086f26c4d
+  metadata.gz: c823dd7f44e5191f730076d3fec30747fa5332b8
+  data.tar.gz: 30ac156546c0fcd154abc0e3e144fe5a8ea7ab75
 SHA512:
-  metadata.gz: c4a50e770e239cbef09f544414d4f18a78471140e456309536672e61e40e192de1c2e5ad25d7e98ae9d4fc8e1964c4c3e3a8649e639fb8cb4442b14eb87bd65e
-  data.tar.gz: 8edc669655778534cddfc4e74e31811740759574d0f0597b2e2b033211084014a397340e14a9b48177f499c02009538658d4c883ccb7682ac65f5b9ff30857ea
+  metadata.gz: acb37922961188b750bf9b69f77fde79b06571b67274dcb76a6918d0a927020cc897a2e353898dfd12199c6f09b911bd79027add70f2e42c7971e1037a44e698
+  data.tar.gz: 8a2f0c023604461e9a03ea95f65bc6016efa786e012c58767085fa732152bcd0be4aa16d750eb2c954d552502c9b032113bb45b3ceda5dce36b0750068d32540

data/app/models/effective/active_record_datatable_tool.rb

@@ -70,6 +70,12 @@ module Effective
         rescue => e
           collection
         end
+      when :obfuscated_id
+        if (deobfuscated_id = collection.deobfuscate(term)) == term # We weren't able to deobfuscate it, so this is an Invalid ID
+          collection.where("#{column} = :term", :term => 0)
+        else
+          collection.where("#{column} = :term", :term => deobfuscated_id)
+        end
       when :integer
         collection.where("#{column} = :term", :term => term.to_i)
       when :year

data/app/models/effective/datatable.rb

@@ -228,6 +228,8 @@ module Effective
             view.instance_exec(obj, collection, self, &opts[:proc])
           elsif opts[:type] == :belongs_to
             val = (obj.send(name) rescue nil).to_s
+          elsif opts[:type] == :obfuscated_id
+            (obj.send(:to_param) rescue nil).to_s
           else
             val = (obj.send(name) rescue nil)
             val = (obj[opts[:array_index]] rescue nil) if val == nil
@@ -310,9 +312,19 @@ module Effective
         cols[name][:name] ||= name
         cols[name][:label] ||= name.titleize
         cols[name][:column] ||= (sql_table && sql_column) ? "\"#{sql_table.name}\".\"#{sql_column.name}\"" : name
-        cols[name][:type] ||= (belong_tos.key?(name) ? :belongs_to : sql_column.try(:type)).presence || :string
         cols[name][:width] ||= nil
         cols[name][:sortable] = true if cols[name][:sortable] == nil
+
+        cols[name][:type] ||= (
+          if belong_tos.key?(name)
+            :belongs_to
+          elsif name == 'id' && collection.respond_to?(:deobfuscate)
+            :obfuscated_id
+          else
+            sql_column.try(:type).presence || :string
+          end
+        )
+
         cols[name][:filter] = initialize_table_column_filter(cols[name][:filter], cols[name][:type], belong_tos[name])
 
         if cols[name][:partial]

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord