rroonga 7.1.1 → 9.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f0ff170aa9082bbfb76dec6278fdf8e73e63d27b
-  data.tar.gz: 036da819743397109b89e4bf03c08083bf006cdc
+SHA256:
+  metadata.gz: 43bad421fe95e5e2fc151ec07685791eea3af24391b3f304bed7edaf4a134322
+  data.tar.gz: c7f44d05c376ad9db717da49587255566196ddbfb35704355dbe7f623fb86248
 SHA512:
-  metadata.gz: 1803d21a06243393ec418481e630b190d1b28cbb027fa10d9204967a4af8502ae9cb30ed25ce4acf578fbe62f924cc3fed8be2d6394b6b2e279808f41491c4a0
-  data.tar.gz: 286a503c57d6c6a82f625fcb893f03bba784020b465b335115c24b28474ea99612868ff4b827f108cb77c23118677a785b4762d31ee40fb98f8ff8cfade16999
+  metadata.gz: b336ca9f19ae221c6a67e9b33b36abdcd5df013f8bfbebc3c90394e4c1c67ef9086634357688779122cd528f0266e994ab7e76402fbf5bcfd0fc32adc9e1f027
+  data.tar.gz: 6b08a37322b308430e92e8f2878fde3c537b658eeb79f96199c782f95d4225e0cde3483b9ece46fd71423a03afab986fc765f676354ec4f2b269a495c0a283f7

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- coding: utf-8; mode: ruby -*-
 #
-# Copyright (C) 2009-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2019  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2017  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -132,7 +132,7 @@ task :configure => "Makefile"
 
 desc "Run test"
 task :test => :configure do
-  ruby("-rubygems", "test/run-test.rb")
+  ruby("test/run-test.rb")
 end
 
 namespace :test do
@@ -143,7 +143,7 @@ namespace :test do
     gem_spec = Gem.source_index.find_name("rroonga").last
     installed_path = gem_spec.full_gem_path
     ENV["NO_MAKE"] = "yes"
-    ruby("-rubygems", "#{installed_path}/test/run-test.rb")
+    ruby("#{installed_path}/test/run-test.rb")
   end
 end
 

data/doc/text/news.md

@@ -1,5 +1,27 @@
 # NEWS
 
+## 9.0.2: 2019-05-10 {#version-9-0-2}
+
+### Improvements
+
+  * Disable groonga-httpd by default.
+
+  * Added support for "--with-groonga-configure-options".
+    [GitHub#146][Reported by Tomás Pollak]
+
+  * {Groonga::RegexpExpressionBuilder}: Added support (?-mix:XXX) for searching of regular expression.
+    [groonga-dev,04694][Reported by Masatoshi SEKI]
+
+  * Use "groonga-latest.tar.gz" for build Groonga.
+
+  * {Groonga::Schema#create_lexicon}: Added.
+
+### Thanks
+
+  * Tomás Pollak
+
+  * Masatoshi SEKI
+
 ## 7.1.1: 2018-01-30 {#version-7-1-1}
 
 ### Improvements

data/ext/groonga/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2009-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2019  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -64,14 +64,14 @@ checking_for(checking_message("Win32 OS")) do
   win32
 end
 
-def install_groonga_locally(major, minor, micro)
+def install_groonga_locally
   FileUtils.mkdir_p(local_groonga_base_dir)
 
   Dir.chdir(local_groonga_base_dir) do
     if win32?
-      extract_groonga_win32_binary(major, minor, micro)
+      extract_groonga_win32_binary
     else
-      build_groonga(major, minor, micro)
+      build_groonga
     end
   end
 
@@ -118,20 +118,22 @@ rescue LoadError
   end
 end
 
-def extract_groonga_win32_binary(major, minor, micro)
+def extract_groonga_win32_binary
   if ENV["RROONGA_USE_GROONGA_X64"]
     architecture = "x64"
   else
     architecture = "x86"
   end
-  zip = "groonga-#{major}.#{minor}.#{micro}-#{architecture}.zip"
-  url = "http://packages.groonga.org/windows/groonga/#{zip}"
+  zip = "groonga-latest-#{architecture}.zip"
+  url = "https://packages.groonga.org/windows/groonga/#{zip}"
   install_dir = local_groonga_install_dir
 
   download(url)
 
   message("extracting...")
+  before_paths = Dir.glob("*")
   extract_zip(zip, ".")
+  extracted_dir = (Dir.glob("*") - before_paths).first
   message(" done\n")
 
   if File.exist?(install_dir)
@@ -141,7 +143,7 @@ def extract_groonga_win32_binary(major, minor, micro)
   end
 
   message("installing...")
-  FileUtils.mv(File.basename(zip, ".zip"), install_dir)
+  FileUtils.mv(extracted_dir, install_dir)
   message(" done\n")
 
   message("removing binary archive...")
@@ -162,16 +164,20 @@ end
 def configure_command_line(prefix)
   command_line = ["./configure"]
   debug_build_p = ENV["RROONGA_DEBUG_BUILD"] == "yes"
-  debug_flags = ["CFLAGS=-g3 -O0", "CXXFLAGS=-g3 -O0"]
-  command_line.concat(debug_flags) if debug_build_p
+  command_line.concat("--enable-debug") if debug_build_p
   command_line << "--prefix=#{prefix}"
   command_line << "--disable-static"
   command_line << "--disable-document"
   command_line << "--disable-benchmark"
+  command_line << "--disable-groonga-httpd"
   command_line << "--without-cutter"
   escaped_command_line = command_line.collect do |command|
     Shellwords.escape(command)
   end
+  custom_command_line_options = with_config("groonga-configure-options")
+  if custom_command_line_options.is_a?(String)
+    escaped_command_line << custom_command_line_options
+  end
   escaped_command_line.join(" ")
 end
 
@@ -210,7 +216,7 @@ def install_for_gnu_build_system(install_dir)
               "#{make} install")
 end
 
-def build_groonga_from_git(major, minor, micro)
+def build_groonga_from_git
   message("removing old cloned repository...")
   FileUtils.rm_rf("groonga")
   message(" done\n")
@@ -230,21 +236,24 @@ def build_groonga_from_git(major, minor, micro)
   message(" done\n")
 end
 
-def build_groonga_from_tar_gz(major, minor, micro)
-  tar_gz = "groonga-#{major}.#{minor}.#{micro}.tar.gz"
-  url = "http://packages.groonga.org/source/groonga/#{tar_gz}"
+def build_groonga_from_tar_gz
+  tar_gz = "groonga-latest.tar.gz"
+  url = "https://packages.groonga.org/source/groonga/#{tar_gz}"
+  groonga_source_dir = "groonga-latest"
 
   download(url)
 
+  FileUtils.rm_rf(groonga_source_dir)
+  FileUtils.mkdir_p(groonga_source_dir)
+
   message("extracting...")
-  if xsystem("tar xfz #{tar_gz}")
+  if xsystem("tar xfz #{tar_gz} -C #{groonga_source_dir} --strip-components=1")
     message(" done\n")
   else
     message(" failed\n")
     exit(false)
   end
 
-  groonga_source_dir = "groonga-#{major}.#{minor}.#{micro}"
   Dir.chdir(groonga_source_dir) do
     install_for_gnu_build_system(local_groonga_install_dir)
   end
@@ -258,23 +267,17 @@ def build_groonga_from_tar_gz(major, minor, micro)
   message(" done\n")
 end
 
-def build_groonga(major, minor, micro)
+def build_groonga
   if RequiredGroongaVersion::RELEASED_DATE > Time.now
-    build_groonga_from_git(major, minor, micro)
+    build_groonga_from_git
   else
-    build_groonga_from_tar_gz(major, minor, micro)
+    build_groonga_from_tar_gz
   end
 end
 
 def install_local_groonga(package_name, major, minor, micro)
   unless have_local_groonga?(package_name, major, minor, micro)
-    required_version = [major, minor, micro]
-    if (required_version <=> LatestGroongaVersion::VERSION) < 0
-      target_version = LatestGroongaVersion::VERSION
-    else
-      target_version = required_version
-    end
-    install_groonga_locally(*target_version)
+    install_groonga_locally
   end
   unless PKGConfig.have_package(package_name, major, minor, micro)
     exit(false)

data/ext/groonga/rb-grn.h

@@ -97,9 +97,9 @@ RB_GRN_BEGIN_DECLS
 #  define debug(...)
 #endif
 
-#define RB_GRN_MAJOR_VERSION 7
-#define RB_GRN_MINOR_VERSION 1
-#define RB_GRN_MICRO_VERSION 1
+#define RB_GRN_MAJOR_VERSION 9
+#define RB_GRN_MINOR_VERSION 0
+#define RB_GRN_MICRO_VERSION 2
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))

