friendly_id 3.0.4 → 3.0.5

data/Changelog.md

@@ -6,6 +6,13 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 3.0.5 (2010-06-10)
+
+* Fixed support for Rails 3.0 beta4 (Bruno Michel)
+* Made rake tasks skip validations (Emilio Tagua).
+* Fixed incorrect status of records found with a numeric friendly_id.
+* Made slug an explicit has_one relation to enable eager-loading via :include => :slug
+
 ## 3.0.4 (2010-04-27)
 
 * Fixed backwards-compatiblity with ActiveSupport 2.3.4 (Thanks Juergen Fesslmeier).

data/Guide.md

@@ -77,7 +77,7 @@ with Rails 2.2.x, 2.3.x. and 3.0.
 After installing the gem, add an entry in environment.rb:
 
     config.gem "friendly_id", :version => "~> 2.3"
-    
+
 ### Rails 3.0
 
 After installing the gem, add an entry in the Gemfile:
@@ -349,11 +349,13 @@ Checking the slugs table all the time has an impact on performance, so as of
 ### Automatic setup
 
 To enable slug caching, simply add a column named "cached_slug" to your model.
+Is also advised to index this column for performance reason.
 FriendlyId will automatically use this column if it detects it:
 
     class AddCachedSlugToUsers < ActiveRecord::Migration
       def self.up
         add_column :users, :cached_slug, :string
+        add_index  :users, :cached_slug
       end
 
       def self.down
@@ -556,4 +558,4 @@ enabled. But if it is, then your patches would be very welcome!
     find model using array of ids                x1000 |   0.862 |   0.882 |   6.152 |       1.919 |
     find model using id, then to_param           x1000 |   0.658 |   2.200 |   8.398 |       1.539 |
     ================================================================================================
-    Total                                              |   2.077 |   4.217 |  21.041 |       4.856 |
+    Total                                              |   2.077 |   4.217 |  21.041 |       4.856 |

data/lib/friendly_id/active_record_adapter/slugged_model.rb

@@ -82,7 +82,7 @@ module FriendlyId
 
         def find
           @result = model_class.scoped(find_options).first(options)
-          handle_friendly_result if friendly?
+          handle_friendly_result if @result or friendly_id_config.scope?
           @result
         rescue ::ActiveRecord::RecordNotFound => @error
           friendly_id_config.scope? ? raise_scoped_error : (raise @error)
@@ -120,9 +120,17 @@ module FriendlyId
 
         def find
           @result = model_class.scoped(find_options).first(options)
-          handle_friendly_result if friendly?
-          @result
+          if @result
+            handle_friendly_result
+            @result
+          else
+            uncached_find
+          end
         rescue ActiveRecord::RecordNotFound
+          uncached_find
+        end
+
+        def uncached_find
           SingleFinder.new(id, model_class, options).find
         end
 
@@ -136,7 +144,8 @@ module FriendlyId
       def self.included(base)
         base.class_eval do
           has_many :slugs, :order => 'id DESC', :as => :sluggable, :dependent => :destroy
-          before_save :build_slug
+          has_one :slug, :order => 'id DESC', :as => :sluggable, :dependent => :destroy
+          before_save :build_a_slug
           after_save :set_slug_cache
           after_update :update_scope
           after_update :update_dependent_scopes
@@ -151,18 +160,6 @@ module FriendlyId
         slugs.find_by_name_and_sequence(name, sequence)
       end
 
-      # The model instance's current {FriendlyId::ActiveRecordAdapter::Slug slug}.
-      def slug
-        return @slug if new_record?
-        @slug ||= slugs.first(:order => "id DESC")
-      end
-
-      # Set the slug.
-      def slug=(slug)
-        @new_friendly_id = slug.to_friendly_id unless slug.nil?
-        super
-      end
-
       # Returns the friendly id, or if none is available, the numeric id.
       def to_param
         friendly_id_config.cache_column ? to_param_from_cache : to_param_from_slug
@@ -185,9 +182,10 @@ module FriendlyId
       end
 
       # Build the new slug using the generated friendly id.
-      def build_slug
+      def build_a_slug
         return unless new_slug_needed?
-        self.slug = slugs.build :name => slug_text.to_s, :scope => friendly_id_config.scope_for(self)
+        @slug = slugs.build :name => slug_text.to_s, :scope => friendly_id_config.scope_for(self)
+        @new_friendly_id = @slug.to_friendly_id
       end
 
       # Reset the cached friendly_id?
@@ -198,8 +196,13 @@ module FriendlyId
       # Reset the cached friendly_id.
       def set_slug_cache
         if new_cache_needed?
