friendly_id 5.0.0.rc3 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc160c133d04de411d380863dcb8f5f6bf3d3eb
-  data.tar.gz: 69989b70207313b3895dcb250dd28b9a5dd52503
+  metadata.gz: be471c9fdfbd158f951d1544207aa7adb87e0595
+  data.tar.gz: e2abb7c2074fbdfd5445e47e6ba01ae9a37a72d0
 SHA512:
-  metadata.gz: 1de2c9b0aa51dca261d977bc4004d0f1d64e6f5f304e8e575ae2dc2c3e1fa1c24b780548729bd39685243f8190fa7fcf46de328f2d421b699c9e7fff75994d08
-  data.tar.gz: e5d920ae4b3eed5a1d93c747dc1d1ef5ff91e930cb85d93b22197bcbc1274c43d4f882b3f57d91c7afc11186e737eac8183643fbc9e31a6c10eb3ca5243202b2
+  metadata.gz: d97900b4d53ef7d02a48665386e97bee42b2aceed5283209246bdc249e2467d40268b08bde9805bc3d0aa7d78eac9500ad83ff39302d6c43df804f298b0cf86e
+  data.tar.gz: 661f24ec624dcca17544c5ccf72cb708f8261fc31f06312110c44a6aafbb47c30f56068a8e38c77df2115d875839a6be100818b73beec7f4f74070bbb6565995

data/Changelog.md

@@ -3,6 +3,11 @@
 We would like to think our many {file:Contributors contributors} for
 suggestions, ideas and improvements to FriendlyId.
 
+## 5.0.0 (2013-10-16)
+
+* Fix to let scoped records reuse their slugs (thanks [Donny
+  Kurnia](https://github.com/donnykurnia)).
+
 ## 5.0.0.rc.3 (2013-10-04)
 
 * Support friendly finds on associations in Rails 4.0.1 and up. They will

data/README.md

@@ -4,8 +4,8 @@
 
 Please ask questions on [Stack
 Overflow](http://stackoverflow.com/questions/tagged/friendly-id) using the
-"friendly_id" or "friendly-id" tag. Prior to asking, search and see if your
-question has already been anwered.
+"friendly-id" tag. Prior to asking, search and see if your question has
+already been anwered.
 
 Please only post issues in Github issues for actual bugs.
 
@@ -163,7 +163,7 @@ cd my_app
 ```
 ```ruby
 # Gemfile
-gem 'friendly_id', '5.0.0.rc2' # Note: You MUST use 5.0.0 or greater for Rails 4.0+
+gem 'friendly_id', '~> 5.0.0' # Note: You MUST use 5.0.0 or greater for Rails 4.0+
 ```
 ```shell
 rails generate friendly_id

data/lib/friendly_id/finders.rb

@@ -49,6 +49,18 @@ in your controllers to use the `friendly` scope. For example:
     def set_restaurant
       @restaurant = Restaurant.friendly.find(params[:id])
     end
+
+#### Active Admin
+
+Unless you use the `:finders` addon, you should modify your admin controllers
+for models that use FriendlyId with something similar to the following:
+
+    controller do
+      def find_resource
+        scoped_collection.friendly.find(params[:id])
+      end
+    end
+
 =end
   module Finders
     def self.included(model_class)

data/lib/friendly_id/scoped.rb

@@ -126,6 +126,10 @@ 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)
+        column = self.class.quoted_table_name + '.' + self.class.quoted_primary_key
+        relation = relation.where("#{column} <> ?", send(self.class.primary_key))
+      end
       friendly_id_config.slug_generator_class.new(relation)
     end
     private :slug_generator

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = "5.0.0.rc3"
+  VERSION = "5.0.0"
 end

data/test/scoped_test.rb

@@ -69,4 +69,13 @@ class ScopedTest < MiniTest::Unit::TestCase
       assert novel3.friendly_id != novel4.friendly_id
     end
   end
+
+  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
+      record.save!
+      assert_equal old_id, record.friendly_id
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc3
+  version: 5.0.0
 platform: ruby
 authors:
 - Norman Clarke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -213,9 +213,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: friendly_id
 rubygems_version: 2.0.3