friendly_id 5.4.0 → 5.5.1

data/test/slugged_test.rb

@@ -2,25 +2,24 @@ require "helper"
 
 class Journalist < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :name, :use => :slugged
+  friendly_id :name, use: :slugged
 end
 
 class Article < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :name, :use => :slugged
+  friendly_id :name, use: :slugged
 end
 
 class Novelist < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :name, :use => :slugged, :sequence_separator => '_'
+  friendly_id :name, use: :slugged, sequence_separator: "_"
 
   def normalize_friendly_id(string)
-    super.gsub("-", "_")
+    super.tr("-", "_")
   end
 end
 
 class SluggedTest < TestCaseClass
-
   include FriendlyId::Test
   include FriendlyId::Test::Shared::Core
   include FriendlyId::Test::Shared::Slugged
@@ -33,13 +32,13 @@ class SluggedTest < TestCaseClass
     model_class = Class.new(ActiveRecord::Base) do
       self.table_name = "articles"
       extend FriendlyId
-      friendly_id :name, :use => :slugged
-      validates_length_of :slug, :maximum => 1
+      friendly_id :name, use: :slugged
+      validates_length_of :slug, maximum: 1
       def self.name
         "Article"
       end
     end
-    instance = model_class.new :name => "hello"
+    instance = model_class.new name: "hello"
     refute instance.valid?
   end
 
@@ -55,21 +54,21 @@ class SluggedTest < TestCaseClass
     model_class = Class.new(ActiveRecord::Base) do
       self.table_name = "journalists"
       extend FriendlyId
-      friendly_id :name, :use => :slugged
+      friendly_id :name, use: :slugged
       validates_uniqueness_of :slug_en
       def self.name
         "Journalist"
       end
     end
     transaction do
-      instance = model_class.create! :name => "hello", :slug_en => "hello"
-      instance2 = model_class.create :name => "hello", :slug_en => "hello"
+      instance = model_class.create! name: "hello", slug_en: "hello"
+      instance2 = model_class.create name: "hello", slug_en: "hello"
       assert instance.valid?
       refute instance2.valid?
     end
   end
 
-  test 'should allow a record to reuse its own slug' do
+  test "should allow a record to reuse its own slug" do
     with_instance_of(model_class) do |record|
       old_id = record.friendly_id
       record.slug = nil
@@ -95,7 +94,7 @@ class SluggedTest < TestCaseClass
   test "should set slug on create if unrelated validations fail" do
     klass = Class.new model_class do
       validates_presence_of :active
-      friendly_id :name, :use => :slugged
+      friendly_id :name, use: :slugged
 
       def self.name
         "Journalist"
@@ -103,18 +102,18 @@ class SluggedTest < TestCaseClass
     end
 
     transaction do
-      instance = klass.new :name => 'foo'
+      instance = klass.new name: "foo"
       refute instance.save
       refute instance.valid?
-      assert_equal 'foo', instance.slug
+      assert_equal "foo", instance.slug
     end
   end
 
   test "should not set slug on create if slug validation fails" do
     klass = Class.new model_class do
       validates_presence_of :active
-      validates_length_of :slug, :minimum => 2
-      friendly_id :name, :use => :slugged
+      validates_length_of :slug, minimum: 2
+      friendly_id :name, use: :slugged
 
       def self.name
         "Journalist"
@@ -122,7 +121,7 @@ class SluggedTest < TestCaseClass
     end
 
     transaction do
-      instance = klass.new :name => 'x'
+      instance = klass.new name: "x"
       refute instance.save
       refute instance.valid?
       assert_nil instance.slug
@@ -131,10 +130,10 @@ class SluggedTest < TestCaseClass
 
   test "should set slug on create if unrelated validations fail with custom slug_column" do
     klass = Class.new(ActiveRecord::Base) do
-      self.table_name = 'authors'
+      self.table_name = "authors"
       extend FriendlyId
       validates_presence_of :active
-      friendly_id :name, :use => :slugged, :slug_column => :subdomain
+      friendly_id :name, use: :slugged, slug_column: :subdomain
 
       def self.name
         "Author"
@@ -142,19 +141,19 @@ class SluggedTest < TestCaseClass
     end
 
     transaction do
-      instance = klass.new :name => 'foo'
+      instance = klass.new name: "foo"
       refute instance.save
       refute instance.valid?
