keyword_search 1.4.1 → 1.5.0

data/lib/keyword_search/definition.rb

@@ -1,17 +1,17 @@
 module KeywordSearch
-  
+
   class Definition
-    
+
     class Keyword
-      
+
       attr_reader :name, :description, :handler
       def initialize(name, description=nil, &handler)
         @name, @description = name, description
         @handler = handler
       end
-      
+
       def handle(value, sign)
-        # If the handler is only expecting one argument, 
+        # If the handler is only expecting one argument,
         # only give them the positive matches
         if handler.arity == 1
           handler.call(value) if sign
@@ -19,14 +19,14 @@ module KeywordSearch
           handler.call(value, sign)
         end
       end
-      
+
     end
 
     def initialize
       @default_keyword = nil
       yield self if block_given?
     end
-    
+
     def keywords
       @keywords ||= []
     end
@@ -34,24 +34,24 @@ module KeywordSearch
     def keyword(name, description=nil, &block)
       keywords << Keyword.new(name, description, &block)
     end
-      
+
     def default_keyword(name)
       @default_keyword = name
     end
-      
+
     def handle(key, values)
       key = @default_keyword if key == :default
       return false unless key
       true_values, false_values = *values.partition { |v| v[1] }
-      
+
       # Get just the values
       true_values.collect! { |v| v[0] }
       false_values.collect! { |v| v[0] }
-      
+
       if k = keywords.detect { |kw| kw.name == key.to_sym}
         k.handle(true_values, true)   unless true_values.empty?
         k.handle(false_values, false) unless false_values.empty?
       end
     end
   end
-end
+end

data/lib/keyword_search/version.rb

@@ -0,0 +1,3 @@
+module KeywordSearch
+  VERSION = '1.5.0'
+end

data/test/test_keyword_search.rb

@@ -1,11 +1,9 @@
-require 'test/unit'
-
-require 'rubygems' rescue nil
-require 'test/spec'
+require 'minitest/spec'
+require 'minitest/autorun'
 
 require File.dirname(__FILE__) + '/../lib/keyword_search'
 
-context "KeywordSearch" do
+describe "KeywordSearch" do
 
   NAME_AND_AGE = %<bruce williams age:26>
   NAME_QUOTED_AND_AGE = %<"bruce williams" age:26>
@@ -18,7 +16,7 @@ context "KeywordSearch" do
   NAME_AND_GROUPED_QUOTED_AGES = %<coda hale age:("27" 34 '48')>
   GROUPED_NAMES_AND_AGE = %<(coda bruce 'hale' "williams") age:20>
 
-  specify "default keyword" do
+  it "default keyword" do
     result = nil
     KeywordSearch.search(NAME_AND_AGE) do |with|
       with.default_keyword :name
@@ -26,10 +24,11 @@ context "KeywordSearch" do
         result = values.join(' ')
       end
     end
+    result.must_equal 'bruce williams'
     assert_equal 'bruce williams', result
   end
 
-  specify "grouped default keywords" do
+  it "grouped default keywords" do
     result = nil
     KeywordSearch.search(GROUPED_NAMES_AND_AGE) do |with|
       with.default_keyword :name
@@ -40,7 +39,7 @@ context "KeywordSearch" do
     assert_equal ['coda', 'bruce', 'hale', 'williams'], result
   end
 
-  specify "unquoted keyword term" do
+  it "unquoted keyword term" do
     result = nil
     KeywordSearch.search(NAME_AND_AGE) do |with|
       with.keyword :age do |values|
@@ -50,7 +49,7 @@ context "KeywordSearch" do
     assert_equal 26, result
   end
 
-  specify "unquoted grouped keyword term" do
+  it "unquoted grouped keyword term" do
     result = nil
     KeywordSearch.search(NAME_AND_GROUPED_AGE) do |with|
       with.keyword :age do |values|
@@ -60,7 +59,7 @@ context "KeywordSearch" do
     assert_equal 27, result
   end
 
-  specify "quoted grouped keyword term" do
+  it "quoted grouped keyword term" do
     result = nil
     KeywordSearch.search(NAME_AND_GROUPED_QUOTED_AGE) do |with|
       with.keyword :age do |values|
@@ -70,7 +69,7 @@ context "KeywordSearch" do
     assert_equal 27, result
   end
 
-  specify "mixed grouped keyword terms" do
+  it "mixed grouped keyword terms" do
     result = nil
     KeywordSearch.search(NAME_AND_GROUPED_QUOTED_AGES) do |with|
       with.keyword :age do |values|
