@@ -1,4 +1,3 @@ -require 'iconv' require 'find_by_param' class ActiveRecord::Base class_inheritable_accessor :permalink_options init.rb @@ -1,3 +1,9 @@ +begin + require "active_support/multibyte" +rescue LoadError + require "rubygems" + require "active_support/multibyte" +end module Railslove module Plugins module FindByParam @@ -59,20 +65,19 @@ You can use for example User.find_by_param(params[:id], args) to find the user b module SingletonMethods - # found somewhere on the web.... don't know where... but it's from a clever guy - (done some motifications) - def escape(str) + # borrowed from http://github.com/henrik/slugalizer ;) thanks henrik http://github.com/henrik + def escape(str, separator='-') return "" if str.blank? # hack if the str/attribute is nil/blank - s = Iconv.iconv('ascii//ignore//translit', 'utf-8', str.dup).to_s - returning str.dup.to_s do |s| - s.gsub!(/\ +/, '-') # spaces to dashes, preferred separator char everywhere - s.gsub!(/\-+/,'-') # ----- to - - s.gsub!(/[^\w^-]+/, '') # kill non-word chars except - - s.strip! # ohh la la - s.downcase! # :D - s.gsub!(/([^ a-zA-Z0-9_-]+)/n,"") # and now kill every char not allowed. - end + re_separator = Regexp.escape(separator) + result = ActiveSupport::Multibyte::Handlers::UTF8Handler.normalize(str.to_s, :kd) + result.gsub!(/[^\x00-\x7F]+/, '') # Remove non-ASCII (e.g. diacritics). + result.gsub!(/[^a-z0-9\-_\+]+/i, separator) # Turn non-slug chars into the separator. + result.gsub!(/#{re_separator}{2,}/, separator) # No more than one of the separator in a row. + result.gsub!(/^#{re_separator}|#{re_separator}$/, '') # Remove leading/trailing separator. + result.downcase! + result end - + =begin rdoc Search for an object by the defined permalink column. Similar to find_by_login. @@ -119,7 +124,7 @@ Accepts an options hash as a second parameter which is passed on to the rails fi return unless self.class.column_names.include?(permalink_options[:field].to_s) counter = 0 base_value = escape_and_truncate_for_permalink(read_attribute(permalink_options[:field_to_encode])) - permalink_value = "#{base_value}" + permalink_value = "#{base_value}".downcase conditions = ["#{self.class.table_name}.#{permalink_options[:field]} = ?", permalink_value] unless new_record? @@ -135,7 +140,7 @@ Accepts an options hash as a second parameter which is passed on to the rails fi end def escape(value) - self.class.escape(value) + "#{value.respond_to?("parameterize") ? value.parameterize : self.class.escape(value)}" end #this escapes and truncates a value. lib/find_by_param.rb @@ -17,7 +17,7 @@ class FindByParamTest < Test::Unit::TestCase def test_permalink_should_be_saved Post.class_eval "make_permalink :with => :title" post = Post.create(:title=>"hey ho let's go!") - assert_equal post.to_param, "hey-ho-lets-go" + assert_equal post.to_param, "hey-ho-let-s-go" assert_equal post.permalink, post.to_param end @@ -46,7 +46,7 @@ class FindByParamTest < Test::Unit::TestCase def test_to_param_should_perpend_id Article.class_eval "make_permalink :with => :title, :prepend_id=>true " article = Article.create(:title=>"hey ho let's go!") - assert_equal article.to_param, "#{article.id}-hey-ho-lets-go" + assert_equal article.to_param, "#{article.id}-hey-ho-let-s-go" end def test_should_increment_counter_if_not_unique @@ -65,7 +65,7 @@ class FindByParamTest < Test::Unit::TestCase end def test_escape_should_strip_special_chars - assert_equal "hello-nice-dude", Post.escape("+*(he/=&l$l<o !ni^?ce-`duäöde;:@") + assert_equal "+-he-l-l-o-ni-ce-duaode", Post.escape("+*(he/=&l$l<o !ni^?ce-`duäöde;:@") end def test_does_not_leak_options test/find_by_param_test.rb @@ -2,7 +2,6 @@ require 'test/unit' require 'rubygems' require 'active_record' require 'active_support' -require 'iconv' require 'find_by_param' class ActiveRecord::Base class_inheritable_accessor :permalink_options test/test_helper.rb 6bf84151b8345a292c44879923bad23b74c6bdd4 Michael Bumann michael@railslove.com http://github.com/bumi/find_by_param/commit/5316794891a7d1e24c5b7b7deffbc4c9ec40e653 5316794891a7d1e24c5b7b7deffbc4c9ec40e653 2008-10-27T09:32:09-07:00 2008-10-27T09:32:09-07:00 rely on active_support/multibyte for slug generation, use Rails parameterize method if present, use escape code from slugalizer (http://github.com/henrik/slugalizer) 7335d7b2a1ed0aaabe7b9bbe5950a1e9ec865165 Michael Bumann michael@railslove.com