friendly_id 4.1.0.beta.1 → 5.0.0.alpha.1

data/test/object_utils_test.rb

@@ -20,7 +20,6 @@ class ObjectUtilsTest < MiniTest::Unit::TestCase
 
   test "ActiveRecord::Base instances should be unfriendly_ids" do
     model_class = Class.new(ActiveRecord::Base) do
-      self.abstract_class = true
       self.table_name = "authors"
     end
     assert model_class.new.unfriendly_id?

data/test/schema.rb

@@ -1,9 +1,4 @@
 require "friendly_id/migration"
-require "globalize3"
-
-class TranslatedArticle < ActiveRecord::Base
-  translates :slug, :title
-end
 
 module FriendlyId
   module Test
@@ -14,7 +9,6 @@ module FriendlyId
           tables.each do |name|
             drop_table name
           end
-          TranslatedArticle.drop_translation_table!
         end
 
         def up
@@ -55,9 +49,6 @@ module FriendlyId
           add_column :journalists, "slug_es", :string
           add_column :journalists, "slug_de", :string
 
-          # This will be used to test globalize translations
-          TranslatedArticle.create_translation_table! :slug => :string, :title => :string
-
           # This will be used to test relationships
           add_column :books, :author_id, :integer
 
@@ -70,7 +61,7 @@ module FriendlyId
         private
 
         def slugged_tables
-          %w[journalists articles novelists novels manuals translated_articles]
+          %w[journalists articles novelists novels manuals]
         end
 
         def scoped_tables

data/test/shared.rb

@@ -7,18 +7,19 @@ module FriendlyId
           assert !model_class.friendly_id_config.sequence_separator.empty?
         end
 
-        test "should make a new slug if the friendly_id method value has changed" do
+        test "should make a new slug if the slug has been set to nil changed" do
           with_instance_of model_class do |record|
             record.name = "Changed Value"
+            record.slug = nil
             record.save!
             assert_equal "changed-value", record.slug
           end
         end
 
-        test "should increment the slug sequence for duplicate friendly ids" do
+        test "should add a UUID for duplicate friendly ids" do
           with_instance_of model_class do |record|
             record2 = model_class.create! :name => record.name
-            assert record2.friendly_id.match(/2\z/)
+            assert record2.friendly_id.match(/([0-9a-z]+\-){4}[0-9a-z]+\z/)
           end
         end
 
@@ -32,12 +33,13 @@ module FriendlyId
           end
         end
 
-        test "should not increment sequence on save" do
+        test "should not change the sequence on save" do
           with_instance_of model_class do |record|
             record2 = model_class.create! :name => record.name
+            friendly_id = record2.friendly_id
             record2.active = !record2.active
             record2.save!
-            assert record2.friendly_id.match(/2\z/)
+            assert_equal friendly_id, record2.reload.friendly_id
           end
         end
 
@@ -45,8 +47,6 @@ module FriendlyId
           with_instance_of model_class do |record|
             record.slug = nil
             record.save!
-            assert_nil record.slug
-            record.save!
             refute_nil record.slug
           end
         end
@@ -56,7 +56,7 @@ module FriendlyId
           self.class.const_set("Foo", my_model_class)
           with_instance_of my_model_class do |record|
             record.update_attributes my_model_class.friendly_id_config.slug_column => nil
-            record = my_model_class.find(record.id)
+            record = my_model_class.friendly.find(record.id)
             record.class.validate Proc.new {errors[:name] = "FAIL"}
             record.save
             assert_equal record.to_param, record.friendly_id
@@ -69,36 +69,40 @@ module FriendlyId
         test "finds should respect conditions" do
           with_instance_of(model_class) do |record|
             assert_raises(ActiveRecord::RecordNotFound) do
-              model_class.where("1 = 2").find record.friendly_id
+              model_class.where("1 = 2").friendly.find record.friendly_id
+            end
+            assert_raises(ActiveRecord::RecordNotFound) do
+              model_class.where("1 = 2").friendly.find record.id
             end
           end
         end
 
         test "should be findable by friendly id" do
-          with_instance_of(model_class) {|record| assert model_class.find record.friendly_id}
+          with_instance_of(model_class) {|record| assert model_class.friendly.find record.friendly_id}
         end
 
         test "should exist? by friendly id" do
           with_instance_of(model_class) do |record|
