friendly_id 4.0.5 → 4.0.6

data/.gitignore

@@ -1,4 +1,3 @@
-Gemfile
 Gemfile.lock
 doc
 docs
@@ -10,4 +9,4 @@ coverage
 *.sqlite3
 *.rbc
 *.lock
-.rbx
+.rbx

data/Changelog.md

@@ -6,6 +6,12 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 4.0.6 (2012-05-21)
+
+* Fix nil return value from to_param when save fails because of validation errors (Tomás Arribas)
+* Fix incorrect usage of i18n API (Vinicius Ferriani)
+* Improve error handling in reserved module (Adrián Mugnolo and Github user "nolamesa")
+
 ## 4.0.5 (2012-04-28)
 
 * Favor `includes` over `joins` in globalize to avoid read-only results (Jakub Wojtysiak)

data/Gemfile

@@ -0,0 +1,15 @@
+source :rubygems
+
+gemspec
+
+# Database Configuration
+group :development, :test do
+  platforms :jruby do
+    gem 'activerecord-jdbcsqlite3-adapter'
+    gem 'jruby-openssl'
+  end
+
+  platforms :ruby do
+    gem 'sqlite3'
+  end
+end

data/lib/friendly_id.rb

@@ -45,7 +45,7 @@ with numeric ids:
 module FriendlyId
 
   # The current version.
-  VERSION = "4.0.5"
+  VERSION = "4.0.6"
 
   @mutex = Mutex.new
 

data/lib/friendly_id/base.rb

@@ -266,7 +266,7 @@ often better and easier to use {FriendlyId::Slugged slugs}.
     # Either the friendly_id, or the numeric id cast to a string.
     def to_param
       if diff = changes[friendly_id_config.query_field]
-        diff.first
+        diff.first || diff.second
       else
         friendly_id.present? ? friendly_id : id.to_s
       end

data/lib/friendly_id/reserved.rb

@@ -30,7 +30,7 @@ For example:
     after_validation :move_friendly_id_error_to_name
 
     def move_friendly_id_error_to_name
-      errors.messages[:name] = errors.messages.delete(:friendly_id)
+      errors.add :name, *errors.delete(:friendly_id) if errors[:friendly_id].present?
     end
   end
 

data/lib/friendly_id/simple_i18n.rb

@@ -80,7 +80,7 @@ current locale:
 
     module Model
       def set_friendly_id(text, locale = nil)
-        I18n.with_locale(locale || I18n.current_locale) do
+        I18n.with_locale(locale || I18n.locale) do
           set_slug(normalize_friendly_id(text))
         end
       end

data/test/compatibility/ancestry/Gemfile

@@ -0,0 +1,8 @@
+source :rubygems
+
+gem "sqlite3", "~> 1.3.4"
+gem "activerecord", "3.0.10"
+gem "minitest", "~> 2.4.0"
+gem "mocha", "~> 0.9.12"
+gem "ancestry"
+gem "rake"

data/test/compatibility/threading/Gemfile

@@ -0,0 +1,8 @@
+source :rubygems
+
+gem "pg"
+gem "mysql2"
+gem "mocha"
+gem "activerecord", "3.1.1"
+gem "sqlite3"
+gem "fatalistic"

data/test/reserved_test.rb

@@ -7,20 +7,34 @@ class ReservedTest < MiniTest::Unit::TestCase
   class Journalist < ActiveRecord::Base
     extend FriendlyId
     friendly_id :name
-  end
 
+    after_validation :move_friendly_id_error_to_name
+
+    def move_friendly_id_error_to_name
+      errors.add :name, *errors.delete(:friendly_id) if errors[:friendly_id].present?
+    end
+  end
 
   def model_class
     Journalist
   end
 
   test "should reserve 'new' and 'edit' by default" do
-    ["new", "edit"].each do |word|
+    %w(new edit).each do |word|
       transaction do
         assert_raises(ActiveRecord::RecordInvalid) {model_class.create! :name => word}
       end
     end
   end
-end
 
+  test "should move friendly_id error to name" do
+    with_instance_of(model_class) do |record|
+      record.errors.add :name, "xxx"
+      record.errors.add :friendly_id, "yyy"
+      record.move_friendly_id_error_to_name
+      assert record.errors[:name].present? && record.errors[:friendly_id].blank?
+      assert_equal 2, record.errors.count
+    end
+  end
 
+end

data/test/shared.rb

@@ -51,6 +51,18 @@ module FriendlyId
           end
         end
 
+        test "when validations block save, to_param should return friendly_id rather than nil" do
+          my_model_class = Class.new(model_class)
+          self.class.const_set("Foo", my_model_class)
+          with_instance_of my_model_class do |record|
+            record.update_attribute(my_model_class.friendly_id_config.slug_column, nil)
+            record = my_model_class.find(record.id)
+            record.class.validate Proc.new {errors[:name] = "FAIL"}
+            record.save
+            assert_equal record.to_param, record.friendly_id
+          end
+        end
+
       end
 
       module Core

data/test/{i18n_test.rb → simple_i18n_test.rb}

@@ -1,6 +1,6 @@
 require "helper"
 
-class I18nTest < MiniTest::Unit::TestCase
+class SimpleI18nTest < MiniTest::Unit::TestCase
   include FriendlyId::Test
 
   class Journalist < ActiveRecord::Base
@@ -8,7 +8,7 @@ class I18nTest < MiniTest::Unit::TestCase
     friendly_id :name, :use => :simple_i18n
   end
 
-  test "friendly_id should return a the current locale's slug" do
+  test "friendly_id should return the current locale's slug" do
     journalist = Journalist.new(:name => "John Doe")
     journalist.slug_es = "juan-fulano"
     journalist.valid?
@@ -58,6 +58,17 @@ class I18nTest < MiniTest::Unit::TestCase
     end
   end
 
+  test "set friendly_id should fall back default locale when none is given" do
+    transaction do
+      journalist = I18n.with_locale(:es) do
+        Journalist.create!(:name => "Juan Fulano")
+      end
+      journalist.set_friendly_id("John Doe")
+      journalist.save!
+      assert_equal "john-doe", journalist.slug_en
+    end
+  end
+
   test "should sequence localized slugs" do
     transaction do
       journalist = Journalist.create!(:name => "John Smith")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70139212924340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70139212924340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70139212923860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70139212923860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70139212923480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70139212923480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70139212923020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70139212923020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70139212971700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70139212971700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70139212971280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70139212971280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70139212970860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70139212970860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70139212970440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70139212970440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70139212970020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70139212970020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: globalize3
-  requirement: &70139212969600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +165,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70139212969600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
   plugins for
 
@@ -179,12 +229,12 @@ files:
 - test/globalize_test.rb
 - test/helper.rb
 - test/history_test.rb
-- test/i18n_test.rb
 - test/object_utils_test.rb
 - test/reserved_test.rb
 - test/schema.rb
 - test/scoped_test.rb
 - test/shared.rb
+- test/simple_i18n_test.rb
 - test/slugged_test.rb
 - test/sti_test.rb
 homepage: http://github.com/norman/friendly_id
@@ -216,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: friendly_id
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.