norman-friendly_id 2.0.1 → 2.0.2

data/config/website.yml

@@ -0,0 +1,2 @@
+host: compay@rubyforge.org
+remote_dir: /var/www/gforge-projects/friendly-id

data/friendly_id.gemspec

@@ -2,14 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{friendly_id}
-  s.version = "2.0.1"
+  s.version = "2.0.2"
+
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Norman Clarke", "Adrian Mugnolo", "Emilio Tagua"]
-  s.date = %q{2009-01-19}
+  s.date = %q{2009-02-07}
   s.description = %q{A comprehensive slugging and pretty-URL plugin for Ruby on Rails.}
   s.email = ["norman@randomba.org", "adrian@randomba.org", "miloops@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-  s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "friendly_id.gemspec", "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", "init.rb", "lib/friendly_id.rb", "lib/friendly_id/helpers.rb", "lib/friendly_id/non_sluggable_class_methods.rb", "lib/friendly_id/non_sluggable_instance_methods.rb", "lib/friendly_id/shoulda_macros.rb", "lib/friendly_id/slug.rb", "lib/friendly_id/sluggable_class_methods.rb", "lib/friendly_id/sluggable_instance_methods.rb", "lib/friendly_id/version.rb", "lib/tasks/friendly_id.rake", "lib/tasks/friendly_id.rb", "test/database.yml", "test/fixtures/countries.yml", "test/fixtures/country.rb", "test/fixtures/people.yml", "test/fixtures/person.rb", "test/fixtures/post.rb", "test/fixtures/posts.yml", "test/fixtures/slugs.yml", "test/fixtures/user.rb", "test/fixtures/users.yml", "test/non_slugged_test.rb", "test/rails/2.x/app/controllers/application.rb", "test/rails/2.x/config/boot.rb", "test/rails/2.x/config/database.yml", "test/rails/2.x/config/environment.rb", "test/rails/2.x/config/environments/test.rb", "test/rails/2.x/config/routes.rb", "test/schema.rb", "test/scoped_model_test.rb", "test/slug_test.rb", "test/sluggable_test.rb", "test/test_helper.rb"]
+  s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "config/website.yml", "friendly_id.gemspec", "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", "init.rb", "lib/friendly_id.rb", "lib/friendly_id/helpers.rb", "lib/friendly_id/non_sluggable_class_methods.rb", "lib/friendly_id/non_sluggable_instance_methods.rb", "lib/friendly_id/shoulda_macros.rb", "lib/friendly_id/slug.rb", "lib/friendly_id/sluggable_class_methods.rb", "lib/friendly_id/sluggable_instance_methods.rb", "lib/friendly_id/version.rb", "lib/tasks/friendly_id.rake", "lib/tasks/friendly_id.rb", "test/database.yml", "test/fixtures/countries.yml", "test/fixtures/country.rb", "test/fixtures/people.yml", "test/fixtures/person.rb", "test/fixtures/post.rb", "test/fixtures/posts.yml", "test/fixtures/slugs.yml", "test/fixtures/user.rb", "test/fixtures/users.yml", "test/non_slugged_test.rb", "test/rails/2.x/app/controllers/application.rb", "test/rails/2.x/config/boot.rb", "test/rails/2.x/config/database.yml", "test/rails/2.x/config/environment.rb", "test/rails/2.x/config/environments/test.rb", "test/rails/2.x/config/routes.rb", "test/schema.rb", "test/scoped_model_test.rb", "test/slug_test.rb", "test/sluggable_test.rb", "test/test_helper.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://randomba.org}
   s.rdoc_options = ["--main", "README.rdoc"]

data/lib/friendly_id/slug.rb

@@ -49,11 +49,16 @@ class Slug < ActiveRecord::Base
         cp < 0x300 || cp > 0x036F
       }.pack('U*')
     end
+    
+    # Remove non-ascii characters from the string.
+    def strip_non_ascii(string)
+      strip_diacritics(string).gsub(/[^a-z0-9]+/i, ' ')
+    end
 
     private
 
     def chars_func
-      Rails.version =~ /2.2.[\d]*/ ? :mb_chars : :chars
+      Rails.version >= "2.2" ? :mb_chars : :chars
     rescue NoMethodError
       :chars
     end

data/lib/friendly_id/sluggable_class_methods.rb

@@ -87,7 +87,7 @@ module FriendlyId::SluggableClassMethods
     ids = []
     ids_and_names.each do |id_or_name|
       name, sequence = Slug.parse id_or_name
