kaminari-core 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 073f49d2cee52f15a94e03ea16932a7a35c140e21126fcaf32be27b16dd9126b
-  data.tar.gz: d18374c251ef627e9ddb5b57cd0350c0092b139f2926d578b8f006f07db3403c
+  metadata.gz: f97cdb29c6cc0f87f4a3b2439bc98d4015894053aece52f9685f9053d828eee2
+  data.tar.gz: fda4562a4e0fe69e90af6276b78575dc6dbbe6f42f98ffecd70bd54ddf7cf5cc
 SHA512:
-  metadata.gz: 4d22379f9e5189f50288741c894323d9e36d5dc983e7eda26034db2f1900f4593223c53a3084b03fcacd391af039680bf9a22d41a3d503c291f7e7513a964b02
-  data.tar.gz: a1b5d908d102b3929e58e8cbeec729b07c8a1b084aac2675562db0580bdc9970d41ef9c37e6d085781f78dc1510c0b41f78f0d5a1592df518129129aaa80747d
+  metadata.gz: 0dbaec420bee38126a89931872d0d4dcc37772a7bb22d0c97844399b95c55cc4677a2634d1b908b1c4c5c60a0319ab5b88d8b7bb4f01658db3ecc52400eb9c94
+  data.tar.gz: a5294c22cd10b649243d4ebd4ac85481e1ae16b956d2777121926026eb21f2c3ec6c07a799ca02271f0348a76f9cc4fcf409ce0cdbe69672289fdca1e745e800

data/lib/generators/kaminari/views_generator.rb

@@ -114,10 +114,10 @@ BANNER
       require 'open-uri'
 
       def get_files_in_master
-        master_tree_sha = open('https://api.github.com/repos/amatsuda/kaminari_themes/git/refs/heads/master') do |json|
+        master_tree_sha = URI.open('https://api.github.com/repos/amatsuda/kaminari_themes/git/refs/heads/master') do |json|
           ActiveSupport::JSON.decode(json.read)['object']['sha']
         end
-        open('https://api.github.com/repos/amatsuda/kaminari_themes/git/trees/' + master_tree_sha + '?recursive=1') do |json|
+        URI.open('https://api.github.com/repos/amatsuda/kaminari_themes/git/trees/' + master_tree_sha + '?recursive=1') do |json|
           blobs = ActiveSupport::JSON.decode(json.read)['tree'].find_all {|i| i['type'] == 'blob' }
           blobs.map do |blob|
             [blob['path'], blob['sha']]
@@ -127,7 +127,7 @@ BANNER
       module_function :get_files_in_master
 
       def get_content_for(path)
-        open('https://api.github.com/repos/amatsuda/kaminari_themes/contents/' + path) do |json|
+        URI.open('https://api.github.com/repos/amatsuda/kaminari_themes/contents/' + path) do |json|
           Base64.decode64(ActiveSupport::JSON.decode(json.read)['content'])
         end
       end

data/lib/kaminari/core/version.rb

@@ -2,6 +2,6 @@
 
 module Kaminari
   module Core
-    VERSION = '1.2.1'
+    VERSION = '1.2.2'
   end
 end

data/lib/kaminari/helpers/helper_methods.rb

@@ -4,14 +4,14 @@ module Kaminari
   module Helpers
 
     # The Kaminari::Helpers::UrlHelper module provides useful methods for
-    # generating a path or url to a particlar page. A class must implement the
+    # generating a path or url to a particular page. A class must implement the
     # following methods:
     #
     #   * <tt>url_for</tt>: A method that generates an actual path
     #   * <tt>params</tt>: A method that returns query string parameters
     #   * <tt>request</tt>: A method that returns a Rack::Request object
     #
-    # A normal Rails controller implements all the methods, which makes it
+    # A normal Rails controller implements all the methods, which make it
     # trivial to use this module:
     #
     # ==== Examples
@@ -20,10 +20,10 @@ module Kaminari
     #     include Kaminari::Helpers::UrlHelper
     #
     #     def index
-    #      @users = User.page(1)
+    #       @users = User.page(1)
     #
-    #      path_to_next_page(@items)
-    #      # => /items?page=2
+    #       path_to_next_page(@items)
+    #       # => /items?page=2
     #     end
     #   end
     #
@@ -41,7 +41,12 @@ module Kaminari
       def next_page_url(scope, options = {})
         "#{request.base_url}#{next_page_path(scope, options)}" if scope.next_page
       end
-      alias path_to_next_url next_page_url
+      alias url_to_next_page next_page_url
+
+      def path_to_next_url(scope, options = {})
+        ActiveSupport::Deprecation.warn 'path_to_next_url is deprecated. Use next_page_url or url_to_next_page instead.'
+        next_page_url(scope, options)
+      end
 
       # A helper that calculates the url to the previous page.
       #
@@ -226,15 +231,15 @@ module Kaminari
       #     <%= rel_next_prev_link_tags @items %>
       #   <% end %>
       #
-      #   #-> <link rel="next" href="/items/page/3" /><link rel="prev" href="/items/page/1" />
+      #   #-> <link rel="next" href="/items/page/3"><link rel="prev" href="/items/page/1">
       #
       def rel_next_prev_link_tags(scope, options = {})
         next_page = path_to_next_page(scope, options)
         prev_page = path_to_prev_page(scope, options)
 
         output = String.new
-        output << %Q|<link rel="next" href="#{next_page}"></link>| if next_page
-        output << %Q|<link rel="prev" href="#{prev_page}"></link>| if prev_page
+        output << %Q|<link rel="next" href="#{next_page}">| if next_page
+        output << %Q|<link rel="prev" href="#{prev_page}">| if prev_page
         output.html_safe
       end
     end

data/lib/kaminari/helpers/tags.rb

@@ -13,7 +13,7 @@ module Kaminari
     # class, so _tag partial is not needed).
     #   e.g.)  PrevLink  ->  app/views/kaminari/_prev_link.html.erb
     #
-    # When no matching template were found in your app, the engine's pre
+    # When no matching templates were found in your app, the engine's pre
     # installed template will be used.
     #   e.g.)  Paginator  ->  $GEM_HOME/kaminari-x.x.x/app/views/kaminari/_paginator.html.erb
     class Tag
@@ -66,7 +66,7 @@ module Kaminari
          "kaminari",
          @theme,
          self.class.name.demodulize.underscore
-        ].compact.join("/")
+        ].compact.join("/").gsub('//', '/')
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-core
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2021-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,7 @@ homepage: https://github.com/kaminari/kaminari
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,8 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
-signing_key: 
+rubygems_version: 3.3.0.dev
+signing_key:
 specification_version: 4
 summary: Kaminari's core pagination library
 test_files: []