table_sortable 0.1.6 → 0.1.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.idea/table_sortable.iml +0 -1
- data/lib/table_sortable/controller.rb +3 -4
- data/lib/table_sortable/result.rb +12 -0
- data/lib/table_sortable/version.rb +1 -1
- data/lib/table_sortable.rb +1 -2
- data/table_sortable.gemspec +0 -1
- metadata +2 -15
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ea868dab316c188a2e54ad685f06a17675b8cccd
|
4
|
+
data.tar.gz: c065b1ce4568a2db812ba5805685a8d1c5efe7d8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2d15f0e1053f207597d19bba44b49adb2cd758cbcb216ac5f461d7dd99dd34f4fe0bab78f2031baf0f933c85e4a2566fd07a8e1dc30e5fc0ba66066d04024132
|
7
|
+
data.tar.gz: 3000f22be7c289aa9b6e07f71a6538bddea58eb60f2a1b4ea5af0da1fa3013ba84616f09722d19d2e55a934c8795a4bb32387199c5d98ec94b76fe6834def5e9
|
data/.idea/table_sortable.iml
CHANGED
@@ -157,7 +157,6 @@
|
|
157
157
|
<orderEntry type="library" scope="PROVIDED" name="erubi (v1.6.0, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
|
158
158
|
<orderEntry type="library" scope="PROVIDED" name="globalid (v0.4.0, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
|
159
159
|
<orderEntry type="library" scope="PROVIDED" name="i18n (v0.8.1, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
|
160
|
-
<orderEntry type="library" scope="PROVIDED" name="kaminari (v0.17.0, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
|
161
160
|
<orderEntry type="library" scope="PROVIDED" name="loofah (v2.0.3, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
|
162
161
|
<orderEntry type="library" scope="PROVIDED" name="mail (v2.6.5, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
|
163
162
|
<orderEntry type="library" scope="PROVIDED" name="method_source (v0.8.2, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
|
@@ -39,8 +39,8 @@ module TableSortable
|
|
39
39
|
def filter_and_sort(scope)
|
40
40
|
cols = @columns.sort_by(display_order)
|
41
41
|
|
42
|
-
page = params[:page]
|
43
|
-
page_size = params[:pagesize]
|
42
|
+
page = params[:page].to_i
|
43
|
+
page_size = params[:pagesize].to_i
|
44
44
|
sort_by_col_data = params[SCOL] ? params[SCOL].keys.first : column_offset
|
45
45
|
sort_order = params[SCOL] ? params[SCOL].values.first : SORT_ASC
|
46
46
|
|
@@ -60,8 +60,7 @@ module TableSortable
|
|
60
60
|
end
|
61
61
|
scope = filters.last.call(scope)
|
62
62
|
if page
|
63
|
-
scope =
|
64
|
-
scope = scope.page(page.to_i + 1).per(page_size)
|
63
|
+
scope = Result.new(scope, page, page_size)
|
65
64
|
end
|
66
65
|
scope
|
67
66
|
end
|
data/lib/table_sortable.rb
CHANGED
@@ -1,8 +1,6 @@
|
|
1
1
|
require 'rails/engine'
|
2
2
|
require 'active_support/concern'
|
3
3
|
require 'action_controller'
|
4
|
-
require 'kaminari'
|
5
|
-
require 'kaminari/models/array_extension'
|
6
4
|
|
7
5
|
module TableSortable
|
8
6
|
|
@@ -22,6 +20,7 @@ require 'table_sortable/concerns/proc'
|
|
22
20
|
require 'table_sortable/column/sorter'
|
23
21
|
require 'table_sortable/column/filter'
|
24
22
|
require 'table_sortable/column'
|
23
|
+
require 'table_sortable/result'
|
25
24
|
require 'table_sortable/columns'
|
26
25
|
require 'table_sortable/version'
|
27
26
|
require 'table_sortable/controller'
|
data/table_sortable.gemspec
CHANGED
@@ -32,6 +32,5 @@ Gem::Specification.new do |spec|
|
|
32
32
|
spec.add_development_dependency "bundler", "~> 1.15"
|
33
33
|
spec.add_development_dependency "rake", "~> 10.0"
|
34
34
|
spec.add_development_dependency "rspec", "~> 3.4"
|
35
|
-
spec.add_dependency "kaminari", '~> 0.17.0'
|
36
35
|
spec.add_dependency "rails", '~> 5.1', '>= 5.1.1'
|
37
36
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: table_sortable
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Oded Davidov
|
@@ -52,20 +52,6 @@ dependencies:
|
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
54
|
version: '3.4'
|
55
|
-
- !ruby/object:Gem::Dependency
|
56
|
-
name: kaminari
|
57
|
-
requirement: !ruby/object:Gem::Requirement
|
58
|
-
requirements:
|
59
|
-
- - "~>"
|
60
|
-
- !ruby/object:Gem::Version
|
61
|
-
version: 0.17.0
|
62
|
-
type: :runtime
|
63
|
-
prerelease: false
|
64
|
-
version_requirements: !ruby/object:Gem::Requirement
|
65
|
-
requirements:
|
66
|
-
- - "~>"
|
67
|
-
- !ruby/object:Gem::Version
|
68
|
-
version: 0.17.0
|
69
55
|
- !ruby/object:Gem::Dependency
|
70
56
|
name: rails
|
71
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -124,6 +110,7 @@ files:
|
|
124
110
|
- lib/table_sortable/columns.rb
|
125
111
|
- lib/table_sortable/concerns/proc.rb
|
126
112
|
- lib/table_sortable/controller.rb
|
113
|
+
- lib/table_sortable/result.rb
|
127
114
|
- lib/table_sortable/version.rb
|
128
115
|
- spec/concerns/proc_class_spec.rb
|
129
116
|
- spec/controllers/test_controller_spec.rb
|