-          send "#{friendly_id_config.cache_column}=", slug.to_friendly_id
-          send :update_without_callbacks
+          begin
+            send "#{friendly_id_config.cache_column}=", slug.to_friendly_id
+            update_without_callbacks
+          rescue ActiveRecord::StaleObjectError
+            reload
+            retry
+          end
         end
       end
 
@@ -226,6 +229,13 @@ module FriendlyId
         friendly_id_config.cache_column?
       end
 
+      # This method was removed in ActiveRecord 3.0.
+      if !ActiveRecord::Base.private_method_defined? :update_without_callbacks
+        def update_without_callbacks
+          save :callbacks => false
+        end
+      end
+
     end
   end
 end

data/lib/friendly_id/active_record_adapter/tasks.rb

@@ -31,7 +31,7 @@ module FriendlyId
       while records = find(:all, options) do
         break if records.size == 0
         records.each do |record|
-          record.save!
+          record.save(:validate => false)
           yield(record) if block_given?
         end
         options[:conditions] = cond + " and #{klass.table_name}.id > #{records.last.id}"
@@ -66,4 +66,4 @@ module FriendlyId
 
   end
 
-end
+end

data/lib/friendly_id/slug_string.rb

@@ -191,7 +191,7 @@ module FriendlyId
       # @param *args <Symbol>
       # @return String
       def approximate_ascii!(*args)
-        @maps = (self.class.approximations + args + [:common]).flatten.uniq
+        @maps = (self.class.approximations + args.flatten + [:common]).flatten.uniq
         @wrapped_string = normalize_utf8(:c).unpack("U*").map { |char| approx_char(char) }.flatten.pack("U*")
       end
 
@@ -206,7 +206,7 @@ module FriendlyId
       # though your milage may vary with Greek and Turkic strings.
       # @return String
       def downcase!
-        @wrapped_string = apply_mapping :lowercase_mapping
+        @wrapped_string = ActiveSupport::Multibyte::Unicode.apply_mapping(@wrapped_string, :lowercase_mapping)
       end
 
       # Remove any non-word characters.
@@ -235,7 +235,7 @@ module FriendlyId
       # @param config [FriendlyId::Configuration]
       # @return String
       def normalize_for!(config)
-        approximate_ascii! if config.approximate_ascii?
+        approximate_ascii!(config.ascii_approximation_options) if config.approximate_ascii?
         to_ascii! if config.strip_non_ascii?
         normalize!
       end
@@ -333,7 +333,7 @@ module FriendlyId
       # though your milage may vary with Greek and Turkic strings.
       # @return String
       def upcase!
-        @wrapped_string = apply_mapping :uppercase_mapping
+        @wrapped_string = ActiveSupport::Multibyte::Unicode.apply_mapping(@wrapped_string, :uppercase_mapping)
       end
 
       # Validate that the slug string is not blank or reserved, and truncate

data/lib/friendly_id/slugged.rb

@@ -96,7 +96,6 @@ module FriendlyId
           !slug? || slug_text_changed?
         end
       end
-
     end
   end
-end
+end

