textquery 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/textquery/textquery.rb

@@ -1,51 +1,57 @@
 require 'rubygems'
 require 'treetop'
-require 'oniguruma'
 
-include Oniguruma
-
-# make it utf-8 compatible
+# make it utf-8 compatible for < 1.9 Ruby
 if RUBY_VERSION < '1.9'
   require 'active_support'
+  require 'oniguruma'
+
+  include Oniguruma
   $KCODE = 'u'
+
+  RegExp = ORegexp
+  RegExp::IGNORECASE = ORegexp::OPTION_IGNORECASE
+
+else
+  RegExp = Regexp
+  RegExp::IGNORECACASE = Regexp::IGNORECASE
 end
 
-FUZZY = ORegexp.new('(\d)*(~)?([^~]+)(~)?(\d)*$')
+FUZZY = RegExp.new('(\d)*(~)?([^~]+)(~)?(\d)*$')
 
 class WordMatch < Treetop::Runtime::SyntaxNode
-  
+
   @@regex ||= {}
   @@regex_case ||= {}
-  
+
   def eval(text, opt)
-    
-    fuzzy = FUZZY.match(query)
-
-    q = []
-    q.push "."                                    if fuzzy[2]
-    q.push fuzzy[1].nil? ? "*" : "{#{fuzzy[1]}}"  if fuzzy[2]
-    q.push fuzzy[3]
-    q.push "."                                    if fuzzy[4]
-    q.push fuzzy[5].nil? ? "*" : "{#{fuzzy[5]}}"  if fuzzy[4]
-    q = q.join
-    
-    regex = "(^|#{opt[:delim]})#{q}(#{opt[:delim]}|$)"
-    
-    unless @@regex[regex] then
-      @@regex[regex] = ORegexp.new(regex, :options => OPTION_IGNORECASE)
-      @@regex_case[regex] = ORegexp.new(regex, nil)
+    query = RegExp.escape(text_value)
+    qkey  = query + opt[:delim]
+
+    if not @@regex[qkey]
+      fuzzy = FUZZY.match(query)
+
+      q = []
+      q.push "."                                    if fuzzy[2]
+      q.push fuzzy[1].nil? ? "*" : "{#{fuzzy[1]}}"  if fuzzy[2]
+      q.push fuzzy[3]
+      q.push "."                                    if fuzzy[4]
+      q.push fuzzy[5].nil? ? "*" : "{#{fuzzy[5]}}"  if fuzzy[4]
+      q = q.join
+
+      regex = "(^|#{opt[:delim]})#{q}(#{opt[:delim]}|$)"
+
+      @@regex[qkey] = RegExp.new(regex, :options => RegExp::IGNORECASE)
+      @@regex_case[qkey] = RegExp.new(regex, nil)
     end
 
     if opt[:ignorecase]
-      not @@regex[regex].match(text).nil?
+      not @@regex[qkey].match(text).nil?
     else
-      not @@regex_case[regex].match(text).nil?
+      not @@regex_case[qkey].match(text).nil?
     end
   end
-  
-  def query
-    ORegexp.escape(text_value)
-  end
+
 end
 
 Treetop.load File.dirname(__FILE__) + "/textquery_grammar"
@@ -88,8 +94,8 @@ class TextQuery
 
   private
 
-  def update_options(options)
-    @options = {:delim => ' '}.merge(options)
-    @options[:delim] = "(#{[@options[:delim]].flatten.map { |opt| ORegexp.escape(opt) }.join("|")})"
-  end
-end
+    def update_options(options)
+      @options = {:delim => ' '}.merge(options)
+      @options[:delim] = "(#{[@options[:delim]].flatten.map { |opt| RegExp.escape(opt) }.join("|")})"
+    end
+end

data/spec/textquery_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require "rubygems"
 require "spec"
 require "pp"

data/textquery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{textquery}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Grigorik"]
-  s.date = %q{2010-08-18}
+  s.date = %q{2010-09-04}
   s.description = %q{Evaluate any text against a collection of match rules}
   s.email = %q{ilya@igvita.com}
   s.extra_rdoc_files = [
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{textquery}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Evaluate any text against a collection of match rules}
   s.test_files = [
     "spec/textquery_spec.rb",
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<treetop>, [">= 0"])
     else
       s.add_dependency(%q<treetop>, [">= 0"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 -04:00
+date: 2010-09-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: treetop
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -60,6 +61,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -67,6 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -76,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: textquery
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Evaluate any text against a collection of match rules