smart_pagination 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 338a3e6b702bd084479deb4e0d2b0bc43038a496
-  data.tar.gz: 01fb72960591a31c7b1447a3336ec22114c58af3
+  metadata.gz: 9e34390880f7d6e8e725b07d68be352337b694da
+  data.tar.gz: 81b5027beb3fca871376b1182dab770e7c7ff136
 SHA512:
-  metadata.gz: 7812a25b268ee04edaec35ff04a8e57571a6d9531d2731361fd8c43789ae0063ba95fae9ff90d7528913084df3110960ca57c6fa3a3836943da19e68fd90340f
-  data.tar.gz: 240314d129d9c3a5d3c954d422fd4875cad9c6ae52da55a47d65dfa3028c2d7e1b0504371178952876dee43d873d8d89cdbfb9ce06ddc1fba536c45fcf51b569
+  metadata.gz: 232b5893d40fd58fdf5cee76c173993b1a08d5a1617901adf4993d1b0ac76763db810bec0f4f7207f4945d4e6459f31e5bd8cd2dfda81baa873938d8d780abfb
+  data.tar.gz: 3b502147daf912f88be2bf2742710a771c40a31395d6e303e6c03356a7c3ccc8223bc9d27f01f1982c00dfb5de75af9ce05b9b31d60ebce4c71c491b7f3abd03

data/lib/smart_pagination/renderer.rb

@@ -92,8 +92,10 @@ module SmartPagination
 
       # Current url parameters
       def url_params
-        url = URI.parse(@context.request.url)
-        Rack::Utils.parse_nested_query(url.query).symbolize_keys
+        url    = URI.parse(@context.request.url)
+        params = Rack::Utils.parse_nested_query(url.query).symbolize_keys
+
+        params.except(:page)
       end
 
       # Get page numbers
@@ -135,11 +137,8 @@ module SmartPagination
 
       # Get link params
       def link_params(page)
-        if page.is_a? Integer
-          { page: page }
-        else
-          { page: @collection.send(:"#{page}_page") }
-        end
+        page = @collection.send(:"#{page}_page") unless page.is_a? Integer
+        { page: page }
       end
 
       # Get link options
@@ -192,10 +191,11 @@ module SmartPagination
 
       # Render link tag
       def link_to(text, params={}, html_options={})
-        url = @context.url_for url_params.merge(params)
+        prm = params.except(:page) if params[:page] == 1
+        url = @context.url_for url_params.merge(prm || params)
         opt = html_options.to_h
+        opt = opt.merge(href: url) if params[:page].present?
 
-        opt.merge!(href: url) if params[:page].present?
         tag :a, "#{text}".html_safe, opt
       end
 

data/lib/smart_pagination/version.rb

@@ -1,3 +1,3 @@
 module SmartPagination
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_pagination
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_paginate