trk_datatables 0.2.15 → 0.2.18

data/gemfiles/rails_7_1.gemfile.lock

@@ -0,0 +1,291 @@
+PATH
+  remote: ..
+  specs:
+    trk_datatables (0.2.17)
+      activesupport
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (7.1.6)
+      actionpack (= 7.1.6)
+      activesupport (= 7.1.6)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.6)
+      actionpack (= 7.1.6)
+      activejob (= 7.1.6)
+      activerecord (= 7.1.6)
+      activestorage (= 7.1.6)
+      activesupport (= 7.1.6)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.6)
+      actionpack (= 7.1.6)
+      actionview (= 7.1.6)
+      activejob (= 7.1.6)
+      activesupport (= 7.1.6)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.6)
+      actionview (= 7.1.6)
+      activesupport (= 7.1.6)
+      cgi
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.6)
+      actionpack (= 7.1.6)
+      activerecord (= 7.1.6)
+      activestorage (= 7.1.6)
+      activesupport (= 7.1.6)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.1.6)
+      activesupport (= 7.1.6)
+      builder (~> 3.1)
+      cgi
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.6)
+      activesupport (= 7.1.6)
+      globalid (>= 0.3.6)
+    activemodel (7.1.6)
+      activesupport (= 7.1.6)
+    activerecord (7.1.6)
+      activemodel (= 7.1.6)
+      activesupport (= 7.1.6)
+      timeout (>= 0.4.0)
+    activestorage (7.1.6)
+      actionpack (= 7.1.6)
+      activejob (= 7.1.6)
+      activerecord (= 7.1.6)
+      activesupport (= 7.1.6)
+      marcel (~> 1.0)
+    activesupport (7.1.6)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.1.2)
+    builder (3.3.0)
+    byebug (11.1.3)
+    cgi (0.5.2)
+    concurrent-ruby (1.3.7)
+    connection_pool (2.5.5)
+    crass (1.0.7)
+    database_cleaner (2.1.0)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.2.2)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0)
+    database_cleaner-core (2.1.0)
+    date (3.5.1)
+    drb (2.2.3)
+    erb (4.0.4.1)
+      cgi (>= 0.3.3)
+    erubi (1.13.1)
+    globalid (1.4.0)
+      activesupport (>= 6.1)
+    i18n (1.14.8)
+      concurrent-ruby (~> 1.0)
+    io-console (0.8.2)
+    irb (1.18.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.20.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    loofah (2.25.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.9.0)
+      logger
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.2.1)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.9)
+    minitest (5.26.1)
+    minitest-color (0.0.2)
+      minitest (~> 5)
+    mutex_m (0.3.0)
+    net-imap (0.4.24)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.1)
+      net-protocol
+    nio4r (2.7.5)
+    nokogiri (1.17.2)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    nokogiri (1.17.2-arm64-darwin)
+      racc (~> 1.4)
+    parallel (1.28.0)
+    parser (3.3.11.1)
+      ast (~> 2.4.1)
+      racc
+    pg (1.6.3-arm64-darwin)
+    pp (0.6.4)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.9.0)
+    psych (5.4.0)
+      date
+      stringio
+    racc (1.8.1)
+    rack (3.2.6)
+    rack-session (2.1.2)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rackup (2.3.1)
+      rack (>= 3)
+    rails (7.1.6)
+      actioncable (= 7.1.6)
+      actionmailbox (= 7.1.6)
+      actionmailer (= 7.1.6)
+      actionpack (= 7.1.6)
+      actiontext (= 7.1.6)
+      actionview (= 7.1.6)
+      activejob (= 7.1.6)
+      activemodel (= 7.1.6)
+      activerecord (= 7.1.6)
+      activestorage (= 7.1.6)
+      activesupport (= 7.1.6)
+      bundler (>= 1.15.0)
+      railties (= 7.1.6)
+    rails-dom-testing (2.3.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (7.1.6)
+      actionpack (= 7.1.6)
+      activesupport (= 7.1.6)
+      cgi
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
+      zeitwerk (~> 2.6)
+    rainbow (3.1.1)
+    rake (13.4.2)
+    rdoc (7.2.0)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    regexp_parser (2.12.0)
+    reline (0.6.3)
+      io-console (~> 0.5)
+    rubocop (1.87.0)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (>= 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    rubocop-performance (1.26.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
+    ruby-progressbar (1.13.0)
+    securerandom (0.3.2)
+    sqlite3 (2.0.4)
+      mini_portile2 (~> 2.8.0)
+    sqlite3 (2.0.4-arm64-darwin)
+    standard (1.55.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.87.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.8)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.9.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.26.0)
+    stringio (3.2.0)
+    thor (1.5.0)
+    timecop (0.9.11)
+    timeout (0.6.1)
+    tsort (0.2.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    websocket-driver (0.8.2)
+      base64
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.18)
+
+PLATFORMS
+  arm64-darwin-24
+
+DEPENDENCIES
+  activerecord (>= 5.0)
+  appraisal
+  bundler (~> 2.0)
+  byebug
+  database_cleaner
+  minitest (~> 5.0)
+  minitest-color
+  pg
+  rails (~> 7.1.0)
+  rake (>= 10.0)
+  sqlite3 (>= 2.0.0)
+  standard
+  timecop
+  trk_datatables!
+
+BUNDLED WITH
+   2.7.2

data/lib/generators/templates/trk_datatable.rb

@@ -3,7 +3,7 @@ class <%= @trk_class_name %> < TrkDatatables::ActiveRecord
     {
 <% @skip_model || class_name.constantize.columns.each do |column| -%>
 <% next if %w[created_at updated_at].include? column.name -%>
-      '<%= table_name %>.<%= column.name %>': {},
+      "<%= table_name %>.<%= column.name %>": {},
 <% end -%>
     }
   end
@@ -19,7 +19,7 @@ class <%= @trk_class_name %> < TrkDatatables::ActiveRecord
       [
 <% @skip_model || class_name.constantize.columns.each do |column| -%>
 <% next if %w[created_at updated_at].include? column.name -%>
-<% if column.name == 'id' -%>
+<% if column.name == "id" -%>
         @view.link_to(<%= singular_table_name %>.id, <%= singular_table_name %>),
 <% else -%>
         <%= singular_table_name %>.<%= column.name %>,

data/lib/generators/trk_datatables/trk_datatables_generator.rb

@@ -2,10 +2,10 @@ module TrkDatatables
   module Generators
     class TrkDatatablesGenerator < Rails::Generators::NamedBase
       # we can call with `rails g trk_datatables` instead of: `rails g trk_datatables:trk_datatables`
-      namespace 'trk_datatables'
-      source_root File.expand_path('../templates', __dir__)
+      namespace "trk_datatables"
+      source_root File.expand_path("../templates", __dir__)
 
-      desc 'Generates datatables file for a give NAME'
+      desc "Generates datatables file for a give NAME"
       def create
         begin
           class_name.constantize
@@ -18,7 +18,7 @@ module TrkDatatables
           @trk_file_name = "#{singular_name}_datatable"
         end
 
-        template 'trk_datatable.rb', "app/datatables/#{@trk_file_name}.rb"
+        template "trk_datatable.rb", "app/datatables/#{@trk_file_name}.rb"
 
         say <<~TEXT
           ======================================================================

data/lib/trk_datatables/active_record.rb

@@ -6,7 +6,7 @@ module TrkDatatables
     # Global search. All columns are typecasted to string. Search string is
     # splited by space and "and"-ed.
     def filter_by_search_all(filtered)
-      conditions = @dt_params.search_all.split(' ').first(MAX_NUMBER_OF_STRINGS).map do |search_string|
+      conditions = @dt_params.search_all.split(" ").first(MAX_NUMBER_OF_STRINGS).map do |search_string|
         @column_key_options.searchable_and_global_search.map do |column_key_option|
           _filter_column_as_string column_key_option, search_string
         end.reduce(:or) # any searchable column is 'or'-ed
@@ -38,8 +38,8 @@ module TrkDatatables
         filter_column_as_in(column_key_option, search_value)
       elsif %i[boolean].include?(column_key_option[:column_type_in_db])
         filter_column_as_boolean(column_key_option, search_value)
-      elsif %i[date datetime integer float].include?(column_key_option[:column_type_in_db]) && \
-            search_value.include?(BETWEEN_SEPARATOR)
+      elsif %i[date datetime integer float].include?(column_key_option[:column_type_in_db]) &&
+          search_value.include?(BETWEEN_SEPARATOR)
         from, to = search_value.split BETWEEN_SEPARATOR
         filter_column_as_between(column_key_option, from, to)
       else
@@ -48,9 +48,9 @@ module TrkDatatables
     end
 
     def _filter_column_as_string(column_key_option, search_value)
-      search_value.split(' ').first(MAX_NUMBER_OF_STRINGS).map do |search_string|
+      search_value.split(" ").first(MAX_NUMBER_OF_STRINGS).map do |search_string|
         casted_column = ::Arel::Nodes::NamedFunction.new(
-          'CAST',
+          "CAST",
           [_arel_column(column_key_option).as(@column_key_options.string_cast)]
         )
         casted_column.matches("%#{search_string}%")
@@ -59,9 +59,9 @@ module TrkDatatables
 
     def filter_column_as_boolean(column_key_option, search_value)
       # return true relation in case we ignore
-      return Arel::Nodes::SqlLiteral.new('1').eq(1) if search_value == 'any'
+      return Arel::Nodes::SqlLiteral.new("1").eq(1) if search_value == "any"
 
-      _arel_column(column_key_option).eq(search_value == 'true')
+      _arel_column(column_key_option).eq(search_value == "true")
     end
 
     def filter_column_as_between(column_key_option, from, to)
@@ -83,13 +83,15 @@ module TrkDatatables
 
     def _parse_from_to(from, to, column_key_option)
       case column_key_option[:column_type_in_db]
-      when :integer, :float
-        # we do not need to cast from string since range will do automatically
-        parsed_from = from
-        parsed_to = to
+      when :integer
+        parsed_from = _parse_integer(from)
+        parsed_to = _parse_integer(to)
+      when :float
+        parsed_from = _parse_float(from)
+        parsed_to = _parse_float(to)
       when :date
-        parsed_from = _parse_in_zone(from).to_date
-        parsed_to = _parse_in_zone(to).to_date
+        parsed_from = _parse_in_zone(from)&.to_date
+        parsed_to = _parse_in_zone(to)&.to_date&.end_of_day
       when :datetime
         parsed_from = _parse_in_zone(from)
         parsed_to = _parse_in_zone(to)
@@ -101,6 +103,22 @@ module TrkDatatables
       [parsed_from, parsed_to]
     end
 
+    def _parse_integer(value)
+      return nil if value.blank?
+
+      Integer(value)
+    rescue ArgumentError
+      nil
+    end
+
+    def _parse_float(value)
+      return nil if value.blank?
+
+      Float(value)
+    rescue ArgumentError
+      nil
+    end
+
     def _parse_in_zone(time)
       return nil if time.blank?
 
@@ -112,8 +130,7 @@ module TrkDatatables
 
     def order_and_paginate_items(filtered)
       filtered = order_items filtered
-      filtered = filtered.offset(@dt_params.dt_offset).limit(dt_per_page_or_default)
-      filtered
+      filtered.offset(@dt_params.dt_offset).limit(dt_per_page_or_default)
     end
 
     def order_items(filtered)
@@ -122,12 +139,12 @@ module TrkDatatables
         next if column_key_option[:column_options][ColumnKeyOptions::ORDER_OPTION] == false
 
         queries << if column_key_option[:table_class] < TrkDatatables::CalculatedInDb
-                     "#{send(column_key_option[:column_key])} #{direction}"
-                   else
-                     "#{column_key_option[:column_key]} #{direction}"
-                   end
+          "#{send(column_key_option[:column_key])} #{direction}"
+        else
+          "#{column_key_option[:column_key]} #{direction}"
+        end
       end
-      filtered.order(Arel.sql(order_by.join(', ')))
+      filtered.order(Arel.sql(order_by.join(", ")))
     end
 
     def _arel_column(column_key_option)

data/lib/trk_datatables/base.rb

@@ -1,8 +1,10 @@
 module TrkDatatables
   # TODO: extract those to configuration options
-  BETWEEN_SEPARATOR = ' - '.freeze
-  MULTIPLE_OPTION_SEPARATOR = '|'.freeze
+  BETWEEN_SEPARATOR = " - ".freeze
+  MULTIPLE_OPTION_SEPARATOR = "|".freeze
   # maximum page length = 100 (we should not believe params)
+  ORDER = "order".freeze
+  PER_PAGE = "per_page".freeze
 
   class Error < StandardError
   end
@@ -85,16 +87,16 @@ module TrkDatatables
     end
 
     def filter_by_search_all(_all)
-      raise 'filter_by_columns_is_defined_in_specific_orm'
+      raise "filter_by_columns_is_defined_in_specific_orm"
     end
 
     def filter_by_columns(_all)
-      raise 'filter_by_columns_is_defined_in_specific_orm' \
+      raise "filter_by_columns_is_defined_in_specific_orm" \
         "\n  Extent from TrkDatatables::ActiveRecord instead of TrkDatatables::Base"
     end
 
     def order_and_paginate_items(_filtered_items)
-      raise 'order_and_paginate_items_is_defined_in_specific_orm'
+      raise "order_and_paginate_items_is_defined_in_specific_orm"
     end
 
     # Returns dt_orders or default as array of index and direction
@@ -110,10 +112,12 @@ module TrkDatatables
         @dt_orders_or_default = []
       elsif @dt_params.dt_orders.present?
         @dt_orders_or_default = @dt_params.dt_orders
-        @preferences.set :order, @dt_params.dt_orders
+        @preferences.set ORDER, @dt_params.dt_orders
       else
-        check_value = ->(r) { r.is_a?(Array) && r[0].is_a?(Array) && r[0][0].is_a?(Integer) && r[0][0] < @column_key_options.size }
-        @dt_orders_or_default = @preferences.get(:order, check_value) || default_order
+        check_value = lambda { |r|
+          r.is_a?(Array) && r[0].is_a?(Array) && r[0][0].is_a?(Integer) && r[0][0] < @column_key_options.size
+        }
+        @dt_orders_or_default = @preferences.get(ORDER, check_value) || default_order
       end
       @dt_orders_or_default
     end
@@ -129,12 +133,12 @@ module TrkDatatables
     def dt_per_page_or_default
       return @dt_per_page_or_default if defined? @dt_per_page_or_default
 
-      @dt_per_page_or_default = \
+      @dt_per_page_or_default =
         if @dt_params.dt_per_page.present?
-          @preferences.set :per_page, @dt_params.dt_per_page
+          @preferences.set PER_PAGE, @dt_params.dt_per_page
           @dt_params.dt_per_page
         else
-          @preferences.get(:per_page) || default_page_length
+          @preferences.get(PER_PAGE) || default_page_length
         end
     end
 
@@ -216,31 +220,31 @@ module TrkDatatables
     end
 
     def predefined_ranges
-      Time.zone ||= 'UTC'
+      Time.zone ||= "UTC"
       {
         date: predefined_date_ranges,
-        datetime: predefined_datetime_ranges,
+        datetime: predefined_datetime_ranges
       }
     end
 
     def predefined_date_ranges # rubocop:todo Metrics/AbcSize
       {
-        'Today': Time.zone.today..Time.zone.today,
-        'Yesterday': [Time.zone.today - 1.day, Time.zone.today - 1.day],
-        'This Month': Time.zone.today.beginning_of_month...Time.zone.today,
-        'Last Month': Time.zone.today.prev_month.beginning_of_month...Time.zone.today.prev_month.end_of_month,
-        'This Year': Time.zone.today.beginning_of_year...Time.zone.today,
+        Today: Time.zone.today..Time.zone.today,
+        Yesterday: [Time.zone.today - 1.day, Time.zone.today - 1.day],
+        "This Month": Time.zone.today.beginning_of_month...Time.zone.today,
+        "Last Month": Time.zone.today.prev_month.beginning_of_month...Time.zone.today.prev_month.end_of_month,
+        "This Year": Time.zone.today.beginning_of_year...Time.zone.today
       }
     end
 
     def predefined_datetime_ranges # rubocop:todo Metrics/AbcSize
       {
-        'Today': Time.zone.now.beginning_of_day..Time.zone.now.end_of_day,
-        'Yesterday': [Time.zone.now.beginning_of_day - 1.day, Time.zone.now.end_of_day - 1.day],
-        'This Month': Time.zone.today.beginning_of_month.beginning_of_day...Time.zone.now.end_of_day,
-        'Last Month':
+        Today: Time.zone.now.beginning_of_day..Time.zone.now.end_of_day,
+        Yesterday: [Time.zone.now.beginning_of_day - 1.day, Time.zone.now.end_of_day - 1.day],
+        "This Month": Time.zone.today.beginning_of_month.beginning_of_day...Time.zone.now.end_of_day,
+        "Last Month":
           Time.zone.today.prev_month.beginning_of_month.beginning_of_day...Time.zone.today.prev_month.end_of_month.end_of_day,
-        'This Year': Time.zone.today.beginning_of_year.beginning_of_day...Time.zone.today.end_of_day,
+        "This Year": Time.zone.today.beginning_of_year.beginning_of_day...Time.zone.today.end_of_day
       }
     end
   end