keyword_search 1.3.0 → 1.3.1

data/History.txt

@@ -1,10 +1,13 @@
+= 1.3.1 / 2007-10-09
+
+* Tests/README update for case sensitivity change
+
 = 1.3.0 / 2007-10-09
 
 * Conversion to Ragel-based parser (faster, less resource-intensive)
-* Better support for other character sets, allow apostrophes in
-  unquoted words
+* Better support for other character sets, allow apostrophes in unquoted words
 * Test suite now uses test/spec
-* API Should be backwards compatible
+* API is almost backwards compatible (though keywords/values are now case sensitive; downcase the input manually if you want the old behavior)
 
 = 1.2.0 / 2007-05-09
 

data/README.txt

@@ -6,19 +6,17 @@ keyword_search
   
 Generic library to parse GMail-style search strings for keyword/value pairs; supports definition of valid keywords and handling of quoted values.
 
-== FEATURES/PROBLEMS:
+== FEATURES:
   
 The library features a very simple, easy-to-use API.
 * Define handlers for supported keywords with blocks
 * Define the default keyword (values not part of a keyword/value pair)
 
-Various notes:
-* Quoted values are supported.
-* Input is automatically downcased (both keywords and values should be assumed to be in lowercase)
-
 Development Roadmap:
 2.0:: Add negation and grouping (will break API backwards compatibility)
 
+Note:: As of 1.3.0, input to KeywordSearch.search is no longer automatically downcased, allowing for case sensitive keyword and value pairs.  If you want case insensitivity, downcase the input before you invoke the method.
+
 == SYNOPSIS:
 
 Here's an example of usage from Rails (though the library is generic, and could presumably be used for any Ruby project)

data/Rakefile

@@ -3,7 +3,7 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.new('keyword_search', '1.3.0') do |p|
+Hoe.new('keyword_search', '1.3.1') do |p|
   p.rubyforge_name = 'codefluency'
   p.summary = 'Generic support for extracting GMail-style search keywords/values from strings'
   p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")

data/lib/keyword_search.rb

@@ -7,7 +7,8 @@ module KeywordSearch
       
   class << self
   
-    # line 44 "lib/keyword_search.rl"
+    # line 48 "lib/keyword_search.rl"
+
     
     def search(input_string, definition=nil, &block)
       definition ||= Definition.new(&block)
@@ -31,8 +32,9 @@ class << self
 	private :_parser_actions, :_parser_actions=
 end
 self._parser_actions = [
-	0, 1, 3, 1, 4, 2, 0, 2, 
-	2, 1, 0
+	0, 1, 3, 1, 5, 1, 6, 2, 
+	0, 2, 2, 1, 0, 3, 0, 2, 
+	4, 3, 1, 0, 4
 ]
 
 class << self
@@ -97,9 +99,9 @@ class << self
 	private :_parser_trans_actions_wi, :_parser_trans_actions_wi=
 end
 self._parser_trans_actions_wi = [
-	5, 3, 5, 5, 3, 5, 1, 0, 
-	0, 0, 0, 8, 8, 0, 8, 1, 
-	0, 0, 0, 0, 0, 1, 0, 0, 
+	7, 5, 13, 13, 5, 7, 1, 0, 
+	0, 0, 0, 17, 17, 0, 10, 1, 
+	0, 0, 0, 3, 0, 1, 0, 3, 
 	0, 1, 0, 0, 0, 0
 ]
 
@@ -121,22 +123,23 @@ class << self
 end
 self.parser_en_main = 1;
 
-# line 62 "lib/keyword_search.rl"
+# line 66 "lib/keyword_search.rl"
     	p = 0
     	pe = data.length
     	key = nil
     	tokstart = nil
     	results = {}
+    	quotes = 0
       
-# line 133 "lib/keyword_search.rb"
+# line 135 "lib/keyword_search.rb"
 begin
 	p ||= 0
 	pe ||= data.length
 	cs = parser_start
 end
-# line 68 "lib/keyword_search.rl"
+# line 73 "lib/keyword_search.rl"
       
-# line 141 "lib/keyword_search.rb"
+# line 143 "lib/keyword_search.rb"
 begin
 	_klen, _trans, _keys, _acts, _nacts = nil
 	if p != pe
@@ -235,11 +238,21 @@ when 3:
       		end
 # line 26 "lib/keyword_search.rl"
 when 4:
-# line 42 "lib/keyword_search.rl"
+# line 32 "lib/keyword_search.rl"
+		begin
+ quotes += 1 		end
+# line 32 "lib/keyword_search.rl"
+when 5:
+# line 34 "lib/keyword_search.rl"
+		begin
+ quotes -= 1 		end
+# line 34 "lib/keyword_search.rl"
+when 6:
+# line 46 "lib/keyword_search.rl"
 		begin
  raise ParseError, "At offset #{p}, near: '#{data[p,10]}'" 		end
-# line 42 "lib/keyword_search.rl"
-# line 244 "lib/keyword_search.rb"
+# line 46 "lib/keyword_search.rl"
+# line 256 "lib/keyword_search.rb"
 		end # action switch
 	end
 	end while false
@@ -251,10 +264,13 @@ when 4:
 	end
 	end
 	end
-# line 69 "lib/keyword_search.rl"
+# line 74 "lib/keyword_search.rl"
     	
-# line 258 "lib/keyword_search.rb"
-# line 70 "lib/keyword_search.rl"
+# line 270 "lib/keyword_search.rb"
+# line 75 "lib/keyword_search.rl"
+    	unless quotes.zero?
+    	  raise ParseError, "Unclosed quotes"
+    	end
     	results
     end
     

data/test/test_keyword_search.rb

@@ -176,6 +176,30 @@ context "KeywordSearch" do
       end
     end
   end
+  
+  specify "keywords are case sensitive" do
+    result = nil
+    KeywordSearch.search(%<Text:justtesting>) do |with|
+      with.keyword :text do |values|
+        result = :small
+      end
+      with.keyword :Text do |values|
+        result = :big
+      end      
+    end
+    assert_equal :big, result
+  end
+  
+  specify "values are case sensitive" do
+    result = nil
+    KeywordSearch.search(%<text:Big>) do |with|
+      with.keyword :text do |values|
+        result = values.first
+      end
+    end
+    assert_equal 'Big', result
+  end
+  
 end
 
 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: keyword_search
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 date: 2007-10-09 00:00:00 -05:00
 summary: Generic support for extracting GMail-style search keywords/values from strings
 require_paths: 
@@ -11,7 +11,7 @@ require_paths:
 email: bruce@codefluency.com
 homepage: "    http://codefluency.rubyforge.org/keyword_search"
 rubyforge_project: codefluency
-description: "== FEATURES/PROBLEMS:  The library features a very simple, easy-to-use API. * Define handlers for supported keywords with blocks * Define the default keyword (values not part of a keyword/value pair)  Various notes: * Quoted values are supported. * Input is automatically downcased (both keywords and values should be assumed to be in lowercase)  Development Roadmap: 2.0:: Add negation and grouping (will break API backwards compatibility)  == SYNOPSIS:"
+description: "== FEATURES:  The library features a very simple, easy-to-use API. * Define handlers for supported keywords with blocks * Define the default keyword (values not part of a keyword/value pair)  Development Roadmap: 2.0:: Add negation and grouping (will break API backwards compatibility)  Note:: As of 1.3.0, input to KeywordSearch.search is no longer automatically downcased, allowing for case sensitive keyword and value pairs.  If you want case insensitivity, downcase the input before you invoke the method.  == SYNOPSIS:"
 autorequire: 
 default_executable: 
 bindir: bin