data/lib/friendly_id/test.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 Module.send :include, Module.new {
   def test(name, &block)
     define_method("test_#{name.gsub(/[^a-z0-9]/i, "_")}".to_sym, &block)
@@ -141,7 +142,7 @@ module FriendlyId
       test "should make a new slug if the friendly_id method value has changed" do
         instance.name = "Changed title"
         instance.send save_method
-        assert_equal 2, instance.slugs.size
+        assert_equal 2, instance.slugs(true).size
       end
 
       test "should be able to reuse an old friendly_id without incrementing the sequence" do
@@ -170,6 +171,13 @@ module FriendlyId
         assert instance2.friendly_id_status.best?
       end
 
+      test "should indicate correct status when found by a numeric friendly_id" do
+        instance = klass.send(create_method, :name => "100")
+        instance2 = klass.send(find_method, "100")
+        assert instance2.friendly_id_status.best?, "status expected to be best but isn't."
+        assert instance2.friendly_id_status.current?, "status expected to be current but isn't."
+      end
+
       test "should remain findable by previous slugs" do
         old_friendly_id = instance.friendly_id
         instance.name = "#{old_friendly_id} updated"
@@ -194,6 +202,19 @@ module FriendlyId
         end
       end
 
+      test "should approximate ascii if configured" do
+        klass.friendly_id_config.stubs(:approximate_ascii?).returns(true)
+        instance = klass.send(create_method, :name => "Cañón")
+        assert_equal "canon", instance.friendly_id
+      end
+
+      test "should approximate ascii with options if configured" do
+        klass.friendly_id_config.stubs(:approximate_ascii?).returns(true)
+        klass.friendly_id_config.stubs(:ascii_approximation_options).returns(:spanish)
+        instance = klass.send(create_method, :name => "Cañón")
+        assert_equal "cannon", instance.friendly_id
+      end
+
     end
 
     # Tests for FriendlyId::Status.

data/lib/friendly_id/version.rb

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

data/test/active_record_adapter/ar_test_helper.rb

@@ -1,8 +1,11 @@
 require File.expand_path('../../test_helper', __FILE__)
 
+require "logger"
 require "active_record"
 require "active_support"
 
+# ActiveRecord::Base.logger = Logger.new($stdout)
+
 require File.expand_path("../../../lib/friendly_id/active_record", __FILE__)
 require File.expand_path("../../../generators/friendly_id/templates/create_slugs", __FILE__)
 require File.expand_path("../support/models", __FILE__)
@@ -31,6 +34,15 @@ class District < ActiveRecord::Base
   has_friendly_id :name, :use_slug => true
 end
 
+# A model with optimistic locking enabled
+class Region < ActiveRecord::Base
+  has_friendly_id :name, :use_slug => true
+  after_create do |obj|
+    other_instance = self.class.find obj.id
+    other_instance.update_attributes :note => name + "!"
+  end
+end
+
 # A model that specifies a custom cached slug column
 class City < ActiveRecord::Base
   has_friendly_id :name, :use_slug => true, :cache_column => "my_slug"
@@ -116,4 +128,4 @@ end
 # A model used as a polymorphic owner
 class Company < ActiveRecord::Base
   has_many :sites, :as => :owner
-end
+end

data/test/active_record_adapter/optimistic_locking_test.rb

@@ -0,0 +1,18 @@
+require File.expand_path("../ar_test_helper", __FILE__)
+
+module FriendlyId
+  module Test
+    module ActiveRecordAdapter
+      class OptimisticLockingTest < ::Test::Unit::TestCase
+        test "should update the cached slug when updating the slug" do
+          region = Region.create! :name => 'some name'
+          assert_nothing_raised do
+            region.update_attributes(:name => "new name")
+          end
+          assert_equal region.slug.to_friendly_id, region.cached_slug
+        end
+      end
+    end
+  end
+end
+

data/test/active_record_adapter/slugged.rb

@@ -9,6 +9,11 @@ module FriendlyId
           assert_nothing_raised do
             klass.find(instance.friendly_id, :include => :slugs)
           end
+
+          assert_nothing_raised do
+            klass.find(instance.friendly_id, :include => :slug)
+          end
+
         end
 
         def klass

data/test/active_record_adapter/support/models.rb

@@ -23,6 +23,13 @@ class CreateSupportModels < ActiveRecord::Migration
     end
     add_index :cities, :my_slug, :unique => true
 
+    create_table :regions do |t|
+      t.string :name
+      t.string :cached_slug
+      t.string :note
+      t.integer :lock_version, :null => false, :default => 0
+    end
+    add_index :regions, :cached_slug, :unique => true
 
     create_table :countries do |t|
       t.string :name
@@ -76,7 +83,7 @@ class CreateSupportModels < ActiveRecord::Migration
       t.integer :owner_id
       t.string :owner_type
     end
-    
+
     create_table :companies do |t|
       t.string :name
     end

data/test/slug_string_test.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require(File.dirname(__FILE__) + "/test_helper")
+require(File.expand_path("../test_helper", __FILE__))
 
 module FriendlyId
   module Test

data/test/test_helper.rb

@@ -11,5 +11,6 @@ end
 require "test/unit"
 require "mocha"
 require "active_support"
+require "ruby-debug"
 require File.expand_path("../../lib/friendly_id", __FILE__)
-require File.expand_path("../../lib/friendly_id/test", __FILE__)
+require File.expand_path("../../lib/friendly_id/test", __FILE__)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 4
-  version: 3.0.4
+  - 5
+  version: 3.0.5
 platform: ruby
 authors: 
 - Norman Clarke
@@ -16,13 +16,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -03:00
+date: 2010-06-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -36,6 +37,7 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -91,6 +93,7 @@ files:
 - test/active_record_adapter/core.rb
 - test/active_record_adapter/custom_normalizer_test.rb
 - test/active_record_adapter/custom_table_name_test.rb
+- test/active_record_adapter/optimistic_locking_test.rb
 - test/active_record_adapter/scoped_model_test.rb
 - test/active_record_adapter/simple_test.rb
 - test/active_record_adapter/slug_test.rb
@@ -122,6 +125,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -129,6 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -138,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: friendly-id
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.
@@ -147,6 +152,7 @@ test_files:
 - test/active_record_adapter/cached_slug_test.rb
 - test/active_record_adapter/custom_normalizer_test.rb
 - test/active_record_adapter/custom_table_name_test.rb
+- test/active_record_adapter/optimistic_locking_test.rb
 - test/active_record_adapter/scoped_model_test.rb
 - test/active_record_adapter/simple_test.rb
 - test/active_record_adapter/slug_test.rb