@@ -80,7 +79,7 @@ context "KeywordSearch" do
     assert_equal [27, 34, 48], result
   end
 
-  specify "quoted default keyword term" do
+  it "quoted default keyword term" do
     result = nil
     KeywordSearch.search(NAME_QUOTED_AND_AGE) do |with|
       with.default_keyword :name
@@ -91,7 +90,7 @@ context "KeywordSearch" do
     assert_equal 'bruce williams', result
   end
 
-  specify "quoted keyword term" do
+  it "quoted keyword term" do
     result = nil
     KeywordSearch.search(NAME_AND_QUOTED_AGE) do |with|
       with.keyword :age do |values|
@@ -101,7 +100,7 @@ context "KeywordSearch" do
     assert_equal 26, result
   end
 
-  specify "quoted keyword term with whitespace" do
+  it "quoted keyword term with whitespace" do
     result = nil
     KeywordSearch.search(DEFAULT_AGE_WITH_QUOTED_AGE) do |with|
       with.default_keyword :age
@@ -112,7 +111,7 @@ context "KeywordSearch" do
     assert_equal 'bruce williams', result
   end
 
-  specify "single quoted keyword term with whitespace" do
+  it "single quoted keyword term with whitespace" do
     result = nil
     r = KeywordSearch.search(DEFAULT_AGE_WITH_SINGLE_QUOTED_AGE) do |with|
       with.default_keyword :age
@@ -123,7 +122,7 @@ context "KeywordSearch" do
     assert_equal 'bruce williams', result
   end
 
-  specify "nested single quote is accumulated" do
+  it "nested single quote is accumulated" do
     result = nil
     KeywordSearch.search(NAME_WITH_NESTED_SINGLE_QUOTES) do |with|
       with.default_keyword :name
@@ -134,7 +133,7 @@ context "KeywordSearch" do
     assert_equal %<d'arcy d'uberville>, result
   end
 
-  specify "nested double quote is accumulated" do
+  it "nested double quote is accumulated" do
     result = nil
     KeywordSearch.search(%<'he was called "jake"'>) do |with|
       with.default_keyword :text
@@ -145,7 +144,7 @@ context "KeywordSearch" do
     assert_equal %<he was called "jake">, result
   end
 