-      assert_equal 'foo', instance.subdomain
+      assert_equal "foo", instance.subdomain
     end
   end
 
   test "should not set slug on create if custom slug column validations fail" do
     klass = Class.new(ActiveRecord::Base) do
-      self.table_name = 'authors'
+      self.table_name = "authors"
       extend FriendlyId
-      validates_length_of :subdomain, :minimum => 2
-      friendly_id :name, :use => :slugged, :slug_column => :subdomain
+      validates_length_of :subdomain, minimum: 2
+      friendly_id :name, use: :slugged, slug_column: :subdomain
 
       def self.name
         "Author"
@@ -162,7 +161,7 @@ class SluggedTest < TestCaseClass
     end
 
     transaction do
-      instance = klass.new :name => 'x'
+      instance = klass.new name: "x"
       refute instance.save
       refute instance.valid?
       assert_nil instance.subdomain
@@ -172,7 +171,7 @@ class SluggedTest < TestCaseClass
   test "should keep new slug on save if unrelated validations fail" do
     klass = Class.new model_class do
       validates_presence_of :active
-      friendly_id :name, :use => :slugged
+      friendly_id :name, use: :slugged
 
       def self.name
         "Journalist"
@@ -180,22 +179,22 @@ class SluggedTest < TestCaseClass
     end
 
     transaction do
-      instance = klass.new :name => 'foo', :active => true
+      instance = klass.new name: "foo", active: true
       assert instance.save
       assert instance.valid?
-      instance.name = 'foobar'
+      instance.name = "foobar"
       instance.slug = nil
       instance.active = nil
       refute instance.save
       refute instance.valid?
-      assert_equal 'foobar', instance.slug
+      assert_equal "foobar", instance.slug
     end
   end
 
   test "should not update slug on save if slug validations fail" do
     klass = Class.new model_class do
-      validates_length_of :slug, :minimum => 2
-      friendly_id :name, :use => :slugged
+      validates_length_of :slug, minimum: 2
+      friendly_id :name, use: :slugged
 
       def self.name
         "Journalist"
@@ -203,20 +202,19 @@ class SluggedTest < TestCaseClass
     end
 
     transaction do
-      instance = klass.new :name => 'foo', :active => true
+      instance = klass.new name: "foo", active: true
       assert instance.save
       assert instance.valid?
-      instance.name = 'x'
+      instance.name = "x"
       instance.slug = nil
       instance.active = nil
       refute instance.save
-      assert_equal 'foo', instance.slug
+      assert_equal "foo", instance.slug
     end
   end
 end
 
 class SlugGeneratorTest < TestCaseClass
-
   include FriendlyId::Test
 
   def model_class
@@ -232,11 +230,11 @@ class SlugGeneratorTest < TestCaseClass
       # self.abstract_class = true
       self.table_name = "journalists"
       extend FriendlyId
-      friendly_id :name, :use => :slugged, :slug_column => "strange name"
+      friendly_id :name, use: :slugged, slug_column: "strange name"
     end
 
     begin
-      with_instance_of(model_class) {|record| assert model_class.friendly.find(record.friendly_id)}
+      with_instance_of(model_class) { |record| assert model_class.friendly.find(record.friendly_id) }
     rescue ActiveRecord::StatementInvalid
       flunk "column name was not quoted"
     end
@@ -244,9 +242,9 @@ class SlugGeneratorTest < TestCaseClass
 
   test "should not resequence lower sequences on update" do
     transaction do
-      m1 = model_class.create! :name => "a b c d"
+      m1 = model_class.create! name: "a b c d"
       assert_equal "a-b-c-d", m1.slug
-      model_class.create! :name => "a b c d"
+      model_class.create! name: "a b c d"
       m1 = model_class.friendly.find(m1.id)
       m1.save!
       assert_equal "a-b-c-d", m1.slug
@@ -255,37 +253,35 @@ class SlugGeneratorTest < TestCaseClass
 
   test "should correctly sequence slugs that end with numbers" do
     transaction do
-      record1 = model_class.create! :name => "Peugeot 206"
+      record1 = model_class.create! name: "Peugeot 206"
       assert_equal "peugeot-206", record1.slug
-      record2 = model_class.create! :name => "Peugeot 206"
-      assert_match(/\Apeugeot-206-([a-z0-9]+\-){4}[a-z0-9]+\z/, record2.slug)
+      record2 = model_class.create! name: "Peugeot 206"
+      assert_match(/\Apeugeot-206-([a-z0-9]+-){4}[a-z0-9]+\z/, record2.slug)
     end
   end
 
   test "should correctly sequence slugs with underscores" do
     transaction do
-      Novelist.create! :name => 'wordsfail, buildings tumble'
-      record2 = Novelist.create! :name => 'word fail'
-      assert_equal 'word_fail', record2.slug
+      Novelist.create! name: "wordsfail, buildings tumble"
+      record2 = Novelist.create! name: "word fail"
+      assert_equal "word_fail", record2.slug
     end
   end
 
   test "should correctly sequence numeric slugs" do
     transaction do
-      n2 = 2.times.map {Article.create :name => '123'}.last
+      n2 = 2.times.map { Article.create name: "123" }.last
       assert_match(/\A123-.*/, n2.friendly_id)
     end
   end
-
 end
 
 class SlugSeparatorTest < TestCaseClass
-
   include FriendlyId::Test
 
   class Journalist < ActiveRecord::Base
     extend FriendlyId
-    friendly_id :name, :use => :slugged, :sequence_separator => ":"
+    friendly_id :name, use: :slugged, sequence_separator: ":"
   end
 
   def model_class
@@ -294,7 +290,7 @@ class SlugSeparatorTest < TestCaseClass
 
   test "should sequence with configured sequence separator" do
     with_instance_of model_class do |record|
-      record2 = model_class.create! :name => record.name
+      record2 = model_class.create! name: record.name
       assert record2.friendly_id.match(/:.*\z/)
     end
   end
@@ -310,34 +306,32 @@ class SlugSeparatorTest < TestCaseClass
     model_class = Class.new(ActiveRecord::Base) do
       self.table_name = "journalists"
       extend FriendlyId
-      friendly_id :name, :use => :slugged, :sequence_separator => '-'
+      friendly_id :name, use: :slugged, sequence_separator: "-"
       def self.name
         "Journalist"
       end
     end
     transaction do
-      record1 = model_class.create! :name => "Peugeot 206"
+      record1 = model_class.create! name: "Peugeot 206"
       assert_equal "peugeot-206", record1.slug
-      record2 = model_class.create! :name => "Peugeot 206"
-      assert_match(/\Apeugeot-206-([a-z0-9]+\-){4}[a-z0-9]+\z/, record2.slug)
+      record2 = model_class.create! name: "Peugeot 206"
+      assert_match(/\Apeugeot-206-([a-z0-9]+-){4}[a-z0-9]+\z/, record2.slug)
     end
   end
 
   test "should sequence blank slugs without a separator" do
-    with_instance_of model_class, :name => "" do |record|
-      assert_match(/\A([a-z0-9]+\-){4}[a-z0-9]+\z/, record.slug)
+    with_instance_of model_class, name: "" do |record|
+      assert_match(/\A([a-z0-9]+-){4}[a-z0-9]+\z/, record.slug)
     end
   end
-
 end
 
 class SlugLimitTest < TestCaseClass
-
   include FriendlyId::Test
 
   class Journalist < ActiveRecord::Base
     extend FriendlyId
-    friendly_id :name, :use => :slugged, :slug_limit => 40
+    friendly_id :name, use: :slugged, slug_limit: 40
   end
 
   def model_class
@@ -346,48 +340,45 @@ class SlugLimitTest < TestCaseClass
 
   test "should limit slug size" do
     transaction do
-      m1 = model_class.create! :name => 'a' * 50
-      assert_equal m1.slug, 'a' * 40
-      m2 = model_class.create! :name => m1.name
+      m1 = model_class.create! name: "a" * 50
+      assert_equal m1.slug, "a" * 40
+      m2 = model_class.create! name: m1.name
       m2.save!
       # "aaa-<uid>"
-      assert_match(/\Aa{3}\-/, m2.slug)
+      assert_match(/\Aa{3}-/, m2.slug)
     end
   end
 end
 
 class DefaultScopeTest < TestCaseClass
-
   include FriendlyId::Test
 
   class Journalist < ActiveRecord::Base
     extend FriendlyId
-    friendly_id :name, :use => :slugged
-    default_scope -> { where(:active => true).order('id ASC') }
+    friendly_id :name, use: :slugged
+    default_scope -> { where(active: true).order("id ASC") }
   end
 
   test "friendly_id should correctly sequence a default_scoped ordered table" do
     transaction do
-      3.times { assert Journalist.create :name => "a", :active => true }
+      3.times { assert Journalist.create name: "a", active: true }
     end
   end
 
   test "friendly_id should correctly sequence a default_scoped scoped table" do
     transaction do
-      assert Journalist.create :name => "a", :active => false
-      assert Journalist.create :name => "a", :active => true
+      assert Journalist.create name: "a", active: false
+      assert Journalist.create name: "a", active: true
     end
   end
-
 end
 
 class UuidAsPrimaryKeyFindTest < TestCaseClass
-
   include FriendlyId::Test
 
   class MenuItem < ActiveRecord::Base
     extend FriendlyId
-    friendly_id :name, :use => :slugged
+    friendly_id :name, use: :slugged
     before_create :init_primary_key
 
     def self.primary_key
@@ -400,6 +391,7 @@ class UuidAsPrimaryKeyFindTest < TestCaseClass
     end
 
     private
+
     def init_primary_key
       self.uuid_key = SecureRandom.uuid
     end
@@ -427,46 +419,40 @@ class UuidAsPrimaryKeyFindTest < TestCaseClass
       end
     end
   end
-
 end
 
 class UnderscoreAsSequenceSeparatorRegressionTest < TestCaseClass
-
   include FriendlyId::Test
 
   class Manual < ActiveRecord::Base
     extend FriendlyId
-    friendly_id :name, :use => :slugged, :sequence_separator => "_"
+    friendly_id :name, use: :slugged, sequence_separator: "_"
   end
 
   test "should not create duplicate slugs" do
     3.times do
       transaction do
-        begin
-          assert Manual.create! :name => "foo"
-        rescue
-          flunk "Tried to insert duplicate slug"
-        end
+        assert Manual.create! name: "foo"
+      rescue
+        flunk "Tried to insert duplicate slug"
       end
     end
   end
-
 end
 
 # https://github.com/norman/friendly_id/issues/148
 class FailedValidationAfterUpdateRegressionTest < TestCaseClass
-
   include FriendlyId::Test
 
   class Journalist < ActiveRecord::Base
     extend FriendlyId
-    friendly_id :name, :use => :slugged
+    friendly_id :name, use: :slugged
     validates_presence_of :slug_de
   end
 
   test "to_param should return the unchanged value if the slug changes before validation fails" do
     transaction do
-      journalist = Journalist.create! :name => "Joseph Pulitzer", :slug_de => "value"
+      journalist = Journalist.create! name: "Joseph Pulitzer", slug_de: "value"
       assert_equal "joseph-pulitzer", journalist.to_param
       assert journalist.valid?
       assert journalist.persisted?
@@ -476,18 +462,45 @@ class FailedValidationAfterUpdateRegressionTest < TestCaseClass
       assert_equal "joseph-pulitzer", journalist.to_param
     end
   end
+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
 
   class Journalist < ActiveRecord::Base
     extend FriendlyId
     validates_presence_of :active
-    validates_length_of :slug, :minimum => 2
-    friendly_id :name, :use => :slugged
+    validates_length_of :slug, minimum: 2
+    friendly_id :name, use: :slugged
 
     attr_accessor :to_param_in_callback
 
@@ -501,86 +514,85 @@ class ToParamTest < TestCaseClass
   end
 
   test "to_param should return original slug if record failed validation" do
-    journalist = Journalist.new :name => 'Clark Kent', :active => nil
+    journalist = Journalist.new name: "Clark Kent", active: nil
     refute journalist.save
-    assert_equal 'clark-kent', journalist.to_param
+    assert_equal "clark-kent", journalist.to_param
   end
 
   test "to_param should clear slug attributes if slug attribute fails validation" do
-    journalist = Journalist.new :name => 'x', :active => true
+    journalist = Journalist.new name: "x", active: true
     refute journalist.save
     assert_nil journalist.to_param
   end
 
   test "to_param should clear slug attribute if slug attribute fails validation and unrelated validation fails" do
-    journalist = Journalist.new :name => 'x', :active => nil
+    journalist = Journalist.new name: "x", active: nil
     refute journalist.save
     assert_nil journalist.to_param
   end
 
   test "to_param should use slugged attribute if record saved successfully" do
     transaction do
