trk_datatables 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e78f6b6116b69f62786d4c055b7ba4d13ea30e47c268d3de230e2bac8b9b2f
-  data.tar.gz: ec35ef831ff82b46b10b88d8f37415317db17966912ee2aae01870f6dd9db3d9
+  metadata.gz: 95eab28b1bdbf4d767426c505a93b5ad1b3e5c942fd0a0ea58d6b76254e28c04
+  data.tar.gz: d0d1a7a4c9539c3793eb840d61038a8cdd11de692c372a059d019eb4bffb5272
 SHA512:
-  metadata.gz: bdea7f9b9fe10cd4a61f43206756e129dc8fdb8ea9f53b7d5716933c9930909a69e4a100f23812975da067bfc734937d4423b661d548afc35b6647792ba4726a
-  data.tar.gz: 35bc6e872063f0a694b8b25f7b9c8dc4400141439eed414a18ab5740774c6ce2e8c4172265441a1fc37740085c5152cd102d479e557120c25c89397355f2846b
+  metadata.gz: 0b1f740d08b2e605acea3d067cbc968320c9549492541cf972abb51725b8a1a1bdbe04873f29a9cd2b35e25b1dbcc803b6ac132b5cdbe6c63106a6f24ce0517e
+  data.tar.gz: 2ab53d33c2283b5e463fca07e5cbcb0ae29afd42ea994c5892b6f8714d766823849b1342c7de456b98343b4ecacce6e3c71c685f4eba9ec548c13e3f868fd7bf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trk_datatables (0.1.9)
+    trk_datatables (0.1.10)
       activesupport
 
 GEM

data/README.md

@@ -91,7 +91,7 @@ class PostsController < ApplicationController
   end
 
   def search
-    render json: PostsDatatable.new(view_context).as_json
+    render json: PostsDatatable.new(view_context)
   end
 end
 ```
@@ -103,7 +103,7 @@ In controller add a route to `:search`
 Rails.application.routes.draw do
   resources :posts do
     colletion do
-      get :search
+      post :search
     end
   end
 end
@@ -177,7 +177,8 @@ class PostsDatatable < TrkDatatables::ActiveRecord
 end
 ```
 
-To enable shortcuts for selecting ranges, you can override predefined ranges
+To enable shortcuts for selecting ranges, you can override predefined ranges and
+enable for all `date` and `datetime` column
 
 ```
 # app/datatables/base_trk_datatable.rb
@@ -188,15 +189,10 @@ class BaseTrkDatable < TrkDatatables::ActiveRecord
   end
 end
 ```
-or you can override for specific datatable
+or you can enable for all `date` and `datetime columns` for specific datatable
+by defining `predefined_ranges` on that datatable. You can disable for specific columns also
 ```
 class PostsDatatable < TrkDatatables::ActiveRecord
-  def columns
-    {
-      'posts.created_at': { predefined_ranges: true },
-    }
-  end
-
   def predefined_ranges
     {
       'Today': Time.zone.now.beginning_of_day..Time.zone.now.end_of_day,
@@ -206,6 +202,12 @@ class PostsDatatable < TrkDatatables::ActiveRecord
       'This Year': Time.zone.today.beginning_of_year...Time.zone.today.end_of_day,
     }
   end
+
+  def columns
+    {
+      'posts.created_at': {}, # this column will have predefined_ranges
+      'posts.published_date': { predefined_ranges: false }
+  end
 end
 ```
 or you can define for specific column

data/lib/trk_datatables/base.rb

@@ -16,7 +16,7 @@ module TrkDatatables
       @view = view
       @dt_params = DtParams.new view.params
       @column_key_options = ColumnKeyOptions.new columns, global_search_columns, predefined_ranges
-      @preferences = Preferences.new preferences_holder, preferences_field
+      @preferences = Preferences.new preferences_holder, preferences_field, self.class.name
 
       # if @dt_params.dt_columns.size != @column_key_options.size
       #   raise Error, "dt_columns size of columns is #{@dt_params.dt_columns.size} \

data/lib/trk_datatables/column_key_options.rb

@@ -111,20 +111,26 @@ module TrkDatatables
 
     # This is helper
     def _determine_string_type_cast # :nodoc:
-      raise NotImplementedError unless defined?(::ActiveRecord::Base)
-
-      DB_ADAPTER_STRING_TYPE_CAST[::ActiveRecord::Base.connection_config[:adapter].to_sym]
+      if defined?(::ActiveRecord::Base)
+        DB_ADAPTER_STRING_TYPE_CAST[::ActiveRecord::Base.connection_config[:adapter].to_sym]
+      else
+        'not_used'
+      end
     end
 
     # @return
     #   :string, :integer, :date, :datetime
     def _determine_db_type_for_column(table_class, column_name)
-      raise NotImplementedError unless defined?(::ActiveRecord::Base)
-
-      ar_column = table_class.columns_hash[column_name]
-      raise Error, "Can't find column #{column_name} in #{table_class.name}" unless ar_column
-
-      ar_column.type
+      if defined?(::ActiveRecord::Base)
+        ar_column = table_class.columns_hash[column_name]
+        raise Error, "Can't find column #{column_name} in #{table_class.name}" unless ar_column
+
+        ar_column.type
+      elsif defined?(::Neo4j::ActiveNode)
+        (table_class.declared_properties[column_name][:type] || String).name.downcase
+      else
+        raise NotImplementedError, 'I work only with ActiveRecord and Neo4j'
+      end
     end
 
     def searchable
@@ -166,7 +172,8 @@ module TrkDatatables
       res['data-orderable'] = false if column_options[ORDER_OPTION] == false
       if %i[date datetime].include? column_type_in_db
         res['data-datatable-range'] = column_type_in_db == :datetime ? :datetime : true
-        if column_options[PREDEFINED_RANGES].present? || @predefined_ranges.present?
+        if column_options[PREDEFINED_RANGES].present? ||
+            (@predefined_ranges.present? && column_options[PREDEFINED_RANGES] != false)
           res['data-datatable-predefined-ranges'] = if column_options[PREDEFINED_RANGES].is_a? Hash
                                                       column_options[PREDEFINED_RANGES]
                                                     else

data/lib/trk_datatables/dt_params.rb

@@ -9,6 +9,7 @@ module TrkDatatables
   # https://github.com/cloudflarearchive/backgrid (archived)
   class DtParams
     def initialize(params)
+      params.permit! if params.respond_to? :permit!
       @params = ActiveSupport::HashWithIndifferentAccess.new params
     end
 

data/lib/trk_datatables/neo4j.rb

@@ -0,0 +1,21 @@
+module TrkDatatables
+  class Neo4j < Base
+    def filter_by_search_all(filtered)
+      filtered
+    end
+
+    def filter_by_columns(all)
+      all
+    end
+
+    def order_and_paginate_items(filtered)
+      filtered = order_items filtered
+      filtered = filtered.offset(@dt_params.dt_offset).limit(dt_per_page_or_default)
+      filtered
+    end
+
+    def order_items(filtered)
+      filtered
+    end
+  end
+end

data/lib/trk_datatables/preferences.rb

@@ -1,8 +1,9 @@
 module TrkDatatables
   class Preferences
-    def initialize(holder, field)
+    def initialize(holder, field, class_name)
       @holder = holder
       @field = field
+      @class_name = class_name
     end
 
     # Get the key from holder
@@ -11,7 +12,7 @@ module TrkDatatables
     def get(key, check_value = nil)
       return unless @holder
 
-      result = @holder.send(@field).dig :dt_preferences, self.class.name, key
+      result = @holder.send(@field).dig :dt_preferences, @class_name, key
       return result if check_value.nil?
       return result if check_value.call result
     end
@@ -19,7 +20,7 @@ module TrkDatatables
     def set(key, value)
       return unless @holder
 
-      h = { dt_preferences: { self.class.name => { key => value } } }
+      h = { dt_preferences: { @class_name => { key => value } } }
       @holder.send("#{@field}=", {}) if @holder.send(@field).nil?
       @holder.send(@field).deep_merge! h
       @holder.save!

data/lib/trk_datatables/version.rb

@@ -1,3 +1,3 @@
 module TrkDatatables
-  VERSION = '0.1.9'.freeze
+  VERSION = '0.1.10'.freeze
 end

data/lib/trk_datatables.rb

@@ -4,6 +4,7 @@ require 'trk_datatables/preferences.rb'
 
 require 'trk_datatables/base'
 require 'trk_datatables/active_record'
+require 'trk_datatables/neo4j'
 require 'trk_datatables/dt_params'
 require 'trk_datatables/column_key_options.rb'
 require 'trk_datatables/render_html.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trk_datatables
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Dusan Orlovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -173,6 +173,7 @@ files:
 - lib/trk_datatables/base.rb
 - lib/trk_datatables/column_key_options.rb
 - lib/trk_datatables/dt_params.rb
+- lib/trk_datatables/neo4j.rb
 - lib/trk_datatables/preferences.rb
 - lib/trk_datatables/render_html.rb
 - lib/trk_datatables/version.rb
@@ -202,7 +203,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Gem that simplify using datatables with Ruby on Rails and Sinatra.