rroonga 5.0.5-x86-mingw32 → 5.0.8-x86-mingw32

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGI4NjY4MDk2NWNhMTQ3NTE1ZGQ4YWUxY2Y0M2VkYTAwMDFkZjY1NQ==
-  data.tar.gz: !binary |-
-    MzBjYjE5YmU0YmM0NzMzZDBjOGQ5YzY0MjhiZWJjNTZmMTNjMzQ1Yw==
+SHA1:
+  metadata.gz: 7760ee78cad527e8062ecc8c4a5ebacdcb6f26bf
+  data.tar.gz: ba9f05900cd4070a2030af484dec4ca956a39a52
 SHA512:
-  metadata.gz: !binary |-
-    M2FlNjU2Y2M2NTk2OWU1ODFhODcyMDQ4YmVmYTRmM2M3ZmU0N2QxYTYwMDBj
-    NTAxY2U5Y2E5N2Y4MGE3ZjdkYjgwYjQwMjU2OTdiY2E5MDI1OTA4NmQyMmIx
-    MzY2MWU4MDhjMzAzYjcyZDkyODMxNThhY2E5OTI3ZDA1OGExY2E=
-  data.tar.gz: !binary |-
-    MWI0MTdiY2U2MzBkNzc3ZDMxYzc1YjY3Y2E4YmI4MzAwYjAxN2ZjOTcyZWE4
-    YzY4MTE2ODI5Mjg3YTYyNWYzNGNhM2FmMzQ3OWUwNzM5ZTJhNTk5MjM1ZDlj
-    YTYyYWZjYjI3NDE4NDQ1MzcyYTE3NWM2ZWYxMjI2OTVhNGM2OTE=
+  metadata.gz: 932a4e0275b1bcce13d977c988b9f2b4aaf9b28ab73ae014836f2b3338a4e073a35822ef5efe176760e10d5f83c7c0f3835a6f3d73024f9c13c27c069650c543
+  data.tar.gz: e1830bba918608ed0ada2085dd93376da1ea4be500e4dc975df56018b09f1f37b4b7ad5812aa99cfee96727965dfc7db51a53ad885cee97d876312a3da5b418a

data/Rakefile

@@ -17,6 +17,7 @@
 
 require "find"
 require "fileutils"
+require "shellwords"
 require "pathname"
 require "erb"
 require "yard"
@@ -148,17 +149,48 @@ namespace :clean do
   end
 end
 
-desc "Build cross compile binary with Vagrant"
 namespace :build do
-  task :windows do
-    pkg_dir = "#{base_dir}/pkg"
-    mkdir pkg_dir unless File.exist?(pkg_dir)
-    cd "build/windows" do
-      sh("vagrant", "up")
-      cp(Dir.glob("pkg/rroonga-*-mingw32.gem"), pkg_dir)
-      sh("vagrant", "destroy", "-f")
+  architectures = [:x86, :x64]
+
+  namespace :windows do
+    ruby_versions = "2.0.0:2.1.6:2.2.2"
+
+    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],
+          ["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)
+
+        version = spec.version
+        cp("#{build_dir}/pkg/rroonga-#{version}-#{architecture}-mingw32.gem",
+           "pkg/")
+      end
     end
   end
+
+  desc "Build gems for Windows"
+  build_tasks = architectures.collect do |architecture|
+    "windows:#{architecture}"
+  end
+  task :windows => build_tasks
 end
 
 task :default => :test

data/ext/groonga/extconf.rb

@@ -162,6 +162,20 @@ def configure_command_line(prefix)
   escaped_command_line.join(" ")
 end
 
+def guess_make
+  env_make = ENV["MAKE"]
+  return env_make if env_make
+
+  candidates = ["gmake", "make"]
+  candidates.each do |candidate|
+    (ENV["PATH"] || "").split(File::PATH_SEPARATOR).each do |path|
+      return candidate if File.executable?(File.join(path, candidate))
+    end
+  end
+
+  "make"
+end
+
 def n_processors
   proc_file = "/proc/cpuinfo"
   if File.exist?(proc_file)
@@ -174,12 +188,13 @@ def n_processors
 end
 
 def install_for_gnu_build_system(install_dir)
+  make = guess_make
   run_command("configuring...",
               configure_command_line(install_dir))
   run_command("building (maybe long time)...",
-              "make -j#{n_processors}")
+              "#{make} -j#{n_processors}")
   run_command("installing...",
-              "make install")
+              "#{make} install")
 end
 
 def build_groonga_from_git(major, minor, micro)

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2010-2014  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2010-2015  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
@@ -943,6 +943,28 @@ rb_grn_context_array_reference (VALUE self, VALUE name_or_id)
     return GRNOBJECT2RVAL(Qnil, context, object, GRN_FALSE);
 }
 
+/*
+ * Checks whether object with the ID is opened or not.
+ *
+ * @overload opened?(id)
+ *   @param id [Integer] The ID to be checked
+ *   @return [Boolean] `true` if object with the `id` is opened,
+ *      `false` otherwise.
+ */
+static VALUE
+rb_grn_context_is_opened (VALUE self, VALUE rb_id)
+{
+    grn_ctx *context;
+    grn_id id;
+    grn_bool is_opened;
+
+    context = SELF(self);
+    id = NUM2UINT(rb_id);
+    is_opened = grn_ctx_is_opened(context, id);
+
+    return CBOOL2RVAL(is_opened);
+}
+
 void
 rb_grn_context_object_created (VALUE rb_context, VALUE rb_object)
 {
@@ -999,4 +1021,6 @@ rb_grn_init_context (VALUE mGrn)
     rb_define_method(cGrnContext, "connect", rb_grn_context_connect, -1);
     rb_define_method(cGrnContext, "send", rb_grn_context_send, 1);
     rb_define_method(cGrnContext, "receive", rb_grn_context_receive, 0);
+
+    rb_define_method(cGrnContext, "opened?", rb_grn_context_is_opened, 1);
 }

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

@@ -160,7 +160,7 @@ reset_floating_objects (VALUE rb_context)
  *
  * @overload create(options=nil)
  *   @return [Groonga::Database] 作成されたデータベースを返す。
- *   @param option [::Hash] options The name and value
+ *   @param [::Hash] options The name and value
  *     pairs. Omitted names are initialized as the default value.
  *   @option options :path
  *     データベースを保存するパス。省略すると一時データベース

data/ext/groonga/rb-grn-patricia-trie.c

@@ -19,8 +19,6 @@
 
 #include "rb-grn.h"
 
-grn_rc grn_obj_cast(grn_ctx *ctx, grn_obj *src, grn_obj *dest, grn_bool addp);
-
 #define SELF(object) ((RbGrnTableKeySupport *)DATA_PTR(object))
 
 VALUE rb_cGrnPatriciaTrie;

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

@@ -1348,10 +1348,10 @@ rb_grn_table_sort (int argc, VALUE *argv, VALUE self)
  *
  *   @!macro [new] table.group.options
  *     @option options :max_n_sub_records
- *       グループ化した後のレコードのそれぞれについて最大 _:max_n_sub_records_ 件まで
+ *       グループ化した後のレコードのそれぞれについて最大`:max_n_sub_records`件まで
  *       そのグループに含まれる _table_ のレコードをサブレコードとして格納する。
  *     @option options [String, Symbol] :calc_target
- *       The target column name for _:calc_types_.
+ *       The target column name for `:calc_types`.
  *     @option options [::Array] :calc_types
  *       It specifies how to calculate (aggregate) values in grouped records by
  *       a drilldown. You can specify multiple calculation types.

data/ext/groonga/rb-grn.h

@@ -101,7 +101,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 5
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 5
+#define RB_GRN_MICRO_VERSION 8
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 

data/lib/groonga/expression-builder.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2015  Masafumi Yokoyama <yokoyama@clear-code.com>
-# Copyright (C) 2009-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2015  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
@@ -448,6 +448,28 @@ module Groonga
         super(Groonga::Operation::TERM_EXTRACT, column_value_builder, value)
       end
     end
+
+    # @private
+    class CallExpressionBuilder < ExpressionBuilder
+      def initialize(function, *arguments)
+        super()
+        @function = function
+        @arguments = arguments
+      end
+
+      def build(expression, variable)
+        expression.append_object(@function)
+        @arguments.each do |argument|
+          case argument
+          when String
+            expression.append_constant(argument)
+          else
+            argument.build(expression, variable)
+          end
+        end
+        expression.append_operation(Operation::CALL, @arguments.size)
+      end
+    end
   end
 
   # @private
@@ -516,6 +538,10 @@ module Groonga
       column_expression_builder(object, name)
     end
 
+    def call(function, *arguments)
+      CallExpressionBuilder.new(@table.context[function], *arguments)
+    end
+
     private
     def build_match_target(&block)
       sub_builder = MatchTargetRecordExpressionBuilder.new(@table, nil)

data/rroonga-build.rb

@@ -20,15 +20,15 @@ module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 5
     MINOR = 0
-    MICRO = 7
+    MICRO = 8
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2015, 8, 31)
+    RELEASED_DATE = Time.utc(2015, 9, 29)
   end
 
   module LatestGroongaVersion
     MAJOR = 5
     MINOR = 0
-    MICRO = 7
+    MICRO = 8
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/rroonga.gemspec

@@ -89,6 +89,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("test-unit-notify")
   s.add_development_dependency("rake")
   s.add_development_dependency("rake-compiler", [">= 0.9.5"])
