pms 0.0.3 → 0.0.4

data/ChangeLog

@@ -1,5 +1,17 @@
 = Revision history for pms
 
+== 0.0.4 [2010-10-24]
+
+* Some code cleanup.
+
+== 0.0.3 [2010-02-18]
+
+* Added some handy operator aliases.
+
+== 0.0.2 [2008-12-09]
+
+* Fixed handling of Proxy internals.
+
 == 0.0.1 [2008-12-06]
 
 * Birthday :-)

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to pms version 0.0.3
+This documentation refers to pms version 0.0.4
 
 
 == DESCRIPTION

data/TODO

@@ -0,0 +1,3 @@
+- positions w/ NEAR + ADJ
+- specs (positions, i18n)
+- docu

data/lib/pms.rb

@@ -24,6 +24,7 @@
 ###############################################################################
 #++
 
+require 'pms/version'
 require 'pms/index'
 require 'pms/proxy'
 
@@ -36,8 +37,8 @@ class PMS
     @index = Index.new(input)
   end
 
-  def search(token = nil)
-    token ? TokenProxy.new(self, token) : Proxy.new(self).and { |*a| yield(*a) }
+  def search(token = nil, &block)
+    token ? TokenProxy.new(self, token) : Proxy.new(self).and(&block)
   end
 
   alias_method :/, :search

data/lib/pms/ext.rb

@@ -28,15 +28,13 @@ require 'pms'
 
 module PMS::Ext
 
-  RECEIVERS = [String, IO, Array].freeze
-
-  def search(*args)
-    PMS.new(self).search(*args)
+  def search(*args, &block)
+    PMS.new(self).search(*args, &block)
   end
 
   alias_method :/, :search
 
-  RECEIVERS.each { |klass|
+  [String, IO, Array].each { |klass|
     klass.send(:include, self)
   }
 
@@ -44,8 +42,9 @@ end
 
 class << File
 
-  def search(file, *args)
-    open(file.respond_to?(:path) ? file.path : file) { |f| f.search(*args) }
+  def search(file, *args, &block)
+    file = file.path if file.respond_to?(:path)
+    open(file) { |f| f.search(*args, &block) }
   end
 
 end

data/lib/pms/i18n.rb

@@ -0,0 +1,44 @@
+#--
+###############################################################################
+#                                                                             #
+# A component of pms, Poor Man's Search.                                      #
+#                                                                             #
+# Copyright (C) 2008-2010 Jens Wille                                          #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#                                                                             #
+# 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   #
+# Foundation; either version 3 of the License, or (at your option) any later  #
+# version.                                                                    #
+#                                                                             #
+# pms is distributed in the hope that it will be useful, but WITHOUT ANY      #
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more       #
+# details.                                                                    #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with pms. If not, see <http://www.gnu.org/licenses/>.                       #
+#                                                                             #
+###############################################################################
+#++
+
+require 'nuggets/util/i18n'
+require 'pms'
+
+class PMS
+
+  class Index
+
+    alias_method :_pms_i18n_original_mangle_token, :mangle_token
+
+    def mangle_token(token)
+      token = _pms_i18n_original_mangle_token(token)
+      token.replace_diacritics!
+      token
+    end
+
+  end
+
+end

data/lib/pms/index.rb

@@ -28,7 +28,7 @@ class PMS
 
   class Index
 
-    TOKEN_RE = %r{\w+}o
+    TOKEN_RE = %r{\w+}
 
     attr_reader :input, :index, :entries
 
@@ -36,8 +36,6 @@ class PMS
       raise ArgumentError, "input must implement #each" unless input.respond_to?(:each)
 
       @input = input
-      @index = Hash.new { |h, k| h[k] = Hash.new { |i, j| i[j] = [] } }
-
       build_index
     end
 
@@ -82,8 +80,8 @@ class PMS
     private
 
     def build_index
-      @documents, @entries = nil, []
-      doc_num = -1
+      @documents, @entries, doc_num = nil, [], -1
+      index = Hash.new { |h, k| h[k] = Hash.new { |i, j| i[j] = [] } }
 
       input.each { |doc|
         @entries << doc_num += 1
@@ -93,6 +91,8 @@ class PMS
           index[mangle_token(token)][doc_num] << pos += 1
         }
       }
+
+      @index = index
     end
 
     def get_documents

data/lib/pms/proxy.rb

@@ -36,31 +36,21 @@ class PMS
       @results = pms.results
     end
 
-    def and(token = nil)
-      token ? apply_operator_with_token('and', token) :
-              apply_operator_with_block('and') { |*a| yield(*a) }
+    def matches
+      index.matches(results)
     end
 
-    alias_method :&, :and
-
-    def or(token = nil)
-      token ? apply_operator_with_token('or', token) :
-              apply_operator_with_block('or') { |*a| yield(*a) }
-    end
+    %w[and or not].each { |op| class_eval %Q{
+      def #{op}(token = nil, &block)
+        token ? apply_operator_with_token(#{op.inspect}, token) :
+                apply_operator_with_block(#{op.inspect}, &block)
+      end
+    } }
 
+    alias_method :&, :and
     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
-
     private
 
     def apply_operator_with_token(op, token)
@@ -69,10 +59,8 @@ class PMS
 
     def apply_operator_with_block(op)
       case sub = yield(pms)
-        when Proxy
-          apply_operator(op, sub.results)
-        else
-          raise "sub-query must return a PMS::Proxy object (got #{sub.class})"
+        when Proxy then apply_operator(op, sub.results)
+        else raise "sub-query must return a #{Proxy} object (got #{sub.class})"
       end
     end
 
@@ -80,14 +68,10 @@ class PMS
       results = self.results
 
       case op = op.to_s.downcase
-        when 'and'
-          results &= doc_nums
-        when 'or'
-          results |= doc_nums
-        when 'not'
-          results -= doc_nums
-        else
-          raise ArgumentError, "invalid operator '#{op}'"
+        when 'and' then results &= doc_nums
+        when 'or'  then results |= doc_nums
+        when 'not' then results -= doc_nums
+        else raise ArgumentError, "invalid operator `#{op}'"
       end
 
       clone_with_results(results)  # allow chaining!

data/lib/pms/version.rb

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

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+
 unless Object.const_defined?(:BASE)
   BASE = File.join(File.dirname(__FILE__), '..')
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: pms
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 +01:00
+date: 2010-10-24 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -24,18 +29,20 @@ extra_rdoc_files:
 - ChangeLog
 - README
 files: 
-- lib/pms.rb
-- lib/pms/index.rb
-- lib/pms/proxy.rb
-- lib/pms/ext.rb
+- lib/pms/i18n.rb
 - lib/pms/version.rb
+- lib/pms/ext.rb
+- lib/pms/proxy.rb
+- lib/pms/index.rb
+- lib/pms.rb
+- COPYING
+- Rakefile
 - README
 - ChangeLog
-- Rakefile
-- COPYING
-- spec/pms/index_spec.rb
-- spec/pms/ext_spec.rb
+- TODO
 - spec/pms/proxy_spec.rb
+- spec/pms/ext_spec.rb
+- spec/pms/index_spec.rb
 - spec/spec_helper.rb
 - spec/pms_spec.rb
 - test_data/fox.txt
@@ -45,33 +52,37 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
+- --line-numbers
+- --inline-source
 - --charset
 - UTF-8
-- --title
-- pms Application documentation
 - --main
 - README
-- --line-numbers
-- --inline-source
+- --title
+- pms Application documentation
 - --all
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: pms
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Poor Man's Search