friendly_id 4.0.0.rc1 → 4.0.0.rc2

data/Rakefile

@@ -39,7 +39,7 @@ task :guide do
   buffer << read_comments("lib/friendly_id/slugged.rb")
   buffer << read_comments("lib/friendly_id/history.rb")
   buffer << read_comments("lib/friendly_id/scoped.rb")
-  buffer << read_comments("lib/friendly_id/i18n.rb")
+  buffer << read_comments("lib/friendly_id/simple_i18n.rb")
   buffer << read_comments("lib/friendly_id/reserved.rb")
 
   File.open("Guide.rdoc", "w") do |file|

data/lib/friendly_id.rb

@@ -45,15 +45,15 @@ with numeric ids:
 module FriendlyId
 
   # The current version.
-  VERSION = "4.0.0.rc1"
+  VERSION = "4.0.0.rc2"
 
   @mutex = Mutex.new
 
-  autoload :History,  "friendly_id/history"
-  autoload :I18n,     "friendly_id/i18n"
-  autoload :Reserved, "friendly_id/reserved"
-  autoload :Scoped,   "friendly_id/scoped"
-  autoload :Slugged,  "friendly_id/slugged"
+  autoload :History,    "friendly_id/history"
+  autoload :SimpleI18n, "friendly_id/simple_i18n"
+  autoload :Reserved,   "friendly_id/reserved"
+  autoload :Scoped,     "friendly_id/scoped"
+  autoload :Slugged,    "friendly_id/slugged"
 
   # FriendlyId takes advantage of `extended` to do basic model setup, primarily
   # extending {FriendlyId::Base} to add {FriendlyId::Base#friendly_id

data/lib/friendly_id/base.rb

@@ -9,7 +9,7 @@ method to configure your desired options:
 
     class Foo < ActiveRecord::Base
       extend FriendlyId
-      friendly_id bar, :use => [:slugged, :i18n]
+      friendly_id bar, :use => [:slugged, :simple_i18n]
     end
 
 The most important option is `:use`, which you use to tell FriendlyId which

data/lib/friendly_id/configuration.rb

@@ -53,7 +53,7 @@ module FriendlyId
     #   end
     # @param [#to_s] *modules Arguments should be a symbols or strings that
     #   correspond with the name of a module inside the FriendlyId namespace. By
-    #   default FriendlyId provides +:slugged+, +:history+, +:i18n+ and +:scoped+.
+    #   default FriendlyId provides +:slugged+, +:history+, +:simple_i18n+ and +:scoped+.
     def use(*modules)
       modules.to_a.flatten.compact.map do |name|
         mod = FriendlyId.const_get(name.to_s.classify)

data/lib/friendly_id/{i18n.rb → simple_i18n.rb}

@@ -6,7 +6,8 @@ module FriendlyId
 
 == Basic I18n
 
-This {FriendlyId::I18n i18n} adds very basic i18n support to FriendlyId.
+The {FriendlyId::SimpleI18n SimpleI18n} module adds very basic i18n support to
+FriendlyId.
 
 In order to use this module, your model must have a slug column for each locale.
 By default FriendlyId looks for columns named, for example, "slug_en",
@@ -50,20 +51,20 @@ When new records are created, the slug is generated for the current locale only.
 === Translating Slugs
 
 To translate an existing record's friendly_id, use
-{FriendlyId::I18n::Model#set_friendly_id}. This will ensure that the slug you
-add is properly escaped, transliterated and sequenced:
+{FriendlyId::SimpleI18n::Model#set_friendly_id}. This will ensure that the slug
+you add is properly escaped, transliterated and sequenced:
 
   post = Post.create :name => "Star Wars"
   post.set_friendly_id("La guerra de las galaxas", :es)
 
-If you don't pass in a locale argument, FriendlyId::I18n will just use the
+If you don't pass in a locale argument, FriendlyId::SimpleI18n will just use the
 current locale:
 
   I18n.with_locale(:es) do
     post.set_friendly_id("la-guerra-de-las-galaxas")
   end
 =end
-  module I18n
+  module SimpleI18n
 
     def self.included(model_class)
       model_class.instance_eval do
@@ -75,7 +76,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.current_locale) do
           set_slug(normalize_friendly_id(text))
         end
       end
@@ -83,7 +84,7 @@ current locale:
 
     module Configuration
       def slug_column
-        "#{super}_#{::I18n.locale}"
+        "#{super}_#{I18n.locale}"
       end
     end
   end

data/test/i18n_test.rb

@@ -3,11 +3,9 @@ require File.expand_path("../helper.rb", __FILE__)
 class I18nTest < MiniTest::Unit::TestCase
   include FriendlyId::Test
 
-  I18n = ::I18n
-
   class Journalist < ActiveRecord::Base
     extend FriendlyId
-    friendly_id :name, :use => :i18n
+    friendly_id :name, :use => :simple_i18n
   end
 
   test "friendly_id should return a the current locale's slug" do
@@ -103,7 +101,7 @@ class I18nTest < MiniTest::Unit::TestCase
     test "should add locale to non-default slug column and non-default locale" do
       model_class = Class.new(ActiveRecord::Base) do
         extend FriendlyId
-        friendly_id :name, :use => :i18n, :slug_column => :foo
+        friendly_id :name, :use => :simple_i18n, :slug_column => :foo
       end
       I18n.with_locale :es do
         assert_equal "foo_es", model_class.friendly_id_config.slug_column

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-19 00:00:00.000000000 Z
+date: 2011-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70137630484920 !ruby/object:Gem::Requirement
+  requirement: &70113010960640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70137630484920
+  version_requirements: *70113010960640
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70137630470220 !ruby/object:Gem::Requirement
+  requirement: &70113010958920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70137630470220
+  version_requirements: *70113010958920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70137630469500 !ruby/object:Gem::Requirement
+  requirement: &70113010957760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70137630469500
+  version_requirements: *70113010957760
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70137630469000 !ruby/object:Gem::Requirement
+  requirement: &70113010956880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70137630469000
+  version_requirements: *70113010956880
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70137630468520 !ruby/object:Gem::Requirement
+  requirement: &70113010955680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70137630468520
+  version_requirements: *70113010955680
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70137630468040 !ruby/object:Gem::Requirement
+  requirement: &70113010954720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70137630468040
+  version_requirements: *70113010954720
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70137630467540 !ruby/object:Gem::Requirement
+  requirement: &70113010953400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70137630467540
+  version_requirements: *70113010953400
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70137630466980 !ruby/object:Gem::Requirement
+  requirement: &70113010952800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70137630466980
+  version_requirements: *70113010952800
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70137630466280 !ruby/object:Gem::Requirement
+  requirement: &70113010952100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70137630466280
+  version_requirements: *70113010952100
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70137630465020 !ruby/object:Gem::Requirement
+  requirement: &70113010951100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137630465020
+  version_requirements: *70113010951100
 description: ! 'FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
   plugins for
 
@@ -155,11 +155,11 @@ files:
 - lib/friendly_id/configuration.rb
 - lib/friendly_id/finder_methods.rb
 - lib/friendly_id/history.rb
-- lib/friendly_id/i18n.rb
 - lib/friendly_id/migration.rb
 - lib/friendly_id/object_utils.rb
 - lib/friendly_id/reserved.rb
 - lib/friendly_id/scoped.rb
+- lib/friendly_id/simple_i18n.rb
 - lib/friendly_id/slug.rb
 - lib/friendly_id/slug_generator.rb
 - lib/friendly_id/slugged.rb