xapian-full 1.1.3.4 → 1.2.3

data/Rakefile

@@ -6,7 +6,7 @@ def system!(cmd)
 	system(cmd) or raise
 end
 
-ver = '1.1.3'
+ver = '1.2.3'
 core = "xapian-core-#{ver}"
 bindings = "xapian-bindings-#{ver}"
 xapian_config = "#{Dir.pwd}/#{core}/xapian-config"
@@ -16,24 +16,26 @@ task :default do
 		system! "tar -xzvf #{x}.tar.gz"
 	end
 
+	prefix = Dir.pwd
+	ENV['LDFLAGS'] = "-R#{prefix}/lib"
+
+	system! "mkdir -p lib"
+
 	Dir.chdir core do
-		system! "./configure"
+		system! "./configure --prefix=#{prefix} --exec-prefix=#{prefix}"
 		system! "make clean all"
+		system! "cp -r .libs/* ../lib/"
 	end
 
+	
+
 	Dir.chdir bindings do
 		ENV['RUBY'] ||= "#{c['bindir']}/#{c['RUBY_INSTALL_NAME']}"
 		ENV['XAPIAN_CONFIG'] = xapian_config
-		system! "./configure --with-ruby"
+		system! "./configure --prefix=#{prefix} --exec-prefix=#{prefix} --with-ruby"
 		system! "make clean all"
 	end
 
-	system! "mkdir -p lib"
-	if File.exists? "#{bindings}/ruby/.libs/_xapian.bundle"
-		system! "cp #{bindings}/ruby/.libs/_xapian.bundle lib"
-		system! "cp -r #{bindings}/ruby/.libs/_xapian.bundle.dSYM lib"
-	else
-		system! "cp #{bindings}/ruby/.libs/_xapian.so lib"
-	end
+	system! "cp -r #{bindings}/ruby/.libs/_xapian.* lib"
 	system! "cp #{bindings}/ruby/xapian.rb lib"
 end

data/lib/xapian.rb

@@ -5,6 +5,7 @@
 #
 # Copyright (C) 2006 Networked Knowledge Systems, Inc.
 # Copyright (C) 2008 Olly Betts
+# Copyright (C) 2010 Richard Boulton
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -102,7 +103,6 @@ module Xapian
       return other.is_a?(Xapian::Match) && other.docid == @docid && other.rank == @rank && 
         other.weight == @weight && other.collapse_count == @collapse_count && other.percent == @percent
     end
-
   end # class Xapian::Match
 
   # Ruby wrapper for an ExpandTerm, i.e. a Xapian::ESetIterator in C++
@@ -124,18 +124,22 @@ module Xapian
 
   # Ruby wrapper for Xapian::ValueIterator
   class Xapian::Value
-    attr_accessor :value, :valueno
+    attr_accessor :value, :valueno, :docid
     
-    def initialize(value, valueno)
+    def initialize(value, valueno, docid)
       @value = value
       @valueno = valueno
+      @docid = docid
     end # initialize
 
     def ==(other)
-      return other.is_a?(Xapian::Value) && other.value == @value && other.valueno == @valueno
+      return other.is_a?(Xapian::Value) && other.value == @value && other.valueno == @valueno && other.docid == @docid
     end
   end # Xapian::Value
 
+  # Refer to the
+  # {Xapian::Document C++ API documentation}[http://xapian.org/docs/apidoc/html/classXapian_1_1Document.html]
+  # for methods not specific to Ruby.
   #--
   # Extend Xapian::Document with a nice wrapper for its nasty input_iterators
   class Xapian::Document
@@ -147,12 +151,15 @@ module Xapian
 
     def values
       Xapian._safelyIterate(self._dangerous_values_begin(), self._dangerous_values_end()) { |item|
-        Xapian::Value.new(item.value, item.valueno)
+        Xapian::Value.new(item.value, item.valueno, 0)
       }
     end # terms
 
   end # class Xapian::Document
 
+  # Refer to the
+  # {Xapian::Query C++ API documentation}[http://xapian.org/docs/apidoc/html/classXapian_1_1Query.html]
+  # for methods not specific to Ruby.
   #--
   # Extend Xapian::Query with a nice wrapper for its dangerous iterators
   class Xapian::Query
@@ -164,6 +171,9 @@ module Xapian
     end
   end # Xapian::Query
 
+  # Refer to the
+  # {Xapian::Enquire C++ API documentation}[http://xapian.org/docs/apidoc/html/classXapian_1_1Enquire.html]
+  # for methods not specific to Ruby.
   #--
   # Extend Xapian::Enquire with a nice wrapper for its dangerous iterators
   class Xapian::Enquire
