friendly_id 2.3.1 → 2.3.2

data/Changelog.md

@@ -6,6 +6,18 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 2.3.2 (2010-02-14)
+
+* Fixed finding by old slug when using cached slugs.
+* Sequence separator parsing now correctly handles occurrences of the sequence
+  separator string inside the friendly_id text (Johan Kok).
+* Fixed missing quotes on table names in a few places (Brian Collins).
+
+
+## 2.3.1 (2010-02-09)
+
+* Fixed stack level too deep error on #strip_diacritics.
+
 
 ## 2.3.0 (2010-02-04)
 
@@ -20,10 +32,10 @@ fork, then this upgrade may causes issues.
 **Changes:**
 
 * Sequence separator can now be configured to something other than "--".
-* New option to pass arguments to {FriendlyId::SlugString#approximate_ascii!}, 
+* New option to pass arguments to {FriendlyId::SlugString#approximate_ascii!},
   allowing custom approximations specific to German or Spanish.
 * FriendlyId now queries against the cached_slug column, which improves performance.
-* {FriendlyId::SlugString} class added, allowing finer-grained control over 
+* {FriendlyId::SlugString} class added, allowing finer-grained control over
   Unicode friendly_id strings.
 * {FriendlyId::Configuration} class added, offering more flexible/hackable
   options.
@@ -222,4 +234,4 @@ fork, then this upgrade may causes issues.
 * Applied patch from Dan Blue to make friendly_id no longer ignore options on
   ActiveRecordBase#find.
 * Added call to options.assert_valid_keys in has_friendly_id. Thanks to W.
-  Andrew Loe III for pointing out that this was missing.
+  Andrew Loe III for pointing out that this was missing.

data/Contributors.md

@@ -7,6 +7,7 @@ community, in particular from the following people:
 * Andrew Loe III
 * Ben Woosley
 * Bence Nagy
+* Brian Collins
 * Bruno Michel
 * Chris Nolan
 * David Ramalho
@@ -17,6 +18,7 @@ community, in particular from the following people:
 * Ian Stewart
 * Jesse Crouch
 * Joe Van Dyk
+* Johan Kok
 * Josh Nichols
 * Mikhail Shirkov
 * Nathan Phelps

data/lib/friendly_id.rb

@@ -60,7 +60,8 @@ end
 
 class String
   def parse_friendly_id(separator = nil)
-    name, sequence = split(separator || FriendlyId::Configuration::DEFAULTS[:sequence_separator])
+    separator ||= FriendlyId::Configuration::DEFAULTS[:sequence_separator]
+    name, sequence = split(/#{Regexp.escape(separator)}(\d)*\z/)
     return name, sequence ||= "1"
   end
-end
+end

data/lib/friendly_id/active_record2/slugged_model.rb

@@ -37,7 +37,7 @@ module FriendlyId
         end
 
         def find_options
-          {:select => "#{table_name}.*", :conditions => find_conditions,
+          {:select => "#{quoted_table_name}.*", :conditions => find_conditions,
             :joins => slugs_included? ? options[:joins] : :slugs}
         end
 
@@ -112,7 +112,7 @@ module FriendlyId
         def find_options
           slug_table = Slug.table_name
           {
-            :select => "#{model_class.table_name}.*",
+            :select => "#{model_class.quoted_table_name}.*",
             :joins => slugs_included? ? options[:joins] : :slugs,
             :conditions => {
               "#{slug_table}.name"     => name,
@@ -135,6 +135,12 @@ module FriendlyId
       # circumstances unless the +:scope+ argument is present.
       class CachedSingleFinder < SimpleModel::SingleFinder
 
+        def find
+          super
+        rescue ActiveRecord::RecordNotFound
+          SingleFinder.new(id, model_class, options).find
+        end
+
         # The column used to store the cached slug.
         def column
           "#{table_name}.#{friendly_id_config.cache_column}"

data/lib/friendly_id/test.rb

@@ -139,6 +139,13 @@ module FriendlyId
         assert_equal instance2, klass.send(find_method, instance2.friendly_id)
       end
 
+      test "should remain findable by previous slugs" do
+        old_friendly_id = instance.friendly_id
+        instance.update_attributes :name => "#{old_friendly_id} updated"
+        assert_not_equal old_friendly_id, instance.friendly_id
+        assert_equal instance, klass.find(old_friendly_id)
+      end
+
     end
 
     # Tests for models to ensure that they properly implement using the
@@ -165,4 +172,4 @@ module FriendlyId
 
     end
   end
-end
+end

data/lib/friendly_id/version.rb

@@ -2,7 +2,7 @@ module FriendlyId
   module Version
     MAJOR = 2
     MINOR = 3
-    TINY = 1
+    TINY = 2
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/friendly_id_test.rb

@@ -18,6 +18,22 @@ module FriendlyId
         assert_equal ["test", "2"], "test:2".parse_friendly_id(":")
       end
 
+      test "should parse when default sequence separator occurs in friendly_id name" do
+        assert_equal ["test--test", "2"], "test--test--2".parse_friendly_id
+      end
+
+      test "should parse when custom sequence separator occurs in friendly_id name" do
+        assert_equal ["test:test", "2"], "test:test:2".parse_friendly_id(":")
+      end
+
+      test "should parse when sequence separator and number occur in friendly_id name" do
+        assert_equal ["test--2--test", "1"], "test--2--test".parse_friendly_id
+      end
+
+      test "should parse when sequence separator, number and sequence occur in friendly_id name" do
+        assert_equal ["test--2--test", "2"], "test--2--test--2".parse_friendly_id
+      end
+
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors: 
 - Norman Clarke
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 -08:00
+date: 2010-02-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency