effective_datatables 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ce0fed54f90ff8b2008a4bc483f76b04c0a0b40
-  data.tar.gz: c7b9e3d1ccd3246c0caff7b1a52843c99cfebc66
+  metadata.gz: 254850f988b403fcd7bab23babac6af5905a7ee4
+  data.tar.gz: c5722ac344bc0798bbe8ddab55582bd5b4c0fead
 SHA512:
-  metadata.gz: 4f17f6ea328d0cb5f6d7b8c17fbc55de4a02dd3ff9936754772ae73d66bf0003504fb8aa335389a4d73fb380b9560469061f7333baaadfeaf0ddd47f7d82fb32
-  data.tar.gz: d95868d508ca03ed0af7f347bcae93da40f34efa267e1bd9db650ab8458042a925f4c50d02e54e9de42c5185e6c2fd5a4648cb5366490cd1c3d3462c80461815
+  metadata.gz: 47d8354626af6be0d1a8176e5609d4f9e7ee58e2a851845ff4d37260e86f4eb3ad344382ac64fd3e9a0755d8d663b178fb7f6c4355bb968229cb942853733aaa
+  data.tar.gz: ed8ab8398e717bea338457560fdbf2fb25f1e008069a73b34d9d20389587e1f5538c14b11028b02fa71780b5a7b3f073ec4a4c492e3f19b9199228e9cfc022cd

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 Code and Effect Inc.
+Copyright 2017 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -565,6 +565,12 @@ As well, you need to change the controller where you define the datatable to be
 @datatable = Effective::Datatables::Posts.new(params[:scopes])
 ```
 
+And to display the scopes anywhere in your view:
+
+```ruby
+= render_datatable_scopes(@datatable)
+```
+
 So initially, the `:start_date` will have the value of `Time.zone.now-3.months` and when submitted by the form, the value will be set there.
 
 The form value will come back as a string, so you may need to `Time.zone.parse` that value.

data/app/assets/javascripts/effective_datatables/initialize.js.coffee

@@ -200,8 +200,7 @@ destroyDataTables = ->
     if $.fn.DataTable.fnIsDataTable(this)
       $(this).DataTable().destroy()
 
-$ -> initializeDataTables()
 $(document).on 'page:change', -> initializeDataTables()
 $(document).on 'turbolinks:load', -> initializeDataTables()
-$(document).on 'turbolinks:before-cache', -> destroyDataTables()
+
 

data/app/models/effective/array_datatable_tool.rb

@@ -30,7 +30,7 @@ module Effective
       if direction == :asc
         collection.sort! do |x, y|
           if (x[index] && y[index])
-            convert_to_column_type(table_column, x[index]) <=> convert_to_column_type(table_column, y[index])
+            x[index] <=> y[index]
           elsif x[index]
             -1
           elsif y[index]
@@ -42,7 +42,7 @@ module Effective
       else
         collection.sort! do |x, y|
           if (x[index] && y[index])
-            convert_to_column_type(table_column, y[index]) <=> convert_to_column_type(table_column, x[index])
+            y[index] <=> x[index]
           elsif x[index]
             1
           elsif y[index]
@@ -70,7 +70,7 @@ module Effective
 
       collection.select! do |row|
         if table_column[:filter][:fuzzy]
-          convert_to_column_type(table_column, row[index]).to_s.downcase.include?(search_term)
+          row[index].to_s.downcase.include?(search_term)
         else
           row[index] == search_term
         end

data/app/models/effective/datatable.rb

@@ -186,11 +186,19 @@ module Effective
     # Check if collection has an order() clause and warn about it
     # Usually that will make the table results look weird.
     def active_record_collection?
-      @active_record_collection ||= (collection.ancestors.include?(ActiveRecord::Base) rescue false)
+      if @active_record_collection == nil
+        @active_record_collection = (collection.ancestors.include?(ActiveRecord::Base) rescue false)
+      end
+
+      @active_record_collection
     end
 
     def array_collection?
-      collection.kind_of?(Array) && collection.first.kind_of?(Array)
+      if @array_collection == nil
+        @array_collection = (collection.kind_of?(Array) && collection.first.kind_of?(Array))
+      end
+
+      @array_collection
     end
 
     # Not every ActiveRecord query will work when calling the simple .count

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

@@ -134,7 +134,7 @@ module Effective
             end
           )
 
-          cols[name][:class] = "col-#{cols[name][:type]} col-#{name} #{cols[name][:class]}".strip
+          cols[name][:class] = "col-#{cols[name][:type]} col-#{name.parameterize} #{cols[name][:class]}".strip
 
           # Formats
           if name == 'id' || name.include?('year') || name.end_with?('_id')

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

@@ -19,28 +19,34 @@ module Effective
           if table_tool.search_terms.present? && array_tool.search_terms.blank?
             self.display_records = active_record_collection_size(col)
           end
-        end
 
-        if array_tool.search_terms.present?
-          col = self.arrayize(col)
-          col = array_tool.search(col)
-          self.display_records = col.size
+          if array_tool.search_terms.present?
+            col = self.arrayize(col)
+            col = array_tool.search(col)
+            self.display_records = col.size
+          end
+
+          if array_tool.order_by_column.present?
+            col = self.arrayize(col)
+            col = array_tool.order(col)
+          end
         end
 
-        if array_tool.order_by_column.present?
-          col = self.arrayize(col)
+        if array_collection?
           col = array_tool.order(col)
+          col = array_tool.search(col)
         end
 
         self.display_records ||= total_records
 
-        if col.kind_of?(Array)
+        if array_collection?
           col = array_tool.paginate(col)
         else
           col = table_tool.paginate(col)
-          col = self.arrayize(col)
         end
 
+        col = self.arrayize(col)
+
         self.format(col)
         col = self.finalize(col)
       end
@@ -85,7 +91,11 @@ module Effective
                 BLANK
               elsif opts[:block]
                 begin
-                  view.instance_exec(obj, collection, self, &opts[:block])
+                  if active_record_collection?
+                    view.instance_exec(obj, collection, self, &opts[:block])
+                  else
+                    view.instance_exec(obj, obj[opts[:array_index]], collection, self, &opts[:block])
+                  end
                 rescue NoMethodError => e
                   if opts[:type] == :actions && e.message == 'super called outside of method'
                     rendered[name][index]
@@ -94,7 +104,11 @@ module Effective
                   end
                 end
               elsif opts[:proc]
-                view.instance_exec(obj, collection, self, &opts[:proc])
+                if active_record_collection?
+                  view.instance_exec(obj, collection, self, &opts[:proc])
+                else
+                  view.instance_exec(obj, obj[opts[:array_index]], collection, self, &opts[:proc])
+                end
               elsif opts[:partial]
                 rendered[name][index]
               elsif opts[:type] == :belongs_to

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.7.0'.freeze
+  VERSION = '2.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- Rakefile
 - app/assets/images/dataTables/sort_asc.png
 - app/assets/images/dataTables/sort_both.png
 - app/assets/images/dataTables/sort_desc.png

data/Rakefile

@@ -1,23 +0,0 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-# Our tasks
-load 'lib/tasks/effective_datatables_tasks.rake'
-
-# Testing tasks
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-Bundler::GemHelper.install_tasks
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
-
-task :default => :spec