@@ -177,6 +187,10 @@ module Xapian
     end
   end # Xapian::Enquire
 
+  # Refer to the
+  # {Xapian::MSet C++ API documentation}[http://xapian.org/docs/apidoc/html/classXapian_1_1MSet.html]
+  # for methods not specific to Ruby.
+  #--
   # MSetIterators are not dangerous, just inconvenient to use within a Ruby
   # programming idiom. So we wrap them.
   class Xapian::MSet
@@ -189,6 +203,10 @@ module Xapian
     end # matches
   end # Xapian::MSet
 
+  # Refer to the
+  # {Xapian::ESet C++ API documentation}[http://xapian.org/docs/apidoc/html/classXapian_1_1ESet.html]
+  # for methods not specific to Ruby.
+  #--
   # ESetIterators are not dangerous, just inconvenient to use within a Ruby
   # programming idiom. So we wrap them.
   class Xapian::ESet
@@ -221,8 +239,11 @@ module Xapian
     end
   end # Xapian::Posting
 
+  # Refer to the
+  # {Xapian::Database C++ API documentation}[http://xapian.org/docs/apidoc/html/classXapian_1_1Database.html]
+  # for methods not specific to Ruby.
   #--
-  # Wrap some dangerous iterators..
+  # Wrap some dangerous iterators.
   class Xapian::Database
     # Returns an Array of all Xapian::Terms for this database.
     def allterms
@@ -249,7 +270,6 @@ module Xapian
       }
     end # termlist(docid)
     
-
     # Returns an Array of Xapian::Termpos objects for the given term (a String)
     # in the given docid.
     def positionlist(docid, term)
@@ -259,7 +279,37 @@ module Xapian
       }
     end # positionlist
 
+    # Returns an Array of Xapian::Value objects for the given slot in the
+    # database.
+    def valuestream(slot)
+      Xapian._safelyIterate(self._dangerous_valuestream_begin(slot),
+                            self._dangerous_valuestream_end(slot)) { |item|
+        Xapian::Value.new(item.value, slot, item.docid)
+      }
+    end # positionlist
   end # Xapian::Database
 
+  # Refer to the
+  # {Xapian::ValueCountMatchSpy C++ API documentation}[http://xapian.org/docs/apidoc/html/classXapian_1_1ValueCountMatchSpy.html]
+  # for methods not specific to Ruby.
+  #--
+  # Wrap some dangerous iterators.
+  class Xapian::ValueCountMatchSpy
+    # Returns an Array of all the values seen, in alphabetical order
+    def values()
+      Xapian._safelyIterate(self._dangerous_values_begin(),
+                            self._dangerous_values_end()) { |item|
+        Xapian::Term.new(item.term, 0, item.termfreq)
+      }
+    end # allterms
+
+    # Returns an Array of the top values seen, by frequency
+    def top_values(maxvalues)
+      Xapian._safelyIterate(self._dangerous_top_values_begin(maxvalues),
+                            self._dangerous_top_values_end(maxvalues)) { |item|
+        Xapian::Term.new(item.term, 0, item.termfreq)
+      }
+    end # allterms
+  end # Xapian::Database
 
 end # Xapian module

data/xapian-full.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xapian-full}
-  s.version = "1.1.3.4"
+  s.version = "1.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Adams", "Rich Lane"]
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   s.files = [
      "lib/xapian.rb",
      "Rakefile",
-     "xapian-bindings-1.1.3.tar.gz",
-     "xapian-core-1.1.3.tar.gz",
+     "xapian-bindings-1.2.3.tar.gz",
+     "xapian-core-1.2.3.tar.gz",
      "xapian-full.gemspec",
   ]
   s.rdoc_options = ["--charset=UTF-8"]

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: xapian-full
 version: !ruby/object:Gem::Version 
-  version: 1.1.3.4
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Tom Adams
@@ -25,8 +30,8 @@ extra_rdoc_files: []
 files: 
 - lib/xapian.rb
 - Rakefile
-- xapian-bindings-1.1.3.tar.gz
-- xapian-core-1.1.3.tar.gz
+- xapian-bindings-1.2.3.tar.gz
+- xapian-core-1.2.3.tar.gz
 - xapian-full.gemspec
 has_rdoc: true
 homepage: 
@@ -38,21 +43,25 @@ rdoc_options:
 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: 
-rubygems_version: 1.3.3
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: xapian-core + Ruby xapian-bindings