friendly_id 4.0.0 → 4.0.1

data/lib/friendly_id/scoped.rb

@@ -105,7 +105,7 @@ an example of one way to set this up:
       # @return Symbol The scope value
       attr_accessor :scope
 
-      # Gets the scope column.
+      # Gets the scope columns.
       #
       # Checks to see if the +:scope+ option passed to
       # {FriendlyId::Base#friendly_id} refers to a relation, and if so, returns
@@ -113,19 +113,19 @@ an example of one way to set this up:
       # the name of column and returns it cast to a String.
       #
       # @return String The scope column
-      def scope_column
-        (reflection_foreign_key or @scope).to_s
+      def scope_columns
+        [@scope].flatten.map { |s| (reflection_foreign_key(s) or s).to_s }
       end
 
       private
 
       if ActiveRecord::VERSION::STRING < "3.1"
-        def reflection_foreign_key
-          model_class.reflections[@scope].try(:primary_key_name)
+        def reflection_foreign_key(scope)
+          model_class.reflections[scope].try(:primary_key_name)
         end
       else
-        def reflection_foreign_key
-          model_class.reflections[@scope].try(:foreign_key)
+        def reflection_foreign_key(scope)
+          model_class.reflections[scope].try(:foreign_key)
         end
       end
     end
@@ -137,8 +137,12 @@ an example of one way to set this up:
       private
 
       def conflict
-        column = friendly_id_config.scope_column
-        conflicts.where(column => sluggable.send(column)).first
+        columns = friendly_id_config.scope_columns
+        matched = columns.inject(conflicts) do |memo, column|
+           memo.where(column => sluggable.send(column))
+        end
+
+        matched.first
       end
     end
   end

data/lib/friendly_id/simple_i18n.rb

@@ -4,7 +4,7 @@ module FriendlyId
 
 =begin
 
-== Basic I18n
+== Simple I18n
 
 The {FriendlyId::SimpleI18n SimpleI18n} module adds very basic i18n support to
 FriendlyId.

data/lib/friendly_id/slug_generator.rb

@@ -12,10 +12,7 @@ module FriendlyId
 
     # Given a slug, get the next available slug in the sequence.
     def next
