friendly_id 4.0.0.beta12 → 4.0.0.beta13

data/README.md

@@ -43,7 +43,7 @@ The current docs can always be found
 
     cd my_app
 
-    gem "friendly_id", "~> 4.0.0.beta8"
+    gem "friendly_id", "~> 4.0.0.beta12"
 
     rails generate scaffold user name:string slug:string
 
@@ -67,7 +67,7 @@ The current docs can always be found
     # If you're adding FriendlyId to an existing app and need
     # to generate slugs for existing users, do this from the
     # console, runner, or add a Rake task:
-    User.all.map(&:save)
+    User.find_each(&:save)
 
 
 ## Benchmarks

data/WhatsNew.md

@@ -90,6 +90,6 @@ strings to ASCII. It's very easy to include - just override
       ...
 
       def normalize_friendly_id(text)
-        text.to_slug.normalize! :transliterate => :russian
+        text.to_slug.normalize! :transliterations => :russian
       end
     end

data/gemfiles/Gemfile.rails-3.1.rb

@@ -13,8 +13,8 @@ platform :ruby do
   gem "sqlite3", "~> 1.3.4"
 end
 
-gem "activerecord", "~> 3.1.0"
+gem "activerecord", "~> 3.1.1"
 gem "minitest", "~> 2.4.0"
 gem "mocha", "~> 0.9.12"
-gem "railties", "~> 3.1.0"
+gem "railties", "~> 3.1.1"
 gem "rake"

data/lib/friendly_id.rb

@@ -81,7 +81,7 @@ In general, use slugs by default unless you know for sure you don't need them.
 module FriendlyId
 
   # The current version.
-  VERSION = "4.0.0.beta12"
+  VERSION = "4.0.0.beta13"
 
   @mutex = Mutex.new
 
@@ -114,6 +114,7 @@ module FriendlyId
   #
   # For examples of this, see the source for {Scoped.included}.
   def self.extended(model_class)
+    return if model_class.respond_to? :friendly_id
     class << model_class
       alias relation_without_friendly_id relation
     end

data/lib/friendly_id/i18n.rb

@@ -83,4 +83,4 @@ current locale:
       end
     end
   end
-end
+end

data/lib/friendly_id/slugged.rb

@@ -196,14 +196,15 @@ This functionality was in fact taken from earlier versions of FriendlyId.
     # slugs to be generated once, and then never updated.
     def should_generate_new_friendly_id?
       return true if new_record?
-      slug_base = send friendly_id_config.base
+      slug_base = normalize_friendly_id send(friendly_id_config.base)
       separator = Regexp.escape friendly_id_config.sequence_separator
       slug_base != current_friendly_id.try(:sub, /#{separator}[\d]*\z/, '')
     end
 
     # Sets the slug.
+    # FIXME: This method sucks and the logic is pretty dubious.
     def set_slug(normalized_slug = nil)
-      if should_generate_new_friendly_id?
+      if normalized_slug || should_generate_new_friendly_id?
         normalized_slug ||= normalize_friendly_id send(friendly_id_config.base)
         generator = friendly_id_config.slug_generator_class.new self, normalized_slug
         send "#{friendly_id_config.slug_column}=", generator.generate

data/test/helper.rb

@@ -39,7 +39,7 @@ module FriendlyId
 
     def with_instance_of(*args)
       model_class = args.shift
-      args[0] ||= {:name => "a"}
+      args[0] ||= {:name => "a b c"}
       transaction { yield model_class.create!(*args) }
     end
 

data/test/i18n_test.rb

@@ -53,7 +53,7 @@ class I18nTest < MiniTest::Unit::TestCase
       journalist = Journalist.create!(:name => "John Smith")
       journalist.set_friendly_id("Juan Fulano", :es)
       journalist.save!
-      assert_equal "john-smith", journalist.to_param
+      assert_equal "juan-fulano", journalist.slug_es
       I18n.with_locale(:es) do
         assert_equal "juan-fulano", journalist.to_param
       end
@@ -75,6 +75,24 @@ class I18nTest < MiniTest::Unit::TestCase
     end
   end
 
+  class RegressionTest < MiniTest::Unit::TestCase
+    include FriendlyId::Test
+
+    test "should not overwrite 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.update_attributes :name => "Johnny Smith"
+        assert_equal "johnny-smith", journalist.to_param
+        I18n.with_locale(:es) do
+          assert_equal "juan-fulano", journalist.to_param
+        end
+      end
+    end
+  end
+
   class ConfigurationTest < MiniTest::Unit::TestCase
     test "should add locale to slug column for a non-default locale" do
       I18n.with_locale :es do
@@ -98,4 +116,4 @@ class I18nTest < MiniTest::Unit::TestCase
       end
     end
   end
-end
+end

data/test/slugged_test.rb

@@ -28,6 +28,37 @@ class SluggedTest < MiniTest::Unit::TestCase
     end
   end
 
+  test "should allow validations on the slug" do
+    model_class = Class.new(ActiveRecord::Base) do
+      self.table_name = "articles"
+      extend FriendlyId
+      friendly_id :name, :use => :slugged
+      validates_length_of :slug, :maximum => 1
+      def self.name
+        "Article"
+      end
+    end
+    instance = model_class.new :name => "hello"
+    refute instance.valid?
+  end
+
+  test "should not break validates_uniqueness_of" do
+    model_class = Class.new(ActiveRecord::Base) do
+      self.table_name = "articles"
+      extend FriendlyId
+      friendly_id :name, :use => :slugged
+      validates_uniqueness_of :name
+      def self.name
+        "Article"
+      end
+    end
+    instance = model_class.create :name => "hello"
+    instance2 = model_class.create :name => "hello"
+    assert instance.valid?
+    refute instance2.valid?
+  end
+
+
 end
 
 class SlugGeneratorTest < MiniTest::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta12
+  version: 4.0.0.beta13
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-13 00:00:00.000000000 Z
+date: 2011-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70173663525760 !ruby/object:Gem::Requirement
+  requirement: &70219708818280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70173663525760
+  version_requirements: *70219708818280
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70173663524880 !ruby/object:Gem::Requirement
+  requirement: &70219708817420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70173663524880
+  version_requirements: *70219708817420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70173663524340 !ruby/object:Gem::Requirement
+  requirement: &70219708816820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70173663524340
+  version_requirements: *70219708816820
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70173663523820 !ruby/object:Gem::Requirement
+  requirement: &70219708815960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70173663523820
+  version_requirements: *70219708815960
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70173663523340 !ruby/object:Gem::Requirement
+  requirement: &70219708804840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70173663523340
+  version_requirements: *70219708804840
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70173663522820 !ruby/object:Gem::Requirement
+  requirement: &70219708804320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70173663522820
+  version_requirements: *70219708804320
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70173663522180 !ruby/object:Gem::Requirement
+  requirement: &70219708803840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70173663522180
+  version_requirements: *70219708803840
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70173663521720 !ruby/object:Gem::Requirement
+  requirement: &70219708803380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70173663521720
+  version_requirements: *70219708803380
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70173663521180 !ruby/object:Gem::Requirement
+  requirement: &70219708802920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70173663521180
+  version_requirements: *70219708802920
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70173663520740 !ruby/object:Gem::Requirement
+  requirement: &70219708802520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70173663520740
+  version_requirements: *70219708802520
 description: ! 'FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
   plugins for
 
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: friendly_id
-rubygems_version: 1.8.6
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.