rails_will_paginate_seo_helper 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05f7e580c4e19d52e330ad88215a0597eb0d154e
-  data.tar.gz: 6f4b08e88bde4b23be7943ca8af0a54247f71d1c
+  metadata.gz: 20345eab25324a106d4dcd1cdb4c04053ded7e3c
+  data.tar.gz: 3f42274fa552f8d73c5db3ba4f9cdf2536c1380c
 SHA512:
-  metadata.gz: 83bdefac9696265fd3743f40cb46ea971cc31e5bbd8974b75c43103b06e39a84afbee237b23bf46ffd50760e48d11f86b1e2900f7e2788f914185d6144feeae1
-  data.tar.gz: 7a04d87e6bdb89d64ac70306fec0999ef70cff2c877fa72488161f007834c633f175beb896fdb9e11f86df53e8e2f50c8e5060618ebb73c11f5997813d7bcad0
+  metadata.gz: 57929fc77321c87ecfde3463e2acee633b2b3caa454b77ea41c8fd1d677336cb2740476896227e850ab6ed6da76bda9cba1bdea3ac4a9d8be4483e3cfe345ca8
+  data.tar.gz: c41c726f0308f50a51ad21b1fa317a88c5685455daa8f9d7b04827425984d1297b9c65ea37ac4129e568a8c2d4c30fadb1c8ab30633539ce4bdde9b9a4d23a8d

data/lib/view_helpers.rb

@@ -3,34 +3,50 @@ module RailsWillPaginateSeoHelper
     def will_paginate_seo_links(collection)
       return unless collection.respond_to?(:current_page)
       @collection = collection
-      build_tags.html_safe 
+      build_tags
     end
 
     private
 
-
     def build_tags
       if next_link_tag && previous_link_tag
-        return previous_link_tag << next_link_tag
-      end
-      return next_link_tag if next_link_tag
-      return previous_link_tag if previous_link_tag
-    end
-
-    def next_link_tag
-      next_page = @collection.next_page
-      if next_page
-        next_page_url = request.original_url.gsub(/page\=\d{1,}/, "page=#{next_page}")
-        return tag(:link, href: next_page_url, rel: :next)
+        return (previous_link_tag << next_link_tag).html_safe
       end
+      return previous_link_tag.html_safe if previous_link_tag
+      next_link_tag.html_safe if next_link_tag
     end
 
     def previous_link_tag
       previous_page = @collection.previous_page
+      original_url = request.original_url
+
       if previous_page
-        prev_page_url = request.original_url.gsub(/page\=\d{1,}/, "page=#{previous_page}")
+        if previous_page == 1
+          prev_page_url = original_url.gsub(/(&|\?)page\=\d{1,}/, '')
+        else
+          prev_page_url = original_url.gsub(/page\=\d{1,}/, "page=#{previous_page}")
+        end
         return tag(:link, href: prev_page_url, rel: :prev)
       end
     end
+
+    def next_link_tag
+      next_page = @collection.next_page
+      original_url = request.original_url
+
+      match = original_url.match(/(&|\?)page\=\d{1,}/)
+
+      if match          # has :page url-parameter
+        next_page_url = original_url.gsub(/page\=\d{1,}/, "page=#{next_page}")
+      else              # no :page url-parameter page
+        sign_match = original_url.match(/\?/)
+        if sign_match   # url has parameter attached
+          next_page_url = original_url.concat("&page=#{next_page}")
+        else            # url has no parameter attached
+          next_page_url = original_url.concat("?page=#{next_page}")
+        end
+      end
+      tag(:link, href: next_page_url, rel: :next) if next_page_url
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_will_paginate_seo_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - rene paulokat