-            assert model_class.exists? record.id
-            assert model_class.exists? record.friendly_id
-            assert model_class.exists?({:id => record.id})
-            assert model_class.exists?(['id = ?', record.id])
-            assert !model_class.exists?(record.friendly_id + "-hello")
-            assert !model_class.exists?(0)
+            assert model_class.friendly.exists? record.id
+            assert model_class.friendly.exists? record.id.to_s
+            assert model_class.friendly.exists? record.friendly_id
+            assert model_class.friendly.exists?({:id => record.id})
+            assert model_class.friendly.exists?(['id = ?', record.id])
+            assert !model_class.friendly.exists?(record.friendly_id + "-hello")
+            assert !model_class.friendly.exists?(0)
           end
         end
 
         test "should be findable by id as integer" do
-          with_instance_of(model_class) {|record| assert model_class.find record.id.to_i}
+          with_instance_of(model_class) {|record| assert model_class.friendly.find record.id.to_i}
         end
 
         test "should be findable by id as string" do
-          with_instance_of(model_class) {|record| assert model_class.find record.id.to_s}
+          with_instance_of(model_class) {|record| assert model_class.friendly.find record.id.to_s}
         end
 
         test "should be findable by numeric friendly_id" do
-          with_instance_of(model_class, :name => "206") {|record| assert model_class.find record.friendly_id}
+          with_instance_of(model_class, :name => "206") {|record| assert model_class.friendly.find record.friendly_id}
         end
 
         test "to_param should return the friendly_id" do
@@ -106,23 +110,23 @@ module FriendlyId
         end
 
         test "should be findable by themselves" do
-          with_instance_of(model_class) {|record| assert_equal record, model_class.find(record)}
+          with_instance_of(model_class) {|record| assert_equal record, model_class.friendly.find(record)}
         end
 
         test "updating record's other values should not change the friendly_id" do
           with_instance_of model_class do |record|
             old = record.friendly_id
             record.update_attributes! :active => false
-            assert model_class.find old
+            assert model_class.friendly.find old
           end
         end
 
         test "instances found by a single id should not be read-only" do
-          with_instance_of(model_class) {|record| assert !model_class.find(record.friendly_id).readonly?}
+          with_instance_of(model_class) {|record| assert !model_class.friendly.find(record.friendly_id).readonly?}
         end
 
         test "failing finds with unfriendly_id should raise errors normally" do
-          assert_raises(ActiveRecord::RecordNotFound) {model_class.find 0}
+          assert_raises(ActiveRecord::RecordNotFound) {model_class.friendly.find 0}
         end
 
         test "should return numeric id if the friendly_id is nil" do

data/test/simple_i18n_test.rb

@@ -83,7 +83,7 @@ class SimpleI18nTest < MiniTest::Unit::TestCase
       journalist.save!
       assert_equal "john-smith", journalist.to_param
       I18n.with_locale(:es) do
-        assert_equal "juan-fulano--2", journalist.to_param
+        assert_match(/juan-fulano-.+/, journalist.to_param)
       end
     end
   end
@@ -91,12 +91,13 @@ class SimpleI18nTest < MiniTest::Unit::TestCase
   class RegressionTest < MiniTest::Unit::TestCase
     include FriendlyId::Test
 
-    test "should not overwrite slugs on update_attributes" do
+    test "should not overwrite other locale's slugs on update_attributes" do
       transaction do
         journalist = Journalist.create!(:name => "John Smith")
         journalist.set_friendly_id("Juan Fulano", :es)
         journalist.save!
         assert_equal "john-smith", journalist.to_param
+        journalist.slug = nil
         journalist.update_attributes :name => "Johnny Smith"
         assert_equal "johnny-smith", journalist.to_param
         I18n.with_locale(:es) do

data/test/slugged_test.rb

@@ -88,14 +88,18 @@ class SlugGeneratorTest < MiniTest::Unit::TestCase
 
   test "should quote column names" do
     model_class = Class.new(ActiveRecord::Base) do
-      self.abstract_class = true
+      # This has been added in 635731bb to fix MySQL/Rubinius. It may still
+      # be necessary, but causes an exception to be raised on Rails 4, so I'm
+      # commenting it out. If it causes MySQL/Rubinius to fail again we'll
+      # look for another solution.
+      # self.abstract_class = true
       self.table_name = "journalists"
       extend FriendlyId
       friendly_id :name, :use => :slugged, :slug_column => "strange name"
     end
 
     begin
-      with_instance_of(model_class) {|record| assert model_class.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
@@ -106,7 +110,7 @@ class SlugGeneratorTest < MiniTest::Unit::TestCase
       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"
-      m1 = model_class.find(m1.id)
+      m1 = model_class.friendly.find(m1.id)
       m1.save!
       assert_equal "a-b-c-d", m1.slug
     end
@@ -117,13 +121,13 @@ class SlugGeneratorTest < MiniTest::Unit::TestCase
       record1 = model_class.create! :name => "Peugeuot 206"
       assert_equal "peugeuot-206", record1.slug
       record2 = model_class.create! :name => "Peugeuot 206"
-      assert_equal "peugeuot-206--2", record2.slug
+      assert_match(/\Apeugeuot-206-([a-z0-9]+\-){4}[a-z0-9]+\z/, record2.slug)
     end
   end
 
   test "should correctly sequence slugs with underscores" do
     transaction do
-      record1 = Novelist.create! :name => 'wordsfail, buildings tumble'
+      Novelist.create! :name => 'wordsfail, buildings tumble'
       record2 = Novelist.create! :name => 'word fail'
       assert_equal 'word_fail', record2.slug
     end
@@ -144,19 +148,17 @@ class SlugSeparatorTest < MiniTest::Unit::TestCase
     Journalist
   end
 
-  test "should increment sequence with configured sequence separator" do
+  test "should sequence with configured sequence separator" do
     with_instance_of model_class do |record|
       record2 = model_class.create! :name => record.name
-      assert record2.friendly_id.match(/:2\z/)
+      assert record2.friendly_id.match(/:.*\z/)
     end
   end
 
-  test "should detect when a sequenced slug has changed" do
+  test "should detect when a stored slug has been cleared" do
     with_instance_of model_class do |record|
-      record2 = model_class.create! :name => record.name
-      assert !record2.should_generate_new_friendly_id?
-      record2.name = "hello world"
-      assert record2.should_generate_new_friendly_id?
+      record.slug = nil
+      assert record.should_generate_new_friendly_id?
     end
   end
 
@@ -173,23 +175,7 @@ class SlugSeparatorTest < MiniTest::Unit::TestCase
       record1 = model_class.create! :name => "Peugeuot 206"
       assert_equal "peugeuot-206", record1.slug
       record2 = model_class.create! :name => "Peugeuot 206"
-      assert_equal "peugeuot-206-2", record2.slug
-    end
-  end
-
-  test "should detect when a sequenced slug has changed when name ends in number and using single dash" do
-    model_class = Class.new(ActiveRecord::Base) do
-      self.table_name = "journalists"
-      extend FriendlyId
-      friendly_id :name, :use => :slugged, :sequence_separator => '-'
-    end
-    transaction do
-      record1 = model_class.create! :name => "Peugeuot 206"
-      assert !record1.should_generate_new_friendly_id?
-      record1.save!
-      assert !record1.should_generate_new_friendly_id?
-      record1.name = "Peugeot 307"
-      assert record1.should_generate_new_friendly_id?
+      assert_match(/\Apeugeuot-206-([a-z0-9]+\-){4}[a-z0-9]+\z/, record2.slug)
     end
   end
 end
@@ -201,7 +187,7 @@ class DefaultScopeTest < MiniTest::Unit::TestCase
   class Journalist < ActiveRecord::Base
     extend FriendlyId
     friendly_id :name, :use => :slugged
-    default_scope :order => 'id ASC', :conditions => { :active => true }
+    default_scope -> { where(:active => true).order('id ASC') }
   end
 
   test "friendly_id should correctly sequence a default_scoped ordered table" do
@@ -218,23 +204,6 @@ class DefaultScopeTest < MiniTest::Unit::TestCase
   end
 end
 
-class SluggedRegressionsTest < MiniTest::Unit::TestCase
-  include FriendlyId::Test
-
-  def model_class
-    Journalist
-  end
-
-  test "should increment the slug sequence for duplicate friendly ids beyond 10" do
-    with_instance_of model_class do |record|
-      (2..12).each do |i|
-        r = model_class.create! :name => record.name
-        assert r.friendly_id.match(/#{i}\z/)
-      end
-    end
-  end
-end
-
 class UnderscoreAsSequenceSeparatorRegressionTest < MiniTest::Unit::TestCase
   include FriendlyId::Test
 
@@ -255,7 +224,7 @@ class UnderscoreAsSequenceSeparatorRegressionTest < MiniTest::Unit::TestCase
 
 end
 
-# https://github.com/norman/friendly_id/issues/148
+# https://github.com/FriendlyId/friendly_id/issues/148
 class FailedValidationAfterUpdateRegressionTest < MiniTest::Unit::TestCase
   include FriendlyId::Test
 

data/test/sti_test.rb

@@ -50,13 +50,13 @@ class StiTest < MiniTest::Unit::TestCase
     assert_equal :bar, klass.friendly_id_config.slug_column
   end
 
-  test "friendly_id slugs should not clash with eachother" do
+  test "friendly_id slugs should not clash with each other" do
     transaction do
       journalist  = model_class.base_class.create! :name => 'foo bar'
       editoralist = model_class.create! :name => 'foo bar'
 
       assert_equal 'foo-bar', journalist.slug
-      assert_equal 'foo-bar--2', editoralist.slug
+      assert_match(/foo-bar-.+/, editoralist.slug)
     end
   end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.1.0.beta.1
-  prerelease: 6
+  version: 5.0.0.alpha.1
 platform: ruby
 authors:
 - Norman Clarke
@@ -10,179 +9,127 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: maruku
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: globalize3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
-  plugins for
-
+description: |
+  FriendlyId is the "Swiss Army bulldozer" of slugging and permalink plugins for
   Ruby on Rails. It allows you to create pretty URLs and work with human-friendly
-
   strings as if they were numeric ids for Active Record models.
-
-'
 email:
 - norman@njclarke.com
-- parndt@gmail.com
+- p@arndt.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -200,23 +147,23 @@ files:
 - WhatsNew.md
 - bench.rb
 - friendly_id.gemspec
-- gemfiles/Gemfile.rails-3.0.rb
-- gemfiles/Gemfile.rails-3.1.rb
-- gemfiles/Gemfile.rails-3.2.rb
+- gemfiles/Gemfile.rails-4.0.rb
 - lib/friendly_id.rb
+- lib/friendly_id/.gitattributes
 - lib/friendly_id/base.rb
+- lib/friendly_id/candidates.rb
 - lib/friendly_id/configuration.rb
-- lib/friendly_id/finder_methods.rb
-- lib/friendly_id/globalize.rb
 - lib/friendly_id/history.rb
 - lib/friendly_id/migration.rb
 - lib/friendly_id/object_utils.rb
 - lib/friendly_id/reserved.rb
 - lib/friendly_id/scoped.rb
+- lib/friendly_id/scopes.rb
 - lib/friendly_id/simple_i18n.rb
 - lib/friendly_id/slug.rb
 - lib/friendly_id/slug_generator.rb
 - lib/friendly_id/slugged.rb
+- lib/friendly_id/version.rb
 - lib/generators/friendly_id_generator.rb
 - test/base_test.rb
 - test/compatibility/ancestry/Gemfile
@@ -228,7 +175,6 @@ files:
 - test/core_test.rb
 - test/databases.yml
 - test/generator_test.rb
-- test/globalize_test.rb
 - test/helper.rb
 - test/history_test.rb
 - test/object_utils_test.rb
@@ -239,38 +185,29 @@ files:
 - test/simple_i18n_test.rb
 - test/slugged_test.rb
 - test/sti_test.rb
-homepage: http://github.com/norman/friendly_id
-licenses: []
-post_install_message: ! 'NOTE: FriendlyId 4.x breaks compatibility with 3.x. If you''re
-  upgrading
-
-  from 3.x, please see this document:
-
-
-  http://rubydoc.info/github/norman/friendly_id/master/file/WhatsNew.md
-
-
-'
+homepage: http://github.com/FriendlyId/friendly_id
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: friendly_id
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A comprehensive slugging and pretty-URL plugin.
 test_files: []
 has_rdoc: