pagy 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49b0fb6295766ee5a4272b21ac33cba767e8f2b0b0aa9b419f9ce436b4b2cd9a
-  data.tar.gz: 1036ef5fc880a856423baf0442bb16ef6e21d8dc91696182aebbf9a4eae77ecb
+  metadata.gz: 873814564a714a56ca4ca46cf037554bdda04416d0fe2b39f80886a228d383a9
+  data.tar.gz: f5643dcac7efbd25cd5afc6a05c3fd6aa4ea52355bb3186dcc91d9c996e94bb1
 SHA512:
-  metadata.gz: a8259eade988ebec0c2d0c7edba17721e7b88c9238ecbcd84213be41a97c7570f7b4a6b29c2f9f20cdacd7f20d43076d70cb87b6575ded375b447aa5e9821ddf
-  data.tar.gz: 0b7796b7e7b673c11696990ec90cf9b62d454e5a21696ab0116ca0372ccbc3cc503f6d03ab55837af382bc6f8b50c2c3ee50531a335d92f8851fab80bae3ba6a
+  metadata.gz: 59bc87a3c93b060a7cd19b5fd9606b2fe47c841b47b41571931a08f17e27d0363a46b5b463976127caaa8760c928031daa628f1dd3369a9263b164806a739f6d
+  data.tar.gz: 0d65814a39a0c99d641914fd18a221322e60af0a777e09aff25ce1a89195204fd478358e110ba1fc51d7272a33e9e5d4a3dbeb99e9bc2c8ecf9f675c83ef7543

data/lib/config/pagy.rb

@@ -52,7 +52,7 @@
 
 # Feature Extras
 
-# Items: Allow the client to request a custom number of items per page with a ready to use selector UI
+# Items: Allow the client to request a custom number of items per page with an optional selector UI
 # See https://ddnexus.github.io/pagy/extras/items
 # require 'pagy/extras/items'
 # Pagy::VARS[:items_param] = :items    # default

data/lib/locales/pagy.yml

@@ -35,7 +35,7 @@ es:
         zero: "Sin resultados"
         one: "Mostrando 1 %{item_name}"
         other: "Mostrando %{count} %{item_name}"
-      multiple_pages: "Mostrando %{item_name}s %{from}-%{to} de %{count} en total"
+      multiple_pages: "Mostrando %{item_name} %{from}-%{to} de %{count} en total"
       item_name:
         zero: "ítems"
         one: "ítem"
@@ -68,5 +68,31 @@ tr:
     items:
       show: "Göster"
       items: "sayfa başı"
+ru:
+  pagy:
+    nav:
+      prev: "‹ Назад"
+      next: "Вперёд ›"
+      gap: "…"
+      current: "Вы на странице"
+    info:
+      single_page:
+        zero: "Пока %{item_name} нет"
+        one: "<b>1</b> %{item_name}"
+        few: "<b>%{count}</b> %{item_name}"
+        many: "Всего <b>%{count}</b> %{item_name}"
+        other: "Всего <b>%{count}</b> %{item_name}"
+      multiple_pages: "Всего <b>%{count}</b> %{item_name}, показаны с <b>%{from}</b> по <b>%{to}</b>"
+      item_name:
+        one: "запись"
+        few: "записи"
+        many: "записей"
+        other: "записей"
+    compact:
+      page: "Страница"
+      of: "из"
+    items:
+      show: "Показать"
+      items: "записей на странице"
 
 # PR for other languages are very welcome. Thanks!

data/lib/pagy.rb

@@ -3,7 +3,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '0.19.1'
+class Pagy ; VERSION = '0.19.2'
 
   class OutOfRangeError < StandardError; attr_reader :pagy; def initialize(pagy) @pagy = pagy end; end
 

data/lib/pagy/extras/trim.rb

@@ -8,23 +8,26 @@ class Pagy
     # boolean used by the compact navs
     TRIM = true
 
-    def pagy_trim_url(url, param_string)
-      url.sub(/((?:[?&])#{param_string}\z|\b(?<=[?&])#{param_string}&)/, '')
-    end
-
     alias_method :pagy_link_proc_without_trim, :pagy_link_proc
     def pagy_link_proc_with_trim(pagy, link_extra='')
       p_prev, p_next, p_vars = pagy.prev, pagy.next, pagy.vars
-      url   = pagy_url_for(MARKER, pagy)
-      p1url = pagy_trim_url(url, "#{p_vars[:page_param]}=#{MARKER}")
-      p1    = %(<a href="#{p1url}" #{p_vars[:link_extra]} #{link_extra})
-      a, b = %(<a href="#{url}" #{p_vars[:link_extra]} #{link_extra}).split(MARKER, 2)
-      -> (n, text=n, extra='') { start = n.to_i == 1 ? p1 : "#{a}#{n}#{b}"
+      marker_url = pagy_url_for(MARKER, pagy)
+      page1_url  = pagy_trim_url(marker_url, "#{p_vars[:page_param]}=#{MARKER}")
+      page1_link = %(<a href="#{page1_url}" #{p_vars[:link_extra]} #{link_extra})
+      a, b = %(<a href="#{marker_url}" #{p_vars[:link_extra]} #{link_extra}).split(MARKER, 2)
+      -> (n, text=n, extra='') { start = n.to_i == 1 ? page1_link : "#{a}#{n}#{b}"
                                  "#{start}#{ if    n == p_prev ; ' rel="prev"'
                                              elsif n == p_next ; ' rel="next"'
                                              else                           '' end } #{extra}>#{text}</a>" }
     end
     alias_method :pagy_link_proc, :pagy_link_proc_with_trim
 
+    private
+
+      # separate method easier to test
+      def pagy_trim_url(url, param_string)
+        url.sub(/((?:[?&])#{param_string}\z|\b(?<=[?&])#{param_string}&)/, '')
+      end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2018-09-21 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,