table_sortable 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e8a1f36657059ba97400dfb9ec3836e4cf7a4ef
-  data.tar.gz: c10b4f4d6a963473a08f7617a66698feeb645117
+  metadata.gz: ea868dab316c188a2e54ad685f06a17675b8cccd
+  data.tar.gz: c065b1ce4568a2db812ba5805685a8d1c5efe7d8
 SHA512:
-  metadata.gz: af22dcc3764e356a3d354996d721849169385866cd547a93451b8c93b2cccc5cca1c88382e7cafcdbb33a46eb4b4d00e65de3fbbc6452589b451d57098552aca
-  data.tar.gz: fbd1eca1c2db9e5f57ec2703b1cb7a980940f35ad492bd34dee56fd37373f844740cd023d4cad9c1cb4cf55253a2811a3f798eadaaf3736fc15a66932968a627
+  metadata.gz: 2d15f0e1053f207597d19bba44b49adb2cd758cbcb216ac5f461d7dd99dd34f4fe0bab78f2031baf0f933c85e4a2566fd07a8e1dc30e5fc0ba66066d04024132
+  data.tar.gz: 3000f22be7c289aa9b6e07f71a6538bddea58eb60f2a1b4ea5af0da1fa3013ba84616f09722d19d2e55a934c8795a4bb32387199c5d98ec94b76fe6834def5e9

data/.idea/table_sortable.iml

@@ -157,7 +157,6 @@
     <orderEntry type="library" scope="PROVIDED" name="erubi (v1.6.0, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="globalid (v0.4.0, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v0.8.1, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="kaminari (v0.17.0, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="loofah (v2.0.3, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mail (v2.6.5, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="method_source (v0.8.2, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />

data/lib/table_sortable/controller.rb

@@ -39,8 +39,8 @@ module TableSortable
     def filter_and_sort(scope)
       cols = @columns.sort_by(display_order)
 
-      page = params[:page]
-      page_size = params[:pagesize]
+      page = params[:page].to_i
+      page_size = params[:pagesize].to_i
       sort_by_col_data = params[SCOL] ? params[SCOL].keys.first : column_offset
       sort_order = params[SCOL] ? params[SCOL].values.first : SORT_ASC
 
@@ -60,8 +60,7 @@ module TableSortable
       end
       scope = filters.last.call(scope)
       if page
-        scope = Kaminari.paginate_array(scope)
-        scope = scope.page(page.to_i + 1).per(page_size)
+        scope = Result.new(scope, page, page_size)
       end
       scope
     end

data/lib/table_sortable/result.rb

@@ -0,0 +1,12 @@
+module TableSortable
+  class Result < Array
+
+    attr_reader :total_count
+
+    def initialize(the_array, page, page_size)
+      @total_count = the_array.length
+      super(the_array[(page)*page_size, page_size])
+    end
+
+  end
+end

data/lib/table_sortable/version.rb

@@ -1,3 +1,3 @@
 module TableSortable
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/lib/table_sortable.rb

@@ -1,8 +1,6 @@
 require 'rails/engine'
 require 'active_support/concern'
 require 'action_controller'
-require 'kaminari'
-require 'kaminari/models/array_extension'
 
 module TableSortable
 
@@ -22,6 +20,7 @@ require 'table_sortable/concerns/proc'
 require 'table_sortable/column/sorter'
 require 'table_sortable/column/filter'
 require 'table_sortable/column'
+require 'table_sortable/result'
 require 'table_sortable/columns'
 require 'table_sortable/version'
 require 'table_sortable/controller'

data/table_sortable.gemspec

@@ -32,6 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.4"
-  spec.add_dependency "kaminari", '~> 0.17.0'
   spec.add_dependency "rails", '~> 5.1', '>= 5.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_sortable
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Oded Davidov
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +110,7 @@ files:
 - lib/table_sortable/columns.rb
 - lib/table_sortable/concerns/proc.rb
 - lib/table_sortable/controller.rb
+- lib/table_sortable/result.rb
 - lib/table_sortable/version.rb
 - spec/concerns/proc_class_spec.rb
 - spec/controllers/test_controller_spec.rb