friendly_id 4.0.0.rc2 → 4.0.0

data/README.md

@@ -20,7 +20,7 @@ instead of:
 FriendlyId offers many advanced features, including: slug history and
 versioning, i18n, scoped slugs, reserved words, and custom slug generators.
 
-FriendlyId is compatible with Active Record **3.0** and **3.1**.
+FriendlyId is compatible with Active Record **3.0**, **3.1** and **3.2**
 
 ## Version 4.x
 
@@ -46,7 +46,7 @@ which compiles the top-level RDocs into one outlined document.
 
     cd my_app
 
-    gem "friendly_id", "~> 4.0.0.beta14"
+    gem "friendly_id", "~> 4.0.0"
 
     rails generate scaffold user name:string slug:string
 

data/friendly_id.gemspec

@@ -36,7 +36,7 @@ EOM
 NOTE: FriendlyId 4.x breaks compatibility with 3.x. If you're upgrading
 from 3.x, please see this document:
 
-https://github.com/norman/friendly_id/blob/4.0.0/WhatsNew.md
+http://rubydoc.info/github/norman/friendly_id/master/file/WhatsNew.md
 
 EOM
 

data/gemfiles/Gemfile.rails-3.1.rb

@@ -13,8 +13,9 @@ platform :ruby do
   gem "sqlite3", "~> 1.3.4"
 end
 
-gem "activerecord", "~> 3.1.1"
+gem "ffaker"
+gem "activerecord", "~> 3.1.3"
 gem "minitest", "~> 2.4.0"
 gem "mocha", "~> 0.9.12"
-gem "railties", "~> 3.1.1"
+gem "railties", "~> 3.1.3"
 gem "rake"

data/gemfiles/Gemfile.rails-3.2.rb

@@ -0,0 +1,21 @@
+source :rubygems
+
+# platform :jruby do
+#   gem "activerecord-jdbc-adapter", :git => "https://github.com/nicksieger/activerecord-jdbc-adapter.git"
+#   gem "activerecord-jdbcmysql-adapter"
+#   gem "activerecord-jdbcpostgresql-adapter"
+#   gem "activerecord-jdbcsqlite3-adapter"
+# end
+
+platform :ruby do
+  gem "mysql2", "~> 0.3.6"
+  gem "pg", "~> 0.11.0"
+  gem "sqlite3", "~> 1.3.4"
+end
+
+gem "ffaker"
+gem "activerecord", "~> 3.2.0.rc1"
+gem "minitest", "~> 2.4.0"
+gem "mocha", "~> 0.9.12"
+gem "railties", "~> 3.2.0.rc1"
+gem "rake"

data/lib/friendly_id.rb

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

data/lib/friendly_id/history.rb

@@ -75,7 +75,9 @@ method.
     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
+      relation = slugs.where(:slug => friendly_id)
+      result = relation.select("id").lock(true).all
+      relation.delete_all unless result.empty?
       slugs.build :slug => friendly_id
     end
 

data/test/compatibility/threading/threading.rb

@@ -0,0 +1,45 @@
+ENV["DB"] = "postgres"
+
+require "thread"
+require File.expand_path("../../../helper", __FILE__)
+require "active_record/locking/fatalistic"
+
+ActiveRecord::Migration.tap do |m|
+  m.drop_table "things"
+  m.create_table("things") do |t|
+    t.string  :name
+    t.string  :slug
+  end
+  m.add_index :things, :slug, :unique => true
+end
+
+class Thing < ActiveRecord::Base
+  extend FriendlyId
+  friendly_id :name, :use => :slugged
+end
+
+$things = 10.times.map do
+  Thing.new :name => "a b c"
+end
+
+$mutex = Mutex.new
+
+def save_thing
+  thing = $mutex.synchronize do
+    $things.pop
+  end
+  if thing.nil? then return end
+  Thing.lock do
+    thing.save!
+    print "#{thing.friendly_id}\n"
+  end
+  true
+end
+
+2.times.map do
+  Thread.new do
+    while true do
+      break unless save_thing
+    end
+  end
+end.map(&:value)

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
-  prerelease: 6
+  version: 4.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Norman Clarke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000 Z
+date: 2011-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70113010960640 !ruby/object:Gem::Requirement
+  requirement: &70322990492320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70113010960640
+  version_requirements: *70322990492320
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70113010958920 !ruby/object:Gem::Requirement
+  requirement: &70322990491640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70113010958920
+  version_requirements: *70322990491640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70113010957760 !ruby/object:Gem::Requirement
+  requirement: &70322990490880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70113010957760
+  version_requirements: *70322990490880
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70113010956880 !ruby/object:Gem::Requirement
+  requirement: &70322990489960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70113010956880
+  version_requirements: *70322990489960
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70113010955680 !ruby/object:Gem::Requirement
+  requirement: &70322990489120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70113010955680
+  version_requirements: *70322990489120
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70113010954720 !ruby/object:Gem::Requirement
+  requirement: &70322990487800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70113010954720
+  version_requirements: *70322990487800
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70113010953400 !ruby/object:Gem::Requirement
+  requirement: &70322990507280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70113010953400
+  version_requirements: *70322990507280
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70113010952800 !ruby/object:Gem::Requirement
+  requirement: &70322990506220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70113010952800
+  version_requirements: *70322990506220
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70113010952100 !ruby/object:Gem::Requirement
+  requirement: &70322990504860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70113010952100
+  version_requirements: *70322990504860
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70113010951100 !ruby/object:Gem::Requirement
+  requirement: &70322990503800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113010951100
+  version_requirements: *70322990503800
 description: ! 'FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
   plugins for
 
@@ -150,6 +150,7 @@ files:
 - friendly_id.gemspec
 - gemfiles/Gemfile.rails-3.0.rb
 - gemfiles/Gemfile.rails-3.1.rb
+- gemfiles/Gemfile.rails-3.2.rb
 - lib/friendly_id.rb
 - lib/friendly_id/base.rb
 - lib/friendly_id/configuration.rb
@@ -167,6 +168,9 @@ files:
 - test/base_test.rb
 - test/compatibility/ancestry/Gemfile
 - test/compatibility/ancestry/ancestry_test.rb
+- test/compatibility/threading/Gemfile
+- test/compatibility/threading/Gemfile.lock
+- test/compatibility/threading/threading.rb
 - test/configuration_test.rb
 - test/core_test.rb
 - test/databases.yml
@@ -189,7 +193,7 @@ post_install_message: ! 'NOTE: FriendlyId 4.x breaks compatibility with 3.x. If
   from 3.x, please see this document:
 
 
-  https://github.com/norman/friendly_id/blob/4.0.0/WhatsNew.md
+  http://rubydoc.info/github/norman/friendly_id/master/file/WhatsNew.md
 
 
 '
@@ -205,9 +209,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: friendly_id
 rubygems_version: 1.8.10