data/lib/groonga/expression-builder.rb

@@ -186,7 +186,7 @@ module Groonga
         end
 
         if other.is_a?(Regexp)
-          RegexpExpressionBuilder.new(self, normalize(other.source))
+          RegexpExpressionBuilder.new(self, normalize(other.to_s))
         else
           MatchExpressionBuilder.new(self, normalize(other))
         end

data/lib/groonga/schema.rb

@@ -672,6 +672,19 @@ module Groonga
       @definitions << definition
     end
 
+    def create_lexicon(name,
+                       use_case: :full_text_search,
+                       **options, &block)
+      case use_case
+      when :full_text_search
+        options[:type] ||= :patricia_trie
+        options[:key_type] ||= :short_text
+        options[:default_tokenizer] ||= "TokenBigram"
+        options[:normalizer] ||= "NormalizerAuto"
+      end
+      create_table(name, options, &block)
+    end
+
     # 名前が _name_ のテーブルを削除する。
     #
     # テーブルの削除は# {define} を呼び出すまでは実行されないこ

data/rroonga-build.rb

@@ -16,18 +16,11 @@
 
 module RroongaBuild
   module RequiredGroongaVersion
-    MAJOR = 7
-    MINOR = 1
-    MICRO = 1
-    VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2018, 1, 29)
-  end
-
-  module LatestGroongaVersion
-    MAJOR = 7
-    MINOR = 1
-    MICRO = 1
+    MAJOR = 9
+    MINOR = 0
+    MICRO = 2
     VERSION = [MAJOR, MINOR, MICRO]
+    RELEASED_DATE = Time.utc(2019, 4, 29)
   end
 
   module_function

data/test/test-expression-builder.rb

@@ -326,6 +326,14 @@ class ExpressionBuilderTest < Test::Unit::TestCase
         assert_equal(["suzuki"],
                      result.collect {|record| record.key.key}.sort)
       end
+
+      def test_option
+        result = @users.select do |record|
+          record["name"] =~ /Su/i
+        end
+        assert_equal(["suzuki"],
+                     result.collect {|record| record.key.key}.sort)
+      end
     end
 
     class QueryStringTest < self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 9.0.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -196,8 +196,8 @@ email:
 executables:
 - grntest-log-analyze
 - groonga-database-inspect
-- grndump
 - groonga-index-dump
+- grndump
 extensions:
 - ext/groonga/extconf.rb
 extra_rdoc_files:
@@ -413,80 +413,79 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Groonga that provide full text search and column store
   features.
 test_files:
-- test/test-context.rb
-- test/test-normalizer.rb
 - test/test-double-array-trie.rb
+- test/test-error-message.rb
 - test/test-token-regexp.rb
