tramway-api 1.8.4 → 1.8.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/tramway/api/v1/application_controller.rb +2 -1
  3. data/lib/tramway/api/version.rb +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1c007eb42b91d7a7b138884b5ce40739a7f90b63254c223c6a82a16b652e9e47
4
- data.tar.gz: 5634bf604e6984e540fdfa1bcab1b4a93aca5e0a3e140756711b6e1f3c993f25
3
+ metadata.gz: 5a4acbd7817b429de6d718ee675810614a832cad7a9138c0f594cf603a5acc8c
4
+ data.tar.gz: fff87179a2ad5f22c4183b32af51fe38f0119426ffb4746316d6a72a30e42f19
5
5
  SHA512:
6
- metadata.gz: 9af7275766df2240504ae8c258ccc0f0e278855890ccf2fdb03ab735f90aa9252dd2ab462f1adb8e8ede509b3ec0e508b1c2db746932e34196c2fdc67253639c
7
- data.tar.gz: ebe525f69af40b34e0f8f12bf70205dcc7d1072462eda9ffadf04858137faeec96b42556e71e30f66724011245f595021deb3a5240a223e734012a5da8e6feb0
6
+ metadata.gz: 4f5e4e5362f56106305c71b38b21202b19f7b204434fd8f3df2a7722d7634606caf759513ae13fa975559eed995b4189df9c8c06289a97c502a7e8ef06f7744f
7
+ data.tar.gz: 51cb8206094060d4815eb4abb23b211ec0632f364f7718f8be3e2c3a346c1f3a0c7bba0b6da566b60584dfc9e09cd59b11a20d5ca4e5556010c96e4506b9a2dc
data/app/controllers/tramway/api/v1/application_controller.rb CHANGED
@@ -31,7 +31,8 @@ module Tramway
31
31
  def records
32
32
  active_records = model_class.respond_to?(:active) ? model_class.active : model_class.all
33
33
  collection = active_records.order(id: :desc).send params[:scope] || :all
34
- collection = collection.full_text_search params[:search] if params[:search]
34
+ collection = collection.page(params[:page]).per(params[:per]) if params[:page].present?
35
+ collection = collection.full_text_search params[:search] if params[:search].present?
35
36
  collection
36
37
  end
37
38
 
data/lib/tramway/api/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Tramway
4
4
  module Api
5
- VERSION = '1.8.4'
5
+ VERSION = '1.8.5'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tramway-api
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.4
4
+ version: 1.8.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Kalashnikov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-07-23 00:00:00.000000000 Z
11
+ date: 2020-07-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: active_model_serializers