-      journalist = Journalist.new :name => 'Clark Kent', :active => true
+      journalist = Journalist.new name: "Clark Kent", active: true
       assert journalist.save
-      assert_equal 'clark-kent', journalist.to_param
+      assert_equal "clark-kent", journalist.to_param
     end
   end
 
   test "to_param should use new slug if existing record changes but fails to save" do
     transaction do
-      journalist = Journalist.new :name => 'Clark Kent', :active => true
+      journalist = Journalist.new name: "Clark Kent", active: true
       assert journalist.save
-      journalist.name = 'Superman'
+      journalist.name = "Superman"
       journalist.slug = nil
       journalist.active = nil
       refute journalist.save
-      assert_equal 'superman', journalist.to_param
+      assert_equal "superman", journalist.to_param
     end
   end
 
   test "to_param should use original slug if new slug attribute is not valid" do
     transaction do
-      journalist = Journalist.new :name => 'Clark Kent', :active => true
+      journalist = Journalist.new name: "Clark Kent", active: true
       assert journalist.save
-      journalist.name = 'x'
+      journalist.name = "x"
       journalist.slug = nil
       journalist.active = nil
       refute journalist.save
-      assert_equal 'clark-kent', journalist.to_param
+      assert_equal "clark-kent", journalist.to_param
     end
   end
 
   test "to_param should use new slug if existing record changes successfully" do
     transaction do
-      journalist = Journalist.new :name => 'Clark Kent', :active => true
+      journalist = Journalist.new name: "Clark Kent", active: true
       assert journalist.save
-      journalist.name = 'Superman'
+      journalist.name = "Superman"
       journalist.slug = nil
       assert journalist.save
-      assert_equal 'superman', journalist.to_param
+      assert_equal "superman", journalist.to_param
     end
   end
 
   test "to_param should use new slug within callbacks if new record is saved successfully" do
     transaction do
-      journalist = Journalist.new :name => 'Clark Kent', :active => true
+      journalist = Journalist.new name: "Clark Kent", active: true
       assert journalist.save
-      assert_equal 'clark-kent', journalist.to_param_in_callback, "value of to_param in callback should use the new slug value"
+      assert_equal "clark-kent", journalist.to_param_in_callback, "value of to_param in callback should use the new slug value"
     end
   end
 
   test "to_param should use new slug within callbacks if existing record changes successfully" do
     transaction do
-      journalist = Journalist.new :name => 'Clark Kent', :active => true
+      journalist = Journalist.new name: "Clark Kent", active: true
       assert journalist.save
       assert journalist.valid?
-      journalist.name = 'Superman'
+      journalist.name = "Superman"
       journalist.slug = nil
       assert journalist.save, "save should be successful"
-      assert_equal 'superman', journalist.to_param_in_callback, "value of to_param in callback should use the new slug value"
+      assert_equal "superman", journalist.to_param_in_callback, "value of to_param in callback should use the new slug value"
     end
   end
-
 end
 
 class ConfigurableRoutesTest < TestCaseClass
@@ -589,18 +601,18 @@ class ConfigurableRoutesTest < TestCaseClass
   class Article < ActiveRecord::Base
     extend FriendlyId
 
-    friendly_id :name, :use => :slugged, :routes => :friendly
+    friendly_id :name, use: :slugged, routes: :friendly
   end
 
   class Novel < ActiveRecord::Base
     extend FriendlyId
 
-    friendly_id :name, :use => :slugged, :routes => :default
+    friendly_id :name, use: :slugged, routes: :default
   end
 
   test "to_param should return a friendly id when the routes option is set to :friendly" do
     transaction do
-      article = Article.create! :name => "Titanic Hits; Iceberg Sinks"
+      article = Article.create! name: "Titanic Hits; Iceberg Sinks"
 
       assert_equal "titanic-hits-iceberg-sinks", article.to_param
     end
@@ -608,7 +620,7 @@ class ConfigurableRoutesTest < TestCaseClass
 
   test "to_param should return the id when the routes option is set to anything but friendly" do
     transaction do
-      novel = Novel.create! :name => "Don Quixote"
+      novel = Novel.create! name: "Don Quixote"
 
       assert_equal novel.id.to_s, novel.to_param
     end