+- test/test-encoding.rb
+- test/test-context.rb
+- test/test-schema-dumper.rb
+- test/test-data-column.rb
+- test/test-lock-timeout.rb
+- test/test-convert.rb
+- test/test-memory-pool.rb
+- test/test-index-column.rb
+- test/test-exception.rb
+- test/test-table.rb
+- test/run-test.rb
+- test/test-flushable.rb
+- test/test-variable-size-column.rb
+- test/test-table-select-mecab.rb
 - test/test-remote.rb
+- test/test-array.rb
+- test/test-table-select-normalize.rb
+- test/test-geo-point.rb
+- test/test-logger.rb
 - test/test-expression.rb
-- test/test-schema-dumper.rb
-- test/test-patricia-trie.rb
-- test/test-table-group.rb
-- test/test-table-select.rb
-- test/test-encoding.rb
+- test/test-procedure.rb
+- test/test-fix-size-column.rb
+- test/test-id.rb
 - test/test-windows-event-logger.rb
-- test/test-plugin.rb
-- test/test-table-select-normalize.rb
-- test/test-hash.rb
-- test/test-gqtp.rb
-- test/test-table-dumper.rb
-- test/test-data-column.rb
-- test/test-pagination.rb
-- test/test-column.rb
-- test/test-table-traverse.rb
-- test/test-default-cache.rb
+- test/test-schema-type.rb
+- test/test-table-select-weight.rb
+- test/test-accessor.rb
 - test/test-type.rb
-- test/test-package-label.rb
-- test/groonga-test-utils.rb
-- test/test-thread.rb
-- test/test-procedure.rb
+- test/test-hash.rb
+- test/test-patricia-trie.rb
 - test/test-query-logger.rb
-- test/test-index-column.rb
+- test/test-record.rb
+- test/test-column.rb
 - test/test-vector-column.rb
-- test/test-fix-size-column.rb
-- test/test-error-message.rb
-- test/test-operator.rb
-- test/test-database-dumper.rb
-- test/run-test.rb
-- test/test-column-cache.rb
-- test/test-index-cursor.rb
-- test/test-schema-type.rb
+- test/test-variable.rb
+- test/test-table-group.rb
+- test/test-table-offset-and-limit.rb
+- test/test-default-cache.rb
+- test/test-normalizer.rb
+- test/test-table-key-support.rb
+- test/test-name.rb
 - test/test-database.rb
-- test/test-id.rb
-- test/test-request-canceler.rb
-- test/test-logger.rb
-- test/test-table.rb
-- test/test-record.rb
 - test/test-version.rb
-- test/test-table-select-mecab.rb
-- test/test-lock-timeout.rb
-- test/test-table-select-weight.rb
-- test/test-geo-point.rb
-- test/test-array.rb
-- test/test-request-timer.rb
+- test/test-pagination.rb
+- test/test-database-inspector.rb
 - test/test-sub-records.rb
+- test/test-gqtp.rb
+- test/test-request-canceler.rb
+- test/test-table-traverse.rb
+- test/test-expression-builder.rb
+- test/test-operator.rb
+- test/test-table-dumper.rb
+- test/test-package-label.rb
+- test/test-plugin.rb
+- test/test-database-dumper.rb
+- test/test-snippet.rb
+- test/test-table-arrow.rb
 - test/test-schema-create-table.rb
-- test/test-name.rb
+- test/groonga-test-utils.rb
+- test/test-thread.rb
 - test/test-schema.rb
-- test/test-command-select.rb
-- test/test-expression-builder.rb
-- test/test-convert.rb
-- test/test-memory-pool.rb
-- test/test-flushable.rb
-- test/test-table-offset-and-limit.rb
-- test/test-exception.rb
-- test/test-variable-size-column.rb
+- test/test-request-timer.rb
+- test/test-index-cursor.rb
+- test/test-column-cache.rb
 - test/test-config.rb
-- test/test-table-key-support.rb
-- test/test-table-arrow.rb
-- test/test-database-inspector.rb
-- test/test-variable.rb
-- test/test-snippet.rb
-- test/test-accessor.rb
+- test/test-command-select.rb
+- test/test-table-select.rb