xapian-full-alaveteli 1.2.21.1 → 1.4.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 83e17987efda22977dd6d06e033aa6fc02eed954
-  data.tar.gz: f7ba1616141e4f721dca2161bbe11fc7e6a5e51d
+SHA256:
+  metadata.gz: aa0e74a5c6a9b94919b5a4422e5d67a9c4b8dd9c7efbe77d6a2055046b127fe0
+  data.tar.gz: 5aebc6cfd88c95a0cf2411fb7f60d4fe969e1c19342e1fd5cf80773bba5391b2
 SHA512:
-  metadata.gz: eeaf4c1544774b467821fc3a0455f2adc03c6b77ec0807309e5ce18a8a3291b99a25a0b07e6cd0bd3c56f6908a552b495f9c850bbf5721f3eca056f829f15f81
-  data.tar.gz: 1323d867c47a5ad35ae29903ab7c667b197860bceaac364cd17edb56c883afecbc5b614d2a12c7d11d1f7fab2996c35ff71025a920f0e19a1d9d109a26040ffc
+  metadata.gz: d0a5c64ef8a9828b18f1a9f8b8bad96546098fa1763915d3c3d425ea85f11c8eb8c2676b12001e15c7ed1a135d769ef863cebddca6562613c24f3fcc3a0cd6c3
+  data.tar.gz: f852a60d3e923c1f82be28c66155951eb2c191aaa3441d2716fe70c130b03be356bff0fb953553829677fd7972aee8c3f23c1fb616fc3695f35ac058561d2ab8

data/Rakefile

@@ -13,7 +13,7 @@ def system!(cmd)
 	system(cmd) or raise
 end
 
-ver = '1.2.21'
+ver = '1.4.11'
 core = "xapian-core-#{ver}"
 bindings = "xapian-bindings-#{ver}"
 
@@ -37,7 +37,7 @@ task :default do
 		if have_bundler
 			# Maybe Bundler is building us in a temporary directory, and will move us to
 			# the system ruby gems directory once built.
-			system! "make clean all LDFLAGS='-R#{Bundler.rubygems.gem_dir}/gems/xapian-full-alaveteli-1.2.21.1/lib'"
+			system! "make clean all LDFLAGS='-R#{Bundler.rubygems.gem_dir}/gems/xapian-full-alaveteli-1.4.11.1/lib'"
 		else
 			system! "make clean all"
 		end

data/lib/xapian.rb

@@ -4,7 +4,8 @@
 # Original version by Paul Legato (plegato@nks.net), 4/20/06.
 #
 # Copyright (C) 2006 Networked Knowledge Systems, Inc.
-# Copyright (C) 2008 Olly Betts
+# Copyright (C) 2008,2011,2019 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
@@ -50,17 +51,17 @@ module Xapian
   # underlying Iterator
   def _safelyIterate(dangerousStart, dangerousEnd) #:nodoc:
     retval = Array.new
-    
+
     item = dangerousStart
     lastTerm = dangerousEnd
-    
+
     return retval if dangerousStart.equals(dangerousEnd)
 
-    begin      
+    begin
       retval.push(yield(item))
       item.next()
-    end while not item.equals(lastTerm) # must use primitive C++ comparator 
-    
+    end while not item.equals(lastTerm) # must use primitive C++ comparator
+
     return retval
   end # _safelyIterate
   module_function :_safelyIterate
@@ -86,7 +87,7 @@ module Xapian
   # non-iterative data.
   # (MSetIterator is not dangerous, but it is inconvenient to use from a Ruby
   # idiom, so we wrap it..)
-  class Xapian::Match     
+  class Xapian::Match
     attr_accessor :docid, :document, :rank, :weight, :collapse_count, :percent
 
     def initialize(docid, document, rank, weight, collapse_count, percent)
@@ -99,10 +100,9 @@ module Xapian
     end # initialize
 
     def ==(other)
-      return other.is_a?(Xapian::Match) && other.docid == @docid && other.rank == @rank && 
+      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
-    
-    def initialize(value, valueno)
+    attr_accessor :value, :valueno, :docid
+
+    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}[https://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 # values
 
   end # class Xapian::Document
 
+  # Refer to the
+  # {Xapian::Query C++ API documentation}[https://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
@@ -161,27 +168,34 @@ module Xapian
         Xapian::Term.new(item.term, item.wdf)
         # termfreq is not supported by TermIterators from Queries
       }
-    end
+    end # terms
   end # Xapian::Query
 
+  # Refer to the
+  # {Xapian::Enquire C++ API documentation}[https://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
     # Get matching terms for some document.
     # document can be either a Xapian::DocID or a Xapian::MSetIterator
     def matching_terms(document)
