psq-dm-xapian 0.4.2 → 0.5.0

data/CHANGES.txt

@@ -1,4 +1,7 @@
-* 2009-02-03
+* 2009-02-06 - 0.5
+- added remove_accents to make searches work regardless of accents (probably should be an option, though)
+
+* 2009-02-03 - 0.4
 - dm-xapian-update daemon to keep the index up to date
 
 * 2008-11-08

data/Rakefile

@@ -6,7 +6,7 @@ require 'merb-core/version'
 require 'merb-core/tasks/merb_rake_helper'
 
 NAME = "dm-xapian"
-GEM_VERSION = "0.3"
+GEM_VERSION = "0.5"
 AUTHOR = "Joshaven Potter, Pascal Belloncle"
 EMAIL = "yourtech@gmail.com, psq@nanorails.com"
 HOMEPAGE = "http://github.com/psq/dm-xapian"

data/lib/dm-xapian.rb

@@ -19,6 +19,7 @@ rescue LoadError
     STDERR.puts "acts_as_xapian: No Ruby bindings for Xapian installed" 
     $acts_as_xapian_bindings_available = false
 end
+require 'remove_accents'
 
 module ActsAsXapian
     ######################################################################
@@ -362,7 +363,7 @@ module ActsAsXapian
             self.initialize_db
 
             # Case of a string, searching for a Google-like syntax query
-            self.query_string = query_string
+            self.query_string = query_string.remove_accents
 
             # Construct query which only finds things from specified models
             model_query = Xapian::Query.new(Xapian::Query::OP_OR, model_classes.map{|mc| "M" + mc.to_s})
@@ -621,7 +622,7 @@ module DataMapper
           elsif type == :boolean
               value ? true : false
           else
-              value.to_s
+              value.to_s.remove_accents
           end
       end
 

data/lib/remove_accents.rb

@@ -0,0 +1,36 @@
+class String
+
+# based on http://codesnippets.joyent.com/posts/show/451
+# and http://snippets.dzone.com/posts/show/2384
+# although should be using http://trac.wordpress.org/browser/trunk/wp-includes/formatting.php#L437
+
+
+  def remove_accents
+    str = String.new(self)
+    accents = {
+      ['á','à','â','ä','ã'] => 'a',
+      ['Ã','Ä','Â','À','Á'] => 'A',
+      ['æ'] => 'oe',
+      ['Æ'] => 'AE',
+      ['é','è','ê','ë'] => 'e',
+      ['Ë','É','È','Ê'] => 'E',
+      ['í','ì','î','ï'] => 'i',
+      ['Ï','Î','Ì','Í'] => 'I',
+      ['ó','ò','ô','ö','õ'] => 'o',
+      ['Õ','Ö','Ô','Ò','Ó'] => 'O',
+      ['ú','ù','û','ü'] => 'u',
+      ['Ú','Û','Ù','Ü'] => 'U',
+      ['ç'] => 'c',
+      ['Ç'] => 'C',
+      ['ñ'] => 'n',
+      ['Ñ'] => 'N',
+      ['ß'] => 'ss'
+      }
+    accents.each do |ac,rep|
+      ac.each do |s|
+        str = str.gsub(s, rep)
+      end
+    end
+    str
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: psq-dm-xapian
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors: 
 - Joshaven Potter, Pascal Belloncle
@@ -49,6 +49,7 @@ files:
 - TODO
 - lib/dm-xapian.rb
 - lib/dm-xapian/merbtasks.rb
+- lib/remove_accents.rb
 - SETUP.txt
 - CHANGES.txt
 - bin/dm-xapian-updater