rroonga 9.0.2 → 10.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43bad421fe95e5e2fc151ec07685791eea3af24391b3f304bed7edaf4a134322
-  data.tar.gz: c7f44d05c376ad9db717da49587255566196ddbfb35704355dbe7f623fb86248
+  metadata.gz: f2dda7dccd26063c5e82e93255c933215a21a37e0c31838eec124b3f12ce3892
+  data.tar.gz: 472fed29e2ba91ff00dd71981ff59a6866c9a292ea7ac83dc5881bd1069536e1
 SHA512:
-  metadata.gz: b336ca9f19ae221c6a67e9b33b36abdcd5df013f8bfbebc3c90394e4c1c67ef9086634357688779122cd528f0266e994ab7e76402fbf5bcfd0fc32adc9e1f027
-  data.tar.gz: 6b08a37322b308430e92e8f2878fde3c537b658eeb79f96199c782f95d4225e0cde3483b9ece46fd71423a03afab986fc765f676354ec4f2b269a495c0a283f7
+  metadata.gz: 0f4c1aa03b1efc04321588d3dfac9a208dafc35c2a1a84724e47a035a1a3eb7cabeaa6d58655fe6e324c1fbfa706812a5c0cdb817686cbde2a947659c3231c76
+  data.tar.gz: fe41f7d510f5ddb1cdd88a8d6de87d477f0f45714f09691b01b2a750bd89c31dd2a60ae334f15e216bfa4fa7752f10f765112efce4c75ecd7084a42b27af837f

data/.yardopts

@@ -1,6 +1,7 @@
 --output-dir doc/reference/en
 --markup markdown
 --markup-provider kramdown
+--asset doc/images:images
 lib/**/*.rb
 ext/**/*.c
 -

data/Rakefile

@@ -1,6 +1,6 @@
-# -*- coding: utf-8; mode: ruby -*-
+# -*- ruby -*-
 #
-# Copyright (C) 2009-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2017  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -16,15 +16,9 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "find"
-require "fileutils"
-require "shellwords"
-require "pathname"
-require "erb"
-require "yard"
 require "bundler/gem_helper"
-require "rake/extensiontask"
 require "packnga"
+require "yard"
 
 base_dir = File.join(File.dirname(__FILE__))
 
@@ -52,73 +46,6 @@ Packnga::ReleaseTask.new(spec) do |task|
   task.index_html_dir = ranguba_org_dir
 end
 
-module YARD
-  module CodeObjects
-    class Proxy
-      alias_method :initialize_original, :initialize
-      def initialize(namespace, name, type=nil)
-        name = name.to_s.gsub(/\AGrn(.*)\z/) do
-          suffix = $1
-          case suffix
-          when ""
-            "Groonga"
-          when "TableKeySupport"
-            "Groonga::Table::KeySupport"
-          else
-            "Groonga::#{suffix}"
-          end
-        end
-        initialize_original(namespace, name, type)
-      end
-    end
-  end
-end
-
-def windows?(platform=nil)
-  platform ||= RUBY_PLATFORM
-  platform =~ /mswin(?!ce)|mingw|cygwin|bccwin/
-end
-
-def collect_binary_files(binary_dir)
-  binary_files = []
-  Find.find(binary_dir) do |name|
-    next unless File.file?(name)
-    next if /\.zip\z/i =~ name
-    binary_files << name
-  end
-  binary_files
-end
-
-def windows_gem_name(spec, architecture)
-  "#{spec.name}-#{spec.version}-#{architecture}-mingw32.gem"
-end
-
-relative_vendor_dir = "vendor"
-relative_binary_dir = File.join("vendor", "local")
-vendor_dir = File.join(base_dir, relative_vendor_dir)
-binary_dir = File.join(base_dir, relative_binary_dir)
-
-groonga_win32_i386_p = ENV["RROONGA_USE_GROONGA_X64"].nil?
-
-Rake::ExtensionTask.new("groonga", spec) do |ext|
-  if groonga_win32_i386_p
-    ext.cross_platform = ["x86-mingw32"]
-  else
-    ext.cross_platform = ["x64-mingw32"]
-  end
-  if windows?
-    ext.gem_spec.files += collect_binary_files(relative_binary_dir)
-  else
-    ext.cross_compile = true
-    ext.cross_compiling do |_spec|
-      if windows?(_spec.platform.to_s)
-        binary_files = collect_binary_files(relative_binary_dir)
-        _spec.files += binary_files
-      end
-    end
-  end
-end
-
 file "Makefile" => ["extconf.rb", "ext/groonga/extconf.rb"] do
   extconf_args = []
   if ENV["TRAVIS"]
