daru-data_tables 0.1.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aa4862903d3e3efa2d6aeb802c6a36dad7aa86b
-  data.tar.gz: d2c5bfdef9cf9d81297c158a48e0c93ad45e27d2
+  metadata.gz: 1f660b4a3ca5a6cc0f958070666b14269810efbf
+  data.tar.gz: 869497cb55c683178b0c7267398689206c9687df
 SHA512:
-  metadata.gz: b85f4a026f9dcfc330cdc7ff764998ccc1cb21a9e8b453cf796425e442fc877dc39011f8fe5cb167c44ef60031e80e18c8da06f63c1b90cbc6e3d7694de4ee00
-  data.tar.gz: ca88214f12668bfb1653ba31ee5ca519f53876945ab0f95707af7f2f47d0f9329c783226a49630d5b9b4865ecc2653235537508d87f2ea26fdb5dd43198978d6
+  metadata.gz: e7c38d078a620932d028ee27add03f862c81ff65cda34cb9b20d76fed581174c377309bac66c7359c6564588584d2c2f973c301bf6896253dd8290aec3a92044
+  data.tar.gz: 5e055a03905a8ca91ef44b30a9724442929a7cb202f8bbe8f823f5a48c0929ca4c3894026ea762e6e62b3408cb6a255616bea485d1c5d1705195d4abe4499648

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/.rubocop.yml

@@ -17,7 +17,7 @@ AllCops:
     - 'daru-data_tables.gemspec'
     - '**/*.rake'
   DisplayCopNames: true
-  TargetRubyVersion: 2.0
+  TargetRubyVersion: 2.2
 
 # Preferred codebase style ---------------------------------------------
 Layout/ExtraSpacing:

data/.simplecov

@@ -0,0 +1,3 @@
+SimpleCov.start do
+  add_group "lib", "lib"
+end

data/.travis.yml

@@ -12,6 +12,9 @@ script:
   - bundle exec rspec
   - bundle exec rubocop
 
+after_script:
+  - bundle exec rake coveralls:push
+
 install:
   - gem install bundler
   - gem install rainbow -v '2.2.1'

data/CHANGELOG.md

@@ -0,0 +1,42 @@
+## 0.3.5 (2017-12-03)
+
+**Enhancements:**
+
+- Load large set of data #20
+
+- Renmaed to `Daru::View::DataTable.new(data, options)` from
+`Daru::DataTables::DataTable.new(data, options)` #23
+
+- Remove bunch of js lines in rails #23 :
+
+Include js in rails app/assets/javascripts/application.js file as:
+
+```
+//= require jquery-latest.min
+//= require jquery.dataTables
+
+```
+CSS files can be included as:
+
+```
+ *= require jquery.dataTables
+```
+
+**Note:**
+
+* [GSoC 2018 project](https://github.com/SciRuby/daru-view/wiki/GSoC-2018---Progress-Report)
+
+* [Wiki page about loading large set in daru-view using daru-data_tables](https://github.com/SciRuby/daru-view/wiki/DataTables-to-load-large-set-data-in-daru-view-table)
+
+## 0.1.0 (2017-09-20)
+
+**Features:**
+
+- [Discussion at datatables forum](https://github.com/Shekharrajak/daru-data_tables/wiki/Discussion-in-datatables-forum)
+
+**NOTE:**
+
+
+- [GSoC 2017 Blog post](http://shekharrajak.github.io/gsoc_2017_posts/)
+
+- [Blog post at SciRuby, how daru-data_table gem is used in daru-view](http://sciruby.com/blog/2017/09/01/gsoc-2017-data-visualization-using-daru-view/)

data/Gemfile

@@ -5,3 +5,13 @@ gem "daru", git: 'https://github.com/sciruby/daru.git'
 
 # Specify your gem's dependencies in datatables.gemspec
 gemspec
+
+
+group :test do
+  gem 'coveralls', require: false
+  gem 'rspec'
+  gem 'simplecov', require: false
+  gem 'simplecov-console', require: false
+end
+
+

data/README.md

@@ -1,12 +1,17 @@
 # data_tables
 
+[![Gem Version](https://badge.fury.io/rb/daru-data_tables.svg)](https://badge.fury.io/rb/daru-data_tables)
+[![Build Status](https://travis-ci.org/shekharrajak/daru-data_tables.svg?branch=master)](https://travis-ci.org/shekharrajak/daru-data_tables)
+[![Coverage Status](https://coveralls.io/repos/github/Shekharrajak/daru-data_tables/badge.svg?branch=master)](https://coveralls.io/github/Shekharrajak/daru-data_tables?branch=master)
+
 This is Ruby gem for the jQuery Javascript library. This gem is created to be used in [daru-view](https://guthub.com/shekharrajak/daru-view). It can create table from Daru::DataFrame and Daru::Vector to display in webpages as well as IRuby notebook.
 
 DataTable is very useful in loading large dataset and also we can load data into pieces.
 
 ## Examples :
 
-- [IRuby notebook examples](http://nbviewer.jupyter.org/github/Shekharrajak/data_tables/tree/master/spec/dummy_iruby/)
+- [Rails examples](https://github.com/Shekharrajak/daru-data_tables/tree/master/spec/dummy_rails)
+
 
 ## Installation
 

data/Rakefile

@@ -1,4 +1,7 @@
 require "bundler/gem_tasks"
 task :default => :spec
 
+require 'coveralls/rake/task'
+Coveralls::RakeTask.new
+
 import 'lib/tasks/data_tables.rake'

data/daru-data_tables.gemspec

@@ -5,7 +5,7 @@ require "daru/data_tables/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "daru-data_tables"
-  spec.version       = Daru::DataTables::VERSION
+  spec.version       = Daru::View::VERSION
   spec.authors       = ["shekharrajak"]
   spec.email         = ["shekharstudy@ymail.com"]
 
@@ -24,9 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'actionview'
   spec.add_development_dependency 'byebug'
+  spec.add_runtime_dependency 'daru'
 
-  spec.add_development_dependency 'rspec', '~> 3.4'
-  spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'rubocop'
 end

data/lib/daru/data_tables/constants_data_table.rb

@@ -0,0 +1,8 @@
+# DataTables CSS dependencies
+DATATABLES_DEPENDENCIES_CSS = ['jquery.dataTables.css'].freeze
+
+# Dependent DataTables JS constants for IRuby notebook
+DATATABLES_DEPENDENCIES_IRUBY = ['jquery.dataTables.js'].freeze
+
+# Dependent DataTables JS constants for web frameworks
+DATATABLES_DEPENDENCIES_WEB = ['jquery-latest.min.js', 'jquery.dataTables.js'].freeze

data/lib/daru/data_tables/core_ext/string.rb

@@ -0,0 +1,10 @@
+class String
+  def js_code(true_or_false=true)
+    @_datatables_js_code = true_or_false
+    self
+  end
+
+  def js_code?
+    @_datatables_js_code || false
+  end
+end

data/lib/daru/data_tables/data_table.rb

@@ -1,10 +1,74 @@
 module Daru
-  module DataTables
+  module View
+    class Engine < ::Rails::Engine; end if defined?(Rails)
     class DataTable
-      attr_accessor :html_options, :element_id, :options
-      def initialize(options={})
+      attr_accessor :html_options, :element_id, :options, :data
+      # @param data [Array, Daru::DataFrame, Daru::Vector] The data provided
+      #   by the user to generate the datatable
+      # @param options [Hash] Various options provided by the user to
+      #   incorporate in datatable
+      # @return Initializes the Daru::DataTables::DataTable object
+      # @example
+      #   vec = Daru::Vector.new([1, 2, 3], name: :a)
+      #   opts = {searching: false}
+      #   table = Daru::DataTables::DataTable.new(vec, opts)
+      def initialize(data=[], options={})
         @element_id = options.delete(:element_id) unless options[:element_id].nil?
-        @options = options.empty? ? nil : options
+        @html_options = options.delete(:html_options) unless options[:html_options].nil?
+        @html_options ||= default_html_options
+        @data = data
+        @options = options
+        @options[:data] = to_data_array(data)
+        row_number = 0
+        @options[:data].each do |array|
+          array.unshift(row_number)
+          row_number += 1
+        end
+      end
+
+      private
+
+      def default_html_options
+        table_opts = {
+          class: 'display',
+          cellspacing: '0',
+          width: '100%'
+        }
+        html_options = {
+          table_options: table_opts
+        }
+        html_options
+      end
+
+      # DataTables accept the data as Array of array.
+      #
+      # TODO : I didn't find use case for Daru::MultiIndex.
+      def to_data_array(data_set)
+        case
+        when data_set.is_a?(Daru::DataFrame)
+          return ArgumentError unless data_set.index.is_a?(Daru::Index)
+
+          rows = data_set.access_row_tuples_by_indexs(*data_set.index.to_a)
+          convert_to_array_of_array(rows)
+        when data_set.is_a?(Daru::Vector)
+          rows = []
+          data_set.to_a.each { |a| rows << [a] }
+          rows
+        when data_set.is_a?(Array)
+          convert_to_array_of_array(data_set)
+        else
+          raise ArgumentError, 'Invalid Argument Passed!'
+        end
+      end
+
+      def convert_to_array_of_array(rows)
+        if rows.all? { |row| row.class==Array }
+          rows
+        else
+          tuples = []
+          rows.each { |row| tuples << [row] }
+          tuples
+        end
       end
     end
   end

data/lib/daru/data_tables/display/display.rb

@@ -3,37 +3,59 @@ require 'erb'
 require_relative 'iruby_notebook'
 require_relative '../generate_js/generate_js'
 require 'action_view'
+require 'daru/data_tables/constants_data_table'
 
 module Daru
-  module DataTables
-    # dependent script for the library. It must be added in the head tag
-    # of the web application.
-    #
-    # @example
-    #
-    # dep_js = DataTables.init_script
-    #
-    # use in Rails app : <%=raw dep_js %>
-    #
-    def self.init_script(
-      dependent_js=[
-        'jquery-latest.min.js', 'jquery.dataTables.js'
-      ],
-      dependent_css=['jquery.dataTables.css']
-    )
-      # TODO: there are many js and css files, that must be added for
-      # more features. Refer: https://datatables.net/download/index
-      js =  ''
-      js << "\n<script type='text/javascript'>"
-      js << Daru::DataTables.generate_init_code_js(dependent_js)
-      js << "\n</script>"
-      js << "\n<style type='text/css'>"
-      js << Daru::DataTables.generate_init_code_css(dependent_css)
-      js << "\n</style>"
-      js
+  module View
+    class DataTables
+      # @param dependent_js [Array] dependent js files required
+      # @return [String] js code of the dependent files
+      def self.init_javascript(
+        dependent_js=DATATABLES_DEPENDENCIES_WEB
+      )
+        # TODO: there are many js and css files, that must be added for
+        # more features. Refer: https://datatables.net/download/index
+        js =  ''
+        js << "\n<script type='text/javascript'>"
+        js << Daru::View.generate_init_code_js(dependent_js)
+        js << "\n</script>"
+        js
+      end
+
+      # @param [Array] dependent css files required
+      # @return [String] CSS code of the dependent file(s)
+      def self.init_css(
+        dependent_css=DATATABLES_DEPENDENCIES_CSS
+      )
+        css = ''
+        css << "\n<style type='text/css'>"
+        css << Daru::View.generate_init_code_css(dependent_css)
+        css << "\n</style>"
+        css
+      end
+
+      # dependent script for the library. It must be added in the head tag
+      # of the web application.
+      #
+      # @return [String] code of the dependent css and js file(s)
+      # @example
+      #
+      # dep_js = DataTables.init_script
+      #
+      # use in Rails app : <%=raw dep_js %>
+      def self.init_script
+        init_code = ''
+        init_code << init_css
+        init_code << init_javascript
+        init_code
+      end
     end
 
     module Display
+      # @param dom [String] The ID of the DIV element that the DataTable
+      #   should be rendered in
+      # @param options [Hash] options provided
+      # @return [String] js script to render the table
       def show_script(dom=SecureRandom.uuid, options={})
         script_tag = options.fetch(:script_tag) { true }
         if script_tag
@@ -48,34 +70,36 @@ module Daru
       # If table_options is not present then it will assume that table tag is
       # already present in the web page source, where we are pasting the
       # html code.
+      # @param id [String] The ID of the DIV element that the DataTable
+      #   should be rendered in
+      # @param options [Hash] options provided
+      # @return [String] Generates JavaScript and renders the table in the
+      #   final HTML output.
       def to_html(id=nil, options={})
         # More things can be added into table_script.erb
-        path = File.expand_path('../../templates/table_script.erb', __FILE__)
+        path = File.expand_path('../templates/table_script.erb', __dir__)
         template = File.read(path)
         id ||= SecureRandom.uuid # TODO: remove it or Use it for table tag.
-        table_script = show_script(id, script_tag: false)
+        element_id ||= id
+        table_script = show_script(element_id, script_tag: false)
         html_code = ERB.new(template).result(binding)
         # table_options is given. That means table html code is not present in
         # the webpage. So it must generate table code with given options.
-        unless options[:table_options].nil?
-          options[:table_options][:id] = id
-          table_thead_tbody = options[:table_options].delete(:table_html)
-          table_thead_tbody ||= ''
-          html_code.concat(
-            content_tag('table', table_thead_tbody.html_safe, options[:table_options])
-          )
-        end
+        table_thead = extract_table
+        draw_table_thead(element_id, html_code, table_thead)
         html_code
       end
 
+      # @param dom [String] The ID of the DIV element that the DataTable
+      #   should be rendered in
+      # @return [void] shows the datatable in IRuby notebook
       def show_in_iruby(dom=SecureRandom.uuid)
         IRuby.html(to_html(dom))
       end
 
-      # Generates JavaScript and renders the tabke in the final HTML output.
-      #
-      # Parameters:
-      #  *element_id            [Required] The ID of the DIV element that the table should be rendered in.
+      # @param element_id [String] The ID of the DIV element that the DataTable
+      #   should be rendered in
+      # @return [String] returns the javascript of the DataTable
       def to_js(element_id)
         js =  ''
         js << "\n<script type='text/javascript'>"
@@ -83,7 +107,40 @@ module Daru
         js << "\n</script>"
         js
       end
-    end # module Display end
+
+      private
+
+      def extract_table
+        return data.to_html_thead unless data.is_a?(Array)
+
+        path = File.expand_path('../templates/thead.erb', __dir__)
+        template = File.read(path)
+        ERB.new(template).result(binding)
+      end
+
+      def draw_table_thead(element_id, html_code, table_thead)
+        if html_options && html_options[:table_options]
+          draw_table_thead_from_html_options(element_id, html_code, table_thead)
+        # if user provided html_options but not provided html_options[:table_options]
+        else
+          html_code.concat(
+            content_tag(
+              'table', table_thead.html_safe, id: element_id, class: 'display'
+            )
+          )
+        end
+      end
+
+      def draw_table_thead_from_html_options(element_id, html_code, table_thead)
+        html_options[:table_options][:id] = element_id
+        html_options[:table_options][:class] ||= 'display'
+        table_thead = html_options[:table_options].delete(:table_thead) if
+        html_options[:table_options][:table_thead]
+        html_code.concat(
+          content_tag('table', table_thead.html_safe, html_options[:table_options])
+        )
+      end
+    end
 
     class DataTable
       include ActionView::Helpers::TagHelper # to use content_tag

data/lib/daru/data_tables/display/iruby_notebook.rb

@@ -1,44 +1,52 @@
+require 'daru/data_tables/constants_data_table'
+
 module Daru
-  module DataTables
+  module View
     # generate initializing code
     def self.generate_init_code_js(dependent_js)
-      js_dir = File.expand_path('../../js', __FILE__)
-      path = File.expand_path('../../templates/init.inline.js.erb', __FILE__)
+      js_dir = File.expand_path(
+        '../../../../vendor/assets/javascripts', __dir__
+      )
+      path = File.expand_path('../templates/init.inline.js.erb', __dir__)
       template = File.read(path)
       ERB.new(template).result(binding)
     end
 
     def self.generate_init_code_css(dependent_css)
-      css_dir = File.expand_path('../../css', __FILE__)
-      path = File.expand_path('../../templates/init.inline.css.erb', __FILE__)
+      css_dir = File.expand_path(
+        '../../../../vendor/assets/stylesheets', __dir__
+      )
+      path = File.expand_path('../templates/init.inline.css.erb', __dir__)
       template = File.read(path)
       ERB.new(template).result(binding)
     end
 
-    # Enable to show plots on IRuby notebook.
-    # Load the dependent JS files in IRuby notebook. Those JS will help in
-    # plotting the table in IRuby cell.
-    #
-    # One can see the loaded JS files in the source code of the notebook.
-    # @example
-    #
-    # DataTables.init_iruby
-    #
-    def self.init_iruby(
-      dependent_js=['jquery.dataTables.js']
-    )
-      # dependent_css=['jquery.dataTables.css']
-      # Note: Jquery is dependecy for DataTables.
-      # Since Jquery is already a dependency for iruby notebook.
-      # So it will be loaded into IRuby notebook when `iruby` is run.
-      # No need to add it in the `dependent_js`.
-      js = generate_init_code_js(dependent_js)
-      # TODO: don't know how to import css like js
-      # css = generate_init_code_css(dependent_css)
-      IRuby.display(IRuby.javascript(js))
-      # IRuby.display(css, mime: 'text/stylesheet')
-      # FixMe: Don't know, how to add css in IRuby notebook (Means there is
-      # no IRuby.stylesheet(..) method)
+    class DataTables
+      # Enable to show plots on IRuby notebook.
+      # Load the dependent JS files in IRuby notebook. Those JS will help in
+      # plotting the table in IRuby cell.
+      #
+      # One can see the loaded JS files in the source code of the notebook.
+      # @example
+      #
+      # DataTables.init_iruby
+      #
+      def self.init_iruby(
+        dependent_js=DATATABLES_DEPENDENCIES_IRUBY
+      )
+        # dependent_css=['jquery.dataTables.css']
+        # Note: Jquery is dependecy for DataTables.
+        # Since Jquery is already a dependency for iruby notebook.
+        # So it will be loaded into IRuby notebook when `iruby` is run.
+        # No need to add it in the `dependent_js`.
+        js = generate_init_code_js(dependent_js)
+        # TODO: don't know how to import css like js
+        # css = generate_init_code_css(dependent_css)
+        IRuby.display(IRuby.javascript(js))
+        # IRuby.display(css, mime: 'text/stylesheet')
+        # FixMe: Don't know, how to add css in IRuby notebook (Means there is
+        # no IRuby.stylesheet(..) method)
+      end
     end
   end
 end

data/lib/daru/data_tables/generate_js/generate_js.rb

@@ -1,38 +1,85 @@
 require_relative 'param_helpers'
+require_relative '../core_ext/string'
 
 module Daru
-  module DataTables
+  module View
     module JsHelpers
-      include Daru::DataTables::ParamHelpers
+      include Daru::View::ParamHelpers
 
-      # Generates JavaScript function for rendering the Table.
-      #
-      # Parameters:
-      #  *element_id            [Required] The ID of the DIV element that the DataTable should be rendered in.
+      # @param id [String] The ID of the DIV element that the DataTable
+      #   should be rendered in
+      # @return [String] Generates JavaScript function for rendering the Table.
       def draw_js(element_id)
+        if options[:data] && options[:data].length >= 50_000
+          data_array = extract_data_array
+          draw_ajax_option
+        end
         js = ''
-        # js << "\n$(function() {"
         js << "\n$(document).ready(function() {"
         js << "\n"
-        # js << "\n  $('##{element_id}').DataTable("
-        js << "\n  $('##{element_id}').DataTable("
-        js << "\n    #{js_parameters(@options)}"
-        js << "\n  );"
+        js << "\n\tvar data_array = #{data_array};" unless options[:data]
+        js << "\n\t$('##{element_id}').DataTable("
+        js << "\n\t\t#{js_parameters(@options)}"
+        js << "\n\t);"
         js << "\n"
         js << "\n});"
         js
       end
 
+      # @param id [String] The ID of the DIV element that the DataTable
+      #   should be rendered in
+      # @return [String] Generates JavaScript function for rendering the Table
+      #   in IRuby notebook
       def draw_js_iruby(element_id)
+        if options[:data] && options[:data].length >= 50_000
+          data_array = extract_data_array
+          draw_ajax_option
+        end
         js = ''
         js << "\n$( function () {"
-        js << "\n  var table = $('##{element_id}').DataTable("
-        js << "\n    #{js_parameters(@options)}"
-        js << "\n  );"
+        js << "\n\tvar data_array = #{data_array};" unless options[:data]
+        js << "\n\tvar table = $('##{element_id}').DataTable("
+        js << "\n\t\t#{js_parameters(@options)}"
+        js << "\n\t);"
         js << "\n"
         js << "\n});"
         js
       end
-    end # module JsHelpers end
+
+      # @return [Array, void] returns data Array if present in the options
+      def extract_data_array
+        options.delete(:data) unless options[:data].nil?
+      end
+
+      # @return [void] adds serverSide and ajax options
+      def draw_ajax_option
+        ajax_str = ''
+        ajax_str << "\nfunction ( data, callback, settings ) {"
+        ajax_str << "\n\tvar out = [];"
+        ajax_str << "\n\tfor (var i=data.start; i<data.start+data.length; i++) {"
+        ajax_str << "\n\t\tif (i < data_array.length) {"
+        ajax_str << "\n\t\t\tout.push( data_array[i] );"
+        ajax_str << "\n\t\t}"
+        ajax_str << "\n\t}"
+        ajax_str << "\n\tsetTimeout( function () {"
+        ajax_str << set_callback_ajax
+        ajax_str << "\n\t}, 50 );"
+        ajax_str << "\n}"
+        @options[:serverSide] = true
+        @options[:ajax] = ajax_str.js_code
+      end
+
+      # @return [String] returns the callback js from the server
+      def set_callback_ajax
+        callback_js = ''
+        callback_js << "\n\t\tcallback( {"
+        callback_js << "\n\t\t\tdraw: data.draw,"
+        callback_js << "\n\t\t\tdata: out,"
+        callback_js << "\n\t\t\trecordsTotal: data_array.length,"
+        callback_js << "\n\t\t\trecordsFiltered: data_array.length,"
+        callback_js << "\n\t\t} );"
+        callback_js
+      end
+    end
   end
 end

data/lib/daru/data_tables/generate_js/param_helpers.rb

@@ -1,7 +1,7 @@
 require 'date'
 
 module Daru
-  module DataTables
+  module View
     module ParamHelpers
       def js_parameters(options)
         return '' if options.nil?
@@ -26,6 +26,8 @@ module Daru
       # rubocop:disable  Metrics/CyclomaticComplexity, Metrics/AbcSize
       def typecast(value, type=nil)
         case
+        when value.respond_to?(:js_code) && value.js_code?
+          value
         when value.is_a?(String)
           value.to_json
         when value.is_a?(Integer) || value.is_a?(Float)
@@ -50,6 +52,8 @@ module Daru
           value
         end
       end
-    end # module ParamHelpers end
+      # rubocop:enable Metrics/PerceivedComplexity, Metrics/MethodLength
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize
+    end
   end
 end

data/lib/daru/data_tables/templates/thead.erb

@@ -0,0 +1,15 @@
+<thead>
+  <tr>
+    <th></th>
+    <% column_number = 0 %>
+    <% if data.sample.is_a?(Array)%>
+      <% columns = data.sample.length - 1 %>
+    <% else %>
+      <% columns = 1 %>
+    <% end %>
+    <% columns.times do %>
+      <th>Column: <%=column_number%></th>
+      <% column_number += 1 %>
+    <% end %>
+  </tr>
+</thead>

data/lib/daru/data_tables/version.rb

@@ -1,5 +1,5 @@
 module Daru
-  module DataTables
-    VERSION = '0.1.0'.freeze
+  module View
+    VERSION = '0.3.5'.freeze
   end
 end

data/lib/tasks/data_tables.rake

@@ -10,21 +10,23 @@ end
 namespace :data_tables do
   desc "Update datatables javascript and stylesheets dependent files"
   task :update => [:js, :css, :jquery]
+  sh "mkdir -p vendor/assets/javascripts/"
   task :js do
     say "Grabbing Core js from datatables codebase..." do
-      sh "curl -# https://nightly.datatables.net/js/jquery.dataTables.js -L --compressed -o lib/data_tables/js/jquery.dataTables.js"
+      sh "curl -# https://nightly.datatables.net/js/jquery.dataTables.js -L --compressed -o vendor/assets/javascripts/jquery.dataTables.js"
     end
   end
 
+  sh "mkdir -p vendor/assets/stylesheets/"
   task :css do
     say "Grabbing css from the datatables website..." do
-      sh "curl -# https://nightly.datatables.net/css/jquery.dataTables.css -L --compressed -o lib/data_tables/css/jquery.dataTables.css"
+      sh "curl -# https://nightly.datatables.net/css/jquery.dataTables.css -L --compressed -o vendor/assets/stylesheets/jquery.dataTables.css"
     end
   end
 
   task :jquery do
     say "Grabbing jquery from the jquery website..." do
-      sh "curl -# http://code.jquery.com/jquery-latest.min.js -L --compressed -o lib/data_tables/js/jquery-latest.min.js"
+      sh "curl -# http://code.jquery.com/jquery-latest.min.js -L --compressed -o vendor/assets/javascripts/jquery-latest.min.js"
     end
   end
 end

data/{lib/daru/data_tables/js → vendor/assets/javascripts}/jquery.dataTables.js

@@ -1,15 +1,15 @@
-/*! DataTables 1.10.16-dev
- * ©2008-2017 SpryMedia Ltd - datatables.net/license
+/*! DataTables 1.10.20-dev
+ * ©2008-2018 SpryMedia Ltd - datatables.net/license
  */
 
 /**
  * @summary     DataTables
  * @description Paginate, search and order HTML tables
- * @version     1.10.16-dev
+ * @version     1.10.20-dev
  * @file        jquery.dataTables.js
  * @author      SpryMedia Ltd
  * @contact     www.datatables.net
- * @copyright   Copyright 2008-2017 SpryMedia Ltd.
+ * @copyright   Copyright 2008-2018 SpryMedia Ltd.
  *
  * This source file is free software, available under the following license:
  *   MIT license - http://datatables.net/license
@@ -909,8 +909,11 @@
 				var s = allSettings[i];
 			
 				/* Base check on table node */
-				if ( s.nTable == this || s.nTHead.parentNode == this || (s.nTFoot && s.nTFoot.parentNode == this) )
-				{
+				if (
+					s.nTable == this ||
+					(s.nTHead && s.nTHead.parentNode == this) ||
+					(s.nTFoot && s.nTFoot.parentNode == this)
+				) {
 					var bRetrieve = oInit.bRetrieve !== undefined ? oInit.bRetrieve : defaults.bRetrieve;
 					var bDestroy = oInit.bDestroy !== undefined ? oInit.bDestroy : defaults.bDestroy;
 			
@@ -967,11 +970,7 @@
 			
 			// Backwards compatibility, before we apply all the defaults
 			_fnCompatOpts( oInit );
-			
-			if ( oInit.oLanguage )
-			{
-				_fnLanguageCompat( oInit.oLanguage );
-			}
+			_fnLanguageCompat( oInit.oLanguage );
 			
 			// If the length menu is given, but the init display length is not, use the length menu
 			if ( oInit.aLengthMenu && ! oInit.iDisplayLength )
@@ -1354,8 +1353,10 @@
 	// - fr - Swiss Franc
 	// - kr - Swedish krona, Norwegian krone and Danish krone
 	// - \u2009 is thin space and \u202F is narrow no-break space, both used in many
+	// - Ƀ - Bitcoin
+	// - Ξ - Ethereum
 	//   standards as thousands separators.
-	var _re_formatted_numeric = /[',$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfk]/gi;
+	var _re_formatted_numeric = /[',$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfkɃΞ]/gi;
 	
 	
 	var _empty = function ( d ) {
@@ -1730,33 +1731,43 @@
 	 */
 	function _fnLanguageCompat( lang )
 	{
+		// Note the use of the Hungarian notation for the parameters in this method as
+		// this is called after the mapping of camelCase to Hungarian
 		var defaults = DataTable.defaults.oLanguage;
-		var zeroRecords = lang.sZeroRecords;
 	
-		/* Backwards compatibility - if there is no sEmptyTable given, then use the same as
-		 * sZeroRecords - assuming that is given.
-		 */
-		if ( ! lang.sEmptyTable && zeroRecords &&
-			defaults.sEmptyTable === "No data available in table" )
-		{
-			_fnMap( lang, lang, 'sZeroRecords', 'sEmptyTable' );
+		// Default mapping
+		var defaultDecimal = defaults.sDecimal;
+		if ( defaultDecimal ) {
+			_addNumericSort( defaultDecimal );
 		}
 	
-		/* Likewise with loading records */
-		if ( ! lang.sLoadingRecords && zeroRecords &&
-			defaults.sLoadingRecords === "Loading..." )
-		{
-			_fnMap( lang, lang, 'sZeroRecords', 'sLoadingRecords' );
-		}
+		if ( lang ) {
+			var zeroRecords = lang.sZeroRecords;
 	
-		// Old parameter name of the thousands separator mapped onto the new
-		if ( lang.sInfoThousands ) {
-			lang.sThousands = lang.sInfoThousands;
-		}
+			// Backwards compatibility - if there is no sEmptyTable given, then use the same as
+			// sZeroRecords - assuming that is given.
+			if ( ! lang.sEmptyTable && zeroRecords &&
+				defaults.sEmptyTable === "No data available in table" )
+			{
+				_fnMap( lang, lang, 'sZeroRecords', 'sEmptyTable' );
+			}
+	
+			// Likewise with loading records
+			if ( ! lang.sLoadingRecords && zeroRecords &&
+				defaults.sLoadingRecords === "Loading..." )
+			{
+				_fnMap( lang, lang, 'sZeroRecords', 'sLoadingRecords' );
+			}
+	
+			// Old parameter name of the thousands separator mapped onto the new
+			if ( lang.sInfoThousands ) {
+				lang.sThousands = lang.sInfoThousands;
+			}
 	
-		var decimal = lang.sDecimal;
-		if ( decimal ) {
-			_addNumericSort( decimal );
+			var decimal = lang.sDecimal;
+			if ( decimal && defaultDecimal !== decimal ) {
+				_addNumericSort( decimal );
+			}
 		}
 	}
 	
@@ -3128,7 +3139,7 @@
 				}
 			}
 	
-			_fnCallbackFire( oSettings, 'aoRowCreatedCallback', null, [nTr, rowData, iRow] );
+			_fnCallbackFire( oSettings, 'aoRowCreatedCallback', null, [nTr, rowData, iRow, cells] );
 		}
 	
 		// Remove once webkit bug 131819 and Chromium bug 365619 have been resolved
@@ -3453,7 +3464,7 @@
 				// iRowCount and j are not currently documented. Are they at all
 				// useful?
 				_fnCallbackFire( oSettings, 'aoRowCallback', null,
-					[nRow, aoData._aData, iRowCount, j] );
+					[nRow, aoData._aData, iRowCount, j, iDataIndex] );
 	
 				anRows.push( nRow );
 				iRowCount++;
@@ -3857,12 +3868,12 @@
 		{
 			ajaxData = ajax.data;
 	
-			var newData = $.isFunction( ajaxData ) ?
+			var newData = typeof ajaxData === 'function' ?
 				ajaxData( data, oSettings ) :  // fn can manipulate data or return
 				ajaxData;                      // an object object or array to merge
 	
 			// If the function returned something, use that alone
-			data = $.isFunction( ajaxData ) && newData ?
+			data = typeof ajaxData === 'function' && newData ?
 				newData :
 				$.extend( true, data, newData );
 	
@@ -3926,7 +3937,7 @@
 				url: ajax || oSettings.sAjaxSource
 			} ) );
 		}
-		else if ( $.isFunction( ajax ) )
+		else if ( typeof ajax === 'function' )
 		{
 			// Is a function - let the caller define what needs to be done
 			oSettings.jqXHR = ajax.call( instance, data, callback, oSettings );
@@ -4809,7 +4820,12 @@
 		} );
 	
 		for ( var i=0, ien=lengths.length ; i<ien ; i++ ) {
-			select[0][ i ] = new Option( language[i], lengths[i] );
+			select[0][ i ] = new Option(
+				typeof language[i] === 'number' ?
+					settings.fnFormatNumber( language[i] ) :
+					language[i],
+				lengths[i]
+			);
 		}
 	
 		var div = $('<div><label/></div>').addClass( classes.sLength );
@@ -5355,14 +5371,18 @@
 		// both match, but we want to hide it completely. We want to also fix their
 		// width to what they currently are
 		_fnApplyToChildren( function(nSizer, i) {
-			nSizer.innerHTML = '<div class="dataTables_sizing" style="height:0;overflow:hidden;">'+headerContent[i]+'</div>';
+			nSizer.innerHTML = '<div class="dataTables_sizing">'+headerContent[i]+'</div>';
+			nSizer.childNodes[0].style.height = "0";
+			nSizer.childNodes[0].style.overflow = "hidden";
 			nSizer.style.width = headerWidths[i];
 		}, headerSrcEls );
 	
 		if ( footer )
 		{
 			_fnApplyToChildren( function(nSizer, i) {
-				nSizer.innerHTML = '<div class="dataTables_sizing" style="height:0;overflow:hidden;">'+footerContent[i]+'</div>';
+				nSizer.innerHTML = '<div class="dataTables_sizing">'+footerContent[i]+'</div>';
+				nSizer.childNodes[0].style.height = "0";
+				nSizer.childNodes[0].style.overflow = "hidden";
 				nSizer.style.width = footerWidths[i];
 			}, footerSrcEls );
 		}
@@ -6556,7 +6576,7 @@
 	{
 		$(n)
 			.on( 'click.DT', oData, function (e) {
-					n.blur(); // Remove focus outline for mouse users
+					$(n).blur(); // Remove focus outline for mouse users
 					fn(e);
 				} )
 			.on( 'keypress.DT', oData, function (e){
@@ -7796,13 +7816,26 @@
 			}
 		}
 		else if ( order == 'current' || order == 'applied' ) {
-			a = search == 'none' ?
-				displayMaster.slice() :                      // no search
-				search == 'applied' ?
-					displayFiltered.slice() :                // applied search
-					$.map( displayMaster, function (el, i) { // removed search
-						return $.inArray( el, displayFiltered ) === -1 ? el : null;
-					} );
+			if ( search == 'none') {
+				a = displayMaster.slice();
+			}
+			else if ( search == 'applied' ) {
+				a = displayFiltered.slice();
+			}
+			else if ( search == 'removed' ) {
+				// O(n+m) solution by creating a hash map
+				var displayFilteredMap = {};
+	
+				for ( var i=0, ien=displayFiltered.length ; i<ien ; i++ ) {
+					displayFilteredMap[displayFiltered[i]] = null;
+				}
+	
+				a = $.map( displayMaster, function (el) {
+					return ! displayFilteredMap.hasOwnProperty(el) ?
+						el :
+						null;
+				} );
+			}
 		}
 		else if ( order == 'index' || order == 'original' ) {
 			for ( i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
@@ -7835,14 +7868,13 @@
 	 * {array}     - jQuery array of nodes, or simply an array of TR nodes
 	 *
 	 */
-	
-	
 	var __row_selector = function ( settings, selector, opts )
 	{
 		var rows;
 		var run = function ( sel ) {
 			var selInt = _intVal( sel );
 			var i, ien;
+			var aoData = settings.aoData;
 	
 			// Short cut - selector is a number and no options provided (default is
 			// all records, so no need to check if the index is in there, since it
@@ -7867,23 +7899,26 @@
 			// Selector - function
 			if ( typeof sel === 'function' ) {
 				return $.map( rows, function (idx) {
-					var row = settings.aoData[ idx ];
+					var row = aoData[ idx ];
 					return sel( idx, row._aData, row.nTr ) ? idx : null;
 				} );
 			}
 	
-			// Get nodes in the order from the `rows` array with null values removed
-			var nodes = _removeEmpty(
-				_pluck_order( settings.aoData, rows, 'nTr' )
-			);
-	
 			// Selector - node
 			if ( sel.nodeName ) {
-				if ( sel._DT_RowIndex !== undefined ) {
-					return [ sel._DT_RowIndex ]; // Property added by DT for fast lookup
+				var rowIdx = sel._DT_RowIndex;  // Property added by DT for fast lookup
+				var cellIdx = sel._DT_CellIndex;
+	
+				if ( rowIdx !== undefined ) {
+					// Make sure that the row is actually still present in the table
+					return aoData[ rowIdx ] && aoData[ rowIdx ].nTr === sel ?
+						[ rowIdx ] :
+						[];
 				}
-				else if ( sel._DT_CellIndex ) {
-					return [ sel._DT_CellIndex.row ];
+				else if ( cellIdx ) {
+					return aoData[ cellIdx.row ] && aoData[ cellIdx.row ].nTr === sel.parentNode ?
+						[ cellIdx.row ] :
+						[];
 				}
 				else {
 					var host = $(sel).closest('*[data-dt-row]');
@@ -7912,6 +7947,11 @@
 				// need to fall through to jQuery in case there is DOM id that
 				// matches
 			}
+			
+			// Get nodes in the order from the `rows` array with null values removed
+			var nodes = _removeEmpty(
+				_pluck_order( settings.aoData, rows, 'nTr' )
+			);
 	
 			// Selector - jQuery selector string, array of nodes or jQuery object/
 			// As jQuery's .filter() allows jQuery objects to be passed in filter,
@@ -8031,6 +8071,11 @@
 			_fnDeleteIndex( settings.aiDisplay, row );
 			_fnDeleteIndex( that[ thatIdx ], row, false ); // maintain local indexes
 	
+			// For server-side processing tables - subtract the deleted row from the count
+			if ( settings._iRecordsDisplay > 0 ) {
+				settings._iRecordsDisplay--;
+			}
+	
 			// Check for an 'overflow' they case for displaying the table
 			_fnLengthOverflow( settings );
 	
@@ -8101,7 +8146,13 @@
 		}
 	
 		// Set
-		ctx[0].aoData[ this[0] ]._aData = data;
+		var row = ctx[0].aoData[ this[0] ];
+		row._aData = data;
+	
+		// If the DOM has an id, and the data source is an array
+		if ( $.isArray( data ) && row.nTr.id ) {
+			_fnSetObjectDataFn( ctx[0].rowId )( data, row.nTr.id );
+		}
 	
 		// Automatically invalidate
 		_fnInvalidate( ctx[0], this[0], 'data' );
@@ -8527,6 +8578,12 @@
 		_fnDrawHead( settings, settings.aoHeader );
 		_fnDrawHead( settings, settings.aoFooter );
 	
+		// Update colspan for no records display. Child rows and extensions will use their own
+		// listeners to do this - only need to update the empty table item here
+		if ( ! settings.aiDisplay.length ) {
+			$(settings.nTBody).find('td[colspan]').attr('colspan', _fnVisbleColumns(settings));
+		}
+	
 		_fnSaveState( settings );
 	};
 	
@@ -8692,7 +8749,10 @@
 			
 			// Selector - index
 			if ( $.isPlainObject( s ) ) {
-				return [s];
+				// Valid cell index and its in the array of selectable rows
+				return s.column !== undefined && s.row !== undefined && $.inArray( s.row, rows ) !== -1 ?
+					[s] :
+					[];
 			}
 	
 			// Selector - jQuery filtered cells
@@ -8755,12 +8815,19 @@
 			} );
 		}
 	
+		// The default built in options need to apply to row and columns
+		var internalOpts = opts ? {
+			page: opts.page,
+			order: opts.order,
+			search: opts.search
+		} : {};
+	
 		// Row + column selector
-		var columns = this.columns( columnSelector, opts );
-		var rows = this.rows( rowSelector, opts );
+		var columns = this.columns( columnSelector, internalOpts );
+		var rows = this.rows( rowSelector, internalOpts );
 		var a, i, ien, j, jen;
 	
-		var cells = this.iterator( 'table', function ( settings, idx ) {
+		this.iterator( 'table', function ( settings, idx ) {
 			a = [];
 	
 			for ( i=0, ien=rows[idx].length ; i<ien ; i++ ) {
@@ -8771,10 +8838,11 @@
 					} );
 				}
 			}
-	
-			return a;
 		}, 1 );
 	
+	    // Now pass through the cell selector for options
+	    var cells = this.cells( a, opts );
+	
 		$.extend( cells.selector, {
 			cols: columnSelector,
 			rows: rowSelector,
@@ -9402,7 +9470,7 @@
 	 *  @type string
 	 *  @default Version number
 	 */
-	DataTable.version = "1.10.16-dev";
+	DataTable.version = "1.10.20-dev";
 
 	/**
 	 * Private data store, containing all of the settings objects that are
@@ -12340,8 +12408,8 @@
 		 *          { "data": "engine" },
 		 *          { "data": "browser" },
 		 *          { "data": "platform.inner" },
-		 *          { "data": "platform.details.0" },
-		 *          { "data": "platform.details.1" }
+		 *          { "data": "details.0" },
+		 *          { "data": "details.1" }
 		 *        ]
 		 *      } );
 		 *    } );
@@ -14138,7 +14206,7 @@
 			 *    $.fn.dataTable.ext.type.detect.push(
 			 *      function ( data, settings ) {
 			 *        // Check the numeric part
-			 *        if ( ! $.isNumeric( data.substring(1) ) ) {
+			 *        if ( ! data.substring(1).match(/[0-9]/) ) {
 			 *          return null;
 			 *        }
 			 *
@@ -14721,7 +14789,8 @@
 	$.extend( _ext.type.order, {
 		// Dates
 		"date-pre": function ( d ) {
-			return Date.parse( d ) || -Infinity;
+			var ts = Date.parse( d );
+			return isNaN(ts) ? -Infinity : ts;
 		},
 	
 		// html
@@ -14912,7 +14981,8 @@
 	
 		text: function () {
 			return {
-				display: __htmlEscapeEntities
+				display: __htmlEscapeEntities,
+				filter: __htmlEscapeEntities
 			};
 		}
 	};
@@ -15037,6 +15107,7 @@
 		_fnRenderer: _fnRenderer,
 		_fnDataSource: _fnDataSource,
 		_fnRowAttributes: _fnRowAttributes,
+		_fnExtend: _fnExtend,
 		_fnCalculateEnd: function () {} // Used by a lot of plug-ins, but redundant
 		                                // in 1.10, so this dead-end function is
 		                                // added to prevent errors

data/{lib/daru/data_tables/css → vendor/assets/stylesheets}/jquery.dataTables.css

@@ -414,7 +414,7 @@ table.dataTable td {
 .dataTables_wrapper.no-footer .dataTables_scrollBody {
   border-bottom: 1px solid #111111;
 }
-.dataTables_wrapper.no-footer div.dataTables_scrollHead > table,
+.dataTables_wrapper.no-footer div.dataTables_scrollHead table.dataTable,
 .dataTables_wrapper.no-footer div.dataTables_scrollBody > table {
   border-bottom: none;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daru-data_tables
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.5
 platform: ruby
 authors:
 - shekharrajak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,27 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  name: daru
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -129,9 +115,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".CHANGELOG.md.swp"
 - ".gitignore"
 - ".rubocop.yml"
+- ".simplecov"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -139,20 +128,23 @@ files:
 - Rakefile
 - daru-data_tables.gemspec
 - lib/daru/data_tables.rb
-- lib/daru/data_tables/css/jquery.dataTables.css
+- lib/daru/data_tables/constants_data_table.rb
+- lib/daru/data_tables/core_ext/string.rb
 - lib/daru/data_tables/data_table.rb
 - lib/daru/data_tables/display/display.rb
 - lib/daru/data_tables/display/iruby_notebook.rb
 - lib/daru/data_tables/generate_js/generate_js.rb
 - lib/daru/data_tables/generate_js/param_helpers.rb
-- lib/daru/data_tables/js/jquery-latest.min.js
-- lib/daru/data_tables/js/jquery.dataTables.js
 - lib/daru/data_tables/templates/init.inline.css.erb
 - lib/daru/data_tables/templates/init.inline.js.erb
 - lib/daru/data_tables/templates/table_script.erb
+- lib/daru/data_tables/templates/thead.erb
 - lib/daru/data_tables/version.rb
 - lib/tasks/data_tables.rake
 - travis.yaml
+- vendor/assets/javascripts/jquery-latest.min.js
+- vendor/assets/javascripts/jquery.dataTables.js
+- vendor/assets/stylesheets/jquery.dataTables.css
 homepage: https://github.com/shekharrajak/data_tables
 licenses:
 - MIT