canonical-rails 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38067fe7096258dd5090045db04194d4ab089758ebcda87b3863011535893d7e
-  data.tar.gz: 16567396612642f5640dc28dc45c65be6702bb1a37389e2d200d52987ef2fea0
+  metadata.gz: ccf0cfb2c475521e6fab106de4ef2e322a1cf4d87038495d5564563a15acd373
+  data.tar.gz: 0b11fbf7641ac94bbc1a74de4c15cc3d0e56ebc39720b027ad4a9d69f2c8e206
 SHA512:
-  metadata.gz: ac96b6a583c455be2407383812ab84bf0670a51cf8debc17c435997a8f66f976b6b2ff4274ca1b539ef3e3079f0d42d0932b90a7b29cdf36fbce61da58ade1fb
-  data.tar.gz: 5347b6cf1356f000144da898cd8d5ddb78bba658cbf3ef35d40a270174d202b7a06a61e70bb51d7b8abe70c8ae86739e6c11c887cbd33feeea1a1c198bdb9480
+  metadata.gz: 7b774522cf2cb5dced126ddc7d78cf918fef84f6e7144526b9be4d041fa845923a04ace457671d4ba22014eabe6f24a4fcae9f876070a14252353a6590b74743
+  data.tar.gz: 764aa02083b5346fa21aae3691b055286efd19a2a587853e5a58e8cc3dfe748594306e8bc6da8f3995ce8f8bbfa808d622550b4672f83e145689c00f56f59324

data/app/helpers/canonical_rails/tag_helper.rb

@@ -4,6 +4,15 @@ module CanonicalRails
       request.params.key?('action') && CanonicalRails.sym_collection_actions.include?(request.params['action'].to_sym)
     end
 
+    # Leave force_trailing_slash as nil to get the original behavior of trailing_slash_if_needed
+    def trailing_slash_config(force_trailing_slash = nil)
+      if force_trailing_slash
+        "/"
+      elsif force_trailing_slash.nil?
+        trailing_slash_if_needed
+      end
+    end
+
     def trailing_slash_if_needed
       "/" if trailing_slash_needed?
     end
@@ -26,18 +35,18 @@ module CanonicalRails
       (CanonicalRails.port || request.port).to_i
     end
 
-    def canonical_href(host = canonical_host, port = canonical_port)
+    def canonical_href(host = canonical_host, port = canonical_port, force_trailing_slash = nil)
       default_ports = { 'https://' => 443, 'http://' => 80 }
       port = port.present? && port.to_i != default_ports[canonical_protocol] ? ":#{port}" : ''
-      raw "#{canonical_protocol}#{host}#{port}#{path_without_html_extension}#{trailing_slash_if_needed}#{whitelisted_query_string}"
+      raw "#{canonical_protocol}#{host}#{port}#{path_without_html_extension}#{trailing_slash_config(force_trailing_slash)}#{whitelisted_query_string}"
     end
 
-    def canonical_path
-      raw "#{path_without_html_extension}#{trailing_slash_if_needed}#{whitelisted_query_string}"
+    def canonical_path(force_trailing_slash = nil)
+      raw "#{path_without_html_extension}#{trailing_slash_config(force_trailing_slash)}#{whitelisted_query_string}"
     end
 
-    def canonical_tag(host = canonical_host, port = canonical_port)
-      canonical_url = canonical_href(host, port)
+    def canonical_tag(host = canonical_host, port = canonical_port, force_trailing_slash = nil)
+      canonical_url = canonical_href(host, port, force_trailing_slash)
       capture do
         if CanonicalRails.opengraph_url
           concat tag(:meta, property: 'og:url', content: canonical_url)

data/lib/canonical-rails/version.rb

@@ -1,3 +1,3 @@
 module CanonicalRails
-  VERSION = "0.2.6"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canonical-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Denis Ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,19 +45,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement