effective_datatables 3.1.3 → 3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4081fbe7767fc0dc7e6142ee15630d12f50b237
-  data.tar.gz: ba5f35b8180b134ce4b567f41acb689f119d3402
+  metadata.gz: b2fd403395ba41023758912f2316bd3550ce87b0
+  data.tar.gz: da929e087db2cdf263b1c5f85c1e9304b834acfa
 SHA512:
-  metadata.gz: d1c9af4a05da6623271d70a10cbcdc45580b889f345fc0896c51fdbaaba7506755b4043228d956cf3673e29b45a7f9aaa80ec4e3c0d4043f18441b9140df50b5
-  data.tar.gz: f9436b7939c2a844b792214f4aa95d447445253fcba4b3354ae92957a1149324a8a0fc36381dac68a0422760cb800fd199c47d839ce9fac9043fca91a91628a6
+  metadata.gz: 398b32bf5d7d09c1fe70f60b2cc7a808ba9d0e3d3203027503b3c88d292e1ef35c3941393055f87b74e1f25cedf3be2aa9b733af90a782209a0227daf33efd3b
+  data.tar.gz: 2ceb4c659055f4de79ce573078f7a0bc054fdb67533d560bc44ea75c59cec4ebff4fefb2902b4000dc50f810a59243d2a944ac05f17128d487da0f0782f1fa70

data/app/models/effective/datatable.rb

@@ -78,6 +78,9 @@ module Effective
       # Figure out the class, and if it's activerecord, do all the resource discovery on it
       load_resource!
 
+      # If attributes match a belongs_to column, scope the collection and remove the column
+      apply_belongs_to_attributes!
+
       save_cookie!
     end
 

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

@@ -146,6 +146,24 @@ module Effective
           end
         end
       end
+
+      def apply_belongs_to_attributes!
+        return unless active_record_collection?
+
+        changed = attributes.any? do |attribute, value|
+          attribute = attribute.to_s
+          next unless attribute.ends_with?('_id')
+
+          associated = attribute.gsub(/_id\z/, '').to_sym  # Replace last _id
+          next unless columns[associated] && columns[associated][:as] == :belongs_to
+
+          @_collection = @_collection.where(attribute => value)
+          columns.delete(associated)
+        end
+
+        columns.each_with_index { |(_, column), index| column[:index] = index } if changed
+      end
+
     end
   end
 end

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.1.3'.freeze
+  VERSION = '3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: '3.2'
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails