data_table 0.4.12 → 0.4.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjQzNzhiYTA0MjRhMWMzZGJlMDQzNmM5NGY1MTI4YjE4NGU3ZDY4Zg==
+    NzYwYjNkY2QzMWQ0YmE2YjE5Mzk2M2U1NjUxMzk1ZjkzYTU5NTRmNQ==
   data.tar.gz: !binary |-
-    ZDNjZjBkMmNjNTJjNmUxNjY3NjU4NzIwZTI2OTJjNjI1ZjdkMWQ0Mg==
+    NGY5MTEyNzQwYTBhMDQwZGI0OTRlYzljNWJlZDJkMTllNmQyNzlkMA==
 SHA512:
   metadata.gz: !binary |-
-    ZWEwNmJmNWM0ZmQ0YjgyNTEwMTY2NGYyZGNjNTEwMzJkYTczYWQ2MWZlNzYw
-    NDFlYmU4MGIxNWI4MWRhNDNhZDUyNWUwYTViY2FkMzFiMjM2MzIwYjQyZDg1
-    NmVmMjExMzY3ZDYwMTBiN2M2YWRkZjQ4ZTNiOTY2Y2I2MDNmYTY=
+    MGNmOTgyNWFkYjJkYzRkMGRhZmUwNTI5YzA3ZmE2NzkyNmM0MTNjMDdhNWFj
+    OGFlN2VkMzhhZjMyNjNlZTRkMDRmMDY0NjY4YjUyZjYzZDA4OTYxOGM4NDNi
+    YzNjZTFhNWZlZDY2YmUzODRlZmNkNTM1ZmU5NDA2ZjQ4MDY5YTM=
   data.tar.gz: !binary |-
-    MjM3OTAwZDQ2YTJlYTdmYjM1ZDE5NDlkMDAzYzk3NTg5ODVhODkyMjIyYTQ5
-    YjhmYjQ0ZjI0NzY4M2RiMDlmZGVmZjc4ZDIyMDM5NWExOTcxMzFkODNlY2M5
-    YTA0YzNjNmM3ZDdlNjQ1ODI4OWJhOTYxODY4NDIwYzcyMDkyNGE=
+    OGU0OGU2NWQyNTIzYzM1NjRiNjZiZjVmNDFhZDIzNWY4NGZmYTk1MWVmZTUz
+    YmMyNGQ3NjA5MDY5MDcwODEyYTEyYTA3MDJlZDk3ZWU0NzRiNmYzMDM2OTA0
+    NDU2MDFlMjcyZWFmMjZhZmViNGQzYjhhZjMwOWNjYjNjZmY4ZjQ=

data/Gemfile.lock

@@ -1,78 +1,71 @@
 PATH
   remote: .
   specs:
-    data_table (0.4.11)
+    data_table (0.4.13)
       rails (>= 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.14)
-      actionpack (= 3.2.14)
+    actionmailer (4.1.0)
+      actionpack (= 4.1.0)
+      actionview (= 4.1.0)
       mail (~> 2.5.4)
-    actionpack (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
+    actionpack (4.1.0)
+      actionview (= 4.1.0)
+      activesupport (= 4.1.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-    activesupport (3.2.14)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
+    activemodel (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+    activerecord (4.1.0)
+      activemodel (= 4.1.0)
+      activesupport (= 4.1.0)
+      arel (~> 5.0.0)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.0)
+    builder (3.2.2)
     diff-lcs (1.2.4)
     erubis (2.7.0)
     hike (1.2.3)
-    i18n (0.6.5)
-    journey (1.0.4)
-    json (1.8.0)
+    i18n (0.6.9)
+    json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.25)
-    multi_json (1.7.9)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    mime-types (1.25.1)
+    minitest (5.3.2)
+    multi_json (1.9.2)
+    polyglot (0.3.4)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.14)
-      actionmailer (= 3.2.14)
-      actionpack (= 3.2.14)
-      activerecord (= 3.2.14)
-      activeresource (= 3.2.14)
-      activesupport (= 3.2.14)
-      bundler (~> 1.0)
-      railties (= 3.2.14)
-    railties (3.2.14)
-      actionpack (= 3.2.14)
-      activesupport (= 3.2.14)
-      rack-ssl (~> 1.3.2)
+    rails (4.1.0)
+      actionmailer (= 4.1.0)
+      actionpack (= 4.1.0)
+      actionview (= 4.1.0)
+      activemodel (= 4.1.0)
+      activerecord (= 4.1.0)
+      activesupport (= 4.1.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.0)
+      sprockets-rails (~> 2.0)
+    railties (4.1.0)
+      actionpack (= 4.1.0)
+      activesupport (= 4.1.0)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.2.2)
     rr (1.1.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -83,17 +76,23 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
     shoulda (2.11.3)
-    sprockets (2.2.2)
+    sprockets (2.12.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.18.1)
+    sprockets-rails (2.1.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.19.1)
+    thread_safe (0.3.3)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/lib/data_table/active_record.rb

@@ -4,7 +4,11 @@ module DataTable
 
       def _find_objects params, fields, search_fields
         self.where(_where_conditions params[:ssearch], search_fields).
-             includes(_discover_joins fields).
+             includes(_discover_joins fields).tap do |query|
+               if query.respond_to?(:references!)
+                 query.references!(_discover_joins fields)
+               end
+             end.
              order(_order_fields params, fields).
              paginate :page => _page(params), :per_page => _per_page(params)
       end

data/lib/data_table/version.rb

@@ -1,3 +1,3 @@
 module DataTable
-  VERSION = "0.4.12"
+  VERSION = "0.4.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_table
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
 platform: ruby
 authors:
 - Jason Dew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails