canonical-rails 0.2.10 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cc8c724bb2b64e543b2becad527e27a2828bd4113032ecb396f5c8f6425f0e2
-  data.tar.gz: df6126c3991db70dfea28424bf78b64a8a216e1634e3d8f33f1e9c624e33218a
+  metadata.gz: d3d683836ca3eab3192c8b640adf905be85117bc9e24bbf321951a2e1123028b
+  data.tar.gz: decac4a87c0d23be1ff2a5d5bb32b0270dc7340c5f32f000b17bc24d80b0f20c
 SHA512:
-  metadata.gz: dafcabbeea6d18de1a8e50d7402e4169d0e451d8fa47a4bb4b311c7e9f616aa78314725ef2ef6684fe44c7a424525d92f58bbd6f9a99540805ecacc0416ab4da
-  data.tar.gz: 3ddf2e2e9fd2423c7eb6f2675755d7ea0461233aa13a61289274129124e1e32cc1b6e9470d74911902baeb5ca165493f8125d5fa1f875186d242c46ee4115b65
+  metadata.gz: d0b42b3666218e59b25b711eec0baa2eb6e918e11401ed95cf878806437059b89570cd8b937872ce92e17f0182064ff11e80a948f1eb5416455901b480bbe2d5
+  data.tar.gz: 884400f724a659c7733306a600fd87a0e75274d615296c074abd54ddc7014ba2e8751c841032beabcbb264464454ddd3102609038c0b8c037bc188d8e84a7669

data/app/helpers/canonical_rails/tag_helper.rb

@@ -20,7 +20,7 @@ module CanonicalRails
     def path_without_html_extension
       return '' if request.path == '/'
 
-      request.path.sub(/\.html$/, '')
+      request.path.sub(/\.html?$/, '')
     end
 
     def canonical_protocol
@@ -73,10 +73,8 @@ module CanonicalRails
       # https://github.com/rack/rack/blob/9939d40a5e23dcb058751d1029b794aa2f551900/test/spec_utils.rb#L222
       # Rack 1.6.0 has it
       # https://github.com/rack/rack/blob/65a7104b6b3e9ecd8f33c63a478ab9a33a103507/test/spec_utils.rb#L251
-
-      wl_params = allowed_params
-
-      "?" + Rack::Utils.build_nested_query(convert_numeric_params(wl_params)) if wl_params.present?
+      parameters = allowed_params
+      "?" + Rack::Utils.build_nested_query(convert_numeric_params(parameters)) if parameters.present?
     end
 
     private

data/lib/canonical-rails/deprecation.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'active_support/deprecation'
+
+module CanonicalRails
+  Deprecation = ActiveSupport::Deprecation.new('1.0', 'CanonicalRails')
+end

data/lib/canonical-rails/version.rb

@@ -1,3 +1,3 @@
 module CanonicalRails
-  VERSION = "0.2.10"
+  VERSION = "0.2.14"
 end

data/lib/canonical-rails.rb

@@ -1,4 +1,5 @@
 require "canonical-rails/engine"
+require "canonical-rails/deprecation"
 
 module CanonicalRails
 
@@ -23,6 +24,10 @@ module CanonicalRails
   mattr_accessor :collection_actions
   @@collection_actions = [:index]
 
+  # @deprecated: use config.allowed_parameters instead
+  mattr_accessor :whitelisted_parameters
+  @@whitelisted_parameters = []
+
   mattr_accessor :allowed_parameters
   @@allowed_parameters = []
 
@@ -34,6 +39,11 @@ module CanonicalRails
   end
 
   def self.sym_allowed_parameters
-    @@sym_allowed_parameters ||= self.allowed_parameters.map(&:to_sym)
+    @@sym_allowed_parameters ||= if self.whitelisted_parameters.empty?
+      self.allowed_parameters.map(&:to_sym)
+    else
+      CanonicalRails::Deprecation.warn('config.whitelisted_parameters is deprecated, please use config.allowed_parameters instead.')
+      self.whitelisted_parameters.map(&:to_sym)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canonical-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.14
 platform: ruby
 authors:
 - Denis Ivanov
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,9 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 4.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -101,15 +101,17 @@ files:
 - app/helpers/canonical_rails/tag_helper.rb
 - config/routes.rb
 - lib/canonical-rails.rb
+- lib/canonical-rails/deprecation.rb
 - lib/canonical-rails/engine.rb
 - lib/canonical-rails/version.rb
 - lib/generators/canonical_rails/install/install_generator.rb
 - lib/generators/canonical_rails/install/templates/canonical_rails.rb
 - lib/tasks/canonical-rails_tasks.rake
 homepage: https://github.com/jumph4x/canonical-rails
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -124,8 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Simple and configurable Rails canonical ref tag helper
 test_files: []