friendly_id 2.3.2 → 2.3.3

data/Changelog.md

@@ -6,6 +6,12 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 2.3.3 (2010-03-10)
+
+* Fixed sequence regexp to grab all trailing digits. (Nash Kabbara)
+* Block param now warns, not raises. (Kamal Fariz Mahyuddin)
+* Misc doc fixes. (Kamal Fariz Mahyuddin)
+
 ## 2.3.2 (2010-02-14)
 
 * Fixed finding by old slug when using cached slugs.

data/lib/friendly_id.rb

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

data/lib/friendly_id/configuration.rb

@@ -87,7 +87,7 @@ module FriendlyId
 
     def normalizer=(arg)
       return if arg.nil?
-      raise("passing a block to has_friendly_id is deprecated and will be removed from 3.0. Please override #friendly_id_normalizer.")
+      warn("passing a block to has_friendly_id is deprecated and will be removed from 3.0. Please override #normalize_friendly_id.")
       @normalizer = arg
     end
 

data/lib/friendly_id/slug_string.rb

@@ -257,7 +257,7 @@ module FriendlyId
       # Replaces whitespace with dashes ("-").
       # @return String
       def with_dashes!
-        @wrapped_string = @wrapped_string.gsub(/\s+/u, '-')
+        @wrapped_string = @wrapped_string.gsub(/[\s\-]+/u, '-')
       end
 
       %w[approximate_ascii clean downcase word_chars normalize normalize_for to_ascii

data/lib/friendly_id/version.rb

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

data/test/active_record2/deprecated_test.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+module FriendlyId
+  module Test
+    module ActiveRecord2
+
+      class DeprecatedTest < ::Test::Unit::TestCase
+
+        include FriendlyId::Test::Generic
+        include FriendlyId::Test::Slugged
+        include FriendlyId::Test::ActiveRecord2::Slugged
+        include FriendlyId::Test::ActiveRecord2::Core
+
+        def klass
+          Block
+        end
+
+      end
+
+    end
+  end
+end
+

data/test/active_record2/support/models.rb

@@ -65,6 +65,11 @@ class CreateSupportModels < ActiveRecord::Migration
       t.index :name, :unique => true
     end
 
+    create_table :blocks do |t|
+      t.string :name
+      t.string :note
+    end
+
   end
 
   def self.down

data/test/active_record2/test_helper.rb

@@ -104,4 +104,11 @@ end
 # A model with no table
 class Question < ActiveRecord::Base
   has_friendly_id :name, :use_slug => true
-end
+end
+
+# A model using the deprecated block syntax
+class Block < ActiveRecord::Base
+  has_friendly_id :name, :use_slug => true do |text|
+    FriendlyId::SlugString.new(text).clean.with_dashes
+  end
+end

data/test/friendly_id_test.rb

@@ -10,6 +10,18 @@ module FriendlyId
         assert_equal ["test", "2"], "test--2".parse_friendly_id
       end
 
+      test "should parse a friendly_id name and 10 as a sequence" do
+        assert_equal ["test", "10"], "test--10".parse_friendly_id
+      end
+
+      test "should parse a friendly_id name and 11 as a sequence" do
+        assert_equal ["test", "11"], "test--11".parse_friendly_id
+      end
+
+      test "should parse a friendly_id name and 29 as a sequence" do
+        assert_equal ["test", "29"], "test--29".parse_friendly_id
+      end
+
       test "should parse with a default sequence of 1" do
         assert_equal ["test", "1"], "test".parse_friendly_id
       end
@@ -18,6 +30,10 @@ module FriendlyId
         assert_equal ["test", "2"], "test:2".parse_friendly_id(":")
       end
 
+      test "should be parseable with a custom separator and a double digit sequence" do
+        assert_equal ["test", "12"], "test:12".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
@@ -34,6 +50,11 @@ module FriendlyId
         assert_equal ["test--2--test", "2"], "test--2--test--2".parse_friendly_id
       end
 
+      test "should parse when double digit sequence separator, number and sequence occur in friendly_id name" do
+        assert_equal ["test--2--test", "12"], "test--2--test--12".parse_friendly_id
+      end
+
+
     end
   end
 end

data/test/slug_string_test.rb

@@ -37,6 +37,10 @@ module FriendlyId
           assert_equal "a-b", SlugString.new("a    b").clean.with_dashes
         end
 
+        test "should replace multiple dashes with 1 dash" do
+          assert_equal "male-female", SlugString.new("male - female").with_dashes
+        end
+
         test "should strip trailing space" do
           assert_equal "ab", SlugString.new("ab ").clean
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors: 
 - Norman Clarke
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 -08:00
+date: 2010-03-10 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,57 +46,58 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/friendly_id/active_record2/configuration.rb
-- lib/friendly_id/active_record2/finders.rb
-- lib/friendly_id/active_record2/simple_model.rb
-- lib/friendly_id/active_record2/slug.rb
-- lib/friendly_id/active_record2/slugged_model.rb
-- lib/friendly_id/active_record2/tasks.rb
-- lib/friendly_id/active_record2.rb
-- lib/friendly_id/configuration.rb
+- lib/friendly_id/test.rb
 - lib/friendly_id/finders.rb
+- lib/friendly_id/configuration.rb
 - lib/friendly_id/slug_string.rb
-- lib/friendly_id/slugged.rb
 - lib/friendly_id/status.rb
-- lib/friendly_id/test.rb
 - lib/friendly_id/version.rb
+- lib/friendly_id/slugged.rb
+- lib/friendly_id/active_record2.rb
+- lib/friendly_id/active_record2/finders.rb
+- lib/friendly_id/active_record2/configuration.rb
+- lib/friendly_id/active_record2/tasks.rb
+- lib/friendly_id/active_record2/slugged_model.rb
+- lib/friendly_id/active_record2/slug.rb
+- lib/friendly_id/active_record2/simple_model.rb
 - lib/friendly_id.rb
 - lib/friendly_id/active_record2/tasks/friendly_id.rake
-- Changelog.md
-- Contributors.md
 - Guide.md
 - README.md
+- Changelog.md
+- Contributors.md
 - LICENSE
 - Rakefile
 - rails/init.rb
 - generators/friendly_id/friendly_id_generator.rb
 - generators/friendly_id/templates/create_slugs.rb
-- test/active_record2/basic_slugged_model_test.rb
+- test/slug_string_test.rb
+- test/test_helper.rb
+- test/active_record2/deprecated_test.rb
 - test/active_record2/cached_slug_test.rb
-- test/active_record2/core.rb
-- test/active_record2/custom_normalizer_test.rb
+- test/active_record2/tasks_test.rb
+- test/active_record2/basic_slugged_model_test.rb
 - test/active_record2/custom_table_name_test.rb
-- test/active_record2/scoped_model_test.rb
-- test/active_record2/simple_test.rb
-- test/active_record2/slug_test.rb
-- test/active_record2/slugged.rb
-- test/active_record2/slugged_status_test.rb
-- test/active_record2/sti_test.rb
-- test/active_record2/support/database.mysql.yml
-- test/active_record2/support/database.postgres.yml
 - test/active_record2/support/database.sqlite3.yml
+- test/active_record2/support/database.mysql.yml
 - test/active_record2/support/models.rb
-- test/active_record2/tasks_test.rb
+- test/active_record2/support/database.postgres.yml
+- test/active_record2/slug_test.rb
+- test/active_record2/scoped_model_test.rb
+- test/active_record2/custom_normalizer_test.rb
+- test/active_record2/slugged.rb
 - test/active_record2/test_helper.rb
+- test/active_record2/core.rb
+- test/active_record2/sti_test.rb
+- test/active_record2/slugged_status_test.rb
+- test/active_record2/simple_test.rb
 - test/friendly_id_test.rb
-- test/slug_string_test.rb
-- test/test_helper.rb
-- extras/bench.rb
 - extras/extras.rb
 - extras/prof.rb
-- extras/README.txt
-- extras/template-gem.rb
 - extras/template-plugin.rb
+- extras/template-gem.rb
+- extras/bench.rb
+- extras/README.txt
 has_rdoc: true
 homepage: http://norman.github.com/friendly_id
 licenses: []
@@ -138,15 +139,16 @@ signing_key:
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.
 test_files: 
-- test/active_record2/basic_slugged_model_test.rb
+- test/slug_string_test.rb
+- test/active_record2/deprecated_test.rb
 - test/active_record2/cached_slug_test.rb
-- test/active_record2/custom_normalizer_test.rb
+- test/active_record2/tasks_test.rb
+- test/active_record2/basic_slugged_model_test.rb
 - test/active_record2/custom_table_name_test.rb
-- test/active_record2/scoped_model_test.rb
-- test/active_record2/simple_test.rb
 - test/active_record2/slug_test.rb
-- test/active_record2/slugged_status_test.rb
+- test/active_record2/scoped_model_test.rb
+- test/active_record2/custom_normalizer_test.rb
 - test/active_record2/sti_test.rb
-- test/active_record2/tasks_test.rb
+- test/active_record2/slugged_status_test.rb
+- test/active_record2/simple_test.rb
 - test/friendly_id_test.rb
-- test/slug_string_test.rb