effective_datatables 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af9c292325c6b762e373141abc1423733b680e07
-  data.tar.gz: 90eae3479c8852b652b45a050b0cd25e002e2ab8
+  metadata.gz: cb5282c6fc8d0dfa572243a3d922182600bf611a
+  data.tar.gz: 2a176f9e34f0bc71180bb66f6b91699306e1ee7a
 SHA512:
-  metadata.gz: adcafc661510d837fe435defab4fce2078c07a203ad2edc815a3af94926e9798934f06979656fd5ff4e7b359dbc2c2a5c0941f29793e8e791d448a39ae0b65fd
-  data.tar.gz: 663e67d4613b20b1d925b0166d8feae2f27750ad3771941a64c893c4f2f85a4d8120ddab46b7d3fc3640b2807ab040c8b32500d981966a97c6120be283803595
+  metadata.gz: c32b379fe3f045efecf295350e5d2385802c60d8f2e95d293bfa6523ba938540fb8c110e39bb2c0f100ce59630f7ebbf2813c3f7a02231e3203f1bd7e9cd703c
+  data.tar.gz: 9fa36118ddc8e3427589f0f6a642b9305b5855cec61176885d77c97357ddd874d1d7fbd71c67d985d85f68fe474fb50dd6ef0635ef65f007eceebb46e7342402

data/app/models/effective/active_record_datatable_tool.rb

@@ -2,7 +2,7 @@ module Effective
   class ActiveRecordDatatableTool
     attr_accessor :table_columns
 
-    delegate :order_name, :order_direction, :page, :per_page, :search_column, :to => :@datatable
+    delegate :order_name, :order_direction, :page, :per_page, :search_column, :collection_class, :to => :@datatable
 
     def initialize(datatable, table_columns)
       @datatable = datatable
@@ -82,6 +82,13 @@ module Effective
         else
           collection.public_send(sql_op, "#{column} = :term", term: deobfuscated_id)
         end
+      when :effective_address
+        ids = Effective::Address
+          .where('addressable_type = ?', collection_class.name)
+          .where('address1 ILIKE :term OR address2 ILIKE :term OR city ILIKE :term OR postal_code ILIKE :term OR state_code = :code OR country_code = :code', term: "%#{term}%", code: term)
+          .pluck(:addressable_id)
+
+        collection.public_send(sql_op, id: ids)
       when :effective_roles
         collection.with_role(term)
       when :datetime, :date

data/app/models/effective/datatable.rb

@@ -57,7 +57,7 @@ module Effective
     end
 
     def collection_class
-      collection.respond_to?(:klass) ? collection.klass : self.class
+      @collection_class ||= (collection.respond_to?(:klass) ? collection.klass : self.class)
     end
 
     def to_json

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

@@ -64,6 +64,8 @@ module Effective
               end
             elsif has_manys.key?(name)
               :has_many
+            elsif name.include?('_address') && (collection_class.new rescue nil).respond_to?(:effective_addresses)
+              :effective_address
             elsif sql_column.try(:type).present?
               sql_column.type
             else
@@ -73,8 +75,8 @@ module Effective
 
           cols[name][:class] = "col-#{cols[name][:type]} col-#{name} #{cols[name][:class]}".strip
 
-          # We can't really sort a HasMany field
-          if cols[name][:type] == :has_many
+          # We can't really sort a HasMany or EffectiveAddress field
+          if [:has_many, :effective_address].include?(cols[name][:type])
             cols[name][:sortable] = false
           end
 
@@ -157,6 +159,8 @@ module Effective
               end
             )
           }
+        when :effective_address
+          {type: :string}
         when :effective_roles
           {type: :select, values: EffectiveRoles.roles}
         when :integer

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

@@ -121,8 +121,10 @@ module Effective
               (obj.send(name).to_a rescue [])
             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 []).join(', ')
+              (obj.send(:roles) rescue [])
             elsif obj.kind_of?(Array) # Array backed collection
               obj[opts[:array_index]]
             else
@@ -154,6 +156,10 @@ module Effective
                   row[index] = value.map { |v| v.to_s }.join('<br>')
                 end
               end
+            when :effective_address
+              row[index] = value.map { |addr| addr.to_html }.join('<br>')
+            when :effective_roles
+              row[index] = value.join(', ')
             when :datetime
               row[index] = value.strftime(EffectiveDatatables.datetime_format) rescue BLANK
             when :date

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.1.8'.freeze
+  VERSION = '2.1.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails