trk_datatables 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25c48f4088f3f708eaa1dc7d464e0daaad342e57cdeca53c2d1a6b53cf317e6e
-  data.tar.gz: 3ab420703241cd84845e88890027840a48c70f203363e2799322837963d47e73
+  metadata.gz: 6bbcc94c87611e1aaa08588c6599df2c691192850905da3b981a69d908ffb981
+  data.tar.gz: ac998b4e62500caf9be81419909a8c1d530f64c7737330c0fd4de22a40a082df
 SHA512:
-  metadata.gz: 7244afc3f897a92c6ea63b5b21721398a70ba5882a19a5296e79396c87df287fc9d257aa5a6a1efe99162ae31f673c5bb1400d4aa457236e8068ad6aac2b6aa1
-  data.tar.gz: 4a9dd2fc25a1ad1be8f2ccab02409a7f0c00f38ba4dffe8d25eb0ebce308c29190e6043e955e352f17d12f4b432061a8baa763b53b1c8e6b4f8b9082d1c613d8
+  metadata.gz: 2adca44aac667b274f31b374f2914a9499f2c37294ef3d308ac45fd0fd0da26e0545093d62c508d42b5c78638e181e10b1c1f3b252396c0ca8a5a952a54dd509
+  data.tar.gz: c1b6ab154c81408296714795d68521135da81bb0ca5226b9407c600f824cc566333f1f022cbd088d71629be94d83494ab2c94d41d71c178a2034e94b697288fd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trk_datatables (0.2.7)
+    trk_datatables (0.2.8)
       activesupport
 
 GEM
@@ -30,6 +30,7 @@ GEM
     rake (10.5.0)
     sqlite3 (1.4.1)
     thread_safe (0.3.6)
+    timecop (0.9.4)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     zeitwerk (2.1.10)
@@ -47,6 +48,7 @@ DEPENDENCIES
   pg
   rake (~> 10.0)
   sqlite3
+  timecop
   trk_datatables!
 
 BUNDLED WITH

data/lib/trk_datatables/base.rb

@@ -7,7 +7,7 @@ module TrkDatatables
   class Error < StandardError
   end
 
-  class Base
+  class Base # rubocop:todo Metrics/ClassLength
     extend TrkDatatables::BaseHelpers
 
     attr_accessor :column_key_options
@@ -97,8 +97,6 @@ module TrkDatatables
       raise 'order_and_paginate_items_is_defined_in_specific_orm'
     end
 
-    # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
-
     # Returns dt_orders or default as array of index and direction
     # https://datatables.net/reference/option/order
     # @return
@@ -114,12 +112,11 @@ module TrkDatatables
         @dt_orders_or_default = @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) }
+        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
       end
       @dt_orders_or_default
     end
-    # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
 
     def default_order
       [[0, :desc]].freeze
@@ -226,7 +223,7 @@ module TrkDatatables
       }
     end
 
-    def predefined_date_ranges
+    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],
@@ -236,12 +233,13 @@ module TrkDatatables
       }
     end
 
-    def predefined_datetime_ranges
+    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': Time.zone.today.prev_month.beginning_of_month.beginning_of_day...Time.zone.today.prev_month.end_of_month.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,
       }.transform_values do |range|
         # datepicker expects format 2020-11-29 11:59:59

data/lib/trk_datatables/version.rb

@@ -1,3 +1,3 @@
 module TrkDatatables
-  VERSION = '0.2.7'.freeze
+  VERSION = '0.2.8'.freeze
 end

data/trk_datatables.gemspec

@@ -46,6 +46,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'minitest-color'
+  spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'pg'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'sqlite3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trk_datatables
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Dusan Orlovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement