friendly_id 4.0.4 → 4.0.5

data/Changelog.md

@@ -6,6 +6,12 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 4.0.5 (2012-04-28)
+
+* Favor `includes` over `joins` in globalize to avoid read-only results (Jakub Wojtysiak)
+* Fix globalize compatibility with results from dynamic finders (Chris Salzberg)
+
+
 ## 4.0.4 (2012-03-26)
 
 * Fix globalize plugin to avoid issues with asset precompilation (Philip Arndt)

data/Guide.rdoc

@@ -114,8 +114,9 @@ store them in a field in your model. By default, this field must be named
 +:slug+, though you may change this using the
 {FriendlyId::Slugged::Configuration#slug_column slug_column} configuration
 option. You should add an index to this column, and in most cases, make it
-unique. You may also wish to constrain it to NOT NULL, but this depends on your
-app's behavior and requirements.
+unique. Do not make the column unique in case you wish to scope the slug 
+(more on this later). You may also wish to constrain it to NOT NULL, but this 
+depends on your app's behavior and requirements.
 
 === Example Setup
 
@@ -356,6 +357,9 @@ Without :scoped in this case, one of the restaurants would have the slug
 The value for the +:scope+ option can be the name of a +belongs_to+ relation, or
 a column.
 
+Please do note that you must drop the uniqueness constraint on the slug's
+column in the database when you're scoping the slug.
+
 === Finding Records by Friendly ID
 
 If you are using scopes your friendly ids may not be unique, so a simple find

data/friendly_id.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "i18n"
   s.add_development_dependency "ffaker"
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "globalize3"
 
   s.description = <<-EOM
 FriendlyId is the "Swiss Army bulldozer" of slugging and permalink plugins for

data/gemfiles/Gemfile.rails-3.0.rb

@@ -18,3 +18,4 @@ gem 'railties', '~> 3.0.0'
 gem 'minitest'
 gem 'mocha'
 gem 'rake'
+gem 'globalize3'

data/gemfiles/Gemfile.rails-3.1.rb

@@ -19,3 +19,4 @@ gem 'ffaker'
 gem 'minitest'
 gem 'mocha'
 gem 'rake'
+gem 'globalize3'

data/gemfiles/Gemfile.rails-3.2.rb

@@ -19,3 +19,4 @@ gem 'railties', '~> 3.2.0'
 gem 'minitest'
 gem 'mocha'
 gem 'rake'
+gem 'globalize3'

data/lib/friendly_id.rb

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

data/lib/friendly_id/globalize.rb

@@ -83,15 +83,18 @@ assign a value to the +slug+ field:
       # @see FriendlyId::ObjectUtils
       def find_one(id)
         return super if id.unfriendly_id?
-        where(@klass.friendly_id_config.query_field => id).first or
-        joins(:translations).
-          where(translation_class.arel_table[:locale].eq(I18n.locale)).
-          where(translation_class.arel_table[@klass.friendly_id_config.query_field].eq(id)).first or
-        # if locale is not translated fallback to default locale
-        joins(:translations).
-          where(translation_class.arel_table[:locale].eq(I18n.default_locale)).
-          where(translation_class.arel_table[@klass.friendly_id_config.query_field].eq(id)).first or
-        super
+        found = where(@klass.friendly_id_config.query_field => id).first
+        found = includes(:translations).
+                where(translation_class.arel_table[:locale].in([I18n.locale, I18n.default_locale])).
+                where(translation_class.arel_table[@klass.friendly_id_config.query_field].eq(id)).first if found.nil?
+
+        if found
+          # Reload the translations for the found records.
+          found.tap { |f| f.translations.reload }
+        else
+          # if locale is not translated fallback to default locale
+          super
+        end
       end
 
       protected :find_one

data/test/globalize_test.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+require "helper"
+
+class TranslatedArticle < ActiveRecord::Base
+  translates :slug, :title
+  extend FriendlyId
+  friendly_id :title, :use => :globalize
+end
+
+class GlobalizeTest < MiniTest::Unit::TestCase
+  include FriendlyId::Test
+
+  test "friendly_id should find slug in current locale if locale is set, otherwise in default locale" do
+    transaction do
+      I18n.default_locale = :en
+      article_en = I18n.with_locale(:en) { TranslatedArticle.create(:title => 'a title') }
+      article_de = I18n.with_locale(:de) { TranslatedArticle.create(:title => 'titel') }
+
+      I18n.with_locale(:de) {
+        assert_equal TranslatedArticle.find("titel"), article_de
+        assert_equal TranslatedArticle.find("a-title"), article_en
+      }
+    end
+  end
+
+  # https://github.com/svenfuchs/globalize3/blob/master/test/globalize3/dynamic_finders_test.rb#L101
+  # see: https://github.com/svenfuchs/globalize3/issues/100
+  test "record returned by friendly_id should have all translations" do
+    transaction do
+      I18n.with_locale(:en) do
+        article = TranslatedArticle.create(:title => 'a title')
+        Globalize.with_locale(:ja) { article.update_attributes(:title => 'タイトル') }
+        article_by_friendly_id = TranslatedArticle.find("a-title")
+        article.translations.each do |translation|
+          assert_includes article_by_friendly_id.translations, translation
+        end
+      end
+    end
+  end
+
+end

data/test/schema.rb

@@ -1,4 +1,9 @@
 require "friendly_id/migration"
+require "globalize3"
+
+class TranslatedArticle < ActiveRecord::Base
+  translates :slug, :title
+end
 
 module FriendlyId
   module Test
@@ -9,6 +14,7 @@ module FriendlyId
           tables.each do |name|
             drop_table name
           end
+          TranslatedArticle.drop_translation_table!
         end
 
         def up
@@ -45,13 +51,16 @@ module FriendlyId
           add_column :journalists, "slug_es", :string
           add_column :journalists, "slug_de", :string
 
+          # This will be used to test globalize translations
+          TranslatedArticle.create_translation_table! :slug => :string, :title => :string
+
           @done = true
         end
 
         private
 
         def slugged_tables
-          ["journalists", "articles", "novelists", "novels", "manuals"]
+          ["journalists", "articles", "novelists", "novels", "manuals", "translated_articles"]
         end
 
         def simple_tables

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70338516662860 !ruby/object:Gem::Requirement
+  requirement: &70139212924340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70338516662860
+  version_requirements: *70139212924340
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70338516662240 !ruby/object:Gem::Requirement
+  requirement: &70139212923860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70338516662240
+  version_requirements: *70139212923860
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70338516661800 !ruby/object:Gem::Requirement
+  requirement: &70139212923480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338516661800
+  version_requirements: *70139212923480
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70338516694440 !ruby/object:Gem::Requirement
+  requirement: &70139212923020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338516694440
+  version_requirements: *70139212923020
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70338516692760 !ruby/object:Gem::Requirement
+  requirement: &70139212971700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338516692760
+  version_requirements: *70139212971700
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70338516724120 !ruby/object:Gem::Requirement
+  requirement: &70139212971280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338516724120
+  version_requirements: *70139212971280
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70338516719100 !ruby/object:Gem::Requirement
+  requirement: &70139212970860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338516719100
+  version_requirements: *70139212970860
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70338516717320 !ruby/object:Gem::Requirement
+  requirement: &70139212970440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338516717320
+  version_requirements: *70139212970440
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70338516730820 !ruby/object:Gem::Requirement
+  requirement: &70139212970020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338516730820
+  version_requirements: *70139212970020
+- !ruby/object:Gem::Dependency
+  name: globalize3
+  requirement: &70139212969600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70139212969600
 description: ! 'FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
   plugins for
 
@@ -165,6 +176,7 @@ files:
 - test/core_test.rb
 - test/databases.yml
 - test/generator_test.rb
+- test/globalize_test.rb
 - test/helper.rb
 - test/history_test.rb
 - test/i18n_test.rb