-      Xapian._safelyIterate(self._dangerous_matching_terms_begin(document), 
+      Xapian._safelyIterate(self._dangerous_matching_terms_begin(document),
                             self._dangerous_matching_terms_end(document)) { |item|
         Xapian::Term.new(item.term, item.wdf)
       }
-    end
+    end # matching_terms
   end # Xapian::Enquire
 
+  # Refer to the
+  # {Xapian::MSet C++ API documentation}[https://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
     def matches
-      Xapian._safelyIterate(self._begin(), 
+      Xapian._safelyIterate(self._begin(),
                             self._end()) { |item|
         Xapian::Match.new(item.docid, item.document, item.rank, item.weight, item.collapse_count, item.percent)
       }
@@ -189,14 +203,18 @@ module Xapian
     end # matches
   end # Xapian::MSet
 
+  # Refer to the
+  # {Xapian::ESet C++ API documentation}[https://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
     def terms
-      Xapian._safelyIterate(self._begin(), 
+      Xapian._safelyIterate(self._begin(),
                             self._end()) { |item|
 	# note: in the ExpandTerm wrapper, we implicitly rename
-	# ESetIterator#term() (defined in xapian.i) to ExpandTerm#term()
+	# ESetIterator#term() (defined in xapian-headers.i) to ExpandTerm#term()
         Xapian::ExpandTerm.new(item.term, item.weight)
       }
 
@@ -221,13 +239,16 @@ module Xapian
     end
   end # Xapian::Posting
 
+  # Refer to the
+  # {Xapian::Database C++ API documentation}[https://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
-      Xapian._safelyIterate(self._dangerous_allterms_begin(), 
-                            self._dangerous_allterms_end()) { |item|
+    def allterms(pref = '')
+      Xapian._safelyIterate(self._dangerous_allterms_begin(pref),
+                            self._dangerous_allterms_end(pref)) { |item|
         Xapian::Term.new(item.term, 0, item.termfreq)
       }
     end # allterms
@@ -235,10 +256,10 @@ module Xapian
     # Returns an Array of Xapian::Postings for the given term.
     # term is a string.
     def postlist(term)
-      Xapian._safelyIterate(self._dangerous_postlist_begin(term), 
+      Xapian._safelyIterate(self._dangerous_postlist_begin(term),
                             self._dangerous_postlist_end(term)) { |item|
         Xapian::Posting.new(item.docid, item.doclength, item.wdf)
-      }      
+      }
     end # postlist(term)
 
     # Returns an Array of Terms for the given docid.
@@ -248,7 +269,6 @@ module Xapian
         Xapian::Term.new(item.term, item.wdf, item.termfreq)
       }
     end # termlist(docid)
-    
 
     # Returns an Array of Xapian::Termpos objects for the given term (a String)
     # in the given docid.
@@ -259,7 +279,58 @@ 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 # valuestream(slot)
   end # Xapian::Database
 
+  # Refer to the
+  # {Xapian::ValueCountMatchSpy C++ API documentation}[https://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 # values
+
+    # 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 # top_values
+  end # Xapian::Database
+
+  # Refer to the
+  # {Xapian::LatLongCoords C++ API documentation}[https://xapian.org/docs/apidoc/html/classXapian_1_1LatLongCoords.html]
+  # for methods not specific to Ruby.
+  #--
+  # Wrap some dangerous iterators.
+  class Xapian::LatLongCoords
+    # Returns an Array of all the values seen, in alphabetical order
+    def all()
+      Xapian._safelyIterate(self._begin(),
+                            self._end()) { |item|
+        item.get_coord()
+      }
+    end # allterms
+  end # Xapian::LatLongCoords
+
+  # Compatibility wrapping for Xapian::BAD_VALUENO (wrapped as a constant since
+  # xapian-bindings 1.4.10).
+  def Xapian::BAD_VALUENO()
+    return Xapian::BAD_VALUENO
+  end
 
 end # Xapian module

data/xapian-full.gemspec

@@ -2,24 +2,25 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xapian-full-alaveteli}
-  s.version = "1.2.21.1"
+  s.version = "1.4.11.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tom Adams", "Rich Lane", "Seb Bacon", "Alexey Pisarenko", "Louise Crow", "Ian Chard"]
-  s.date = %q{2015-06-17}
+  s.authors = ["Tom Adams", "Rich Lane", "Seb Bacon", "Alexey Pisarenko", "Louise Crow", "Ian Chard", "Sam Pearson"]
+  s.homepage = %q{https://github.com/mysociety/xapian-full}
+  s.date = %q{2020-05-20}
   s.description = %q{Xapian bindings for Ruby without dependency on system Xapian library}
-  s.email = %q{louise@mysociety.org}
+  s.email = %q{mysociety@alaveteli.org}
   s.extensions = ["Rakefile"]
   s.files = [
      "lib/xapian.rb",
      "Rakefile",
-     "xapian-bindings-1.2.21.tar.xz",
-     "xapian-core-1.2.21.tar.xz",
+     "xapian-bindings-1.4.11.tar.xz",
+     "xapian-core-1.4.11.tar.xz",
      "xapian-full.gemspec",
   ]
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.required_ruby_version = ">= 2.1.0"
   s.summary = %q{xapian-core + Ruby xapian-bindings}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xapian-full-alaveteli
 version: !ruby/object:Gem::Version
-  version: 1.2.21.1
+  version: 1.4.11.1
 platform: ruby
 authors:
 - Tom Adams
@@ -10,13 +10,14 @@ authors:
 - Alexey Pisarenko
 - Louise Crow
 - Ian Chard
+- Sam Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies: []
 description: Xapian bindings for Ruby without dependency on system Xapian library
-email: louise@mysociety.org
+email: mysociety@alaveteli.org
 executables: []
 extensions:
 - Rakefile
@@ -24,30 +25,29 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - lib/xapian.rb
-- xapian-bindings-1.2.21.tar.xz
-- xapian-core-1.2.21.tar.xz
+- xapian-bindings-1.4.11.tar.xz
+- xapian-core-1.4.11.tar.xz
 - xapian-full.gemspec
-homepage: 
+homepage: https://github.com/mysociety/xapian-full
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 3
 summary: xapian-core + Ruby xapian-bindings