-      # Don't assume that the separator is unique within the slug
-      sequence = conflict.to_param.gsub(/^#{Regexp.quote(normalized)}(#{Regexp.quote(separator)})?/, '').to_i
-      next_sequence = sequence == 0 ? 2 : sequence.next
-      "#{normalized}#{separator}#{next_sequence}"
+      "#{normalized}#{separator}#{next_in_sequence}"
     end
 
     # Generate a new sequenced slug.
@@ -25,6 +22,15 @@ module FriendlyId
 
     private
 
+    def next_in_sequence
+      last_in_sequence == 0 ? 2 : last_in_sequence.next
+    end
+
+    def last_in_sequence
+      # Don't assume that the separator is unique in the slug.
+      @_last_in_sequence ||= conflict.to_param.gsub(/^#{Regexp.quote(normalized)}(#{Regexp.quote(separator)})?/, '').to_i
+    end
+
     def column
       sluggable.connection.quote_column_name friendly_id_config.slug_column
     end
@@ -41,9 +47,11 @@ module FriendlyId
     end
 
     def conflicts
-      pkey  = sluggable.class.primary_key
+      sluggable_class = friendly_id_config.model_class
+
+      pkey  = sluggable_class.primary_key
       value = sluggable.send pkey
-      scope = sluggable.class.unscoped.where("#{column} = ? OR #{column} LIKE ?", normalized, wildcard)
+      scope = sluggable_class.unscoped.where("#{column} = ? OR #{column} LIKE ?", normalized, wildcard)
       scope = scope.where("#{pkey} <> ?", value) unless sluggable.new_record?
       scope = scope.order("LENGTH(#{column}) DESC, #{column} DESC")
     end

data/test/base_test.rb

@@ -5,6 +5,7 @@ class CoreTest < MiniTest::Unit::TestCase
 
   test "friendly_id should accept a base and a hash" do
     klass = Class.new(ActiveRecord::Base) do
+      self.abstract_class = true
       extend FriendlyId
       friendly_id :foo, :use => :slugged, :slug_column => :bar
     end
@@ -16,6 +17,7 @@ class CoreTest < MiniTest::Unit::TestCase
 
   test "friendly_id should accept a block" do
     klass = Class.new(ActiveRecord::Base) do
+      self.abstract_class = true
       extend FriendlyId
       friendly_id :foo do |config|
         config.use :slugged
@@ -30,6 +32,7 @@ class CoreTest < MiniTest::Unit::TestCase
 
   test "the block passed to friendly_id should be evaluated before arguments" do
     klass = Class.new(ActiveRecord::Base) do
+      self.abstract_class = true
       extend FriendlyId
       friendly_id :foo do |config|
         config.base = :bar
@@ -44,6 +47,7 @@ class CoreTest < MiniTest::Unit::TestCase
         config.base = :foo
       end
       klass = Class.new(ActiveRecord::Base) do
+        self.abstract_class = true
         extend FriendlyId
       end
       assert_equal :foo, klass.friendly_id_config.base

data/test/configuration_test.rb

@@ -5,7 +5,9 @@ class ConfigurationTest < MiniTest::Unit::TestCase
   include FriendlyId::Test
 
   def setup
-    @model_class = Class.new(ActiveRecord::Base)
+    @model_class = Class.new(ActiveRecord::Base) do
+      self.abstract_class = true
+    end
   end
 
   test "should set model class on initialization" do

data/test/core_test.rb

@@ -20,7 +20,9 @@ class CoreTest < MiniTest::Unit::TestCase
   end
 
   test "models don't use friendly_id by default" do
-    assert !Class.new(ActiveRecord::Base).respond_to?(:friendly_id)
+    assert !Class.new(ActiveRecord::Base) {
+      self.abstract_class = true
+    }.respond_to?(:friendly_id)
   end
 
   test "model classes should have a friendly id config" do

data/test/generator_test.rb

@@ -1,6 +1,5 @@
 require File.expand_path("../helper", __FILE__)
 
-require "test/unit"
 require "rails/generators"
 require "generators/friendly_id_generator"
 

data/test/helper.rb

@@ -51,15 +51,6 @@ module FriendlyId
         driver  = FriendlyId::Test::Database.driver
         engine  = RUBY_ENGINE rescue "ruby"
 
-        # This hack is needed to get AR 3.1 + JDBC to play nicely together
-        if version >= "3.1" && engine == "jruby"
-          if driver == "sqlite3"
-            puts "Skipping SQLite3 test on JRuby with AR 3.1; it doesn't currently work."
-            exit 0
-          end
-          config.each { |_, value| value["adapter"] = "jdbc" + value["adapter"].gsub(/2\z/, '') }
-        end
-
         ActiveRecord::Base.establish_connection config[driver]
         message = "Using #{engine} #{RUBY_VERSION} AR #{version} with #{driver}"
 

data/test/history_test.rb

@@ -15,7 +15,7 @@ class HistoryTest < MiniTest::Unit::TestCase
   end
 
   test "should insert record in slugs table on create" do
-    with_instance_of(model_class) {|record| assert !record.slugs.empty?}
+    with_instance_of(model_class) {|record| assert record.slugs.any?}
   end
 
   test "should not create new slug record if friendly_id is not changed" do
@@ -48,6 +48,17 @@ class HistoryTest < MiniTest::Unit::TestCase
     end
   end
 
+  test "should create slug records on each change" do
+    transaction do
+      record = model_class.create! :name => "hello"
+      assert_equal 1, FriendlyId::Slug.count
+      record = model_class.find("hello")
+      record.name = "hello again"
+      record.save!
+      assert_equal 2, FriendlyId::Slug.count
+    end
+  end
+
   test "should not be read only when found by old slug" do
     with_instance_of(model_class) do |record|
       old_friendly_id = record.friendly_id
@@ -59,8 +70,10 @@ class HistoryTest < MiniTest::Unit::TestCase
 
 
   test "should raise error if used with scoped" do
-    model_class = Class.new(ActiveRecord::Base)
-    model_class.extend FriendlyId
+    model_class = Class.new(ActiveRecord::Base) do
+      self.abstract_class = true
+      extend FriendlyId
+    end
     assert_raises RuntimeError do
       model_class.friendly_id :name, :use => [:history, :scoped]
     end
@@ -77,4 +90,36 @@ class HistoryTest < MiniTest::Unit::TestCase
     end
   end
 
+  test "should not create new slugs that match old slugs" do
+    transaction do
+      first_record = model_class.create! :name => "foo"
+      first_record.name = "bar"
+      first_record.save!
+      second_record = model_class.create! :name => "foo"
+      assert second_record.slug != "foo"
+      assert second_record.slug == "foo--2"
+    end
+  end
+
+  test 'should increment the sequence by one for each historic slug' do
+    transaction do
+      previous_record = model_class.create! :name => "foo"
+      first_record = model_class.create! :name => 'another'
+      second_record = model_class.create! :name => 'another'
+      assert second_record.slug == "another--2"
+    end
+  end
+
+  test 'should not fail when updating historic slugs' do
+    transaction do
+      first_record = model_class.create! :name => "foo"
+      second_record = model_class.create! :name => 'another'
+
+      second_record.update_attributes :name => 'foo'
+      assert second_record.slug == "foo--2"
+      first_record.update_attributes :name => 'another'
+      assert first_record.slug == "another--2"
+    end
+  end
+
 end

data/test/i18n_test.rb

@@ -100,6 +100,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
+        self.abstract_class = true
         extend FriendlyId
         friendly_id :name, :use => :simple_i18n, :slug_column => :foo
       end

data/test/object_utils_test.rb

@@ -19,8 +19,10 @@ class ObjectUtilsTest < MiniTest::Unit::TestCase
   end
 
   test "ActiveRecord::Base instances should be unfriendly_ids" do
-    model_class = Class.new(ActiveRecord::Base)
-    model_class.table_name = "authors"
+    model_class = Class.new(ActiveRecord::Base) do
+      self.abstract_class = true
+      self.table_name = "authors"
+    end
     assert model_class.new.unfriendly_id?
   end
 end

data/test/schema.rb

@@ -30,6 +30,7 @@ module FriendlyId
 
           # This will be used to test scopes
           add_column :novels, :novelist_id, :integer
+          add_column :novels, :publisher_id, :integer
           remove_index :novels, :slug
 
           # This will be used to test column name quoting
@@ -53,7 +54,7 @@ module FriendlyId
         end
 
         def simple_tables
-          ["authors", "books"]
+          ["authors", "books", "publishers"]
         end
 
         def tables
@@ -62,4 +63,4 @@ module FriendlyId
       end
     end
   end
-end
+end

data/test/scoped_test.rb

@@ -8,7 +8,12 @@ end
 class Novel < ActiveRecord::Base
   extend FriendlyId
   belongs_to :novelist
-  friendly_id :name, :use => :scoped, :scope => :novelist
+  belongs_to :publisher
+  friendly_id :name, :use => :scoped, :scope => [:publisher, :novelist]
+end
+
+class Publisher < ActiveRecord::Base
+  has_many :novels
 end
 
 class ScopedTest < MiniTest::Unit::TestCase
@@ -21,14 +26,16 @@ class ScopedTest < MiniTest::Unit::TestCase
   end
 
   test "should detect scope column from belongs_to relation" do
-    assert_equal "novelist_id", Novel.friendly_id_config.scope_column
+    assert_equal ["publisher_id", "novelist_id"], Novel.friendly_id_config.scope_columns
   end
 
   test "should detect scope column from explicit column name" do
-    model_class = Class.new(ActiveRecord::Base)
-    model_class.extend FriendlyId
-    model_class.friendly_id :empty, :use => :scoped, :scope => :dummy
-    assert_equal "dummy", model_class.friendly_id_config.scope_column
+    model_class = Class.new(ActiveRecord::Base) do
+      self.abstract_class = true
+      extend FriendlyId
+      friendly_id :empty, :use => :scoped, :scope => :dummy
+    end
+    assert_equal ["dummy"], model_class.friendly_id_config.scope_columns
   end
 
   test "should allow duplicate slugs outside scope" do
@@ -48,10 +55,29 @@ class ScopedTest < MiniTest::Unit::TestCase
   end
 
   test "should raise error if used with history" do
-    model_class = Class.new(ActiveRecord::Base)
-    model_class.extend FriendlyId
+    model_class = Class.new(ActiveRecord::Base) do
+      self.abstract_class = true
+      extend FriendlyId
+    end
+
     assert_raises RuntimeError do
       model_class.friendly_id :name, :use => [:scoped, :history]
     end
   end
-end
+
+  test "should apply scope with multiple columns" do
+    transaction do
+      novelist = Novelist.create! :name => "a"
+      publisher = Publisher.create! :name => "b"
+
+      novel1 = Novel.create! :name => "c", :novelist => novelist, :publisher => publisher
+      novel2 = Novel.create! :name => "c", :novelist => novelist, :publisher => Publisher.create(:name => "d")
+      novel3 = Novel.create! :name => "c", :novelist => Novelist.create(:name => "e"), :publisher => publisher
+      novel4 = Novel.create! :name => "c", :novelist => novelist, :publisher => publisher
+
+      assert_equal novel1.friendly_id, novel2.friendly_id
+      assert_equal novel2.friendly_id, novel3.friendly_id
+      assert novel3.friendly_id != novel4.friendly_id
+    end
+  end
+end

data/test/slugged_test.rb

@@ -78,10 +78,13 @@ class SlugGeneratorTest < MiniTest::Unit::TestCase
   end
 
   test "should quote column names" do
-    model_class            = Class.new(ActiveRecord::Base)
-    model_class.table_name = "journalists"
-    model_class.extend FriendlyId
-    model_class.friendly_id :name, :use => :slugged, :slug_column => "strange name"
+    model_class = Class.new(ActiveRecord::Base) do
+      self.abstract_class = true
+      self.table_name = "journalists"
+      extend FriendlyId
+      friendly_id :name, :use => :slugged, :slug_column => "strange name"
+    end
+
     begin
       with_instance_of(model_class) {|record| assert model_class.find(record.friendly_id)}
     rescue ActiveRecord::StatementInvalid

data/test/sti_test.rb

@@ -20,6 +20,7 @@ class StiTest < MiniTest::Unit::TestCase
 
   test "friendly_id should accept a base and a hash with single table inheritance" do
     abstract_klass = Class.new(ActiveRecord::Base) do
+      def self.table_exists?; false end
       extend FriendlyId
       friendly_id :foo, :use => :slugged, :slug_column => :bar
     end
@@ -29,9 +30,9 @@ class StiTest < MiniTest::Unit::TestCase
     assert_equal :bar, klass.friendly_id_config.slug_column
   end
 
-
   test "friendly_id should accept a block with single table inheritance" do
     abstract_klass = Class.new(ActiveRecord::Base) do
+      def self.table_exists?; false end
       extend FriendlyId
       friendly_id :foo do |config|
         config.use :slugged
@@ -45,4 +46,12 @@ class StiTest < MiniTest::Unit::TestCase
     assert_equal :bar, klass.friendly_id_config.slug_column
   end
 
-end
+  test "friendly_id slugs should not clash with eachother" do
+    journalist  = Journalist.create! :name => 'foo bar'
+    editoralist = Editorialist.create! :name => 'foo bar'
+
+    assert_equal 'foo-bar', journalist.slug
+    assert_equal 'foo-bar--2', editoralist.slug
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,110 +9,99 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-27 00:00:00.000000000 Z
+date: 2012-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70322990492320 !ruby/object:Gem::Requirement
+  requirement: &70170127893680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70322990492320
+  version_requirements: *70170127893680
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70322990491640 !ruby/object:Gem::Requirement
+  requirement: &70170127892900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70322990491640
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70322990490880 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.4
-  type: :development
-  prerelease: false
-  version_requirements: *70322990490880
+  version_requirements: *70170127892900
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70322990489960 !ruby/object:Gem::Requirement
+  requirement: &70170127892400 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322990489960
+  version_requirements: *70170127892400
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70322990489120 !ruby/object:Gem::Requirement
+  requirement: &70170127891740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322990489120
+  version_requirements: *70170127891740
 - !ruby/object:Gem::Dependency
-  name: ffaker
-  requirement: &70322990487800 !ruby/object:Gem::Requirement
+  name: maruku
+  requirement: &70170127891160 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322990487800
+  version_requirements: *70170127891160
 - !ruby/object:Gem::Dependency
-  name: maruku
-  requirement: &70322990507280 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: &70170127890460 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322990507280
+  version_requirements: *70170127890460
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &70322990506220 !ruby/object:Gem::Requirement
+  name: i18n
+  requirement: &70170127889980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322990506220
+  version_requirements: *70170127889980
 - !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &70322990504860 !ruby/object:Gem::Requirement
+  name: ffaker
+  requirement: &70170127889500 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322990504860
+  version_requirements: *70170127889500
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70322990503800 !ruby/object:Gem::Requirement
+  requirement: &70170127888840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,13 +109,13 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322990503800
+  version_requirements: *70170127888840
 description: ! 'FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
   plugins for
 
-  Ruby on Rails. It allows you to create pretty URL''s and work with
+  Ruby on Rails. It allows you to create pretty URLs and work with human-friendly
 
-  human-friendly strings as if they were numeric ids for ActiveRecord models.
+  strings as if they were numeric ids for Active Record models.
 
 '
 email:
@@ -155,6 +144,7 @@ files:
 - lib/friendly_id/base.rb
 - lib/friendly_id/configuration.rb
 - lib/friendly_id/finder_methods.rb
+- lib/friendly_id/globalize.rb
 - lib/friendly_id/history.rb
 - lib/friendly_id/migration.rb
 - lib/friendly_id/object_utils.rb
@@ -185,7 +175,7 @@ files:
 - test/shared.rb
 - test/slugged_test.rb
 - test/sti_test.rb
-homepage: http://norman.github.com/friendly_id
+homepage: http://github.com/norman/friendly_id
 licenses: []
 post_install_message: ! 'NOTE: FriendlyId 4.x breaks compatibility with 3.x. If you''re
   upgrading
@@ -214,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: friendly_id
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.