friendly_id4 4.0.0.pre → 4.0.0.pre3

data/test/helper.rb

@@ -0,0 +1,41 @@
+require "rubygems"
+require "bundler/setup"
+require "active_record"
+require "active_support"
+require "friendly_id"
+$VERBOSE = true
+
+ActiveRecord::Migration.verbose = false
+
+# Change the connection args as you see fit to test against different adapters.
+ActiveRecord::Base.establish_connection \
+  :adapter  => "sqlite3",
+  :database => ":memory:"
+
+# If you want to see the ActiveRecord log, invoke the tests using `rake test LOG=true`
+if ENV["LOG"]
+  require "logger"
+  ActiveRecord::Base.logger = Logger.new($stdout)
+end
+
+User, Book = ["users", "books"].map do |table_name|
+  ActiveRecord::Migration.create_table table_name do |t|
+    t.string  :name
+    t.boolean :active
+  end
+  Class.new(ActiveRecord::Base)
+end
+
+def transaction
+  ActiveRecord::Base.transaction { yield ; raise ActiveRecord::Rollback }
+end
+
+def with_instance_of(*args)
+  klass = args.shift
+  args[0] ||= {:name => "a"}
+  transaction { yield klass.create!(*args) }
+end
+
+def migration
+  yield ActiveRecord::Migration
+end

data/test/history_test.rb

@@ -0,0 +1,46 @@
+require File.expand_path("../helper.rb", __FILE__)
+require "friendly_id/migration"
+
+CreateFriendlyIdSlugs.up
+
+migration do |m|
+  m.add_column :users, :slug, :string
+end
+
+User.send :include, FriendlyId::History
+User.has_friendly_id :name
+
+setup {User}
+
+
+test "should insert record in slugs table on create" do |klass|
+  with_instance_of(klass) {|record| assert !record.friendly_id_slugs.empty?}
+end
+
+test "should not create new slug record if friendly_id is not changed" do |klass|
+  with_instance_of(klass) do |record|
+    record.active = true
+    record.save!
+    assert_equal 1, FriendlyIdSlug.count
+  end
+end
+
+test "should create new slug record when friendly_id changes" do |klass|
+  with_instance_of(klass) do |record|
+    record.name = record.name + "b"
+    record.save!
+    assert_equal 2, FriendlyIdSlug.count
+  end
+end
+
+test "should be findable by old slugs" do |klass|
+  with_instance_of(klass) do |record|
+    old_friendly_id = record.friendly_id
+    record.name = record.name + "b"
+    record.save!
+    assert found = klass.find_by_friendly_id(old_friendly_id)
+    assert !found.readonly?
+  end
+end
+
+require File.expand_path("../shared.rb", __FILE__)

data/test/object_utils_test.rb

@@ -0,0 +1,18 @@
+require File.expand_path("../helper.rb", __FILE__)
+
+test "strings with letters are friendly_ids" do
+  assert "a".friendly_id?
+end
+
+test "integers should be unfriendly ids" do
+  assert 1.unfriendly_id?
+end
+
+test "numeric strings are neither friendly nor unfriendly" do
+  assert_equal nil, "1".friendly_id?
+  assert_equal nil, "1".unfriendly_id?
+end
+
+test "ActiveRecord::Base instances should be unfriendly_ids" do
+  assert User.new.unfriendly_id?
+end

data/test/scoped_test.rb

@@ -1,61 +1,42 @@
 # encoding: utf-8
-require File.expand_path("../test_helper", __FILE__)
-require "friendly_id/scoped"
+require File.expand_path("../helper", __FILE__)
 
-Restaurant = make_model("restaurants", :name) do |t|
-  t.string :name
-  t.string :slug
-  t.integer :city_id
+migration do |m|
+  m.add_column :books, :slug, :string
+  m.add_column :books, :user_id, :integer
 end
 
-City = make_model("cities", :name) do |t|
-  t.string :name
-  t.string :slug
-end
-
-Restaurant.belongs_to :city
-City.has_many :restaurants
-City.send :include, FriendlyId::Slugged
-Restaurant.send :include, FriendlyId::Scoped
-Restaurant.has_friendly_id :name, :scope => :city
-
-class ScopedTest < Test::Unit::TestCase
+User.has_many :books
+Book.belongs_to :user
+Book.send :include, FriendlyId::Scoped
+Book.has_friendly_id :name, :scope => :user
 
-  def setup
-    Restaurant.delete_all
-    City.delete_all
-  end
-
-  test "should detect scope column from belongs_to relation" do
-    assert_equal "city_id", Restaurant.friendly_id_config.scope_column
-  end
+test "should detect scope column from belongs_to relation" do
+  assert_equal "user_id", Book.friendly_id_config.scope_column
+end
 
-  test "should detect scope column from explicit column name" do
-    klass = Class.new(ActiveRecord::Base)
-    klass.has_friendly_id :empty, :scope => :dummy
-    assert_equal "dummy", klass.friendly_id_config.scope_column
-  end
+test "should detect scope column from explicit column name" do
+  klass = Class.new(ActiveRecord::Base)
+  klass.has_friendly_id :empty, :scope => :dummy
+  assert_equal "dummy", klass.friendly_id_config.scope_column
+end
 
-  test "should allow duplicate slugs outside scope" do
-    c1 = City.create! :name => "Nuñez"
-    c2 = City.create! :name => "Las Cañitas"
-    r1 = Restaurant.create! :name => "La Guitarrita", :city => c1
-    r2 = Restaurant.create! :name => "La Guitarrita", :city => c2
-    assert_equal r1.friendly_id, r2.friendly_id
+test "should allow duplicate slugs outside scope" do
+  transaction do
+    book1 = Book.create! :name => "a", :user => User.create!(:name => "a")
+    book2 = Book.create! :name => "a", :user => User.create!(:name => "b")
+    assert_equal book1.friendly_id, book2.friendly_id
   end
+end
 
-  test "should not allow duplicate slugs inside scope" do
-    c1 = City.create! :name => "Nuñez"
-    r1 = Restaurant.create! :name => "La Guitarrita", :city => c1
-    r2 = Restaurant.create! :name => "La Guitarrita", :city => c1
-    assert_not_equal "la-guitarrita", r2.friendly_id
+test "should not allow duplicate slugs inside scope" do
+  with_instance_of User do |user|
+    book1 = Book.create! :name => "a", :user => user
+    book2 = Book.create! :name => "a", :user => user
+    assert book1.friendly_id != book2.friendly_id
   end
+end
 
-  test "updating record's other values should not change the friendly_id" do
-    city = City.create! :name => "Nuñez"
-    old = city.friendly_id
-    city.save!
-    assert_equal old, city.friendly_id
-  end
+setup { Book }
 
-end
+require File.expand_path("../shared.rb", __FILE__)

data/test/shared.rb

@@ -0,0 +1,47 @@
+test "finds should respect conditions" do |klass|
+  with_instance_of(klass) do |record|
+    assert_raise(ActiveRecord::RecordNotFound) do
+      klass.where("1 = 2").find record.friendly_id
+    end
+  end
+end
+
+test "should be findable by friendly id" do |klass|
+  with_instance_of(klass) {|record| assert klass.find record.friendly_id}
+end
+
+test "should be findable by id as integer" do |klass|
+  with_instance_of(klass) {|record| assert klass.find record.id.to_i}
+end
+
+test "should be findable by id as string" do |klass|
+  with_instance_of(klass) {|record| assert klass.find record.id.to_s}
+end
+
+test "should be findable by numeric friendly_id" do |klass|
+  with_instance_of(klass, :name => "206") {|record| assert klass.find record.friendly_id}
+end
+
+test "to_param should return the friendly_id" do |klass|
+  with_instance_of(klass) {|record| assert_equal record.friendly_id, record.to_param}
+end
+
+test "should be findable by themselves" do |klass|
+  with_instance_of(klass) {|record| assert_equal record, klass.find(record)}
+end
+
+test "updating record's other values should not change the friendly_id" do |klass|
+  with_instance_of klass do |record|
+    old = record.friendly_id
+    record.update_attributes! :active => false
+    assert klass.find old
+  end
+end
+
+test "instances found by a single id should not be read-only" do |klass|
+  with_instance_of(klass) {|record| assert !klass.find(record.friendly_id).readonly?}
+end
+
+test "failing finds with unfriendly_id should raise errors normally" do |klass|
+  assert_raise(ActiveRecord::RecordNotFound) {klass.find 0}
+end

data/test/slugged_test.rb

@@ -1,64 +1,43 @@
-require File.expand_path("../test_helper", __FILE__)
-require "friendly_id/slugged"
+require File.expand_path("../helper.rb", __FILE__)
 
-class SluggedTest < Test::Unit::TestCase
-
-  include FriendlyId::Test::Generic
-
-  def instance(name = "user")
-    @instance ||= klass.create!(:name => name)
-  end
-
-  def klass
-    return @@klass if defined?(@@klass)
-    @@klass = make_model("slugged_model", :name) do |t|
-      t.string  :name,   :unique  => true
-      t.string  :slug,   :unique  => true
-      t.boolean :active, :default => true
-    end
-    @@klass.send :include, FriendlyId::Slugged
-    @@klass
+[User, Book].map do |klass|
+  migration do |m|
+    m.add_column klass.table_name, :slug, :string
+    m.add_index  klass.table_name, :slug, :unique => true
   end
