pms 0.0.2 → 0.0.3

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to pms version 0.0.2
+This documentation refers to pms version 0.0.3
 
 
 == DESCRIPTION
@@ -57,7 +57,7 @@ Rubyforge project:: <http://rubyforge.org/projects/pms>
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2008 Jens Wille
+Copyright (C) 2008-2010 Jens Wille
 
 pms is free software: you can redistribute it and/or modify it under the
 terms of the GNU General Public License as published by the Free Software

data/lib/pms.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # pms - Poor Man's Search.                                                    #
 #                                                                             #
-# Copyright (C) 2008 Jens Wille                                               #
+# Copyright (C) 2008-2010 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@uni-koeln.de>                                    #
@@ -40,6 +40,8 @@ class PMS
     token ? TokenProxy.new(self, token) : Proxy.new(self).and { |*a| yield(*a) }
   end
 
+  alias_method :/, :search
+
   def results
     @index.entries
   end

data/lib/pms/ext.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of pms, Poor Man's Search.                                      #
 #                                                                             #
-# Copyright (C) 2008 Jens Wille                                               #
+# Copyright (C) 2008-2010 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@uni-koeln.de>                                    #
@@ -34,16 +34,18 @@ module PMS::Ext
     PMS.new(self).search(*args)
   end
 
+  alias_method :/, :search
+
   RECEIVERS.each { |klass|
     klass.send(:include, self)
   }
 
 end
 
-class File
+class << File
 
-  def self.search(file, *args)
-    File.open(file.respond_to?(:path) ? file.path : file) { |f| f.search(*args) }
+  def search(file, *args)
+    open(file.respond_to?(:path) ? file.path : file) { |f| f.search(*args) }
   end
 
 end

data/lib/pms/index.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of pms, Poor Man's Search.                                      #
 #                                                                             #
-# Copyright (C) 2008 Jens Wille                                               #
+# Copyright (C) 2008-2010 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@uni-koeln.de>                                    #
@@ -68,7 +68,7 @@ class PMS
 
     def documents(doc_nums = default = Object.new)
       @documents ||= get_documents
-      default ? @documents : doc_nums.map { |doc_num| @documents[doc_num] }
+      default ? @documents : @documents.values_at(*doc_nums)
     end
 
     alias_method :matches, :documents

data/lib/pms/proxy.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of pms, Poor Man's Search.                                      #
 #                                                                             #
-# Copyright (C) 2008 Jens Wille                                               #
+# Copyright (C) 2008-2010 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@uni-koeln.de>                                    #
@@ -41,16 +41,22 @@ class PMS
               apply_operator_with_block('and') { |*a| yield(*a) }
     end
 
+    alias_method :&, :and
+
     def or(token = nil)
       token ? apply_operator_with_token('or', token) :
               apply_operator_with_block('or') { |*a| yield(*a) }
     end
 
+    alias_method :|, :or
+
     def not(token = nil)
       token ? apply_operator_with_token('not', token) :
               apply_operator_with_block('not') { |*a| yield(*a) }
     end
 
+    alias_method :-, :not
+
     def matches
       index.matches(results)
     end
@@ -132,10 +138,15 @@ class PMS
       apply_operator('and', doc_nums)
     end
 
+    alias_method :%, :near
+
     def adjacent(token, distance = 1)
       near(token, distance, true)
     end
 
+    alias_method :adj, :adjacent
+    alias_method :^, :adjacent
+
   end
 
 end

data/lib/pms/version.rb

@@ -4,7 +4,7 @@ class PMS
 
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     class << self
 

data/spec/pms/ext_spec.rb

@@ -28,6 +28,22 @@ shared_examples_for 'any Searchable' do
 
 end
 