-      slug = Slug.find(:first, :readonly => true, :conditions => {
+      slug = Slug.find(:first, :conditions => {
         :name           => name,
         :scope          => scope,
         :sequence       => sequence,

data/lib/friendly_id/sluggable_instance_methods.rb

@@ -57,10 +57,13 @@ module FriendlyId::SluggableInstanceMethods
   def slug_text
     base = send friendly_id_options[:column]
     if self.friendly_id_options[:strip_diacritics]
-      base = Slug::normalize(Slug::strip_diacritics(base))
-    else
-      base = Slug::normalize(base)
+      base = Slug::strip_diacritics(base)
     end
+    if self.friendly_id_options[:strip_non_ascii]
+      base = Slug::strip_non_ascii(base)
+    end
+    base = Slug::normalize(base)
+    
     if base.length > friendly_id_options[:max_length]
       base = base[0...friendly_id_options[:max_length]]
     end
@@ -82,7 +85,7 @@ module FriendlyId::SluggableInstanceMethods
   def init_finder_slug
     return false if !@finder_slug_name
     name, sequence = Slug.parse(@finder_slug_name)
-    slug = Slug.find(:first, :conditions => {:sluggable_id => id, :name => name, :sequence => sequence, :sluggable_type => self.class.name })
+    slug = Slug.find(:first, :conditions => {:sluggable_id => id, :name => name, :sequence => sequence, :sluggable_type => self.class.base_class.name })
     finder_slug = slug
   end
 

data/lib/friendly_id/version.rb

@@ -2,7 +2,7 @@ module FriendlyId #:nodoc:
   module Version #:nodoc:
     MAJOR = 2
     MINOR = 0
-    TINY = 1
+    TINY = 2
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/lib/friendly_id.rb

@@ -1,4 +1,3 @@
-require 'unicode'
 require 'friendly_id/helpers'
 require 'friendly_id/slug'
 require 'friendly_id/shoulda_macros'
@@ -13,8 +12,8 @@ module FriendlyId
   module ClassMethods
 
     # Default options for friendly_id.
-    DEFAULT_FRIENDLY_ID_OPTIONS = {:method => nil, :use_slug => false, :max_length => 255, :reserved => [], :strip_diacritics => false, :scope => nil}.freeze
-    VALID_FRIENDLY_ID_KEYS = [:use_slug, :max_length, :reserved, :strip_diacritics, :scope].freeze
+    DEFAULT_FRIENDLY_ID_OPTIONS = {:method => nil, :use_slug => false, :max_length => 255, :reserved => [], :strip_diacritics => false, :strip_non_ascii => false, :scope => nil}.freeze
+    VALID_FRIENDLY_ID_KEYS = [:use_slug, :max_length, :reserved, :strip_diacritics, :strip_non_ascii, :scope].freeze
 
     # Set up an ActiveRecord model to use a friendly_id.
     #
@@ -25,6 +24,7 @@ module FriendlyId
     # * <tt>:use_slug</tt> - Defaults to false. Use slugs when you want to use a non-unique text field for friendly ids.
     # * <tt>:max_length</tt> - Defaults to 255. The maximum allowed length for a slug.
     # * <tt>:strip_diacritics</tt> - Defaults to false. If true, it will remove accents, umlauts, etc. from western characters.
+    # * <tt>:strip_non_ascii</tt> - Defaults to false. If true, it will all non-ascii ([^a-z0-9]) characters.
     # * <tt>:reseved</tt> - Array of words that are reserved and can't be used as slugs. If such a word is used, it will be treated the same as if that slug was already taken (numeric extension will be appended). Defaults to [].
     def has_friendly_id(column, options = {})
       options.assert_valid_keys VALID_FRIENDLY_ID_KEYS
@@ -33,7 +33,7 @@ module FriendlyId
       class_inheritable_reader :friendly_id_options
 
       if options[:use_slug]
-        has_many :slugs, :order => 'id DESC', :as => :sluggable, :dependent => :destroy, :readonly => true
+        has_many :slugs, :order => 'id DESC', :as => :sluggable, :dependent => :destroy
         require 'friendly_id/sluggable_class_methods'
         require 'friendly_id/sluggable_instance_methods'
         extend SluggableClassMethods
@@ -55,7 +55,15 @@ module FriendlyId
     def enable
       return if ActiveRecord::Base.methods.include? 'has_friendly_id'
       ActiveRecord::Base.class_eval { extend FriendlyId::ClassMethods }
-      Test::Unit::TestCase.class_eval { include FriendlyId::ShouldaMacros }
+      begin
+        if Rails.version >= "2.3"
+          ActiveSupport::TestCase.class_eval { include FriendlyId::ShouldaMacros }
+        else
+          Test::Unit::TestCase.class_eval { include FriendlyId::ShouldaMacros }
+        end
+      rescue NoMethodError
+        Test::Unit::TestCase.class_eval { include FriendlyId::ShouldaMacros }
+      end
     end
 
   end
@@ -64,4 +72,4 @@ end
 
 if defined?(ActiveRecord)
   FriendlyId::enable
-end
+end

data/test/sluggable_test.rb

@@ -6,6 +6,8 @@ class SluggableTest < Test::Unit::TestCase
 
   def setup
     Post.friendly_id_options[:max_length] = FriendlyId::ClassMethods::DEFAULT_FRIENDLY_ID_OPTIONS[:max_length]
+    Post.friendly_id_options[:strip_non_ascii] = false
+    Post.friendly_id_options[:strip_diacritics] = false
   end
 
   def test_should_allow_for_identical_slug_names_between_sluggable_types
@@ -100,11 +102,16 @@ class SluggableTest < Test::Unit::TestCase
   end
 
   def test_should_not_strip_diactics_from_slug_unless_configured_to_do_so
-    Post.friendly_id_options[:strip_diacritics] = false
     @post = Post.new(:name => "¡FELIZ AÑO!")
     assert_equal "feliz-año", @post.slug_text
   end
 
+  def test_should_convert_to_ascii
+    Post.friendly_id_options[:strip_non_ascii] = true
+    @post = Post.new(:name => "17” cômpütér mõnitor")
+    assert_equal '17-computer-monitor', @post.slug_text
+  end
+
   def test_should_not_make_new_slug_unless_friendly_id_method_has_changed
     posts(:with_one_slug).content = "Edited content"
     posts(:with_one_slug).save!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: norman-friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Norman Clarke
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-19 00:00:00 -08:00
+date: 2009-02-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- config/website.yml
 - friendly_id.gemspec
 - generators/friendly_id/friendly_id_generator.rb
 - generators/friendly_id/templates/create_slugs.rb