friendly_id 3.0.1 → 3.0.2

data/Changelog.md

@@ -6,6 +6,14 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 3.0.2 (2010-04-09)
+
+* Fixed finding non-slugged models by an array of ids.
+* Added backported `tidy_bytes` implementation from [utf8_utils](http://github.com/norman/utf8_utils)
+* Removed dependency on Rubygems 1.3.6; this blocked deploy on Heroku (thanks Steven Noble)
+* Replaced File.dirname calls with File.expand_path, which should allow compatibility with Ruby 1.9.2
+* Cleanups and some improvements to tests.
+
 ## 3.0.1 (2010-03-30)
 
 * Fixed bad path in Rails 2.x generator.
@@ -15,7 +23,7 @@ suggestions, ideas and improvements to FriendlyId.
 * Rails 3 support.
 * Removed features deprecated in FriendlyId 2.3.
 * Fixed searching by numeric friendly_id in non-slugged models.
-* Added :allow_nil config option (Andre Duffeck and Norman Clarke)
+* Added `:allow_nil` config option (Andre Duffeck and Norman Clarke)
 
 ## 2.3.4 (2010-03-22)
 

data/Guide.md

@@ -517,7 +517,7 @@ any time.
 FriendlyId uses [Bundler](http://github.com/carlhuda/bundler) to manage its gem
 dependencies. To run the tests, first make sure you have bundler installed.
 Then, copy Gemfile.default to Gemfile. If you wish to test against different gem
-versions than the ones specifed in the Gemfile (for example, to test with
+versions than the ones specified in the Gemfile (for example, to test with
 Postgres or MySQL rather than SQLite3, or to test against different versions of
 ActiveRecord), then simply modify the Gemfile to suit your dependencies.
 
@@ -535,19 +535,25 @@ enabled. But if it is, then your patches would be very welcome!
 
     ruby 1.9.1p378 (2010-01-10 revision 26273) [i386-darwin10.2.0]
     activerecord (2.3.5)
-    friendly_id (2.3.0)
+    friendly_id (2.3.2)
     sqlite3 3.6.19 in-memory database
+                                                       | DEFAULT | NO_SLUG |    SLUG | CACHED_SLUG |
     ------------------------------------------------------------------------------------------------
-    find model using id                                                 x10000 |   2.948 |       0 |
-    find model using array of ids                                       x10000 |   6.020 |       0 |
-    find unslugged model using friendly id                              x10000 |   4.474 |     52% |
-    find unslugged model using array of friendly ids                    x10000 |   6.498 |      7% |
-    find slugged model using friendly id                                x10000 |   7.536 |    155% |
-    find slugged model using array of friendly ids                      x10000 |  18.020 |    200% |
-    find cached slugged model using friendly id                         x10000 |   4.791 |     63% |
-    find cached slugged model using array of friendly ids               x10000 |   7.275 |     21% |
-    find model using id, then to_param                                  x10000 |   2.974 |       0 |
-    find unslugged model using friendly id, then to_param               x10000 |   4.608 |     55% |
-    find slugged model using friendly id, then to_param                 x10000 |  12.589 |    323% |
-    find cached slugged model using friendly id, then to_param          x10000 |   5.037 |     69% |
+    find model by id                             x1000 |   0.274 |   0.426 |   0.780 |       0.489 |
+    find model using array of ids                x1000 |   0.517 |   0.525 |   1.692 |       0.623 |
+    find model using id, then to_param           x1000 |   0.279 |   0.431 |   1.253 |       0.498 |
+    ================================================================================================
+    Total                                              |   1.071 |   1.382 |   3.725 |       1.610 |
+
+    ruby 1.9.1p378 (2010-01-10 revision 26273) [i386-darwin10.2.0]
+    activerecord (3.0.0.beta1)
+    friendly_id (2.3.2)
+    sqlite3 3.6.19 in-memory database
+
+                                                       | DEFAULT | NO_SLUG |    SLUG | CACHED_SLUG |
     ------------------------------------------------------------------------------------------------
+    find model by id                             x1000 |   0.557 |   1.135 |   6.491 |       1.398 |
+    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 |

data/Rakefile

@@ -4,8 +4,9 @@ require "rake/gempackagetask"
 require "rake/rdoctask"
 require "rake/clean"
 
-CLEAN << "pkg" << "doc" << "coverage" << ".yardoc"
+task :default => :test
 
+CLEAN << "pkg" << "doc" << "coverage" << ".yardoc"
 Rake::GemPackageTask.new(eval(File.read("friendly_id.gemspec"))) { |pkg| }
 Rake::RDocTask.new do |r|
   r.rdoc_dir = "doc"
@@ -32,10 +33,7 @@ rescue LoadError
 end
 
 
-task :test do
-  Rake::Task["test:friendly_id"].invoke
-  Rake::Task["test:ar"].invoke
-end
+Rake::TestTask.new(:test) { |t| t.pattern = "test/**/*_test.rb" }
 
 namespace :test do
   task :rails do
@@ -45,7 +43,7 @@ namespace :test do
   end
   Rake::TestTask.new(:friendly_id) { |t| t.pattern = "test/*_test.rb" }
   Rake::TestTask.new(:ar) { |t| t.pattern = "test/active_record_adapter/*_test.rb" }
-  
+
   namespace :rails do
     task :plugin do
       rm_rf "fid"
@@ -65,4 +63,4 @@ task :pushdocs do
   sh "git push origin gh-pages"
   sh "git checkout #{branch}"
   sh "git stash apply"
-end
+end

data/extras/bench.rb

@@ -1,59 +1,36 @@
-#!/usr/bin/env ruby -KU
-require File.dirname(__FILE__) + '/extras'
+require File.expand_path('../extras', __FILE__)
 require 'rbench'
-FACTOR = 100
+FACTOR = 10
+
 RBench.run(TIMES) do
 
   column :times
-  column :ar
+  column :default
+  column :no_slug
+  column :slug
+  column :cached_slug
 
-  report 'find model using id', (TIMES * FACTOR).ceil do
-    ar { User.find(get_id) }
+  report 'find model by id', (TIMES * FACTOR).ceil do
+    default { User.find(get_id) }
+    no_slug { User.find(USERS.rand) }
+    slug { Post.find(POSTS.rand) }
+    cached_slug { District.find(DISTRICTS.rand) }
   end
 
   report 'find model using array of ids', (TIMES * FACTOR).ceil do
-    ar { User.find([get_id, get_id]) }
-  end
-
-  report 'find unslugged model using friendly id', (TIMES * FACTOR).ceil do
-    ar { User.find(USERS.rand) }
-  end
-
-  report 'find unslugged model using array of friendly ids', (TIMES * FACTOR).ceil do
-    ar { User.find([USERS.rand, USERS.rand]) }
-  end
-
-  report 'find slugged model using friendly id', (TIMES * FACTOR).ceil do
-    ar { Post.find(POSTS.rand) }
-  end
-
-  report 'find slugged model using array of friendly ids', (TIMES * FACTOR).ceil do
-    ar { Post.find([POSTS.rand, POSTS.rand]) }
-  end
-
-  report 'find cached slugged model using friendly id', (TIMES * FACTOR).ceil do
-    ar { District.find(DISTRICTS.rand) }
-  end
-
-  report 'find cached slugged model using array of friendly ids', (TIMES * FACTOR).ceil do
-    ar { District.find([DISTRICTS.rand, DISTRICTS.rand]) }
+    default { User.find(get_id(2)) }
+    no_slug { User.find(USERS.rand(2)) }
+    slug { Post.find(POSTS.rand(2)) }
+    cached_slug { District.find(DISTRICTS.rand(2)) }
   end
 
   report 'find model using id, then to_param', (TIMES * FACTOR).ceil do
-    ar { User.find(get_id).to_param }
-  end
-
-  report 'find unslugged model using friendly id, then to_param', (TIMES * FACTOR).ceil do
-    ar { User.find(USERS.rand).to_param }
+    default { User.find(get_id).to_param }
+    no_slug { User.find(USERS.rand).to_param }
+    slug { Post.find(POSTS.rand).to_param }
+    cached_slug { District.find(DISTRICTS.rand).to_param }
   end
 
-  report 'find slugged model using friendly id, then to_param', (TIMES * FACTOR).ceil do
-    ar { Post.find(POSTS.rand).to_param }
-  end
-
-  report 'find cached slugged model using friendly id, then to_param', (TIMES * FACTOR).ceil do
-    ar { District.find(DISTRICTS.rand).to_param }
-   end
-
   summary 'Total'
+
 end

data/extras/extras.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -KU
 require File.dirname(__FILE__) + '/../test/test_helper'
-require File.dirname(__FILE__) + '/../test/active_record_adapter/test_helper'
+require File.dirname(__FILE__) + '/../test/active_record_adapter/ar_test_helper'
 require 'ffaker'
 
 TIMES = (ENV['N'] || 100).to_i
@@ -11,7 +11,7 @@ USERS     = []
 User.delete_all
 Post.delete_all
 District.delete_all
-(Slug or Slug).delete_all
+Slug.delete_all
 
 100.times do
   name = Faker::Name.name
@@ -20,12 +20,19 @@ District.delete_all
   DISTRICTS << (District.create! :name => name).friendly_id
 end
 
-def get_id
-  rand(99) + 1
+def get_id(returns = 1)
+  (1..100).to_a.rand(returns)
 end
 
 class Array
-  def rand
-    self[Kernel.rand(length)]
+  def rand(returns = 1)
+    @return = []
+    returns.times do
+      until @return.length == returns do
+        val = self[Kernel.rand(length)]
+        @return << val unless @return.include? val
+      end
+    end
+    return returns == 1 ? @return.first : @return
   end
 end

data/lib/friendly_id/active_record_adapter/configuration.rb

@@ -33,10 +33,6 @@ module FriendlyId
         @custom_cache_column = cache_column
       end
 
-      def cache_finders?
-        !! cache_column
-      end
-
       def child_scopes
         @child_scopes ||= associated_friendly_classes.select { |klass| klass.friendly_id_config.scopes_over?(configured_class) }
       end

data/lib/friendly_id/active_record_adapter/simple_model.rb

@@ -24,7 +24,7 @@ module FriendlyId
         include SimpleFinder
 
         def find
-          @results = model_class.scoped(:conditions => conditions).scoped(options).all(options)
+          @results = model_class.scoped(:conditions => conditions).all(options).uniq
           raise(::ActiveRecord::RecordNotFound, error_message) if @results.size != expected_size
           friendly_results.each { |result| result.friendly_id_status.name = result.to_param }
           @results

data/lib/friendly_id/active_record_adapter/slugged_model.rb

@@ -62,10 +62,6 @@ module FriendlyId
           slugs.detect {|slug| result.id == slug.sluggable_id}
         end
 
-        def unfriendly_ids?
-          ! unfriendly_ids.empty?
-        end
-
       end
 
       # Performs a find a single friendly_id using the cached_slug column,

data/lib/friendly_id/configuration.rb

@@ -86,10 +86,6 @@ module FriendlyId
       yield self if block_given?
     end
 
-    def forbid_nil?
-      !allow_nil?
-    end
-
     def reserved_words=(*words)
       @reserved_words = words.flatten.uniq
     end

data/lib/friendly_id/slug_string.rb

@@ -59,6 +59,42 @@ module FriendlyId
         :spanish => Hash[209, [78, 110], 241, [110, 110]]
       }
 
+      # CP-1252 decimal byte => UTF-8 approximation as an array of bytes
+      CP1252 = {
+        128 => [226, 130, 172],
+        129 => nil,
+        130 => [226, 128, 154],
+        131 => [198, 146],
+        132 => [226, 128, 158],
+        133 => [226, 128, 166],
+        134 => [226, 128, 160],
+        135 => [226, 128, 161],
+        136 => [203, 134],
+        137 => [226, 128, 176],
+        138 => [197, 160],
+        139 => [226, 128, 185],
+        140 => [197, 146],
+        141 => nil,
+        142 => [197, 189],
+        143 => nil,
+        144 => nil,
+        145 => [226, 128, 152],
+        146 => [226, 128, 153],
+        147 => [226, 128, 156],
+        148 => [226, 128, 157],
+        149 => [226, 128, 162],
+        150 => [226, 128, 147],
+        151 => [226, 128, 148],
+        152 => [203, 156],
+        153 => [226, 132, 162],
+        154 => [197, 161],
+        155 => [226, 128, 186],
+        156 => [197, 147],
+        157 => nil,
+        158 => [197, 190],
+        159 => [197, 184]
+      }
+
       cattr_accessor :approximations
       self.approximations = []
 
@@ -110,6 +146,7 @@ module FriendlyId
       # @param string [String] The string to use as the basis of the SlugString.
       def initialize(string)
         super string.to_s
+        tidy_bytes!
       end
 
       # Approximate an ASCII string. This works only for Western strings using
@@ -218,10 +255,61 @@ module FriendlyId
         with_dashes!
       end
 
-      # Truncate the string to +max+ length.
-      # @return String
-      def truncate!(max)
-        @wrapped_string = self[0...max].to_s if length > max
+      # Attempt to replace invalid UTF-8 bytes with valid ones. This method
+      # naively assumes if you have invalid UTF8 bytes, they are either Windows
+      # CP-1252 or ISO8859-1. In practice this isn't a bad assumption, but may not
+      # always work.
+      #
+      # Passing +true+ will forcibly tidy all bytes, assuming that the string's
+      # encoding is CP-1252 or ISO-8859-1.
+      def tidy_bytes!(force = false)
+
+        if force
+          @wrapped_string = @wrapped_string.unpack("C*").map do |b|
+            tidy_byte(b)
+          end.flatten.compact.pack("C*").unpack("U*").pack("U*")
+        end
+
+        bytes = @wrapped_string.unpack("C*")
+        conts_expected = 0
+        last_lead = 0
+
+        bytes.each_index do |i|
+
+          byte          = bytes[i]
+          is_ascii      = byte < 128
+          is_cont       = byte > 127 && byte < 192
+          is_lead       = byte > 191 && byte < 245
+          is_unused     = byte > 240
+          is_restricted = byte > 244
+
+          # Impossible or highly unlikely byte? Clean it.
+          if is_unused || is_restricted
+            bytes[i] = tidy_byte(byte)
+          elsif is_cont
+            # Not expecting contination byte? Clean up. Otherwise, now expect one less.
+            conts_expected == 0 ? bytes[i] = tidy_byte(byte) : conts_expected -= 1
+          else
+            if conts_expected > 0
+              # Expected continuation, but got ASCII or leading? Clean backwards up to
+              # the leading byte.
+              (1..(i - last_lead)).each {|j| bytes[i - j] = tidy_byte(bytes[i - j])}
+              conts_expected = 0
+            end
+            if is_lead
+              # Final byte is leading? Clean it.
+              if i == bytes.length - 1
+                bytes[i] = tidy_byte(bytes.last)
+              else
+                # Valid leading byte? Expect continuations determined by position of
+                # first zero bit, with max of 3.
+                conts_expected = byte < 224 ? 1 : byte < 240 ? 2 : 3
+                last_lead = i
+              end
+            end
+          end
+        end
+        @wrapped_string = bytes.empty? ? "" : bytes.flatten.compact.pack("C*").unpack("U*").pack("U*")
       end
 
       # Delete any non-ascii characters.
@@ -235,6 +323,12 @@ module FriendlyId
         end
       end
 
+      # Truncate the string to +max+ length.
+      # @return String
+      def truncate!(max)
+        @wrapped_string = self[0...max].to_s if length > max
+      end
+
       # Upper-cases the string. Note that this works for Unicode strings,
       # though your milage may vary with Greek and Turkic strings.
       # @return String
@@ -261,8 +355,8 @@ module FriendlyId
         @wrapped_string = @wrapped_string.gsub(/[\s\-]+/u, "-")
       end
 
-      %w[approximate_ascii clean downcase word_chars normalize normalize_for to_ascii
-          truncate upcase with_dashes].each do |method|
+      %w[approximate_ascii clean downcase word_chars normalize normalize_for tidy_bytes
+          to_ascii truncate upcase with_dashes].each do |method|
         class_eval(<<-EOM)
           def #{method}(*args)
             send_to_new_instance(:#{method}!, *args)
@@ -289,5 +383,9 @@ module FriendlyId
         string
       end
 
+      def tidy_byte(byte)
+        byte < 160 ? CP1252[byte] : byte < 192 ? [194, byte] : [195, byte - 64]
+      end
+
   end
 end

data/lib/friendly_id/test.rb

@@ -198,6 +198,7 @@ module FriendlyId
 
     # Tests for FriendlyId::Status.
     module Status
+
       test "should default to not friendly" do
         assert !status.friendly?
       end
@@ -205,6 +206,7 @@ module FriendlyId
       test "should default to numeric" do
         assert status.numeric?
       end
+
     end
 
     # Tests for FriendlyId::Status for a model that uses slugs.

data/lib/friendly_id/version.rb

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

data/test/active_record_adapter/{test_helper.rb → ar_test_helper.rb}

@@ -1,16 +1,17 @@
-require File.dirname(__FILE__) + "/../test_helper"
+require File.expand_path('../../test_helper', __FILE__)
 
 require "active_record"
 require "active_support"
 
-require File.dirname(__FILE__) + "/../../lib/friendly_id/active_record.rb"
-require File.dirname(__FILE__) + "/../../generators/friendly_id/templates/create_slugs"
-require File.dirname(__FILE__) + "/support/models"
-require File.dirname(__FILE__) + '/core'
-require File.dirname(__FILE__) + '/slugged'
+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__)
+require File.expand_path('../core', __FILE__)
+require File.expand_path('../slugged', __FILE__)
+
+local_db_settings   = File.expand_path("../support/database.yml", __FILE__)
+default_db_settings = File.expand_path("../support/database.sqlite3.yml", __FILE__)
 
-local_db_settings = File.dirname(__FILE__) + "/support/database.yml"
-default_db_settings = File.dirname(__FILE__) + "/support/database.sqlite3.yml"
 db_settings = File.exists?(local_db_settings) ? local_db_settings : default_db_settings
 ActiveRecord::Base.establish_connection(YAML::load(File.open(db_settings)))
 
@@ -32,7 +33,6 @@ end
 
 # A model that specifies a custom cached slug column
 class City < ActiveRecord::Base
-  attr_accessible :name
   has_friendly_id :name, :use_slug => true, :cache_column => "my_slug"
 end
 

data/test/active_record_adapter/basic_slugged_model_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path('../ar_test_helper', __FILE__)
 
 module FriendlyId
   module Test

data/test/active_record_adapter/cached_slug_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path("../ar_test_helper", __FILE__)
 
 module FriendlyId
   module Test

data/test/active_record_adapter/core.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path("../ar_test_helper", __FILE__)
 
 module FriendlyId
 
@@ -44,26 +44,31 @@ module FriendlyId
 
         test "instances should be findable by an array of friendly_ids" do
           second = klass.create!(:name => "second_instance")
+          third = klass.create!(:name => "third_instance")
           assert_equal 2, klass.find([instance.friendly_id, second.friendly_id]).size
         end
 
         test "instances should be findable by an array of numeric ids" do
           second = klass.create!(:name => "second_instance")
+          third = klass.create!(:name => "third_instance")
           assert_equal 2, klass.find([instance.id.to_i, second.id.to_i]).size
         end
 
         test "instances should be findable by an array of numeric ids as strings" do
           second = klass.create!(:name => "second_instance")
+          third = klass.create!(:name => "third_instance")
           assert_equal 2, klass.find([instance.id.to_s, second.id.to_s]).size
         end
 
         test "instances should be findable by an array of instances" do
           second = klass.create!(:name => "second_instance")
+          third = klass.create!(:name => "third_instance")
           assert_equal 2, klass.find([instance, second]).size
         end
 
         test "instances should be findable by an array of mixed types" do
           second = klass.create!(:name => "second_instance")
+          third = klass.create!(:name => "third_instance")
           assert_equal 2, klass.find([instance.friendly_id, second]).size
         end
 

data/test/active_record_adapter/custom_normalizer_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path("../ar_test_helper", __FILE__)
 
 module FriendlyId
   module Test

data/test/active_record_adapter/custom_table_name_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path("../ar_test_helper", __FILE__)
 
 module FriendlyId
   module Test

data/test/active_record_adapter/scoped_model_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path("../ar_test_helper", __FILE__)
 
 module FriendlyId
   module Test

data/test/active_record_adapter/simple_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path('../ar_test_helper', __FILE__)
 
 module FriendlyId
   module Test
@@ -21,11 +21,12 @@ module FriendlyId
 
         class StatusTest < ::Test::Unit::TestCase
 
-          include FriendlyId::Test::Generic
-          include FriendlyId::Test::Simple
-          include FriendlyId::Test::ActiveRecordAdapter::Core
           include SimpleTest
 
+          def setup
+            User.delete_all
+          end
+
           test "should default to not friendly" do
             assert !status.friendly?
           end
@@ -51,8 +52,21 @@ module FriendlyId
         end
 
         class BasicTest < ::Test::Unit::TestCase
-          include Core
+          include FriendlyId::Test::Generic
+          include FriendlyId::Test::Simple
+          include FriendlyId::Test::ActiveRecordAdapter::Core
           include SimpleTest
+
+          test "status should be friendly when found using friendly id" do
+            record = klass.send(find_method, instance.friendly_id)
+            assert record.friendly_id_status.friendly?
+          end
+
+          test "status should not be friendly when found using numeric id" do
+            record = klass.send(find_method, instance.id)
+            assert !record.friendly_id_status.friendly?
+          end
+
         end
 
       end

data/test/active_record_adapter/slug_test.rb

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

data/test/active_record_adapter/slugged.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path("../ar_test_helper", __FILE__)
 
 module FriendlyId
   module Test

data/test/active_record_adapter/slugged_status_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path("../ar_test_helper", __FILE__)
 
 
 module FriendlyId

data/test/active_record_adapter/sti_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path('../ar_test_helper', __FILE__)
 
 module FriendlyId
   module Test

data/test/active_record_adapter/support/models.rb

@@ -20,8 +20,9 @@ class CreateSupportModels < ActiveRecord::Migration
       t.string :name
       t.string :my_slug
       t.integer :population
-      t.index :my_slug, :unique => true
     end
+    add_index :cities, :my_slug, :unique => true
+
 
     create_table :countries do |t|
       t.string :name
@@ -31,8 +32,8 @@ class CreateSupportModels < ActiveRecord::Migration
       t.string :name
       t.string :note
       t.string :cached_slug
-      t.index :cached_slug, :unique => true
     end
+    add_index :districts, :cached_slug, :unique => true
 
     create_table :events do |t|
       t.string :name
@@ -67,8 +68,8 @@ class CreateSupportModels < ActiveRecord::Migration
 
     create_table :users do |t|
       t.string :name
-      t.index :name, :unique => true
     end
+    add_index :users, :name, :unique => true
 
   end
 

data/test/active_record_adapter/tasks_test.rb

@@ -1,5 +1,5 @@
-require(File.dirname(__FILE__) + '/test_helper')
-require File.dirname(__FILE__) + '/../../lib/friendly_id/active_record_adapter/tasks'
+require File.expand_path('../ar_test_helper', __FILE__)
+require File.expand_path('../../../lib/friendly_id/active_record_adapter/tasks', __FILE__)
 
 class TasksTest < Test::Unit::TestCase
 

data/test/friendly_id_test.rb

@@ -1,4 +1,4 @@
-require(File.dirname(__FILE__) + "/test_helper")
+require File.expand_path('../test_helper', __FILE__)
 
 module FriendlyId
 

data/test/slug_string_test.rb

@@ -73,8 +73,14 @@ module FriendlyId
           assert_equal "検-索", SlugString.new("検 索").with_dashes
         end
 
-        test "to_ascii should work with invalid UTF-8 strings" do
-          assert_equal "abc", SlugString.new("\x93abc").to_ascii.to_s
+        test "should work with invalid UTF-8 strings" do
+          %w[approximate_ascii clean downcase word_chars normalize to_ascii upcase with_dashes].each do |method|
+            string = SlugString.new("\x93abc")
+            assert_nothing_raised do
+              method == "truncate" ? string.send(method, 32) : string.send(method)
+            end
+          end
+
         end
 
     end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 $KCODE = "UTF8" if RUBY_VERSION < "1.9"
 $VERBOSE = false
 begin
-  require File.join(File.dirname(__FILE__), '../.bundle/environment')
+  require File.expand_path('../../.bundle/environment', __FILE__)
 rescue LoadError
   # Fall back on doing an unlocked resolve at runtime.
   require "rubygems"
@@ -11,5 +11,5 @@ end
 require "test/unit"
 require "mocha"
 require "active_support"
-require File.dirname(__FILE__) + "/../lib/friendly_id"
-require File.dirname(__FILE__) + "/../lib/friendly_id/test"
+require File.expand_path("../../lib/friendly_id", __FILE__)
+require File.expand_path("../../lib/friendly_id/test", __FILE__)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - Norman Clarke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 -03:00
+date: 2010-04-09 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ files:
 - rails/init.rb
 - generators/friendly_id/friendly_id_generator.rb
 - generators/friendly_id/templates/create_slugs.rb
+- test/active_record_adapter/ar_test_helper.rb
 - test/active_record_adapter/basic_slugged_model_test.rb
 - test/active_record_adapter/cached_slug_test.rb
 - test/active_record_adapter/core.rb
@@ -102,7 +103,6 @@ files:
 - test/active_record_adapter/support/database.sqlite3.yml
 - test/active_record_adapter/support/models.rb
 - test/active_record_adapter/tasks_test.rb
-- test/active_record_adapter/test_helper.rb
 - test/friendly_id_test.rb
 - test/slug_string_test.rb
 - test/test_helper.rb
@@ -133,10 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 6
-      version: 1.3.6
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: friendly-id