dusen 0.4.2 → 0.4.3

data/lib/dusen/active_record/search_text.rb

@@ -8,8 +8,9 @@ module Dusen
 
       belongs_to :source, :polymorphic => true, :inverse_of => :search_text_record
 
-      def update_words!(words)
-        update_attributes!(:words => words, :stale => false)
+      def update_words!(text)
+        text = Util.normalize_word_boundaries(text)
+        update_attributes!(:words => text, :stale => false)
       end
 
       def invalidate!
@@ -41,18 +42,19 @@ module Dusen
         true
       end
 
-      def self.match(model, words)
+      def self.match(model, phrases)
         synchronize_model(model) if model.search_text?
         Dusen::Util.append_scope_conditions(
           model,
-          :id => matching_source_ids(model, words)
+          :id => matching_source_ids(model, phrases)
         )
       end
 
-      def self.matching_source_ids(model, words)
+      def self.matching_source_ids(model, phrases)
+        phrases = phrases.collect { |phrase| Util.normalize_word_boundaries(phrase) }
         conditions = [
           'MATCH (words) AGAINST (? IN BOOLEAN MODE)',
-          Dusen::Util.boolean_fulltext_query(words)
+          Dusen::Util.boolean_fulltext_query(phrases)
         ]
         matching_texts = Dusen::Util.append_scope_conditions(for_model(model), conditions)
         Dusen::Util.collect_column(matching_texts, :source_id)

data/lib/dusen/parser.rb

@@ -3,7 +3,7 @@
 module Dusen
   class Parser
 
-    WESTERNISH_WORD_CHARACTER =  '\\w\\-\\.@_ÄÖÜäöüß' # this is wrong on so many levels
+    WESTERNISH_WORD_CHARACTER =  '\\w\\-\\.;@_ÄÖÜäöüß' # this is wrong on so many levels
     TEXT_QUERY = /(?:"([^"]+)"|([#{WESTERNISH_WORD_CHARACTER}]+))/
     FIELD_QUERY = /(\w+)\:#{TEXT_QUERY}/
 

data/lib/dusen/util.rb

@@ -117,5 +117,10 @@ module Dusen
     #  ::ActiveRecord::Base.connection.select_values(query).collect(&:to_i)
     #end
 
+    def normalize_word_boundaries(text)
+      unwanted_mysql_boundary = /[\.;]/
+      text.gsub(unwanted_mysql_boundary, '')
+    end
+
   end
 end

data/lib/dusen/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Dusen
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/spec/rails-2.3/app_root/config/database.yml

@@ -2,5 +2,5 @@ test:
   adapter: mysql2
   host: localhost
   username: root
-  password: junior
+  password: foobar
   database: dusen_test

data/spec/rails-3.0/app_root/config/database.yml

@@ -2,5 +2,5 @@ test:
   adapter: mysql2
   host: localhost
   username: root
-  password: junior
+  password: foobar
   database: dusen_test

data/spec/rails-3.2/app_root/config/database.yml

@@ -2,5 +2,5 @@ test:
   adapter: mysql2
   host: localhost
   username: root
-  password: junior
+  password: foobar
   database: dusen_test

data/spec/shared/spec/dusen/active_record/base_ext_spec.rb

@@ -56,6 +56,18 @@ shared_examples_for 'model with search syntax' do
       subject.search('Abraham').to_a.should == [match]
     end
 
+    it 'should find words where one letter is separated from other letters by a period' do
+      match = subject.create!(:name => 'E.ONNNEN')
+      subject.search('E.ONNNEN').to_a.should == [match]
+    end
+
+    it 'should find words where one letter is separated from other letters by a period' do
+      match = subject.create!(:name => 'E;ONNNEN')
+      subject.search('E;ONNNEN')
+      # debugger
+      subject.search('E;ONNNEN').to_a.should == [match]
+    end
+
   end
 
   describe '.search_syntax' do

data/spec/shared/spec/dusen/util_spec.rb

@@ -18,4 +18,18 @@ describe Dusen::Util do
 
   end
 
+  describe '#normalize_word_boundaries' do
+
+    it 'should remove characters that MySQL would mistakenly consider a word boundary' do
+      Dusen::Util.normalize_word_boundaries("E.ON Bayern").should == 'EON Bayern'
+      Dusen::Util.normalize_word_boundaries("E.ON E.ON").should == 'EON EON'
+      Dusen::Util.normalize_word_boundaries("E;ON").should == 'EON'
+    end
+
+    it 'should remove characters that MySQL would mistakenly consider a word boundary' do
+      Dusen::Util.normalize_word_boundaries("Foobar Raboof").should == 'Foobar Raboof'
+    end
+
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dusen
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-08 00:00:00 +01:00
-default_executable: 
+date: 2013-01-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -133,7 +132,6 @@ files:
 - spec/shared/spec/dusen/parser_spec.rb
 - spec/shared/spec/dusen/query_spec.rb
 - spec/shared/spec/dusen/util_spec.rb
-has_rdoc: true
 homepage: https://github.com/makandra/dusen
 licenses: []
 
@@ -163,9 +161,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Comprehensive full text search for ActiveRecord and MySQL
 test_files: []
 
+has_rdoc: