friendly_id 5.4.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fa83b80901ae7c4930b4a0dea61544152f2cc4a7d94b828c2f52e807fb5d686
-  data.tar.gz: b5db403619e2d9bc275d567dc9f567fb943316e1222bc9c6052e43a285b92116
+  metadata.gz: ba26f9f615f068d0094f6646a6c6a5aceef44b59bde321aa168542b62420402f
+  data.tar.gz: 155666a337c2162adc31c2b3337867a7086b63cba390d6d9c6ca8486b7d663d6
 SHA512:
-  metadata.gz: f8c8bef9ec1e0a42103fa813d40b087bcb84c1f3148f73d53d21fde568865b9a6dc0a2c83508431a2ffa2c2b09bf7f3d26e49b30ac09a758e39dd02323aff328
-  data.tar.gz: 0f78de10e8d9597728e554dc53949318f23a5771adb8014b23172c204f550c48b5f2222f8df144a4368d5f34560f01051a5f42183fcac415f85ad9e1bfb262e4
+  metadata.gz: bc67ddc3c8940a7b0bcf0c918c0f5f398e1f484d72fde5fa7f1136035d34ac77a25b0db3ac4070fc0abd21abe926e2d15bc9f536e4f57ddb0dcd84c4f787b1b0
+  data.tar.gz: 1e590565fff83c890ee04dede81e518c98912214dc3122690763ee1731559fd337421bd05c4d201224cddd67891416054a81e7d8b0bbc24acfc2e6661e5ebe03

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: parndt

data/.github/stale.yml

@@ -1,5 +1,5 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 42
+daysUntilStale: 84
 # Number of days of inactivity before a stale issue is closed
 daysUntilClose: 7
 # Issues with these labels will never be considered stale

data/.github/workflows/test.yml

@@ -11,8 +11,8 @@ jobs:
       matrix:
         architecture: [ x64 ]
         database: [ mysql, postgresql ]
-        gemfile: [ '6.0', '5.2', '5.1', '5.0' ]
-        ruby: [ '2.6.x', '2.5.x' ]
+        gemfile: [ '6.0', '5.2' ]
+        ruby: [ '2.7.x', '2.6.x', '2.5.x' ]
       fail-fast: false
     runs-on: ubuntu-latest
     name: ${{ matrix.ruby }} ${{ matrix.database }} rails-${{ matrix.gemfile }}
@@ -22,10 +22,10 @@ jobs:
         architecture: ${{ matrix.architecture }}
         ruby-version: ${{ matrix.ruby }}
         version: ${{ matrix.ruby }}
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - run: sudo apt-get update && sudo apt-get install libpq-dev postgresql-client libmysqlclient-dev mysql-client libsqlite3-dev -y
     - id: cache-bundler
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: vendor/bundle
         key: ${{ matrix.ruby }}-gem-${{ hashFiles(format('gemfiles/Gemfile.rails-{0}.rb', matrix.gemfile)) }}

data/Changelog.md

@@ -5,6 +5,10 @@ suggestions, ideas and improvements to FriendlyId.
 
 ## Unreleased
 
+## 5.4.1 (2020-11-06)
+
+* Fix unexpected `:slug` error on valid, unpersisted model ([#952](https://github.com/norman/friendly_id/pull/952))
+
 ## 5.4.0 (2020-08-14)
 
 * Fix Ruby 2.7 keyword params deprecation warning ([#939](https://github.com/norman/friendly_id/pull/939))

data/README.md

@@ -1,10 +1,10 @@
 [![Build Status](https://github.com/norman/friendly_id/workflows/CI/badge.svg)](https://github.com/norman/friendly_id/actions)
 [![Code Climate](https://codeclimate.com/github/norman/friendly_id.svg)](https://codeclimate.com/github/norman/friendly_id)
-[![Inline docs](http://inch-ci.org/github/norman/friendly_id.svg?branch=master)](http://inch-ci.org/github/norman/friendly_id)
+[![Inline docs](https://inch-ci.org/github/norman/friendly_id.svg?branch=master)](https://inch-ci.org/github/norman/friendly_id)
 
 # FriendlyId
 
-**For the most complete, user-friendly documentation, see the [FriendlyId Guide](http://norman.github.io/friendly_id/file.Guide.html).**
+**For the most complete, user-friendly documentation, see the [FriendlyId Guide](https://norman.github.io/friendly_id/file.Guide.html).**
 
 FriendlyId is the "Swiss Army bulldozer" of slugging and permalink plugins for
 Active Record. It lets you create pretty URLs and work with human-friendly
@@ -12,16 +12,16 @@ strings as if they were numeric ids.
 
 With FriendlyId, it's easy to make your application use URLs like:
 
-    http://example.com/states/washington
+    https://example.com/states/washington
 
 instead of:
 
-    http://example.com/states/4323454
+    https://example.com/states/4323454
 
 
 ## Getting Help
 
-Ask questions on [Stack Overflow](http://stackoverflow.com/questions/tagged/friendly-id)
+Ask questions on [Stack Overflow](https://stackoverflow.com/questions/tagged/friendly-id)
 using the "friendly-id" tag, and for bugs have a look at [the bug section](https://github.com/norman/friendly_id#bugs)
 
 ## FriendlyId Features
@@ -39,9 +39,11 @@ FriendlyId offers many advanced features, including:
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'friendly_id', '~> 5.2.4' # Note: You MUST use 5.0.0 or greater for Rails 4.0+
+gem 'friendly_id', '~> 5.4.0'
 ```
 
+Note: You MUST use 5.0.0 or greater for Rails 4.0+.
+
 And then execute:
 
 ```shell
@@ -105,7 +107,7 @@ User.find_each(&:save)
 ## Bugs
 
 Please report them on the [Github issue
-tracker](http://github.com/norman/friendly_id/issues) for this project.
+tracker](https://github.com/norman/friendly_id/issues) for this project.
 
 If you have a bug to report, please include the following information:
 
@@ -131,7 +133,7 @@ volunteers](https://github.com/norman/friendly_id/contributors).
 
 ## License
 
-Copyright (c) 2008-2016 Norman Clarke and contributors, released under the MIT
+Copyright (c) 2008-2020 Norman Clarke and contributors, released under the MIT
 license.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of

data/lib/friendly_id/slugged.rb

@@ -375,7 +375,7 @@ Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
     private :slug_generator
 
     def unset_slug_if_invalid
-      if errors[friendly_id_config.query_field].present? && attribute_changed?(friendly_id_config.query_field.to_s)
+      if errors.key?(friendly_id_config.query_field) && attribute_changed?(friendly_id_config.query_field.to_s)
         diff = changes[friendly_id_config.query_field]
         send "#{friendly_id_config.slug_column}=", diff.first
       end

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = '5.4.0'.freeze
+  VERSION = '5.4.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1
 platform: ruby
 authors:
 - Norman Clarke
@@ -35,7 +35,7 @@ cert_chain:
   Hsej0MQ3drCB1eA4c9OXdCUQJnY2aLTq3uNvTbZvoTgWK55eq3KLBJ4zzoKZ4tBX
   /HIFI/fEwYlI1Ji3oikUrHkc4rWgaQ==
   -----END CERTIFICATE-----
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -175,6 +175,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gemtest"
+- ".github/FUNDING.yml"
 - ".github/stale.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
@@ -189,8 +190,6 @@ files:
 - bench.rb
 - certs/parndt.pem
 - friendly_id.gemspec
-- gemfiles/Gemfile.rails-5.0.rb
-- gemfiles/Gemfile.rails-5.1.rb
 - gemfiles/Gemfile.rails-5.2.rb
 - gemfiles/Gemfile.rails-6.0.rb
 - guide.rb
@@ -254,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A comprehensive slugging and pretty-URL plugin.

data/gemfiles/Gemfile.rails-5.0.rb

@@ -1,28 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '../'
-
-gem 'activerecord', '~> 5.0.0'
-gem 'railties', '~> 5.0.0'
-gem 'i18n', '~> 0.7.0'
-
-# Database Configuration
-group :development, :test do
-  platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter', '~> 50.1'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 50.1'
-    gem 'kramdown'
-  end
-
-  platforms :ruby, :rbx do
-    gem 'sqlite3'
-    gem 'mysql2'
-    gem 'pg'
-    gem 'redcarpet'
-  end
-
-  platforms :rbx do
-    gem 'rubysl', '~> 2.0'
-    gem 'rubinius-developer_tools'
-  end
-end

data/gemfiles/Gemfile.rails-5.1.rb

@@ -1,27 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '../'
-
-gem 'activerecord', '~> 5.1.0'
-gem 'railties', '~> 5.1.0'
-
-# Database Configuration
-group :development, :test do
-  platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter', '~> 50.1'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 50.1'
-    gem 'kramdown'
-  end
-
-  platforms :ruby, :rbx do
-    gem 'sqlite3'
-    gem 'mysql2'
-    gem 'pg'
-    gem 'redcarpet'
-  end
-
-  platforms :rbx do
-    gem 'rubysl', '~> 2.0'
-    gem 'rubinius-developer_tools'
-  end
-end