+  klass.send :include, FriendlyId::Slugged
+  klass.has_friendly_id :name
+end
 
-  def other_class
-    return @@other_class if defined?(@@other_class)
-    @@other_class = make_model("other_slugged_model", :name) do |t|
-      t.string  :name,   :unique  => true
-      t.string  :slug,   :unique  => true
-      t.boolean :active, :default => true
-    end
-    @@other_class.send :include, FriendlyId::Slugged
-    @@other_class
-  end
+setup { User }
 
-  def setup
-    klass.delete_all
-    other_class.delete_all
-  end
+require File.expand_path("../shared.rb", __FILE__)
 
-  test "configuration should have a sequence_separator" do
-    assert_not_nil klass.friendly_id_config.sequence_separator
-  end
+test "configuration should have a sequence_separator" do |klass|
+  assert !klass.friendly_id_config.sequence_separator.empty?
+end
 
-  test "should make a new slug if the friendly_id method value has changed" do
-    instance.name = "Changed Value"
-    instance.save!
-    assert_equal "changed-value", instance.slug
+test "should make a new slug if the friendly_id method value has changed" do |klass|
+  with_instance_of klass do |record|
+    record.name = "Changed Value"
+    record.save!
+    assert_equal "changed-value", record.slug
   end
+end
 
-  test "should increment the slug sequence for duplicate friendly ids" do
-    instance2 = klass.create! :name => instance.name
-    assert_match(/2\z/, instance2.friendly_id)
-    instance3 = klass.create! :name => instance.name
-    assert_match(/3\z/, instance3.friendly_id)
+test "should increment the slug sequence for duplicate friendly ids" do |klass|
+  with_instance_of klass do |record|
+    record2 = klass.create! :name => record.name
+    assert record2.friendly_id.match(/2\z/)
   end
+end
 
-  test "should not add slug sequence on update after other conflicting slugs were added" do
-    old = instance.friendly_id
-    instance2 = klass.create! :name => instance.name
-    instance.save!
-    instance.reload
-    assert_equal old, instance.to_param
+test "should not add slug sequence on update after other conflicting slugs were added" do |klass|
+  with_instance_of klass do |record|
+    old = record.friendly_id
+    record2 = klass.create! :name => record.name
+    record.save!
+    record.reload
+    assert_equal old, record.to_param
   end
-
 end

metadata

@@ -2,7 +2,7 @@
 name: friendly_id4
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 4.0.0.pre
+  version: 4.0.0.pre3
 platform: ruby
 authors: 
 - Norman Clarke
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 -03:00
-default_executable: 
+date: 2011-06-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -25,29 +24,52 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: sqlite3
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.9"
+        version: "1.3"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: cutest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.3"
+        version: 1.1.2
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: ffaker
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: "    FriendlyId is the \"Swiss Army bulldozer\" of slugging and permalink plugins\n    for Ruby on Rails. It allows you to create pretty URL's and work with\n    human-friendly strings as if they were numeric ids for ActiveRecord models.\n"
-email: norman@njclarke.com
+email: 
+- norman@njclarke.com
 executables: []
 
 extensions: []
@@ -55,20 +77,34 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
+- ABOUT.md
+- Guide.md
+- README.md
+- Rakefile
+- bench.rb
+- friendly_id.gemspec
+- lib/friendly_id.rb
+- lib/friendly_id/base.rb
+- lib/friendly_id/configuration.rb
+- lib/friendly_id/finder_methods.rb
+- lib/friendly_id/history.rb
+- lib/friendly_id/migration.rb
+- lib/friendly_id/model.rb
+- lib/friendly_id/object_utils.rb
 - lib/friendly_id/scoped.rb
+- lib/friendly_id/slug_sequencer.rb
 - lib/friendly_id/slugged.rb
-- lib/friendly_id/test/generic.rb
-- lib/friendly_id/test.rb
 - lib/friendly_id/version.rb
-- lib/friendly_id.rb
-- README.md
-- Rakefile
+- lib/generators/friendly_id_generator.rb
 - test/core_test.rb
+- test/helper.rb
+- test/history_test.rb
+- test/object_utils_test.rb
 - test/scoped_test.rb
+- test/shared.rb
 - test/slugged_test.rb
-- test/test_helper.rb
-has_rdoc: true
-homepage: http://norman.github.com/friendly_id_4
+homepage: http://norman.github.com/friendly_id
 licenses: []
 
 post_install_message: 
@@ -90,12 +126,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 
-rubyforge_project: friendly-id
-rubygems_version: 1.6.1
+rubyforge_project: friendly_id
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.
-test_files: 
-- test/core_test.rb
-- test/scoped_test.rb
-- test/slugged_test.rb
+test_files: []
+