thbar-diacritics_fu 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.1 / 2008-12-05
+  * Added support for Rails > 2.2 (thanks Nicolas Fouché!)
+  * Refactored to check ActiveSupport version
+  * Added missing require activerecord to the lib
+
 == 1.0.0 / 2008-10-21
   * Packaged as a gem.
  

data/Manifest.txt

@@ -1,6 +1,10 @@
 diacritics_fu.gemspec
 History.txt
 lib/diacritics_fu.rb
+lib/diacritics_fu/new_escaper.rb
+lib/diacritics_fu/old_escaper.rb
 Manifest.txt
+Rakefile
 README
-spec/diacritics_fu_spec.rb
+spec/diacritics_fu_spec.rb
+spec/spec_helper.rb

data/README

@@ -10,23 +10,23 @@ DiacriticsFu::escape("räksmörgås")
 What?
 =====
 
-A small library to remove accents from a string. Relies on ActiveSupport::Multibyte::Handlers::UTF8Handler (Rails).
+A small library to remove accents from a string. Relies on ActiveSupport.
 
 Created because I needed a simple way to remove most diacritics from French sentences, while generating slugs (url) for a CMS (either Mephisto or ComatoseCMS).
 
 Nb: this approach is not the fastest way to achieve this. It's good enough for me though.
 
