friendly_id 3.2.0 → 3.2.1

data/Changelog.md

@@ -6,6 +6,11 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 3.2.1 (2011-02-03)
+
+* Fixed minor issue with ActiveRecord 3.0.4.rc1 (Bruno Michel)
+* Added support for Rubygems-test
+
 ## 3.2.0 (2011-01-17)
 
 * Fixed deprecation on Rails edge. Thanks [slbug](http://github.com/slbug)

data/Guide.md

@@ -80,13 +80,13 @@ with Rails 2.3.x. and 3.0.
 
 After installing the gem, add an entry in environment.rb:
 
-    config.gem "friendly_id", :version => "~> 3.2"
+    config.gem "friendly_id", :version => "~> 3.2.1"
 
 ### Rails 3.0
 
 After installing the gem, add an entry in the Gemfile:
 
-    gem "friendly_id", "~> 3.2"
+    gem "friendly_id", "~> 3.2.1"
 
 ### As a Plugin
 

data/README.md

@@ -41,7 +41,7 @@ continue to support 2.3.x until Rails 3.1 is released.
     cd my_app
 
     # add to Gemfile
-    gem "friendly_id", "~> 3.2"
+    gem "friendly_id", "~> 3.2.1"
 
     rails generate friendly_id
     rails generate scaffold user name:string cached_slug:string

data/Rakefile

@@ -8,7 +8,11 @@ require "rake/clean"
 task :default => :test
 
 CLEAN << "pkg" << "doc" << "coverage" << ".yardoc"
-Rake::GemPackageTask.new(eval(File.read("friendly_id.gemspec"))) { |pkg| }
+
+gemspec = File.expand_path("../friendly_id.gemspec", __FILE__)
+if File.exists? gemspec
+  Rake::GemPackageTask.new(eval(File.read("friendly_id.gemspec"))) { |pkg| }
+end
 
 begin
   require "yard"
@@ -43,7 +47,7 @@ namespace :test do
 
   desc "Test against lots of versions"
   task :pre_release do
-    ["ree-1.8.7-2010.02", "ruby-1.9.2-p0"].each do |ruby|
+    ["ree-1.8.7-2010.02", "ruby-1.9.2-p136"].each do |ruby|
       ["sqlite3", "mysql", "postgres"].each do |driver|
         [2, 3].each do |ar_version|
           command = "rake-#{ruby} test AR=#{ar_version} DB=#{driver}"

data/lib/friendly_id/active_record_adapter/relation.rb

@@ -101,7 +101,7 @@ module FriendlyId
           fragment = "(slugs.sluggable_type = %s AND slugs.name = %s AND slugs.sequence = %d)"
           conditions = ids.inject(nil) do |clause, id|
             name, seq = id.parse_friendly_id
-            string = fragment % [connection.quote(klass.base_class), connection.quote(name), seq]
+            string = fragment % [connection.quote(klass.base_class.name), connection.quote(name), seq]
             clause ? clause + " OR #{string}" : string
           end
           sql = "SELECT sluggable_id FROM slugs WHERE (%s)" % conditions

data/lib/friendly_id/version.rb

@@ -2,7 +2,7 @@ module FriendlyId
   module Version
     MAJOR = 3
     MINOR = 2
-    TINY = 0
+    TINY  = 1
     BUILD = nil
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 3
-  - 2
-  - 0
-  version: 3.2.0
+  prerelease: 
+  version: 3.2.1
 platform: ruby
 authors: 
 - Norman Clarke
@@ -16,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +01:00
+date: 2011-02-03 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +22,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 1
         version: 0.2.1
   type: :runtime
   prerelease: false
@@ -41,10 +33,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :development
   prerelease: false
@@ -56,9 +44,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
         version: "0.9"
   type: :development
   prerelease: false
@@ -70,8 +55,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
         version: "1"
   type: :development
   prerelease: false
@@ -145,6 +128,7 @@ files:
 - extras/README.txt
 - extras/template-gem.rb
 - extras/template-plugin.rb
+- .gemtest
 has_rdoc: true
 homepage: http://norman.github.com/friendly_id
 licenses: []
@@ -159,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3183738274277774801
+      hash: -1851693387328844526
       segments: 
       - 0
       version: "0"
@@ -168,13 +152,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: friendly-id
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.