friendly_id 5.4.1 → 5.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba26f9f615f068d0094f6646a6c6a5aceef44b59bde321aa168542b62420402f
-  data.tar.gz: 155666a337c2162adc31c2b3337867a7086b63cba390d6d9c6ca8486b7d663d6
+  metadata.gz: 21ddfb374efbecb41ddb5164a5f0fbb4df5838edfcb13a8e7d8d6caa1b378f34
+  data.tar.gz: 363955e55e33b9b15d59099f1b6ac00d88f32e0b3835f1dfd6fcf718aad7ac7f
 SHA512:
-  metadata.gz: bc67ddc3c8940a7b0bcf0c918c0f5f398e1f484d72fde5fa7f1136035d34ac77a25b0db3ac4070fc0abd21abe926e2d15bc9f536e4f57ddb0dcd84c4f787b1b0
-  data.tar.gz: 1e590565fff83c890ee04dede81e518c98912214dc3122690763ee1731559fd337421bd05c4d201224cddd67891416054a81e7d8b0bbc24acfc2e6661e5ebe03
+  metadata.gz: d966763a10e683b815681576ef71c720caeafee88c49f866f912cae1a2aae12a33fd00bfc93f2d0eb7204ae2b91c514613edf34996119519613452b0ce0cdfb1
+  data.tar.gz: f8e8522f7f4b1c8a32bc8fd58c719d8376beb3325f2adfbca0554f7ec63a2742d5ab5b7128bbf2fa3f106075f5f89af590843c36bf3924d975674bada3673ca9

data/.github/workflows/test.yml

@@ -9,35 +9,24 @@ jobs:
   test:
     strategy:
       matrix:
-        architecture: [ x64 ]
         database: [ mysql, postgresql ]
         gemfile: [ '6.0', '5.2' ]
-        ruby: [ '2.7.x', '2.6.x', '2.5.x' ]
+        ruby: [ '2.7', '2.6', '2.5' ]
       fail-fast: false
     runs-on: ubuntu-latest
     name: ${{ matrix.ruby }} ${{ matrix.database }} rails-${{ matrix.gemfile }}
     steps:
-    - uses: actions/setup-ruby@v1.0.0
-      with:
-        architecture: ${{ matrix.architecture }}
-        ruby-version: ${{ matrix.ruby }}
-        version: ${{ matrix.ruby }}
     - 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@v2
+    - uses: ruby/setup-ruby@v1
       with:
-        path: vendor/bundle
-        key: ${{ matrix.ruby }}-gem-${{ hashFiles(format('gemfiles/Gemfile.rails-{0}.rb', matrix.gemfile)) }}
-    - run: gem install bundler
-    - run: bundle install --path vendor/bundle
+        bundler-cache: true
+        ruby-version: ${{ matrix.ruby }}
     - run: bundle exec rake db:create db:up
     - run: bundle exec rake test
 
     env:
-      BUNDLE_JOBS: 4
       BUNDLE_GEMFILE: gemfiles/Gemfile.rails-${{ matrix.gemfile }}.rb
-      BUNDLE_PATH: vendor/bundle
       CI: true
       COVERALLS: true
       DB: ${{ matrix.database }}

data/Changelog.md

@@ -5,6 +5,11 @@ suggestions, ideas and improvements to FriendlyId.
 
 ## Unreleased
 
