friendly_id 5.0.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae540f2127bb8f4e872640deb40fe582eedad06a
-  data.tar.gz: 8d9e0ddb7339a440bd8000240a083b5586dee6a8
+  metadata.gz: 6650a7d112a806cb566708865ade666184dab77a
+  data.tar.gz: 2cde3e354e65e588d566a02f7e61d2b7e5e77657
 SHA512:
-  metadata.gz: dcbcea5a8df1f5919c72ac9775ad619953fc776a7191c5e163d04c3361d9338fda12e37a7b50104345ef8583c3e8ac589b563231aa99e97cf52ed5305550fd2d
-  data.tar.gz: 2f48d2758e511c32ad5de5187c28509799cd2a46180d6d9b69ee6e190a5d8449b076e9f8cf7ef1159a69b6fc572f650bcb907087303ac2396b483418b2fe71d1
+  metadata.gz: 38805122e7a3cef575c89dab8945589815c80d871ec01f6f2932fb7542a9240b00cdb3506d8cc1edbe5f42aa65d96c66cf5c3909dd9f4eefd5dfa03745f846c9
+  data.tar.gz: fc87f81b4c941571d34c961efa2fa6c81fbb02c29befa9a7b615ff7a3c392884f8dea699be2774c231449aeb2c982a38aea47bc7504b70e5f34b2847d0a491ae

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 2.0.0
   - 2.1.0
   - jruby-19mode
-  - rbx
+  - rbx-2
 env:
   - DB=postgres
   - DB=mysql

data/Changelog.md

@@ -3,14 +3,27 @@
 We would like to think our many {file:Contributors contributors} for
 suggestions, ideas and improvements to FriendlyId.
 
+## 5.0.4 (2014-05-29)
+
+* Bug fix for call to removed `primary` method on Edge Rails. ([#557](https://github.com/norman/friendly_id/pull/557)).
+* Bug for for unwanted slug regeneration when the slug source was not changed, but not the actual generated slug ([#563](https://github.com/norman/friendly_id/pull/562)).
+* Big fix to look for UUIDs only at the end of slugs ([#548](https://github.com/norman/friendly_id/pull/548)).
+* Various documentation and test setup improvements.
+
+
+## 5.0.3 (2013-02-14)
+
+* Bug fix for calls to #dup with unslugged models ([#518](https://github.com/norman/friendly_id/pull/518)).
+* Bug fixes for STI ([#516](https://github.com/norman/friendly_id/pull/516)).
+* Bug fix for slug regeneration (both scoped and unscoped) ([#513](https://github.com/norman/friendly_id/pull/513)).
+* Bug fix for finds with models that use the :history module ([#509](https://github.com/norman/friendly_id/pull/509)).
+
 ## 5.0.2 (2013-12-10)
 
 * Query performance improvements ([#497](https://github.com/norman/friendly_id/pull/497)).
 * Documentation improvements (thanks [John Bachir](https://github.com/jjb)).
 * Minor refactoring of internals (thanks [Gagan Ahwad](https://github.com/gaganawhad)).
 * Set slug to `nil` on call to `dup` to ensure slug is generated ([#483](https://github.com/norman/friendly_id/pull/483)).
-* Bug fixes for STI ([#516](https://github.com/norman/friendly_id/pull/516)).
-* Bug fix for finds with models that use the :history module ([#509](https://github.com/norman/friendly_id/pull/509)).
 
 ## 5.0.1 (2013-10-27)
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2010 Norman Clarke, Adrian Mugnolo and Emilio Tagua.
+Copyright (c) 2008-2014 Norman Clarke, Adrian Mugnolo and Emilio Tagua.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -145,6 +145,7 @@ Docs for older versions are also available:
 
 * [4.0](http://norman.github.io/friendly_id/4.0/)
 * [3.3](http://norman.github.io/friendly_id/3.3/)
+* [2.3](http://norman.github.io/friendly_id/2.3/)
 
 The best place to start is with the
 [Guide](http://norman.github.io/friendly_id/file.Guide.html),
@@ -165,13 +166,7 @@ gem 'friendly_id', '~> 5.0.0' # Note: You MUST use 5.0.0 or greater for Rails 4.
 ```
 ```shell
 rails generate friendly_id
-rails generate scaffold user name:string slug:string
-```
-```ruby
-# edit db/migrate/*_create_users.rb
-add_index :users, :slug, unique: true
-```
-```shell
+rails generate scaffold user name:string slug:string:uniq
 rake db:migrate
 ```
 ```ruby
@@ -233,7 +228,7 @@ volunteers](https://github.com/norman/friendly_id/contributors).
 
 ## License
 
-Copyright (c) 2008-2013 Norman Clarke and contributors, released under the MIT
+Copyright (c) 2008-2014 Norman Clarke and contributors, released under the MIT
 license.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of

data/friendly_id.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', '>= 4.0.0'
 
   s.add_development_dependency 'coveralls'
-  s.add_development_dependency 'railties', '~> 4.0.0'
+  s.add_development_dependency 'railties', '~> 4.0'
   s.add_development_dependency 'minitest', '>= 4.4.0'
   s.add_development_dependency 'mocha', '~> 0.13.3'
   s.add_development_dependency 'yard'

data/gemfiles/Gemfile.rails-4.1.rb

@@ -2,8 +2,8 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'activerecord', '~> 4.1.0.beta1'
-gem 'railties', '~> 4.1.0.beta1'
+gem 'activerecord', '~> 4.1.0'
+gem 'railties', '~> 4.1.0'
 
 # Database Configuration
 group :development, :test do
@@ -26,4 +26,4 @@ group :development, :test do
     gem 'rubinius-developer_tools'
     gem 'json'
   end
-end
+end

data/gemfiles/Gemfile.rails-stable.rb

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'rails', github: 'rails/rails', branch: '4-0-stable' do
+gem 'rails', github: 'rails/rails', branch: '4-1-stable' do
   gem 'activerecord'
   gem 'railties'
 end

data/lib/friendly_id/base.rb

@@ -222,7 +222,7 @@ often better and easier to use {FriendlyId::Slugged slugs}.
     end
 
     def primary_key_type
-      @primary_key_type ||= columns.find(&:primary).type
+      @primary_key_type ||= columns.find { |c| c.name == primary_key}.type
     end
   end
 

data/lib/friendly_id/finder_methods.rb

@@ -47,7 +47,7 @@ module FriendlyId
       when :integer
         Integer(id, 10) rescue false
       when :uuid
-        id.match /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
+        id.match /\A[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\z/
       else
         true
       end

data/lib/friendly_id/scoped.rb

@@ -126,11 +126,8 @@ an example of one way to set this up:
       friendly_id_config.scope_columns.each do |column|
         relation = relation.where(column => send(column))
       end
-      if changed.include?(friendly_id_config.slug_column)
-        primary_key_name = self.class.primary_key
-        relation = relation.where.not(primary_key_name => send(primary_key_name))
-      end
-      relation
+      primary_key_name = self.class.primary_key
+      relation.where.not(primary_key_name => send(primary_key_name))
     end
     private :scope_for_slug_generator
 

data/lib/friendly_id/slugged.rb

@@ -186,6 +186,18 @@ control exactly when new friendly ids are set:
       end
     end
 
+If you want to extend the default behavior but, adding your own conditions,
+don't forget to invoke `super` from your implementation:
+
+    class Category < ActiveRecord::Base
+      extend FriendlyId
+      friendly_id :name, :use => :slugged
+
+      def should_generate_new_friendly_id?
+        name_changed? || super
+      end
+    end
+
 #### Locale-specific Transliterations
 
 Active Support's `parameterize` uses
@@ -300,12 +312,8 @@ Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
     def scope_for_slug_generator
       scope = self.class.base_class.unscoped
       scope = scope.friendly unless scope.respond_to?(:exists_by_friendly_id?)
-
-      if changed.include?(friendly_id_config.slug_column)
-        primary_key_name = self.class.primary_key
-        scope = scope.where.not(primary_key_name => send(primary_key_name))
-      end
-      scope
+      primary_key_name = self.class.primary_key
+      scope.where.not(primary_key_name => send(primary_key_name))
     end
     private :scope_for_slug_generator
 

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = "5.0.3"
+  VERSION = "5.0.4"
 end

data/test/helper.rb

@@ -18,6 +18,8 @@ if ENV["COVERAGE"]
   end
 end
 
+I18n.enforce_available_locales = false
+
 require "friendly_id"
 
 # If you want to see the ActiveRecord log, invoke the tests using `rake test LOG=true`

data/test/schema.rb

@@ -23,10 +23,10 @@ module FriendlyId
             end
           end
 
-          tables_with_string_primary_key.each do |table_name|
-            create_table table_name, primary_key: :string_key, id: false do |t|
+          tables_with_uuid_primary_key.each do |table_name|
+            create_table table_name, primary_key: :uuid_key, id: false do |t|
               t.string :name
-              t.string :string_key, null: false
+              t.string :uuid_key, null: false
               t.string :slug
             end
             add_index table_name, :slug, unique: true
@@ -73,7 +73,7 @@ module FriendlyId
           %w[journalists articles novelists novels manuals]
         end
 
-        def tables_with_string_primary_key
+        def tables_with_uuid_primary_key
           ["menu_items"]
         end
 

data/test/slugged_test.rb

@@ -77,6 +77,21 @@ class SluggedTest < MiniTest::Unit::TestCase
       assert_equal old_id, record.friendly_id
     end
   end
+
+  test "should not update matching slug" do
+    with_instance_of(model_class) do |record|
+      class << record
+        def should_generate_new_friendly_id?
+          name_changed?
+        end
+      end
+      old_id = record.friendly_id
+      record.name += " "
+      record.save!
+      assert_equal old_id, record.friendly_id
+    end
+  end
+
 end
 
 class SlugGeneratorTest < MiniTest::Unit::TestCase
@@ -119,10 +134,10 @@ class SlugGeneratorTest < MiniTest::Unit::TestCase
 
   test "should correctly sequence slugs that end with numbers" do
     transaction do
-      record1 = model_class.create! :name => "Peugeuot 206"
-      assert_equal "peugeuot-206", record1.slug
-      record2 = model_class.create! :name => "Peugeuot 206"
-      assert_match(/\Apeugeuot-206-([a-z0-9]+\-){4}[a-z0-9]+\z/, record2.slug)
+      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)
     end
   end
 
@@ -209,10 +224,10 @@ class SlugSeparatorTest < MiniTest::Unit::TestCase
       end
     end
     transaction do
-      record1 = model_class.create! :name => "Peugeuot 206"
-      assert_equal "peugeuot-206", record1.slug
-      record2 = model_class.create! :name => "Peugeuot 206"
-      assert_match(/\Apeugeuot-206-([a-z0-9]+\-){4}[a-z0-9]+\z/, record2.slug)
+      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)
     end
   end
 end
@@ -241,7 +256,7 @@ class DefaultScopeTest < MiniTest::Unit::TestCase
   end
 end
 
-class StringAsPrimaryKeyFindTest < MiniTest::Unit::TestCase
+class UuidAsPrimaryKeyFindTest < MiniTest::Unit::TestCase
   include FriendlyId::Test
 
   class MenuItem < ActiveRecord::Base
@@ -250,12 +265,17 @@ class StringAsPrimaryKeyFindTest < MiniTest::Unit::TestCase
     before_create :init_primary_key
 
     def self.primary_key
-      "string_key"
+      "uuid_key"
+    end
+
+    # Overwrite the method added by FriendlyId
+    def self.primary_key_type
+      :uuid
     end
 
     private
     def init_primary_key
-      self.string_key = SecureRandom.uuid
+      self.uuid_key = SecureRandom.uuid
     end
   end
 
@@ -263,16 +283,25 @@ class StringAsPrimaryKeyFindTest < MiniTest::Unit::TestCase
     MenuItem
   end
 
-  test "should have a string as a primary key" do
-    assert_equal model_class.primary_key, "string_key"
-    assert_equal model_class.columns.find(&:primary).name, "string_key"
+  test "should have a uuid_key as a primary key" do
+    assert_equal model_class.primary_key, "uuid_key"
+    assert_equal model_class.columns.find { |c| c.name == model_class.primary_key}.name, "uuid_key"
+    assert_equal model_class.primary_key_type, :uuid
   end
 
-  test "should be findable by the string primary key" do
+  test "should be findable by the UUID primary key" do
     with_instance_of(model_class) do |record|
       assert model_class.friendly.find record.id
     end
   end
+
+  test "should handle a string that simply contains a UUID correctly" do
+    with_instance_of(model_class) do |record|
+      assert_raises(ActiveRecord::RecordNotFound) do
+        model_class.friendly.find "test-#{SecureRandom.uuid}"
+      end
+    end
+  end
 end
 
 class UnderscoreAsSequenceSeparatorRegressionTest < MiniTest::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.4
 platform: ruby
 authors:
 - Norman Clarke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: friendly_id
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A comprehensive slugging and pretty-URL plugin.