@@ -136,75 +63,15 @@ task :test => :configure do
 end
 
 namespace :test do
-  task :install do
-    gemspec_helper = Rake.application.jeweler.gemspec_helper
-    ruby("-S gem install --user-install #{gemspec_helper.gem_path}")
-
-    gem_spec = Gem.source_index.find_name("rroonga").last
-    installed_path = gem_spec.full_gem_path
+  task :install => "install" do
+    rroonga_specs = Gem.source_index.find_name("rroonga")
+    target_rroonga_spec = rroonga_specs.find do |rroonga_spec|
+      rroonga_spec.version == helper.gemspec.version
+    end
+    installed_path = target_rroonga_spec.full_gem_path
     ENV["NO_MAKE"] = "yes"
     ruby("#{installed_path}/test/run-test.rb")
   end
 end
 
-desc "Remove Groonga binary directory"
-namespace :clean do
-  task :groonga do
-    rm_rf binary_dir
-  end
-end
-
-windows_architectures = [:x86, :x64]
-
-namespace :build do
-  namespace :windows do
-    ruby_versions = "2.1.6:2.2.2:2.3.0:2.4.0:2.5.0"
-
-    windows_architectures.each do |architecture|
-      desc "Build gem for Windows #{architecture}"
-      task architecture do
-        build_dir = "tmp/windows"
-        rm_rf build_dir
-        mkdir_p build_dir
-
-        commands = [
-          ["git", "clone", "file://#{Dir.pwd}/.git", build_dir],
-          ["cd", build_dir],
-          ["gem", "install", "json"],
-          ["bundle"],
-          ["rake", "cross", "native", "gem", "RUBY_CC_VERSION=#{ruby_versions}"],
-        ]
-        if architecture == :x64
-          commands.unshift(["export", "RROONGA_USE_GROONGA_X64=true"])
-        end
-        raw_commands = commands.collect do |command|
-          Shellwords.join(command)
-        end
-        raw_command_line = raw_commands.join(" && ")
-
-        require "rake_compiler_dock"
-        RakeCompilerDock.sh(raw_command_line)
-
-        cp("#{build_dir}/pkg/#{windows_gem_name(spec, architecture)}",
-           "pkg/")
-      end
-    end
-  end
-
-  desc "Build gems for Windows"
-  build_tasks = windows_architectures.collect do |architecture|
-    "windows:#{architecture}"
-  end
-  task :windows => build_tasks
-end
-
-namespace :release do
-  desc "Push gems for Windows to RubyGems.org"
-  task :windows do
-    windows_architectures.each do |architecture|
-      ruby("-S", "gem", "push", "pkg/#{windows_gem_name(spec, architecture)}")
-    end
-  end
-end
-
 task :default => :test

data/doc/text/news.md

@@ -1,5 +1,77 @@
 # NEWS
 
+## 10.0.6: 2020-09-01 {#version-10-0-6}
+
+### Fixes
+
+  * Fixed a bug that failed `gem install rroonga` in Windows version.
+
+## 10.0.2: 2020-04-29 {#version-10-0-2}
+
+### Improvements
+
+  * Added support for Float32 in Groonga 10.0.2.
+
+  * [doc] Fixed markup of a image in tutorial [GitHub#192][Patched by takahashim]
+
+### Thanks
+
+  * takahashim
+
+## 10.0.1: 2020-04-02 {#version-10-0-1}
+
+### Improvements
+
+  * Added support for creating a table with normalizer with options
+
+  * Windows: Added Ruby 2.7 support.
+
+  * Windows: Dropped Ruby 2.3.
+
+    * This version has been EOL.
+
+  * Dropped fat gem support.
+
+## 9.0.7: 2019-08-29 {#version-9-0-7}
+
+### Improvements
+
+  * {Groonga::Object#lexicon?} Added.
+
+  * {Groonga::IndexColumn} Added support "INDEX_LARGE".
+
+  * {Groonga::IndexCursor#set_min?} Added.
+
+  * {Groonga::IndexCursor#set_min=} Added.
+
+  * {Groonga::Context#force_match_escalation?} Added.
+
+  * {Groonga::Context#force_match_escalation=} Added.
+
+  * {Groonga::Object#id_accessor?} Added.
+
+  * {Groonga::Logger.flags} Added support for thread id option.
+
+  * {Groonga::Object#bulk?} Added.
+
+  * {Groonga::Object#value_accessor?} Added.
+
+  * {Groonga::Table} Delegate support_score? from Groonga::Record to Groonga::Table.
+
+  * Groonga::Flashable Added support dependent option.
+
+  * {Groonga::Object#score_accessor?} Added.
+
+  * {Groonga::Object#nsubrecs_accessor? } Added.
+
+  * Translate a part of explanation of Groonga::Table into English.
+
+## 9.0.3: 2019-05-10 {#version-9-0-3}
+
+### Improvements
+
+  * Windows: Added Ruby 2.6 support.
+
 ## 9.0.2: 2019-05-10 {#version-9-0-2}
 
 ### Improvements
@@ -9,7 +81,7 @@
   * 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::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.

data/doc/text/tutorial.md

@@ -178,7 +178,7 @@ bookmarks.
 
 First, you add tables for users and for comments like below:
 
-!http://qwik.jp/senna/senna2.files/rect4605.png!
+![Sample schema](images/sample-schema.png)
 
 Let's add the table for users, `Users`.
 

data/ext/groonga/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2009-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2020  Sutou Kouhei <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
@@ -49,30 +49,11 @@ def win32?
   /cygwin|mingw|mswin/ =~ RUBY_PLATFORM
 end
 
-checking_for(checking_message("Win32 OS")) do
-  win32 = win32?
-  if win32
-    $defs << "-DRB_GRN_PLATFORM_WIN32"
-    import_library_name = "libruby-#{module_name}.a"
-    $DLDFLAGS << " -Wl,--out-implib=#{import_library_name}"
-    $cleanfiles << import_library_name
-    binary_base_dir = base_dir + "vendor" + "local"
-    pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
-    PKGConfig.add_path(pkg_config_dir.to_s)
-    PKGConfig.set_override_variable("prefix", binary_base_dir.to_s)
-  end
-  win32
-end
-
 def install_groonga_locally
   FileUtils.mkdir_p(local_groonga_base_dir)
 
   Dir.chdir(local_groonga_base_dir) do
-    if win32?
-      extract_groonga_win32_binary
-    else
-      build_groonga
-    end
+    build_groonga
   end
 
   prepend_pkg_config_path_for_local_groonga
@@ -107,50 +88,6 @@ def download(url)
   end
 end
 
-def extract_zip(filename, destrination_dir)
-  require "archive/zip"
-
-  Archive::Zip.extract(filename, destrination_dir)
-rescue LoadError
-  command_line = ["unzip", filename, "-d", destrination_dir]
-  unless system(*command_line)
-    raise "Failed to unzip: #{command_line.join(' ')}"
-  end
-end
-
-def extract_groonga_win32_binary
-  if ENV["RROONGA_USE_GROONGA_X64"]
-    architecture = "x64"
-  else
-    architecture = "x86"
-  end
-  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)
-    message("removing old install... #{install_dir}")
-    FileUtils.rm_rf(install_dir)
-    message(" done\n")
-  end
-
-  message("installing...")
-  FileUtils.mv(extracted_dir, install_dir)
-  message(" done\n")
-
-  message("removing binary archive...")
-  FileUtils.rm_rf(zip)
-  message(" done\n")
-end
-
 def run_command(start_message, command)
   message(start_message)
   if xsystem(command)
@@ -247,6 +184,7 @@ def build_groonga_from_tar_gz
   FileUtils.mkdir_p(groonga_source_dir)
 
   message("extracting...")
+  # TODO: Use Zlip::GzipReader and Gem::Package::TarReader
   if xsystem("tar xfz #{tar_gz} -C #{groonga_source_dir} --strip-components=1")
     message(" done\n")
   else
@@ -285,14 +223,8 @@ def install_local_groonga(package_name, major, minor, micro)
   add_rpath_for_local_groonga
 end
 
-if win32?
-  unless have_local_groonga?(package_name, major, minor, micro)
-    install_local_groonga(package_name, major, minor, micro)
-  end
-else
-  unless PKGConfig.have_package(package_name, major, minor, micro)
-    install_local_groonga(package_name, major, minor, micro)
-  end
+unless PKGConfig.have_package(package_name, major, minor, micro)
+  install_local_groonga(package_name, major, minor, micro)
 end
 
 real_version = PKGConfig.modversion(package_name)
@@ -335,7 +267,7 @@ end
 
 def enable_debug_build_flag(flags)
   if gcc?
-    flags.gsub(/(^|\s)?-g\d?(\s|$)?/, '\\1-ggdb3\\2')
+    flags.gsub(/(^|\s)?-g\d?(\s|$)/, '\\1-ggdb3\\2')
   else
     flags
   end
@@ -347,6 +279,9 @@ checking_for(checking_message("--enable-debug-build option")) do
     $CFLAGS = disable_optimization_build_flag($CFLAGS)
     $CFLAGS = enable_debug_build_flag($CFLAGS)
 
+    CONFIG["optflags"] = disable_optimization_build_flag(CONFIG["optflags"])
+    CONFIG["debugflags"] = enable_debug_build_flag(CONFIG["debugflags"])
+
     CONFIG["CXXFLAGS"] = disable_optimization_build_flag(CONFIG["CXXFLAGS"])
     CONFIG["CXXFLAGS"] = enable_debug_build_flag(CONFIG["CXXFLAGS"])
   end

data/ext/groonga/rb-grn-context.c

@@ -2,6 +2,7 @@
 /*
   Copyright (C) 2010-2018  Kouhei Sutou <kou@clear-code.com>
   Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
+  Copyright (C) 2019  Horimoto Yasuhiro <horimoto@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
@@ -604,6 +605,27 @@ rb_grn_context_get_ruby_encoding (VALUE self)
     return rb_grn_encoding_to_ruby_encoding_object(encoding);
 }
 
+/*
+ * @overload force_match_escalation?
+ *   @return [Bool]
+ */
+static VALUE
+rb_grn_context_force_match_escalation_p (VALUE self)
+{
+    return CBOOL2RVAL(grn_ctx_get_force_match_escalation(SELF(self)));
+}
+
+/*
+ * @overload force_match_escalation=(force_match_escalation)
+ */
+static VALUE
+rb_grn_context_set_force_match_escalation (VALUE self, VALUE force_match_escalation)
+{
+    grn_ctx_set_force_match_escalation(SELF(self),
+                                       RVAL2CBOOL(force_match_escalation));
+    return force_match_escalation;
+}
+
 /*
  * このコンテキストを使って検索したときに検索の挙動をエスカレー
  * ションする閾値を返します。
@@ -1039,6 +1061,11 @@ rb_grn_init_context (VALUE mGrn)
     rb_define_method(cGrnContext, "encoding=", rb_grn_context_set_encoding, 1);
     rb_define_method(cGrnContext, "ruby_encoding",
                      rb_grn_context_get_ruby_encoding, 0);
+
+    rb_define_method(cGrnContext, "force_match_escalation?",
+                     rb_grn_context_force_match_escalation_p, 0);
+    rb_define_method(cGrnContext, "force_match_escalation=",
+                     rb_grn_context_set_force_match_escalation, 1);
     rb_define_method(cGrnContext, "match_escalation_threshold",
                      rb_grn_context_get_match_escalation_threshold, 0);
     rb_define_method(cGrnContext, "match_escalation_threshold=",