friendly_id 3.2.1.1 → 3.3.0.alpha1

data/Changelog.md

@@ -6,6 +6,11 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 3.3.0 (NOT_RELEASED_YET)
+
+* Compatibility with Active Record 3.1 ([Andrew White](https://github.com/pixeltrix))
+* Gemspec compatibility with RubyGems 1.7 ([Philip Arndt](https://github.com/parndt))
+
 ## 3.2.1 (2011-02-03)
 
 * Fixed minor issue with ActiveRecord 3.0.4.rc1 (Bruno Michel)

data/Guide.md

@@ -351,6 +351,22 @@ store a reserved value, FriendlyId raises a
 reserved words in {FriendlyId::Configuration::DEFAULTS} to set the value for any
 model using FriendlyId.
 
+If you'd like to show a validation error when a word is reserved, you can add
+an callback to your model that catches the error:
+
+    class Person < ActiveRecord::Base
+      has_friendly_id :name, :use_slug => true
+
+      after_validation :validate_reserved
+
+      def validate_reserved
+        slug_text
+      rescue FriendlyId::ReservedError
+        @errors[friendly_id_config.method] = "is reserved. Please choose something else"
+        return false
+      end
+    end
+
 ## Caching the FriendlyId Slug for Better Performance
 
 Checking the slugs table all the time has an impact on performance, so as of

data/Rakefile

@@ -1,9 +1,9 @@
 require "rubygems"
-require "bundler/setup"
 require "rake"
 require "rake/testtask"
 require "rake/gempackagetask"
 require "rake/clean"
+require "bundler/setup"
 
 task :default => :test
 

data/lib/friendly_id/active_record_adapter/relation.rb

@@ -62,7 +62,7 @@ module FriendlyId
           sluggable_ids = sluggable_ids_for([id])
 
           if sluggable_ids.size > 1 && fc.scope?
-            return relation.where(relation.primary_key.in(sluggable_ids)).first
+            return relation.where(primary_key_column.in(sluggable_ids)).first
           end
 
           sluggable_id = sluggable_ids.first
@@ -83,7 +83,7 @@ module FriendlyId
           return find_some_using_slug(friendly_ids, unfriendly_ids) if use_slugs_table
           column     = fc.cache_column || fc.column
           friendly   = arel_table[column].in(friendly_ids)
-          unfriendly = arel_table[relation.primary_key.name].in unfriendly_ids
+          unfriendly = primary_key_column.in unfriendly_ids
           if friendly_ids.present? && unfriendly_ids.present?
             where(friendly.or(unfriendly))
           else
@@ -93,7 +93,7 @@ module FriendlyId
 
         def find_some_using_slug(friendly_ids, unfriendly_ids)
           ids = [unfriendly_ids + sluggable_ids_for(friendly_ids)].flatten.uniq
-          where(arel_table[relation.primary_key.name].in(ids))
+          where(primary_key_column.in(ids))
         end
 
         def sluggable_ids_for(ids)
@@ -131,6 +131,14 @@ module FriendlyId
             raise ActiveRecord::RecordNotFound, error
           end
         end
+
+        def primary_key_column
+          if relation.primary_key.is_a?(String)
+            arel_table[relation.primary_key]
+          else
+            arel_table[relation.primary_key.name]
+          end
+        end
       end
 
       def apply_finder_options(options)

data/lib/friendly_id/active_record_adapter/slug.rb

@@ -45,6 +45,14 @@ class Slug < ::ActiveRecord::Base
     end
   end
 
+  def save(*args)
+    persisted? && !scope_changed? ? true : super
+  end
+
+  def save!(*args)
+    persisted? && !scope_changed? ? true : super
+  end
+
   private
 
   # If we're renaming back to a previously used friendly_id, delete the

data/lib/friendly_id/active_record_adapter/slugged_model.rb

@@ -5,7 +5,7 @@ module FriendlyId
       def self.included(base)
         base.class_eval do
           has_many :slugs, :order => 'id DESC', :as => :sluggable, :dependent => :destroy
-          has_one :slug, :order => 'id DESC', :as => :sluggable, :dependent => :destroy
+          has_one :slug, :order => 'id DESC', :as => :sluggable, :dependent => :nullify
           before_save :build_a_slug
           after_save :set_slug_cache
           after_update :update_scope
@@ -46,9 +46,8 @@ module FriendlyId
       # Build the new slug using the generated friendly id.
       def build_a_slug
         return unless new_slug_needed?
-        @slug = slugs.build :name => slug_text.to_s, :scope => friendly_id_config.scope_for(self),
-          :sluggable => self
-        @new_friendly_id = @slug.to_friendly_id
+        self.slug = slugs.build(:name => slug_text.to_s, :scope => friendly_id_config.scope_for(self), :sluggable => self)
+        @new_friendly_id = slug.to_friendly_id
       end
 
       # Reset the cached friendly_id?

data/lib/friendly_id/version.rb

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

data/test/active_record_adapter/scoped_model_test.rb

@@ -96,6 +96,13 @@ module FriendlyId
         assert_equal @resident2, @canada.residents.find("john-smith")
       end
 
+      test "scope records found as a relation member should be 'best'" do
+        assert_equal @resident, @usa.residents.find("john-smith")
+        assert @resident.friendly_id_status.best?
+        assert_equal @resident2, @canada.residents.find("john-smith")
+        assert @resident2.friendly_id_status.best?
+      end
+
       test "should find a single scoped record using slug conditions" do
         assert_equal @resident, Resident.find(@resident.friendly_id, :include => :slugs,
           :conditions => {:slugs => {:scope => @resident.country.to_param}})
@@ -116,4 +123,4 @@ module FriendlyId
       end
     end
   end
-end
+end

data/test/active_record_adapter/support/database.mysql2.yml

@@ -0,0 +1,4 @@
+adapter: mysql2
+database: friendly_id_test
+username: root
+hostname: 127.0.0.1

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 3.2.1.1
+  prerelease: 6
+  version: 3.3.0.alpha1
 platform: ruby
 authors: 
 - Norman Clarke
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -03:00
+date: 2011-05-13 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.0
+        version: "3.0"
   type: :development
   prerelease: false
   version_requirements: *id002
@@ -116,6 +116,7 @@ files:
 - test/active_record_adapter/sti_test.rb
 - test/active_record_adapter/support/database.jdbcsqlite3.yml
 - test/active_record_adapter/support/database.mysql.yml
+- test/active_record_adapter/support/database.mysql2.yml
 - test/active_record_adapter/support/database.postgres.yml
 - test/active_record_adapter/support/database.sqlite3.yml
 - test/active_record_adapter/support/models.rb
@@ -143,16 +144,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2028799673610630281
+      hash: 1894634640096086793
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: friendly-id