trk_datatables 0.2.16 → 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/trk_datatables/active_record.rb

@@ -83,10 +83,12 @@ 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&.end_of_day
@@ -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?
 

data/lib/trk_datatables/base.rb

@@ -3,6 +3,8 @@ module TrkDatatables
   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
@@ -110,12 +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 = 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
+        @dt_orders_or_default = @preferences.get(ORDER, check_value) || default_order
       end
       @dt_orders_or_default
     end
@@ -133,10 +135,10 @@ module TrkDatatables
 
       @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
 

data/lib/trk_datatables/preferences.rb

@@ -13,7 +13,8 @@ module TrkDatatables
     def get(key, check_value = nil)
       return unless @holder
 
-      result = @holder.send(@field).dig KEY_IN_PREFERENCES, @class_name, key
+      values = @holder.send(@field).dig KEY_IN_PREFERENCES, @class_name
+      result = values&.fetch(key, nil) || values&.fetch(key.to_s, nil)
       return result if check_value.nil?
       result if check_value.call result
     end
@@ -21,10 +22,25 @@ module TrkDatatables
     def set(key, value)
       return unless @holder
 
-      h = {KEY_IN_PREFERENCES => {@class_name => {key => value}}}
+      h = {KEY_IN_PREFERENCES => {@class_name => {key.to_s => _value_for_serialization(value)}}}
       @holder.send(:"#{@field}=", {}) if @holder.send(@field).nil?
       @holder.send(@field).deep_merge! h
       @holder.save!
     end
+
+    private
+
+    def _value_for_serialization(value)
+      case value
+      when Array
+        value.map { |v| _value_for_serialization v }
+      when Hash
+        value.transform_values { |v| _value_for_serialization v }
+      when Symbol
+        value.to_s
+      else
+        value
+      end
+    end
   end
 end

data/lib/trk_datatables/version.rb

@@ -1,3 +1,3 @@
 module TrkDatatables
-  VERSION = "0.2.16".freeze
+  VERSION = "0.2.18".freeze
 end

data/lib/trk_datatables.rb

@@ -1,5 +1,6 @@
 require "trk_datatables/version"
 # libs
+require "active_support"
 require "active_support/core_ext/hash/indifferent_access"
 require "active_support/core_ext/hash/keys"
 require "active_support/core_ext/string/inflections"

data/trk_datatables.gemspec

@@ -39,15 +39,16 @@ Gem::Specification.new do |spec|
   # for HashWithIndifferentAccess
   spec.add_dependency "activesupport"
 
-  spec.add_development_dependency "activerecord", "~> 6.0"
+  spec.add_development_dependency "activerecord", ">= 5.0"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "minitest-color"
   spec.add_development_dependency "pg"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "rake", ">= 10.0"
+  spec.add_development_dependency "sqlite3", ">= 1.4"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "standard"
+  spec.add_development_dependency "appraisal"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: trk_datatables
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.18
 platform: ruby
 authors:
 - Dusan Orlovic
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +27,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +125,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -142,14 +141,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +177,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Html render first page, sort and filter...
 email:
 - duleorlovic@gmail.com
@@ -188,6 +201,7 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -197,6 +211,15 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/.bundle/config
+- gemfiles/rails_5.gemfile
+- gemfiles/rails_5.gemfile.lock
+- gemfiles/rails_6.gemfile
+- gemfiles/rails_6.gemfile.lock
+- gemfiles/rails_7.gemfile
+- gemfiles/rails_7.gemfile.lock
+- gemfiles/rails_7_1.gemfile
+- gemfiles/rails_7_1.gemfile.lock
 - lib/generators/templates/trk_datatable.rb
 - lib/generators/trk_datatables/trk_datatables_generator.rb
 - lib/trk_datatables.rb
@@ -220,7 +243,6 @@ metadata:
   source_code_uri: https://github.com/trkin/trk_datatables
   changelog_uri: https://github.com/trkin/trk_datatables/blob/master/CHANGELOG.md
   yard.run: yri
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -235,8 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Gem that simplify using datatables with Ruby on Rails and Sinatra.
 test_files: []