-  specify "bare single quote in unquoted literal is accumulated" do
+  it "bare single quote in unquoted literal is accumulated" do
     result = nil
     KeywordSearch.search(%<bruce's age:27>) do |with|
       with.default_keyword :text
@@ -156,7 +155,7 @@ context "KeywordSearch" do
     assert_equal %<bruce's>, result
   end
 
-  specify "single quoted literal is accumulated" do
+  it "single quoted literal is accumulated" do
     result = nil
     KeywordSearch.search(%<foo 'bruce williams' age:27>) do |with|
       with.default_keyword :text
@@ -167,7 +166,7 @@ context "KeywordSearch" do
     assert_equal %<bruce williams>, result
   end
 
-  specify "period in literal is accumulated" do
+  it "period in literal is accumulated" do
     result = nil
     KeywordSearch.search(%<okay... age:27>) do |with|
       with.default_keyword :text
@@ -178,7 +177,7 @@ context "KeywordSearch" do
     assert_equal %<okay...>, result
   end
 
-  specify "parse error results in exception" do
+  it "parse error results in exception" do
     assert_raises(KeywordSearch::ParseError) do
       KeywordSearch.search(%<we_do_not_allow:! or ::>) do |with|
         with.default_keyword :text
@@ -189,7 +188,7 @@ context "KeywordSearch" do
     end
   end
 
-  specify "can use apostrophes in unquoted literal" do
+  it "can use apostrophes in unquoted literal" do
     result = nil
     KeywordSearch.search(%<d'correct>) do |with|
       with.default_keyword :text
@@ -200,7 +199,7 @@ context "KeywordSearch" do
     assert_equal "d'correct", result
   end
 
-  specify "can use apostrophes in unquoted literal values" do
+  it "can use apostrophes in unquoted literal values" do
     result = nil
     KeywordSearch.search(%<text:d'correct>) do |with|
       with.default_keyword :text
@@ -211,7 +210,7 @@ context "KeywordSearch" do
     assert_equal "d'correct", result
   end
 
-  specify "cannot use an apostrophe at the beginning on an unquoted literal" do
+  it "cannot use an apostrophe at the beginning on an unquoted literal" do
     assert_raises(KeywordSearch::ParseError) do
       KeywordSearch.search(%<'thisiswrong>) do |with|
         with.default_keyword :text
@@ -222,7 +221,7 @@ context "KeywordSearch" do
     end
   end
 
-  specify "keywords are case sensitive" do
+  it "keywords are case sensitive" do
     result = nil
     KeywordSearch.search(%<Text:justtesting>) do |with|
       with.keyword :text do |values|
@@ -235,7 +234,7 @@ context "KeywordSearch" do
     assert_equal :big, result
   end
 
-  specify "values are case sensitive" do
+  it "values are case sensitive" do
     result = nil
     KeywordSearch.search(%<text:Big>) do |with|
       with.keyword :text do |values|
@@ -245,7 +244,7 @@ context "KeywordSearch" do
     assert_equal 'Big', result
   end
 
-  specify "spaces are condensed" do
+  it "spaces are condensed" do
     result = nil
     KeywordSearch.search(%<   this   is    some    text   >) do |with|
       with.default_keyword :text
@@ -256,7 +255,7 @@ context "KeywordSearch" do
     assert_equal %w(this is some text), result
   end
 
-  specify "an empty search is successful" do
+  it "an empty search is successful" do
     result = nil
     KeywordSearch.search(%<>) do |with|
       with.default_keyword :text
@@ -267,7 +266,7 @@ context "KeywordSearch" do
     assert_nil result
   end
 
-  specify 'a negative search' do
+  it 'a negative search' do
     result = nil
 
     KeywordSearch.search(%<-site:google.com>) do |with|
@@ -278,7 +277,7 @@ context "KeywordSearch" do
     assert_equal [ [ 'google.com' ], false ], result
   end
 
-  specify 'a positive search' do
+  it 'a positive search' do
     result = nil
 
     KeywordSearch.search(%<+site:google.com>) do |with|
@@ -289,7 +288,7 @@ context "KeywordSearch" do
     assert_equal [ [ 'google.com' ], true ], result
   end
 
-  specify 'a search with no sign' do
+  it 'a search with no sign' do
     result = nil
 
     KeywordSearch.search(%<site:google.com>) do |with|
@@ -300,7 +299,7 @@ context "KeywordSearch" do
     assert_equal [ [ 'google.com' ], true ], result
   end
 
-  specify 'a term should default to positive with no sign' do
+  it 'a term should default to positive with no sign' do
     result = nil
 
     KeywordSearch.search(%<-site:google.com inurl:atom>) do |with|
@@ -311,7 +310,7 @@ context "KeywordSearch" do
     assert_equal [ %w(atom), true ], result
   end
 
-  specify 'a negative and positive search to the default keyword' do
+  it 'a negative and positive search to the default keyword' do
     result = []
 
     KeywordSearch.search(%<text -google.com search>) do |with|
@@ -323,7 +322,7 @@ context "KeywordSearch" do
     assert_equal [ [ %w(text search), true ], [ %w(google.com), false ] ], result
   end
 
-  specify 'a negative search to the default keyword with quotes' do
+  it 'a negative search to the default keyword with quotes' do
     result = []
 
     KeywordSearch.search(%<-google.com>) do |with|

metadata

@@ -1,67 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: keyword_search
-version: !ruby/object:Gem::Version 
-  version: 1.4.1
+version: !ruby/object:Gem::Version
+  version: 1.5.0
 platform: ruby
-authors: 
+authors:
 - Bruce Williams
 - Eric Lindvall
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-10-22 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
+date: 2013-05-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: 
-- bruce@codefluency.com
+email:
+- brwcodes@gmail.com
 - eric@sevenscale.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.markdown
-files: 
-- History.txt
+extra_rdoc_files: []
+files:
+- .gitignore
+- .travis.yml
+- Gemfile
+- LICENSE
 - Manifest
-- README.markdown
+- README.md
 - Rakefile
-- VERSION
 - keyword_search.gemspec
 - lib/keyword_search.rb
 - lib/keyword_search.rl
 - lib/keyword_search/definition.rb
+- lib/keyword_search/version.rb
 - test/test_keyword_search.rb
-has_rdoc: true
 homepage: http://github.com/bruce/keyword_search
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: codefluency
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Generic library to parse GMail-style search strings for keyword/value pairs; supports definition of valid keywords and handling of quoted values.
-test_files: 
+specification_version: 4
+summary: Generic library to parse GMail-style search strings for keyword/value pairs;
+  supports definition of valid keywords and handling of quoted values.
+test_files:
 - test/test_keyword_search.rb
+has_rdoc: