friendly_id 2.2.7 → 2.3.0

data/test/friendly_id_test.rb

@@ -0,0 +1,23 @@
+require(File.dirname(__FILE__) + "/test_helper")
+
+module FriendlyId
+
+  module Test
+
+    class FriendlyIdTest < ::Test::Unit::TestCase
+
+      test "should parse a friendly_id name and sequence" do
+        assert_equal ["test", "2"], "test--2".parse_friendly_id
+      end
+
+      test "should parse with a default sequence of 1" do
+        assert_equal ["test", "1"], "test".parse_friendly_id
+      end
+
+      test "should be parseable with a custom separator" do
+        assert_equal ["test", "2"], "test:2".parse_friendly_id(":")
+      end
+
+    end
+  end
+end

data/test/slug_string_test.rb

@@ -0,0 +1,74 @@
+# encoding: utf-8
+require(File.dirname(__FILE__) + "/test_helper")
+
+module FriendlyId
+  module Test
+
+    class SlugStringTest < ::Test::Unit::TestCase
+
+        test "should approximate ascii" do
+          # create string with range of Unicode"s western characters with
+          # diacritics, excluding the division and multiplication signs which for
+          # some reason or other are floating in the middle of all the letters.
+          s = SlugString.new((0xC0..0x17E).to_a.reject {|c| [0xD7, 0xF7].include? c}.pack("U*"))
+          output = s.approximate_ascii
+          assert(output.length > s.length)
+          assert_match output, /^[a-zA-Z']*$/
+        end
+
+        test "should strip non-word chars" do
+          s = SlugString.new "¡feliz año!"
+          assert_equal "feliz año", s.word_chars
+        end
+
+        test "should lowercase  strings" do
+          assert_equal "feliz año", SlugString.new("FELIZ AÑO").downcase
+        end
+
+        test "should uppercase  strings" do
+          assert_equal "FELIZ AÑO", SlugString.new("feliz año").upcase
+        end
+
+        test "should replace whitespace with dashes" do
+          assert_equal "a-b", SlugString.new("a b").clean.with_dashes
+        end
+
+        test "should replace multiple spaces with 1 dash" do
+          assert_equal "a-b", SlugString.new("a    b").clean.with_dashes
+        end
+
+        test "should strip trailing space" do
+          assert_equal "ab", SlugString.new("ab ").clean
+        end
+
+        test "should strip leading space" do
+          assert_equal "ab", SlugString.new(" ab").clean
+        end
+
+        test "should strip trailing slashes" do
+          assert_equal "ab", SlugString.new("ab-").clean
+        end
+
+        test "should strip leading slashes" do
+          assert_equal "ab", SlugString.new("-ab").clean
+        end
+
+        test "should not modify valid name strings" do
+          assert_equal "a-b-c-d", SlugString.new("a-b-c-d").clean
+        end
+
+        test "should do special approximations for German" do
+          assert_equal "Juergen", SlugString.new("Jürgen").approximate_ascii(:german)
+        end
+
+        test "should do special approximations for Spanish" do
+          assert_equal "anno", SlugString.new("año").approximate_ascii(:spanish)
+        end
+
+        test "should work with non roman chars" do
+          assert_equal "検-索", SlugString.new("検 索").with_dashes
+        end
+
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,104 +1,9 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-$:.unshift(File.dirname(__FILE__))
-
-$KCODE = 'UTF8' if RUBY_VERSION < '1.9'
+$KCODE = "UTF8" if RUBY_VERSION < "1.9"
 $VERBOSE = false
 
-require 'rubygems'
-require 'test/unit'
-require 'contest'
-require 'mocha'
-
-# You can use "rake test AR_VERSION=2.2.3" to test against 2.2.3 for example.
-# The default is to use the latest installed ActiveRecord.
-if ENV["AR_VERSION"]
-  gem 'activerecord', "#{ENV["AR_VERSION"]}"
-  gem 'activesupport', "#{ENV["AR_VERSION"]}"
-end
-
-require 'active_record'
-require 'active_support'
-require 'friendly_id'
-require File.dirname(__FILE__) + '/../generators/friendly_id/templates/create_slugs'
-require File.dirname(__FILE__) + '/support/models'
-
-local_db_settings = File.dirname(__FILE__) + '/support/database.yml'
-default_db_settings = File.dirname(__FILE__) + '/support/database.yml.sqlite3'
-db_settings = File.exists?(local_db_settings) ? local_db_settings : default_db_settings
-ActiveRecord::Base.establish_connection(YAML::load(File.open(db_settings)))
-
-class ActiveRecord::Base
-  def log_protected_attribute_removal(*args) end
-end
-
-ActiveRecord::Base.connection.tables.each do |table|
-  ActiveRecord::Base.connection.drop_table(table)
-end
-ActiveRecord::Migration.verbose = false
-CreateSlugs.up
-CreateSupportModels.up
-
-# A model that uses the automagically configured "cached_slug" column
-class District < ActiveRecord::Base
-  has_friendly_id :name, :use_slug => true
-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
-
-# A model with a custom slug text normalizer
-class Person < ActiveRecord::Base
-  has_friendly_id :name, :use_slug => true do |text|
-    text.upcase
-  end
-end
-
-# A slugged model that uses a scope
-class Resident < ActiveRecord::Base
-  belongs_to :country
-  has_friendly_id :name, :use_slug => true, :scope => :country
-end
-
-# A model used as a scope
-class Country < ActiveRecord::Base
-  has_many :people
-  has_friendly_id :name, :use_slug => true
-end
-
-# A model that doesn't use slugs
-class User < ActiveRecord::Base
-  has_friendly_id :name
-end
-
-# A model that uses default slug settings and has a named scope
-class Post < ActiveRecord::Base
-  has_friendly_id :name, :use_slug => true
-  named_scope :published, :conditions => { :published => true }
-end
-
-# Model that uses a custom table name
-class Place < ActiveRecord::Base
-  self.table_name = "legacy_table"
-  has_friendly_id :name, :use_slug => true
-end
-
-# A model that uses a datetime field for its friendly_id
-class Event < ActiveRecord::Base
-  has_friendly_id :event_date, :use_slug => true
-end
-
-# A base model for single table inheritence
-class Book < ActiveRecord::Base ; end
-
-# A model that uses STI
-class Novel < ::Book
-  has_friendly_id :name, :use_slug => true
-end
-
-# A model with no table
-class Question < ActiveRecord::Base
-  has_friendly_id :name, :use_slug => true
-end
+require "rubygems"
+require "test/unit"
+require "mocha"
+require "active_support"
+require File.dirname(__FILE__) + "/../lib/friendly_id"
+require File.dirname(__FILE__) + "/../lib/friendly_id/test"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.2.7
+  version: 2.3.0
 platform: ruby
 authors: 
 - Norman Clarke
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 -03:00
+date: 2010-02-04 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.3
+        version: "2.2"
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -32,19 +32,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.3
+        version: "2.2"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: contest
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: "    FriendlyId is the \"Swiss Army bulldozer\" of slugging and permalink\n    plugins for Ruby on Rails. It allows you to create pretty URL\xE2\x80\x99s\n    and work with human-friendly strings as if they were numeric ids for\n    ActiveRecord models.\n"
+description: "    FriendlyId is the \"Swiss Army bulldozer\" of slugging and permalink plugins\n    for Ruby on Rails. It allows you to create pretty URL\xE2\x80\x99s and work with\n    human-friendly strings as if they were numeric ids for ActiveRecord models.\n"
 email: 
 - norman@njclarke.com
 - adrian@mugnolo.com
@@ -53,47 +43,62 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
-- History.txt
+extra_rdoc_files: []
+
 files: 
-- lib/friendly_id/helpers.rb
-- lib/friendly_id/non_sluggable_class_methods.rb
-- lib/friendly_id/non_sluggable_instance_methods.rb
-- lib/friendly_id/slug.rb
-- lib/friendly_id/sluggable_class_methods.rb
-- lib/friendly_id/sluggable_instance_methods.rb
-- lib/friendly_id/tasks.rb
+- lib/friendly_id/active_record2/configuration.rb
+- lib/friendly_id/active_record2/finders.rb
+- lib/friendly_id/active_record2/simple_model.rb
+- lib/friendly_id/active_record2/slug.rb
+- lib/friendly_id/active_record2/slugged_model.rb
+- lib/friendly_id/active_record2/tasks.rb
+- lib/friendly_id/active_record2.rb
+- lib/friendly_id/configuration.rb
+- lib/friendly_id/finders.rb
+- lib/friendly_id/slug_string.rb
+- lib/friendly_id/slugged.rb
+- lib/friendly_id/status.rb
+- lib/friendly_id/test.rb
 - lib/friendly_id/version.rb
 - lib/friendly_id.rb
-- lib/tasks/friendly_id.rb
-- lib/tasks/friendly_id.rake
-- init.rb
-- README.rdoc
-- History.txt
+- lib/friendly_id/active_record2/tasks/friendly_id.rake
+- Changelog.md
+- Contributors.md
+- Guide.md
+- README.md
 - LICENSE
 - Rakefile
+- rails/init.rb
 - generators/friendly_id/friendly_id_generator.rb
 - generators/friendly_id/templates/create_slugs.rb
-- generators/friendly_id_20_upgrade/friendly_id_20_upgrade_generator.rb
-- generators/friendly_id_20_upgrade/templates/upgrade_friendly_id_to_20.rb
-- test/cached_slug_test.rb
-- test/custom_slug_normalizer_test.rb
-- test/non_slugged_test.rb
-- test/scoped_model_test.rb
-- test/slug_test.rb
-- test/slugged_model_test.rb
-- test/sti_test.rb
-- test/support/database.yml.postgres
-- test/support/database.yml.sqlite3
-- test/support/models.rb
-- test/tasks_test.rb
+- test/active_record2/basic_slugged_model_test.rb
+- test/active_record2/cached_slug_test.rb
+- test/active_record2/core.rb
+- test/active_record2/custom_normalizer_test.rb
+- test/active_record2/custom_table_name_test.rb
+- test/active_record2/scoped_model_test.rb
+- test/active_record2/simple_test.rb
+- test/active_record2/slug_test.rb
+- test/active_record2/slugged.rb
+- test/active_record2/slugged_status_test.rb
+- test/active_record2/sti_test.rb
+- test/active_record2/support/database.mysql.yml
+- test/active_record2/support/database.postgres.yml
+- test/active_record2/support/database.sqlite3.yml
+- test/active_record2/support/models.rb
+- test/active_record2/tasks_test.rb
+- test/active_record2/test_helper.rb
+- test/friendly_id_test.rb
+- test/slug_string_test.rb
 - test/test_helper.rb
+- extras/bench.rb
+- extras/extras.rb
+- extras/prof.rb
 - extras/README.txt
 - extras/template-gem.rb
 - extras/template-plugin.rb
 has_rdoc: true
-homepage: http://rdoc.info/projects/norman/friendly_id
+homepage: http://norman.github.com/friendly_id
 licenses: []
 
 post_install_message: |+
@@ -109,9 +114,8 @@ post_install_message: |+
   
       ***********************************************************
   
-rdoc_options: 
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -132,13 +136,17 @@ rubyforge_project: friendly-id
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: A comprehensive slugging and pretty-URL plugin for ActiveRecord.
+summary: A comprehensive slugging and pretty-URL plugin.
 test_files: 
-- test/cached_slug_test.rb
-- test/custom_slug_normalizer_test.rb
-- test/non_slugged_test.rb
-- test/scoped_model_test.rb
-- test/slug_test.rb
-- test/slugged_model_test.rb
-- test/sti_test.rb
-- test/tasks_test.rb
+- test/active_record2/basic_slugged_model_test.rb
+- test/active_record2/cached_slug_test.rb
+- test/active_record2/custom_normalizer_test.rb
+- test/active_record2/custom_table_name_test.rb
+- test/active_record2/scoped_model_test.rb
+- test/active_record2/simple_test.rb
+- test/active_record2/slug_test.rb
+- test/active_record2/slugged_status_test.rb
+- test/active_record2/sti_test.rb
+- test/active_record2/tasks_test.rb
+- test/friendly_id_test.rb
+- test/slug_string_test.rb

data/History.txt

@@ -1,194 +0,0 @@
-== 2.2.7 2009-12-16
-
-* 1 minor fix
-  * Fixed typo in Rake tasks which caused delete_old_slugs to fail. (Diego R.V.)
-
-== 2.2.6 2009-12-10
-
-* 2 major fixes
-  * Made cached_slug automagic configuration occur outside of has_friendly_id. This was causing problems
-    in code where the class is loaded before ActiveRecord has established its connection.
-  * Fixes for scope feature with Postgres (Ben Woosley)
-
-* 2 minor enhancements
-  * Migrated away from Hoe/Newgem for gem management.
-  * Made tests database-agnostic (Ben Woosley)
-
-== 2.2.5 2009-11-30
-
-* 1 minor fix
-  * Fixed typo which in config options (Steven Noble).
-
-== 2.2.4 2009-11-12
-
-* 1 minor fix
-  * Fixed typo in post-install message.
-
-== 2.2.3 2009-11-12
-
-* 4 minor enhancements:
-  * Fixed some issues with gem load order under 1.8.x (closes GH Issue #20)
-  * Made sure friendly_id generator makes a lib/tasks directory (Josh Nichols)
-  * Finders now accept instances of ActiveRecord::Base, matching AR's behavior (Josh Nichols)
-  * SlugGenerationError now raise when a blank value is passed to strip_diacritics
-
-== 2.2.2 2009-10-26
-
-* 1 minor enhancement:
-  * Fixed Rake tasks creating duplicate slugs and not properly clearing cached slugs (closes GH issues #14 and #15)
-
-== 2.2.1 2009-10-23
-
-* 2 minor enhancements:
-  * slug cache now properly caches the slug sequence (closes GH issue #10)
-  * attr_protected is now only invoked on the cached_slug column if attr_accessible has not already been invoked. (closes GH issue #11)
-
-== 2.2.0 2009-10-19
-
-* 1 major enhancement:
-  *  Added slug caching, offers huge performance boost (Bruno Michel)
-
-* 2 minor enhancements:
-  * Handle Unicode string length correctly (Mikhail Shirkov)
-  * Remove alias_method_chain in favor of super (Diego Carrion)
-
-== 2.1.4 2009-09-01
-
-* 3 minor enhancements:
-  * Fixed upgrade generator not installing rake tasks (Harry Love)
-  * Fixed handling of very large id's (Nathan Phelps)
-  * Fixed long index name on migration (Rob Ingram)
-
-== 2.1.3 2009-06-03
-
-* 1 minor enhancement:
-  * Always call #to_s on slug_text to allow objects such as DateTimes to be used for the friendly_id text. (reported by Jon Ng)
-
-== 2.1.2 2009-05-21
-
-* 2 minor enhancements:
-  * Non-slugged models now validate the friendly_id on save as well as create (Joe Van Dyk).
-  * Replaced Shoulda with Contest.
-
-== 2.1.1 2009-03-25
-
-* 2 minor enhancements:
-  * Fixed bug with find_some; if a record has old slugs, find_some will no longer return
-multiple copies of that record when finding by numerical ID. (Steve Luscher)
-  * Fixed bug with find_some: you can now find_some with an array of numerical IDs without
-an error being thrown. (Steve Luscher)
-
-== 2.1.0 2009-03-25
-
-* 2 major enhancements:
-  * Ruby 1.9 compatibility.
-  * Removed dependency on ancient Unicode gem.
-
-== 2.0.4 2009-02-12
-
-* 1 major enhancment:
-  * You can now pass in your own custom slug generation blocks while setting up friendly_id.
-
-== 2.0.3 2009-02-11
-
-* 1 minor enhancment:
-  * Fixed to_param returning an empty string for non-slugged models with a null friendly_id.
-
-== 2.0.2 2009-02-09
-
-* 2 major enhancements:
-  * Made FriendlyId depend only on ActiveRecord. It should now be possible to
-    use FriendlyId with Camping or any other codebase that uses AR.
-  * Overhauled creaky testing setup and switched to Shoulda.
-
-* 1 minor enhancment:
-  * Made reserved words work for non-slugged models.
-
-== 2.0.1 2009-01-19
-
-* 1 minor enhancements:
-  * Fix infinite redirect bug when using .has_better_id? in your controllers (Sean Abrahams)
-
-
-== 2.0.0 2009-01-03
-
-* 5 major enhancements:
-  * Support for scoped slugs (Norman Clarke)
-  * Support for UTF-8 friendly_ids (Norman Clarke)
-  * Can now be installed via Ruby Gems, or as a Rails plugin (Norman Clarke)
-  * Improved handling of non-unique slugs (Norman Clarke and Adrian Mugnolo)
-* 2 minor enhancements:
-  * Shoulda macro (Josh Nichols)
-  * Various small bugfixes, cleanups and refactorings
-
-== 2008-12-01
-
-* Fixed bug that may return invalid records having similar id/names and using MySQL. (Emilio Tagua)
-* Fixed slug generation to increment only numeric extension without modifying the name on duplicated slugs. (Emilio Tagua)
-
-== 2008-10-31
-
-* Fixed compatibility with Rails 2.0.x. (Norman Clarke)
-* friendly_id::make_slugs update records in chunks of 1000 to avoid running out of memory with large datasets. (Tim Kadom)
-* Fixed logic error with slug name collisions. Thanks to Tim Kadom for reporting this bug.
-
-== 2008-10-22
-
-* Reverted use of UTF8Handler - was causing errors for some people (Bence Nagy)
-* Corrected find in case if a friendly_id begins with number (Bence Nagy)
-* Added ability to reserve words from slugs (Adam Cigánek)
-
-== 2008-10-09
-
-* Moved "require"" for iconv to init.rb (Florian Aßmann)
-* Removed "require" for Unicode, use Rails' handler instead (Florian Aßmann)
-* Replaced some magic numbers with constants (Florian Aßmann)
-* Don't overwrite find, alias_method_chain find_one and find_some instead (Florian Aßmann)
-* Slugs behave more like ids now (Florian Aßmann)
-* Can find by mixture of ids and slugs (Florian Aßmann)
-* Reformatted code and comments (Florian Aßmann)
-* Added support for Edge Rails' Inflector::parameterize (Norman Clarke)
-
-== 2008-08-25
-
-* Moved strip_diacritics into Slug for easier reuse/better organization.
-* Put class methods inside class << self block. (Norman Clarke)
-
-* Small change to allow friendly_id to work better with STI. (David Ramalho)
-
-== 2008-07-14
-
-* Improved slug generation for friendly id's with apostrophes. (Alistair Holt)
-* Added support for namespaced models in Rakefile. (David Ramalho)
-
-== 2008-06-23
-
-* Cached most recent slug to improve performance (Emilio Tagua).
-
-== 2008-06-10
-
-* Added ability to find friendly_ids by array (Emilio Tagua)
-
-== 2008-05-15
-
-* Made friendly_id raise an error if slug method returns a blank value.
-
-== 2008-05-12
-
-* Added experimental Github gemspec.
-
-== 2008-04-18
-
-* Improved slug name collision avoidance.
-
-== 2008-03-13
-
-* Added :dependent => :destroy to slug relation, as suggested by Emilio Tagua.
-* Fixed error when renaming a slugged item back to a previously used name.
-* Incorporated documentation changes suggested by Jesse Crouch and Chris Nolan.
-
-== 2008-02-07
-
-* Applied patches from blog commenter "suntzu" to fix problem with model values were being overwritten.
-* Applied patch from Dan Blue to make friendly_id no longer ignore options on ActiveRecordBase#find.
-* Added call to options.assert_valid_keys in has_friendly_id. Thanks to W. Andrew Loe III for pointing out that this was missing.