-The library is not packaged (either like a gem, or a plugin, that is). Just drop diacritics_fu.rb in your /lib folder.
-
 Author
 ======
 
 Thibaut Barrère (http://blog.logeek.fr)
 
-TODO
-====
+Testing
+=======
+
+You can run the spec against the latest available ActiveSupport using "rake spec".
 
-This Git commit http://github.com/rails/rails/commit/22f75d539dca7b6f33cbf86e4e9d1944bb22731f indicates that the gem won't be able to work in future versions of rails => fix this.
+To run the tests against all installed ActiveSupport versions, use "rake spec_multi"
 
 License
 =======

data/Rakefile

@@ -0,0 +1,18 @@
+require 'rubygems'
+require 'spec'
+require 'spec/rake/spectask'
+
+task :default => :spec
+
+desc "run specs for the gem"
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_files = FileList["spec/**/*_spec.rb"]
+end
+
+desc "run specs for the gem against all available activesupport versions"
+task :spec_multi do
+  # hmm - there's probably a better way to write this
+  IO.popen("gem list activesupport").readlines.last.split(',').grep(/(\d\.\d\.\d)/) { $1 }.each do |version|
+    throw "Failed against ActiveSupport v#{version}" unless system("rake spec DIACRITICS_FU_ACTIVESUPPORT_VERSION=#{version}")
+  end
+end

data/diacritics_fu.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "diacritics_fu"
-  s.version  = "1.0.0"
-  s.date     = "2008-10-21"
+  s.version  = "1.0.1"
+  s.date     = "2008-12-05"
   s.summary  = "Tiny Ruby library to remove accents and other diacritics from a string (relies on ActiveSupport)."
   s.email    = "thibaut.barrere@gmail.com"
   s.homepage = "http://github.com/thbar/diacritics_fu"
@@ -10,10 +10,13 @@ Gem::Specification.new do |s|
   s.authors  = ["Thibaut Barrère"]
   s.files    = ["History.txt", 
 		"README",
+		"Rakefile",
 		"Manifest.txt",
 		"diacritics_fu.gemspec", 
-		"lib/diacritics_fu.rb"]
-  s.test_files = ["spec/diacritics_fu_spec.rb"]
+		"lib/diacritics_fu.rb",
+		"lib/diacritics_fu/new_escaper.rb",
+		"lib/diacritics_fu/old_escaper.rb"]
+  s.test_files = ["spec/diacritics_fu_spec.rb","spec/spec_helper.rb"]
   
   s.rdoc_options = ["--main", "README"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README"]

data/lib/diacritics_fu/new_escaper.rb

@@ -0,0 +1,5 @@
+module DiacriticsFu
+  def self.escape(str)
+    ActiveSupport::Multibyte::Chars.new(str).normalize(:d).split(//u).reject { |e| e.length > 1 }.join
+  end
+end

data/lib/diacritics_fu/old_escaper.rb

@@ -0,0 +1,5 @@
+module DiacriticsFu
+  def self.escape(str)
+    ActiveSupport::Multibyte::Handlers::UTF8Handler.normalize(str,:d).split(//u).reject { |e| e.length > 1 }.join
+  end
+end

data/lib/diacritics_fu.rb

@@ -1,11 +1,8 @@
-# A tiny class to remove accents (éèê) and other diacritics (ç) from a string.
-#
-# Author::    Thibaut Barrère  (mailto:thibaut.barrere@gmail.com)
-# Copyright:: Copyright (c) 2008 LoGeek EURL
-# License::   Distributes under the same terms as Ruby
-module DiacriticsFu
-  # Remove all accents and other diacritics from the passed string (ie: éphémère will return ephemere)
-  def self.escape(str)
-    ActiveSupport::Multibyte::Handlers::UTF8Handler.normalize(str,:d).split(//u).reject { |e| e.length > 1 }.join
-  end
+require 'active_support'
+require 'active_support/version'
+
+if ActiveSupport::VERSION::STRING >= "2.2.0"
+  require File.dirname(__FILE__) + '/diacritics_fu/new_escaper'
+else
+  require File.dirname(__FILE__) + '/diacritics_fu/old_escaper'
 end

data/spec/diacritics_fu_spec.rb

@@ -1,23 +1,32 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'diacritics_fu'
+require 'rubygems'
 
-describe "DiacriticsFu.escape" do
+# allow activation of a specific version of activesupport for testing
+gem 'activesupport', "= #{ENV['DIACRITICS_FU_ACTIVESUPPORT_VERSION']}" if ENV['DIACRITICS_FU_ACTIVESUPPORT_VERSION']
+
+require File.dirname(__FILE__) + '/spec_helper'
+require 'active_support'
+
+describe DiacriticsFu do
+  
+  before(:all) do
+    puts "Testing using ActiveSupport version #{ActiveSupport::VERSION::STRING}"
+  end
   
   it "should remove the accents with grace" do
-    DiacriticsFu::escape("éphémère").should eql("ephemere")
+    DiacriticsFu::escape("éphémère").should == "ephemere"
     DiacriticsFu::escape("éêèïîù").should eql("eeeiiu")
   end
 
-  it "should work" do
+  it "should remove more exotic accents" do
     DiacriticsFu::escape("räksmörgås").should eql("raksmorgas")  
   end
-
+  
   KNOWN_DIACRITICS = { "a" => "àäâ", "e" => "éèêë", "i" => "îï", "o" => "ôö", "u" => "üû", "c" => "ç",
                        "I" => "ÏÎ",  "E" => "ÊË", "n" => "ñ", "O" => "ÔÖ", "Y" => "Ÿ", "y" => "ÿ", "N" => "Ñ"  }
   
   KNOWN_DIACRITICS.each do |expected_replacement,originals|
     it "should transform any of '#{originals}' into '#{expected_replacement}'" do
-      originals.split(//).each do |original|
+      originals.each_char do |original|
         DiacriticsFu.escape(original).should eql(expected_replacement)
       end
     end

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'rubygems'
+require File.dirname(__FILE__) + '/../lib/diacritics_fu'
+
+# require after library code to avoid http://emmanueloga.wordpress.com/2008/10/16/rspec-118-in-exit-undefined-method-run-rails-210/
+require 'spec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thbar-diacritics_fu
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - "Thibaut Barr\xC3\xA8re"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-21 00:00:00 -07:00
+date: 2008-12-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,9 +34,12 @@ extra_rdoc_files:
 files: 
 - History.txt
 - README
+- Rakefile
 - Manifest.txt
 - diacritics_fu.gemspec
 - lib/diacritics_fu.rb
+- lib/diacritics_fu/new_escaper.rb
+- lib/diacritics_fu/old_escaper.rb
 has_rdoc: true
 homepage: http://github.com/thbar/diacritics_fu
 post_install_message: 
@@ -66,3 +69,4 @@ specification_version: 2
 summary: Tiny Ruby library to remove accents and other diacritics from a string (relies on ActiveSupport).
 test_files: 
 - spec/diacritics_fu_spec.rb
+- spec/spec_helper.rb