pagy 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d15c4b37bce77cfd5a60512d46d728a5ea33dcd8f9f32cf31de6307f9d5b5d8
-  data.tar.gz: 501a0e654d0874766cafaa5c12b79e3dc5b643cdb3150a99e6bd2d4cf45ce159
+  metadata.gz: dda23dfaf654fccdeafca5c511f6e1f23c501e4599989f5e6887b1d1f0ecc3ad
+  data.tar.gz: 9be4570f44ffdd234e58364ff92bbec6fd5f8dedad6050a7defef37314dd84e2
 SHA512:
-  metadata.gz: eb2aff48d06edc8e6aa08c118f55b01cc9e70beafc23fbb99a9af5bcb45bd63d0abc90a766d941abfeafa7ed0dbdd592f2471c383b8082bda02f328a679c3ad6
-  data.tar.gz: c48a529c198243dbcb66c20f7b5047dd12bdec53a22d72954b61967dbbb205bc5037ab6e84426f12be2ca3f5d43d4b61380d99a16f64ace8116a08c79ee8d489
+  metadata.gz: 52e7cb89a79da6e3a8f9610ed4e0088cfc731a14f61fef6b0a1dc40eec0b692639dd3d41692774bf0f8e87464609eb9e52cc0afd653c9f66214b3e703d3d559d
+  data.tar.gz: d2418aa0a685140b8e73c06fe510076126bdc62f0d264f1be5a1e282f53600387ae5905b5c552aaf19d6e2b82eb64a215044484189a5522323ea578e85ea00a2

data/lib/pagy.rb

@@ -2,15 +2,15 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '0.8.3'
+class Pagy ; VERSION = '0.8.4'
 
   class OutOfRangeError < StandardError; end
 
   # root pathname to get the path of pagy files like templates or dictionaries
   def self.root; Pathname.new(__FILE__).dirname end
 
-  # default core vars
-  VARS = { page:1, items:20, outset:0, size:[1,4,4,1], page_param: :page, params: {} }
+  # default vars
+  VARS = { page:1, items:20, outset:0, size:[1,4,4,1], page_param: :page, params: {}, anchor: ''.freeze, link_extra: ''.freeze, item_path: 'pagy.info.item_name'.freeze }
 
   attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :from, :to, :prev, :next
 

data/lib/pagy/frontend.rb

@@ -28,9 +28,9 @@ class Pagy
 
     # return examples: "Displaying items 41-60 of 324 in total"  or "Displaying Products 41-60 of 324 in total"
     def pagy_info(pagy)
-      name = pagy_t(pagy.vars[:item_path] || 'pagy.info.item_name'.freeze, count: pagy.count)
-      key  = pagy.pages == 1 ? 'single_page'.freeze : 'multiple_pages'.freeze
-      pagy_t("pagy.info.#{key}", item_name: name, count: pagy.count, from: pagy.from, to: pagy.to)
+      name = pagy_t(pagy.vars[:item_path], count: pagy.count)
+      path = pagy.pages == 1 ? 'pagy.info.single_page'.freeze : 'pagy.info.multiple_pages'.freeze
+      pagy_t(path, item_name: name, count: pagy.count, from: pagy.from, to: pagy.to)
     end
 
 
@@ -47,16 +47,15 @@ class Pagy
 
     MARKER = "-pagy-#{'pagy'.hash}-".freeze
 
-    # returns a specialized proc to generate the HTML links
-    def pagy_link_proc(pagy, lx=''.freeze)  # "lx" means "link extra"
-      p_prev, p_next, p_lx = pagy.prev, pagy.next, pagy.vars[:link_extra]
-      a, b = %(<a href="#{pagy_url_for(MARKER, pagy)}"#{p_lx ? %( #{p_lx}) : ''.freeze}#{lx.empty? ? lx : %( #{lx})}).split(MARKER)
-      -> (n, text=n, x=''.freeze) { "#{a}#{n}#{b}#{ if    n == p_prev ; ' rel="prev"'.freeze
-                                                    elsif n == p_next ; ' rel="next"'.freeze
-                                                    else                           ''.freeze end }#{x.empty? ? x : %( #{x})}>#{text}</a>" }
+    # returns a performance optimized proc to generate the HTML links
+    def pagy_link_proc(pagy, link_extra=''.freeze)
+      p_prev, p_next = pagy.prev, pagy.next
+      a, b = %(<a href="#{pagy_url_for(MARKER, pagy)}" #{pagy.vars[:link_extra]} #{link_extra}).split(MARKER, 2)
+      -> (n, text=n, extra=''.freeze) { "#{a}#{n}#{b}#{ if    n == p_prev ; ' rel="prev"'.freeze
+                                                        elsif n == p_next ; ' rel="next"'.freeze
+                                                        else                           ''.freeze end } #{extra}>#{text}</a>" }
     end
 
-
     # Pagy::Frontend::I18N constant
     zero_one = [:zero, :one]; I18N = { plurals: -> (c) {(zero_one[c] || :other).to_s.freeze}, data: {}}
     def I18N.load_file(file) I18N[:data].replace(YAML.load_file(file).first[1]) end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-06-02 00:00:00.000000000 Z
 dependencies: []
 description: 'Agnostic pagination in plain ruby: it works with any framework, ORM
   and DB type, with all kinds of collections, even pre-paginated, scopes, Arrays,