xapian-full-alaveteli 1.4.21.1 → 1.4.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6ef67e0f605e4de3de85ddbad1a537b988c7bebeff28ffe8440ecfbdfde19bc
-  data.tar.gz: ade0c4387305344c365911e16e946b66a15262116ea2dd7663ba93ac0a55414a
+  metadata.gz: f1c0941e0590e0e2e9f0e6c701b99711713a024e7d2ecf6f1eb8d97e089a2b05
+  data.tar.gz: 998d123ab9240557bce32e31650c5eff999e9982509a6434ce2daa91297b9d3a
 SHA512:
-  metadata.gz: 27c0de4998c0c70e7f987e5165d4ebb79b3f4fa49f48501e1255a2fd80871dbd368678f65b6ab696211c2db868bfa4be33bd041eb14f9836f675d0a70542ecf3
-  data.tar.gz: 8c9c667039e3a325fc8006b51d1363de4d1324651172e9f1a8d581ea67b57b4b67fe0251ce0bfb0e95d75cffeea4f55195de764b27ff5579a4e88a85b8bf8cad
+  metadata.gz: 61940c7d1804cda3510f117022d41c15dc376b43ad2c3fbf2b010c66e11c0428c07293a46549973618425265c644fdd9a3f8dc5e21e5e000ba1c6a905175110c
+  data.tar.gz: a43c46051ce26e6c2482f0701d976247e62d8321cda647cae9c2e47cef87e5323f463b972d5ef33c82d65f659e7d929fb405f9cedac8d3bacf9ad8d9602358f8

data/Rakefile

@@ -1,50 +1,52 @@
-require 'rbconfig'
-c = RbConfig::CONFIG
-
-begin
-    require 'bundler'
-    have_bundler = true
-rescue LoadError
-    have_bundler = false
+require 'mini_portile2'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'lib'
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
 end
 
-def system!(cmd)
-	puts cmd
-	system(cmd) or raise
+ver = '1.4.22'
+package_root_dir = Dir.pwd
+
+task :core do
+  MiniPortile.new("xapian-core", ver).tap do |recipe|
+    recipe.target = File.join(package_root_dir, 'ports')
+    recipe.files << {
+      url: "https://oligarchy.co.uk/xapian/#{ver}/xapian-core-#{ver}.tar.xz",
+      sha256: '05884af00b06702ce486057d62a3bfbe6606cf965ada0f5ea570b328a2fa1ea8'
+    }
+    recipe.configure_options = [] # removes MiniPortile defaults
+
+    unless File.exist?(File.join(recipe.target, recipe.host, recipe.name, recipe.version))
+      recipe.cook
+    end
+
+    recipe.activate
+  end
 end
 
-ver = '1.4.21'
-iter = '1'
-core = "xapian-core-#{ver}"
-bindings = "xapian-bindings-#{ver}"
-
-task :default do
-	[core,bindings].each do |x|
-		system! "tar -xJvf #{x}.tar.xz"
-	end
-
-	prefix = Dir.pwd
-
-	Dir.chdir core do
-		system! "./configure --prefix=#{prefix} --exec-prefix=#{prefix}"
-		system! "make clean all"
-		system! "make install"
-	end
-
-	Dir.chdir bindings do
-		ENV['RUBY'] ||= "#{c['bindir']}/#{c['RUBY_INSTALL_NAME']}"
-		ENV['XAPIAN_CONFIG'] = "#{prefix}/bin/xapian-config"
-		system! "./configure --prefix=#{prefix} --exec-prefix=#{prefix} --with-ruby"
-		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-#{ver}.#{iter}/lib'"
-		else
-			system! "make clean all"
-		end
-	end
-
-	system! "cp -RL #{bindings}/ruby/.libs/_xapian.* lib"
-	system! "cp #{bindings}/ruby/xapian.rb lib"
+task bindings: [:core] do
+  ENV['RUBY_LIB'] = ENV['RUBY_LIB_ARCH'] = File.join(__dir__, 'lib')
+
+  MiniPortile.new("xapian-bindings", ver).tap do |recipe|
+    recipe.target = File.join(package_root_dir, 'ports')
+    recipe.files << {
+      url: "https://oligarchy.co.uk/xapian/#{ver}/xapian-bindings-#{ver}.tar.xz",
+      sha256: '6b5454833ac52a3e32c0bb3a7290a5a2b50488d8918f2a45269557e4de9a31e5'
+    }
+    recipe.configure_options = ['--with-ruby']
+
+    unless File.exist?(File.join(recipe.target, recipe.host, recipe.name, recipe.version))
+      recipe.cook
+    end
+
+    recipe.activate
+  end
 end
 
+desc 'Compile all extensions'
+task compile: [:bindings]
+
+task default: [:compile]

data/xapian-full.gemspec

@@ -2,22 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xapian-full-alaveteli}
-  s.version = "1.4.21.1"
+  s.version = "1.4.22.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", "Sam Pearson"]
+  s.authors = ["Tom Adams", "Rich Lane", "Seb Bacon", "Alexey Pisarenko", "Louise Crow", "Ian Chard", "Sam Pearson", "Graeme Porteous"]
   s.homepage = %q{https://github.com/mysociety/xapian-full}
-  s.date = %q{2022-12-06}
+  s.date = %q{2023-02-02}
   s.description = %q{Xapian bindings for Ruby without dependency on system Xapian library}
   s.email = %q{mysociety@alaveteli.org}
   s.extensions = ["Rakefile"]
   s.files = [
-     "lib/xapian.rb",
      "Rakefile",
-     "xapian-bindings-1.4.21.tar.xz",
-     "xapian-core-1.4.21.tar.xz",
+     "ports/archives/xapian-bindings-1.4.22.tar.xz",
+     "ports/archives/xapian-core-1.4.22.tar.xz",
      "xapian-full.gemspec",
   ]
+  s.files += Dir.glob("patches/**/*")
+
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.required_ruby_version = ">= 2.7.0"
@@ -28,4 +29,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
   else
   end
+
+  s.add_dependency 'mini_portile2', '~> 2.8'
+  s.add_dependency 'rake', '~> 13.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xapian-full-alaveteli
 version: !ruby/object:Gem::Version
-  version: 1.4.21.1
+  version: 1.4.22.1
 platform: ruby
 authors:
 - Tom Adams
@@ -11,11 +11,40 @@ authors:
 - Louise Crow
 - Ian Chard
 - Sam Pearson
+- Graeme Porteous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
-dependencies: []
+date: 2023-02-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mini_portile2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 description: Xapian bindings for Ruby without dependency on system Xapian library
 email: mysociety@alaveteli.org
 executables: []
@@ -24,9 +53,8 @@ extensions:
 extra_rdoc_files: []
 files:
 - Rakefile
-- lib/xapian.rb
-- xapian-bindings-1.4.21.tar.xz
-- xapian-core-1.4.21.tar.xz
+- ports/archives/xapian-bindings-1.4.22.tar.xz
+- ports/archives/xapian-core-1.4.22.tar.xz
 - xapian-full.gemspec
 homepage: https://github.com/mysociety/xapian-full
 licenses: []

data/lib/xapian.rb

@@ -1,407 +0,0 @@
-# :title:Ruby Xapian bindings
-# =Ruby Xapian bindings
-#
-# Original version by Paul Legato (plegato@nks.net), 4/20/06.
-#
-# Copyright (C) 2006 Networked Knowledge Systems, Inc.
-# 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
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
-# USA
-#
-# ==Underscore methods
-# Note: Methods whose names start with an underscore character _ are internal
-# methods from the C++ API. Their functionality is not accessible in a
-# Ruby-friendly way, so this file provides wrapper code to make it easier to
-# use them from a Ruby programming idiom.  Most are also dangerous insofar as
-# misusing them can cause your program to segfault.  In particular, all of
-# Xapian's *Iterator classes are wrapped into nice Ruby-friendly Arrays.
-#
-# It should never be necessary to use any method whose name starts with an
-# underscore from user-level code. Make sure you are _VERY_ certain that you
-# know exactly what you're doing if you do use one of these methods. Beware.
-# You've been warned...
-#
-
-
-module Xapian
-  ######## load the SWIG-generated library
-  require '_xapian'
-
-
-  # iterate over two dangerous iterators (i.e. those that can cause segfaults
-  # if used improperly.)
-  # If block_given? then the results are fed to it one by one, otherwise the
-  # results are returned as an Array.
-  # Users should never need to use this method.
-  #
-  # wrapper is a lambda that returns some appropriate Ruby object to wrap the
-  # results from the underlying Iterator
-  def _safelyIterate(dangerousStart, dangerousEnd, wrapper) #:nodoc:
-    item = dangerousStart
-    if block_given?
-      while not item.equals(dangerousEnd) do
-        yield wrapper.call(item)
-        item.next()
-      end
-    else
-      retval = Array.new
-      while not item.equals(dangerousEnd) do
-        retval.push(wrapper.call(item))
-        item.next()
-      end
-      return retval
-    end
-  end # _safelyIterate
-  module_function :_safelyIterate
-
-  #--
-  ### safe Ruby wrapper for the dangerous C++ Xapian::TermIterator class
-  class Xapian::Term
-    attr_accessor :term, :wdf, :termfreq
-
-    def initialize(term, wdf=nil, termfreq=nil)
-      @term = term
-      @wdf = wdf
-      @termfreq = termfreq
-    end
-
-    def ==(other)
-      return other.is_a?(Xapian::Term) && other.term == @term && other.wdf == @wdf && other.termfreq == @termfreq
-    end
-  end # class Term
-
-  ### Ruby wrapper for a Match, i.e. a Xapian::MSetIterator (Match Set) in C++.
-  # it's no longer an iterator in the Ruby version, but we want to preserve its
-  # non-iterative data.
-  # (MSetIterator is not dangerous, but it is inconvenient to use from a Ruby
-  # idiom, so we wrap it..)
-  class Xapian::Match
-    attr_accessor :docid, :document, :rank, :weight, :collapse_count, :percent
-
-    def initialize(docid, document, rank, weight, collapse_count, percent)
-      @docid = docid
-      @document = document
-      @rank = rank
-      @weight = weight
-      @collapse_count = collapse_count
-      @percent = percent
-    end # initialize
-
-    def ==(other)
-      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++
-  # Not dangerous, but inconvenient to use from a Ruby programming idiom, so we
-  # wrap it.
-  class Xapian::ExpandTerm
-    attr_accessor :name, :weight
-
-    def initialize(name, weight)
-      @name = name
-      @weight = weight
-    end # initialize
-
-    def ==(other)
-      return other.is_a?(Xapian::ExpandTerm) && other.name == @name && other.weight == @weight
-    end
-
-  end # Xapian::ExpandTerm
-
-  # Ruby wrapper for Xapian::ValueIterator
-  class Xapian::Value
-    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 && 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
-    def terms(&block)
-      Xapian._safelyIterate(self._dangerous_termlist_begin(),
-                            self._dangerous_termlist_end(),
-                            lambda {
-                              |item| Xapian::Term.new(item.term, item.wdf)
-                            },
-                            &block)
-    end # terms
-
-    def values(&block)
-      Xapian._safelyIterate(self._dangerous_values_begin(),
-                            self._dangerous_values_end(),
-                            lambda {
-                              |item| Xapian::Value.new(item.value,
-                                                       item.valueno,
-                                                       0)
-                            },
-                            &block)
-    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
-    def terms(&block)
-      # termfreq is not supported by TermIterators from Queries
-      Xapian._safelyIterate(self._dangerous_terms_begin(),
-                            self._dangerous_terms_end(),
-                            lambda {
-                              |item| Xapian::Term.new(item.term, item.wdf)
-                            },
-                            &block)
-    end # terms
-
-    def unique_terms(&block)
-      # termfreq is not supported by TermIterators from Queries
-      Xapian._safelyIterate(self._dangerous_unique_terms_begin(),
-                            self._dangerous_unique_terms_end(),
-                            lambda {
-                              |item| Xapian::Term.new(item.term, item.wdf)
-                            },
-                            &block)
-    end # unique_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, &block)
-      Xapian._safelyIterate(self._dangerous_matching_terms_begin(document),
-                            self._dangerous_matching_terms_end(document),
-                            lambda { |item| Xapian::Term.new(item.term, item.wdf) },
-                            &block)
-    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(&block)
-      Xapian._safelyIterate(self._begin(),
-                            self._end(),
-                            lambda { |item| Xapian::Match.new(item.docid, item.document, item.rank, item.weight, item.collapse_count, item.percent) },
-                            &block)
-    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(&block)
-      # note: in the ExpandTerm wrapper, we implicitly rename
-      # ESetIterator#term() (defined in xapian-headers.i) to ExpandTerm#term()
-      Xapian._safelyIterate(self._begin(),
-                            self._end(),
-                            lambda { |item| Xapian::ExpandTerm.new(item.term, item.weight) },
-                            &block)
-    end # terms
-  end # Xapian::ESet
-
-
-  #--
-  # Wrapper for the C++ class Xapian::PostingIterator
-  class Xapian::Posting
-    attr_accessor :docid, :doclength, :wdf
-
-    def initialize(docid, doclength, wdf)
-      @docid = docid
-      @doclength = doclength
-      @wdf = wdf
-    end
-
-    def ==(other)
-      return other.is_a?(Xapian::Posting) && other.docid == @docid && other.doclength == @doclength &&
-        other.wdf == @wdf
-    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.
-  class Xapian::Database
-    # Returns an Array of all Xapian::Terms for this database.
-    def allterms(pref = '', &block)
-      Xapian._safelyIterate(self._dangerous_allterms_begin(pref),
-                            self._dangerous_allterms_end(pref),
-                            lambda { |item| Xapian::Term.new(item.term, 0, item.termfreq) },
-                            &block)
-    end # allterms
-
-    # Returns an Array of all metadata keys for this database.
-    def metadata_keys(pref = '', &block)
-      Xapian._safelyIterate(self._dangerous_metadata_keys_begin(pref),
-                            self._dangerous_metadata_keys_end(pref),
-                            lambda { |item| item.term },
-                            &block)
-    end # metadata_keys
-
-    # Returns an Array of Xapian::Postings for the given term.
-    # term is a string.
-    def postlist(term, &block)
-      Xapian._safelyIterate(self._dangerous_postlist_begin(term),
-                            self._dangerous_postlist_end(term),
-                            lambda { |item| Xapian::Posting.new(item.docid, item.doclength, item.wdf) },
-                            &block)
-    end # postlist(term)
-
-    # Returns an Array of Terms for the given docid.
-    def termlist(docid, &block)
-      Xapian._safelyIterate(self._dangerous_termlist_begin(docid),
-                            self._dangerous_termlist_end(docid),
-                            lambda { |item| Xapian::Term.new(item.term, item.wdf, item.termfreq) },
-                            &block)
-    end # termlist(docid)
-
-    # Returns an Array of term positions for the given term (a String)
-    # in the given docid.
-    def positionlist(docid, term, &block)
-      Xapian._safelyIterate(self._dangerous_positionlist_begin(docid, term),
-                            self._dangerous_positionlist_end(docid, term),
-                            lambda { |item| item.termpos },
-                            &block)
-    end # positionlist
-
-    # Returns an Array of Xapian::Value objects for the given slot in the
-    # database.
-    def valuestream(slot, &block)
-      Xapian._safelyIterate(self._dangerous_valuestream_begin(slot),
-                            self._dangerous_valuestream_end(slot),
-                            lambda { |item| Xapian::Value.new(item.value, slot, item.docid) },
-                            &block)
-    end # valuestream(slot)
-
-    # Returns an Array of Xapian::Term objects for the spelling dictionary.
-    def spellings(&block)
-      Xapian._safelyIterate(self._dangerous_spellings_begin(),
-                            self._dangerous_spellings_end(),
-                            lambda { |item| Xapian::Term.new(item.term, 0, item.termfreq) },
-                            &block)
-    end # spellings
-
-    # Returns an Array of synonyms of the given term.
-    def synonyms(term, &block)
-      Xapian._safelyIterate(self._dangerous_synonyms_begin(term),
-                            self._dangerous_synonyms_end(term),
-                            lambda { |item| item.term },
-                            &block)
-    end # synonyms
-
-    # Returns an Array of terms with synonyms.
-    def synonym_keys(&block)
-      Xapian._safelyIterate(self._dangerous_synonym_keys_begin(),
-                            self._dangerous_synonym_keys_end(),
-                            lambda { |item| item.term },
-                            &block)
-    end # synonym_keys
-  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(&block)
-      Xapian._safelyIterate(self._dangerous_values_begin(),
-                            self._dangerous_values_end(),
-                            lambda { |item| Xapian::Term.new(item.term, 0, item.termfreq) },
-                            &block)
-    end # values
-
-    # Returns an Array of the top values seen, by frequency
-    def top_values(maxvalues, &block)
-      Xapian._safelyIterate(self._dangerous_top_values_begin(maxvalues),
-                            self._dangerous_top_values_end(maxvalues),
-                            lambda { |item| Xapian::Term.new(item.term, 0, item.termfreq) },
-                            &block)
-    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(&block)
-      Xapian._safelyIterate(self._begin(),
-                            self._end(),
-                            lambda { |item| item.get_coord() },
-                            &block)
-    end # allterms
-  end # Xapian::LatLongCoords
-
-  class Xapian::QueryParser
-    # Returns an Array of all words in the query ignored as stopwords.
-    def stoplist(&block)
-      Xapian._safelyIterate(self._dangerous_stoplist_begin(),
-                            self._dangerous_stoplist_end(),
-                            lambda { |item| item.term },
-                            &block)
-    end # stoplist
-
-    # Returns an Array of all words in the query which stem to a given term.
-    def unstem(term, &block)
-      Xapian._safelyIterate(self._dangerous_unstem_begin(term),
-                            self._dangerous_unstem_end(term),
-                            lambda { |item| item.term },
-                            &block)
-    end # unstem
-  end # Xapian::QueryParser
-
-  # 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