friendly_id 4.0.0.beta11 → 4.0.0.beta12

data/friendly_id.gemspec

@@ -15,8 +15,9 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- {test}/*`.split("\n")
   s.require_paths     = ["lib"]
 
-  s.add_development_dependency "activerecord", "~> 3.1"
-  s.add_development_dependency "sqlite3", "~> 1.3"
+  s.add_development_dependency "railties", "~> 3.1.0"
+  s.add_development_dependency "activerecord", "~> 3.1.0"
+  s.add_development_dependency "sqlite3", "~> 1.3.4"
   s.add_development_dependency "minitest", "~> 2.4.0"
   s.add_development_dependency "mocha", "~> 0.9.12"
   s.add_development_dependency "ffaker", "~> 1.8.0"

data/gemfiles/Gemfile.rails-3.0.rb

@@ -12,7 +12,8 @@ platform :ruby do
   gem "sqlite3", "~> 1.3.4"
 end
 
-gem "activerecord", "3.0.10"
+gem "activerecord", "~> 3.0.10"
 gem "minitest", "~> 2.4.0"
 gem "mocha", "~> 0.9.12"
+gem "railties", "~> 3.0.10"
 gem "rake"

data/gemfiles/Gemfile.rails-3.1.rb

@@ -16,4 +16,5 @@ end
 gem "activerecord", "~> 3.1.0"
 gem "minitest", "~> 2.4.0"
 gem "mocha", "~> 0.9.12"
+gem "railties", "~> 3.1.0"
 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.beta11"
+  VERSION = "4.0.0.beta12"
 
   @mutex = Mutex.new
 

data/lib/friendly_id/finder_methods.rb

@@ -23,6 +23,8 @@ module FriendlyId
     # @example
     #  person = Person.exists?(123)
     #  person = Person.exists?("joe")
+    #  person = Person.exists?({:name => 'joe'})
+    #  person = Person.exists?(['name = ?', 'joe'])
     #
     # @see FriendlyId::ObjectUtils
     def exists?(id = nil)

data/lib/friendly_id/history.rb

@@ -59,8 +59,9 @@ method.
       model_class.instance_eval do
         raise "FriendlyId::History is incompatible with FriendlyId::Scoped" if self < Scoped
         @friendly_id_config.use :slugged
-        has_many :slugs, :as => :sluggable, :dependent => :destroy, :class_name => Slug.to_s
-        before_save :build_slug, :if => lambda {|r| r.should_generate_new_friendly_id?}
+        has_many :slugs, :as => :sluggable, :dependent => :destroy,
+          :class_name => Slug.to_s, :order => "#{Slug.quoted_table_name}.id DESC"
+        before_save :build_slug
         relation_class.send :include, FinderMethods
       end
     end
@@ -68,6 +69,9 @@ method.
     private
 
     def build_slug
+      return unless should_generate_new_friendly_id?
+      # Allow reversion back to a previously used slug
+      slugs.where(:slug => friendly_id).delete_all
       slugs.build :slug => friendly_id
     end
 
@@ -76,7 +80,7 @@ method.
 
       # Search for a record in the slugs table using the specified slug.
       def find_one(id)
-        return super if id.unfriendly_id?
+        return super(id) if id.unfriendly_id?
         where(@klass.friendly_id_config.query_field => id).first or
         with_old_friendly_id(id) {|x| find_one_without_friendly_id(x)} or
         find_one_without_friendly_id(id)
@@ -84,7 +88,7 @@ method.
 
       # Search for a record in the slugs table using the specified slug.
       def exists?(id = nil)
-        return super if id.unfriendly_id?
+        return super(id) if id.unfriendly_id?
         exists_without_friendly_id?(@klass.friendly_id_config.query_field => id) or
         with_old_friendly_id(id) {|x| exists_without_friendly_id?(x)} or
         exists_without_friendly_id?(id)

data/lib/friendly_id/object_utils.rb

@@ -12,17 +12,25 @@ module FriendlyId
     # else nil.
     #
     # An object is considired "definitely unfriendly" if its class is or
-    # inherits from Numeric, Symbol or ActiveRecord::Base.
+    # inherits from ActiveRecord::Base, Array, Hash, NilClass, Numeric, or
+    # Symbol.
     #
     # An object is considered "definitely friendly" if it responds to +to_i+,
     # and its value when cast to an integer and then back to a string is
     # different from its value when merely cast to a string:
     #
-    #   123.friendly_id?       #=> false
-    #   "123".friendly_id?     #=> nil
-    #   "abc123".friendly_id?  #=> true
+    #   123.friendly_id?                  #=> false
+    #   :id.friendly_id?                  #=> false
+    #   {:name => 'joe'}.friendly_id?     #=> false
+    #   ['name = ?', 'joe'].friendly_id?  #=> false
+    #   nil.friendly_id?                  #=> false
+    #   "123".friendly_id?                #=> nil
+    #   "abc123".friendly_id?             #=> true
     def friendly_id?
-      if [Numeric, Symbol, ActiveRecord::Base].detect {|klass| self.class < klass}
+      unfriendly_classes = [ActiveRecord::Base, Array, Hash, NilClass, Numeric, Symbol]
+      # Considered unfriendly if this is an instance of an unfriendly class or
+      # one of its descendants.
+      if unfriendly_classes.detect {|klass| self.class <= klass}
         false
       elsif respond_to?(:to_i) && to_i.to_s != to_s
         true

data/lib/generators/friendly_id_generator.rb

@@ -1,10 +1,11 @@
 require 'rails/generators'
-require 'rails/generators/migration'
+require "rails/generators/active_record"
 
 # This generator adds a migration for the {FriendlyId::History
 # FriendlyId::History} addon.
 class FriendlyIdGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
+  extend ActiveRecord::Generators::Migration
 
   source_root File.expand_path('../../friendly_id', __FILE__)
 
@@ -13,14 +14,4 @@ class FriendlyIdGenerator < Rails::Generators::Base
     migration_template 'migration.rb', 'db/migrate/create_friendly_id_slugs.rb'
   end
 
-  # TODO: use the module provided with Rails, no need to do this
-  # any more
-  # Taken from ActiveRecord's migration generator
-  def self.next_migration_number(dirname) #:nodoc:
-    if ActiveRecord::Base.timestamped_migrations
-      Time.now.utc.strftime("%Y%m%d%H%M%S")
-    else
-      "%.3d" % (current_migration_number(dirname) + 1)
-    end
-  end
 end

data/test/generator_test.rb

@@ -0,0 +1,22 @@
+require File.expand_path("../helper", __FILE__)
+
+require "test/unit"
+require "rails/generators"
+require "generators/friendly_id_generator"
+
+class FriendlyIdGeneratorTest < Rails::Generators::TestCase
+
+  tests FriendlyIdGenerator
+  destination File.expand_path("../../tmp", __FILE__)
+
+  setup :prepare_destination
+
+  test "should generate a migration" do
+    begin
+      run_generator
+      assert_migration "db/migrate/create_friendly_id_slugs"
+    ensure
+      FileUtils.rm_rf self.destination_root
+    end
+  end
+end

data/test/history_test.rb

@@ -66,4 +66,15 @@ class HistoryTest < MiniTest::Unit::TestCase
     end
   end
 
+  test "should handle renames" do
+    with_instance_of(model_class) do |record|
+      record.name = 'x'
+      assert record.save
+      record.name = 'y'
+      assert record.save
+      record.name = 'x'
+      assert record.save
+    end
+  end
+
 end

data/test/shared.rb

@@ -70,6 +70,8 @@ module FriendlyId
           with_instance_of(model_class) do |record|
             assert model_class.exists? record.id
             assert model_class.exists? record.friendly_id
+            assert model_class.exists?({:id => record.id})
+            assert model_class.exists?(['id = ?', record.id])
             assert !model_class.exists?(record.friendly_id + "-hello")
             assert !model_class.exists?(0)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta11
+  version: 4.0.0.beta12
   prerelease: 6
 platform: ruby
 authors:
@@ -9,33 +9,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-07 00:00:00.000000000 Z
+date: 2011-09-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: &70173663525760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: *70173663525760
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70177920323920 !ruby/object:Gem::Requirement
+  requirement: &70173663524880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70177920323920
+  version_requirements: *70173663524880
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70177920323260 !ruby/object:Gem::Requirement
+  requirement: &70173663524340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70177920323260
+  version_requirements: *70173663524340
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70177920322440 !ruby/object:Gem::Requirement
+  requirement: &70173663523820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70177920322440
+  version_requirements: *70173663523820
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70177920321640 !ruby/object:Gem::Requirement
+  requirement: &70173663523340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70177920321640
+  version_requirements: *70173663523340
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70177920321060 !ruby/object:Gem::Requirement
+  requirement: &70173663522820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70177920321060
+  version_requirements: *70173663522820
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70177920499500 !ruby/object:Gem::Requirement
+  requirement: &70173663522180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70177920499500
+  version_requirements: *70173663522180
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70177920498640 !ruby/object:Gem::Requirement
+  requirement: &70173663521720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70177920498640
+  version_requirements: *70173663521720
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70177920497740 !ruby/object:Gem::Requirement
+  requirement: &70173663521180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +109,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70177920497740
+  version_requirements: *70173663521180
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70177920496960 !ruby/object:Gem::Requirement
+  requirement: &70173663520740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177920496960
+  version_requirements: *70173663520740
 description: ! 'FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
   plugins for
 
@@ -159,6 +170,7 @@ files:
 - test/configuration_test.rb
 - test/core_test.rb
 - test/databases.yml
+- test/generator_test.rb
 - test/helper.rb
 - test/history_test.rb
 - test/i18n_test.rb