+shared_examples_for 'most Searchables' do
+
+  it 'should allow boolean combination with & (AND)' do
+    (@searchable/'fox' & 'goose').results.sort.should == [3, 6]
+  end
+
+  it 'should allow boolean combination with | (OR)' do
+    (@searchable/'fox' | 'goose').results.sort.should == [0, 2, 3, 4, 6]
+  end
+
+  it 'should allow boolean combination with - (NOT)' do
+    (@searchable/'fox' - 'goose').results.sort.should == [0, 4]
+  end
+
+end
+
 describe String, ' when extended by pms' do
 
   before :each do
@@ -35,6 +51,7 @@ describe String, ' when extended by pms' do
   end
 
   it_should_behave_like 'any Searchable'
+  it_should_behave_like 'most Searchables'
 
 end
 
@@ -45,6 +62,7 @@ describe IO, ' when extended by pms' do
   end
 
   it_should_behave_like 'any Searchable'
+  it_should_behave_like 'most Searchables'
 
 end
 
@@ -55,6 +73,7 @@ describe Array, ' when extended by pms' do
   end
 
   it_should_behave_like 'any Searchable'
+  it_should_behave_like 'most Searchables'
 
 end
 

data/spec/pms_spec.rb

@@ -20,14 +20,26 @@ describe PMS do
     @pms.search('fox').and('goose').results.sort.should == [3, 6]
   end
 
+  it 'should support boolean operator & (AND)' do
+    (@pms/'fox' & 'goose').results.sort.should == [3, 6]
+  end
+
   it 'should support boolean operator OR' do
     @pms.search('fox').or('goose').results.sort.should == [0, 2, 3, 4, 6]
   end
 
+  it 'should support boolean operator | (OR)' do
+    (@pms/'fox' | 'goose').results.sort.should == [0, 2, 3, 4, 6]
+  end
+
   it 'should support boolean operator NOT' do
     @pms.search('fox').not('goose').results.sort.should == [0, 4]
   end
 
+  it 'should support boolean operator - (NOT)' do
+    (@pms/'fox' - 'goose').results.sort.should == [0, 4]
+  end
+
   it 'should allow chaining of operators' do
     @pms.search('fox').and('goose').not('knife').results.sort.should == [3]
   end
@@ -58,10 +70,22 @@ describe PMS do
     @pms.search('fox').near('goose', 10).results.sort.should == [3, 6]
   end
 
+  it 'should support proximity operator % (NEAR)' do
+    (@pms/'night' % 'chilly').results.sort.should == [0]
+  end
+
   it 'should support proximity operator ADJACENT' do
     @pms.search('fox').adjacent('goose', 10).results.sort.should == [6]
   end
 
+  it 'should support proximity operator ADJ (ADJACENT)' do
+    @pms.search('fox').adj('goose', 10).results.sort.should == [6]
+  end
+
+  it 'should support proximity operator ^ (ADJACENT)' do
+    (@pms/'chilly' ^ 'night').results.sort.should == [0]
+  end
+
   it 'should search case-insensitively' do
     @pms.search('said').results.sort.should == [1, 4]
     @pms.search('Said').results.sort.should == [1, 4]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pms
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-09 00:00:00 +01:00
+date: 2010-02-18 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -25,32 +25,34 @@ extra_rdoc_files:
 - README
 files: 
 - lib/pms.rb
+- lib/pms/index.rb
 - lib/pms/proxy.rb
 - lib/pms/ext.rb
 - lib/pms/version.rb
-- lib/pms/index.rb
+- README
+- ChangeLog
 - Rakefile
 - COPYING
-- ChangeLog
-- README
-- spec/spec_helper.rb
-- spec/pms/proxy_spec.rb
 - spec/pms/index_spec.rb
 - spec/pms/ext_spec.rb
+- spec/pms/proxy_spec.rb
+- spec/spec_helper.rb
 - spec/pms_spec.rb
 - test_data/fox.txt
 has_rdoc: true
 homepage: http://pms.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
+- --charset
+- UTF-8
 - --title
 - pms Application documentation
 - --main
 - README
-- --charset
-- UTF-8
+- --line-numbers
+- --inline-source
 - --all
 require_paths: 
 - lib
@@ -69,9 +71,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pms
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Poor Man's Search
 test_files: []