+## 5.4.2 (2021-01-07)
+
+* Fix: Set slug before save if needed ([#948](https://github.com/norman/friendly_id/pull/948))
+* Revert "Make `first_by_friendly_id` case insensitive using `downcase`" ([#951](https://github.com/norman/friendly_id/pull/951))
+
 ## 5.4.1 (2020-11-06)
 
 * Fix unexpected `:slug` error on valid, unpersisted model ([#952](https://github.com/norman/friendly_id/pull/952))

data/lib/friendly_id/finder_methods.rb

@@ -20,8 +20,8 @@ module FriendlyId
       return super if args.count != 1 || id.unfriendly_id?
       first_by_friendly_id(id).tap {|result| return result unless result.nil?}
       return super if potential_primary_key?(id)
-      raise_not_found_exception id
-      
+
+      raise_not_found_exception(id)
     end
 
     # Returns true if a record with the given id exists.
@@ -39,7 +39,7 @@ module FriendlyId
     end
 
     def exists_by_friendly_id?(id)
-      where(friendly_id_config.query_field => id).exists?
+      where(friendly_id_config.query_field => parse_friendly_id(id)).exists?
     end
 
     private
@@ -59,14 +59,47 @@ module FriendlyId
     end
 
     def first_by_friendly_id(id)
-      find_by(friendly_id_config.query_field => id.downcase)
+      find_by(friendly_id_config.query_field => parse_friendly_id(id))
+    end
+
+    # Parse the given value to make it suitable for use as a slug according to
+    # your application's rules.
+    #
+    # This method is not intended to be invoked directly; FriendlyId uses it
+    # internally to process a slug into string to use as a finder.
+    #
+    # However, if FriendlyId's default slug parsing doesn't suit your needs,
+    # you can override this method in your model class to control exactly how
+    # slugs are generated.
+    #
+    # ### Example
+    #
+    #     class Person < ActiveRecord::Base
+    #       extend FriendlyId
+    #       friendly_id :name_and_location
+    #
+    #       def name_and_location
+    #         "#{name} from #{location}"
+    #       end
+    #
+    #       # Use default slug, but lower case
+    #       # If `id` is "Jane-Doe" or "JANE-DOE", this finds data by "jane-doe"
+    #       def parse_friendly_id(slug)
+    #         super.downcase
+    #       end
+    #     end
+    #
+    # @param [#to_s] value The slug to be parsed.
+    # @return The parsed slug, which is not modified by default.
+    def parse_friendly_id(value)
+      value
     end
 
     def raise_not_found_exception(id)
       message = "can't find record with friendly id: #{id.inspect}"
-      if ActiveRecord.version < Gem::Version.create('5.0') then 
+      if ActiveRecord.version < Gem::Version.create('5.0')
         raise ActiveRecord::RecordNotFound.new(message)
-      else 
+      else
         raise ActiveRecord::RecordNotFound.new(message, name, friendly_id_config.query_field, id)
       end
     end

data/lib/friendly_id/slugged.rb

@@ -248,6 +248,7 @@ Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
         defaults[:sequence_separator] ||= '-'
       end
       model_class.before_validation :set_slug
+      model_class.before_save :set_slug
       model_class.after_validation :unset_slug_if_invalid
     end
 

data/lib/friendly_id/version.rb

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

data/test/finders_test.rb

@@ -26,28 +26,4 @@ class Finders < TestCaseClass
       assert model_class.existing.find(record.friendly_id)
     end
   end
-
-  test 'should find capitalized records with finders as class methods' do
-    with_instance_of(model_class) do |record|
-      assert model_class.find(record.friendly_id.capitalize)
-    end
-  end
-
-  test 'should find capitalized records with finders on relations' do
-    with_instance_of(model_class) do |record|
-      assert model_class.existing.find(record.friendly_id.capitalize)
-    end
-  end
-
-  test 'should find upcased records with finders as class methods' do
-    with_instance_of(model_class) do |record|
-      assert model_class.find(record.friendly_id.upcase)
-    end
-  end
-
-  test 'should find upcased records with finders on relations' do
-    with_instance_of(model_class) do |record|
-      assert model_class.existing.find(record.friendly_id.upcase)
-    end
-  end
 end

data/test/slugged_test.rb

@@ -479,6 +479,37 @@ class FailedValidationAfterUpdateRegressionTest < TestCaseClass
 
 end
 
+# https://github.com/norman/friendly_id/issues/947
+class GeneratingSlugWithValidationSkippedTest < TestCaseClass
+
+  include FriendlyId::Test
+
+  class Journalist < ActiveRecord::Base
+    extend FriendlyId
+    friendly_id :name, :use => :slugged
+  end
+
+  test "should generate slug when skipping validation" do
+    transaction do
+      m1 = Journalist.new
+      m1.name = 'Bob Timesletter'
+      m1.save(validate: false)
+      assert_equal 'bob-timesletter', m1.slug
+    end
+  end
+
+  test "should generate slug when #valid? called" do
+    transaction do
+      m1 = Journalist.new
+      m1.name = 'Bob Timesletter'
+      m1.valid?
+      m1.save(validate: false)
+      assert_equal 'bob-timesletter', m1.slug
+    end
+  end
+
+end
+
 class ToParamTest < TestCaseClass
 
   include FriendlyId::Test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 5.4.2
 platform: ruby
 authors:
 - Norman Clarke
@@ -35,7 +35,7 @@ cert_chain:
   Hsej0MQ3drCB1eA4c9OXdCUQJnY2aLTq3uNvTbZvoTgWK55eq3KLBJ4zzoKZ4tBX
   /HIFI/fEwYlI1Ji3oikUrHkc4rWgaQ==
   -----END CERTIFICATE-----
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A comprehensive slugging and pretty-URL plugin.