+  s.add_development_dependency("rake-compiler-dock")
   s.add_development_dependency("bundler")
   s.add_development_dependency("yard")
   s.add_development_dependency("packnga", [">= 1.0.0"])

data/test/test-column.rb

@@ -331,8 +331,10 @@ class ColumnTest < Test::Unit::TestCase
         table.index("Comments.title")
       end
     end
-    assert_equal([Groonga["Titles.Comments_title"],
-                  Groonga["Terms.Comments_title"]],
+    assert_equal([
+                   Groonga["Terms.Comments_title"],
+                   Groonga["Titles.Comments_title"],
+                 ],
                  title.indexes)
   end
 

data/test/test-context.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2015  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
@@ -135,6 +135,14 @@ class ContextTest < Test::Unit::TestCase
     assert_true(context.closed?)
   end
 
+  def test_opened?
+    Groonga::Database.create
+    context = Groonga::Context.default
+    assert do
+      context.opened?(Groonga::Type::SHORT_TEXT)
+    end
+  end
+
   class RestoreTest < self
     def test_simple
       commands = <<EOD

data/test/test-expression-builder.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2014-2015  Masafumi Yokoyama <yokoyama@clear-code.com>
-# Copyright (C) 2009-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2015  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
@@ -523,6 +523,43 @@ EOC
     end
   end
 
+  class CallTest < self
+    def setup_tables
+      Groonga::Schema.define do |schema|
+        schema.create_table("Shops",
+                            :type => :hash,
+                            :key_type => "ShortText") do |table|
+          table.wgs84_geo_point("location")
+        end
+
+        schema.create_table("Locations",
+                            :type => :patricia_trie,
+                            :key_type => :wgs84_geo_point) do |table|
+          table.index("Shops.location")
+        end
+      end
+
+      @shops = Groonga["Shops"]
+    end
+
+    def setup_data
+      @shops.add("Nezu no taiyaki", :location => "35.720253,139.762573")
+      @shops.add("Taiyaki Kataoka", :location => "35.712521,139.715591")
+      @shops.add("Taiyaki Sharaku", :location => "35.716969,139.794846")
+    end
+
+    def test_search
+      result = @shops.select do |record|
+        record.call("geo_in_rectangle",
+                    record.location,
+                    "35.7185,139.7912",
+                    "35.7065,139.8069")
+      end
+      assert_equal(["Taiyaki Sharaku"],
+                   result.collect(&:_key))
+    end
+  end
+
   class RecordTest < self
     def setup_tables
       Groonga::Schema.define do |schema|

data/test/test-remote.rb

@@ -47,9 +47,18 @@ class RemoteTest < Test::Unit::TestCase
     id, result = _context.receive
     assert_equal(0, id)
     values = JSON.load(result)
-    assert_equal(["alloc_count", "cache_hit_rate", "command_version",
-                  "default_command_version", "max_command_version",
-                  "n_queries", "starttime", "uptime", "version"],
+    assert_equal([
+                   "alloc_count",
+                   "cache_hit_rate",
+                   "command_version",
+                   "default_command_version",
+                   "max_command_version",
+                   "n_queries",
+                   "start_time",
+                   "starttime",
+                   "uptime",
+                   "version",
+                 ],
                  values.keys.sort)
   end
 

data/test/test-table-group.rb

@@ -325,11 +325,12 @@ class TableGroupTest < Test::Unit::TestCase
     def test_max
       grouped_records = @memos.group("tag",
                                      :calc_target => "priority",
-                                     :calc_types => [:max]).collect do |group|
-        tag = group.key
+                                     :calc_types => [:max])
+      grouped_data = grouped_records.collect do |record|
+        tag = record.key
         [
           tag.key,
-          group.max,
+          record.max,
         ]
       end
 
@@ -338,20 +339,21 @@ class TableGroupTest < Test::Unit::TestCase
                      ["Mroonga", 50],
                      ["Rroonga", 25],
                    ],
-                   grouped_records)
+                   grouped_data)
     end
 
     def test_all_types
       grouped_records = @memos.group("tag",
                                      :calc_target => "priority",
-                                     :calc_types => [:max, :min, :sum, :average]).collect do |group|
-        tag = group.key
+                                     :calc_types => [:max, :min, :sum, :average])
+      grouped_data = grouped_records.collect do |record|
+        tag = record.key
         [
           tag.key,
-          group.max,
-          group.min,
-          group.sum,
-          group.average.round(3),
+          record.max,
+          record.min,
+          record.sum,
+          record.average.round(3),
         ]
       end
 
@@ -360,7 +362,7 @@ class TableGroupTest < Test::Unit::TestCase
                      ["Mroonga", 50, 10, 85, 28.333],
                      ["Rroonga", 25, -25, 0, 0.0],
                    ],
-                   grouped_records)
+                   grouped_data)
     end
   end
 end