rroonga 5.0.0-x64-mingw32 → 5.0.1-x64-mingw32

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

@@ -146,7 +146,7 @@ rb_grn_equal_option (VALUE option, const char *key)
 {
     VALUE key_string, key_symbol;
 
-    key_string = rb_str_new2(key);
+    key_string = rb_str_new_cstr(key);
     if (RVAL2CBOOL(rb_funcall(option, rb_intern("=="), 1, key_string)))
         return GRN_TRUE;
 
@@ -171,6 +171,12 @@ rb_grn_equal_string (const char *string1, const char *string2)
     return strcmp(string1, string2) == 0;
 }
 
+VALUE
+rb_grn_convert_to_string (VALUE object)
+{
+    return rb_convert_type(object, RUBY_T_STRING, "String", "to_str");
+}
+
 VALUE
 rb_grn_convert_to_array (VALUE object)
 {
@@ -364,6 +370,8 @@ rb_grn_bulk_to_ruby_object (grn_ctx *context, grn_obj *bulk,
 grn_obj *
 rb_grn_bulk_from_ruby_object (VALUE object, grn_ctx *context, grn_obj *bulk)
 {
+    int object_type;
+
     if (bulk && bulk->header.domain == GRN_DB_TIME)
         return RVAL2GRNBULK_WITH_TYPE(object, context, bulk,
                                       bulk->header.domain,
@@ -374,13 +382,24 @@ rb_grn_bulk_from_ruby_object (VALUE object, grn_ctx *context, grn_obj *bulk)
         rb_grn_context_check(context, object);
     }
 
-    switch (TYPE(object)) {
+    object_type = TYPE(object);
+    switch (object_type) {
     case T_NIL:
         grn_obj_reinit(context, bulk, GRN_DB_VOID, 0);
         break;
     case T_SYMBOL:
-        object = rb_funcall(object, rb_intern("to_s"), 0);
+    case T_REGEXP:
     case T_STRING:
+        switch (object_type) {
+        case T_SYMBOL:
+            object = rb_funcall(object, rb_intern("to_s"), 0);
+            break;
+        case T_REGEXP:
+            object = rb_funcall(object, rb_intern("source"), 0);
+            break;
+        default:
+            break;
+        }
         grn_obj_reinit(context, bulk, GRN_DB_TEXT, 0);
         rb_grn_context_text_set(context, bulk, object);
         break;

data/ext/groonga/rb-grn.h

@@ -1,7 +1,7 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
   Copyright (C) 2015  Masafumi Yokoyama <yokoyama@clear-code.com>
-  Copyright (C) 2009-2014  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
@@ -49,6 +49,14 @@
 #  define rb_to_symbol(rb_string) (rb_str_intern(rb_string))
 #endif
 
+#ifndef HAVE_RB_ARY_NEW_FROM_ARGS
+#  define rb_ary_new_from_args(n, ...) rb_ary_new3((n), __VA_ARGS__)
+#endif
+
+#ifndef HAVE_RB_ARY_NEW_FROM_VALUES
+#  define rb_ary_new_from_values(n, values) rb_ary_new4((n), (values))
+#endif
+
 #include <groonga.h>
 
 #if defined(__cplusplus)
@@ -93,7 +101,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 5
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 0
+#define RB_GRN_MICRO_VERSION 1
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -104,7 +112,7 @@ RB_GRN_BEGIN_DECLS
 #define RB_GRN_TABLE(object) ((RbGrnTable *)(object))
 #define RB_GRN_TABLE_KEY_SUPPORT(object) ((RbGrnTableKeySupport *)(object))
 #define RB_GRN_DOUBLE_ARRAY_TRIE(object) ((RbGrnDoubleArrayTrie *)(object))
-#define RB_GRN_TABLE_CURSOR(object) ((RbGrnTableCursort *)(object))
+#define RB_GRN_TABLE_CURSOR(object) ((RbGrnTableCursor *)(object))
 #define RB_GRN_COLUMN(object) ((RbGrnColumn *)(object))
 #define RB_GRN_VARIABLE_SIZE_COLUMN(object) ((RbGrnVariableSizeColumn *)(object))
 #define RB_GRN_INDEX_COLUMN(object) ((RbGrnIndexColumn *)(object))
@@ -278,6 +286,15 @@ RB_GRN_VAR VALUE rb_cGrnLogger;
 RB_GRN_VAR VALUE rb_cGrnSnippet;
 RB_GRN_VAR VALUE rb_cGrnVariable;
 RB_GRN_VAR VALUE rb_cGrnOperator;
+RB_GRN_VAR VALUE rb_cGrnEqualOperator;
+RB_GRN_VAR VALUE rb_cGrnNotEqualOperator;
+RB_GRN_VAR VALUE rb_cGrnLessOperator;
+RB_GRN_VAR VALUE rb_cGrnGreaterOperator;
+RB_GRN_VAR VALUE rb_cGrnLessEqualOperator;
+RB_GRN_VAR VALUE rb_cGrnGreaterEqualOperator;
+RB_GRN_VAR VALUE rb_cGrnMatchOperator;
+RB_GRN_VAR VALUE rb_cGrnPrefixOperator;
+RB_GRN_VAR VALUE rb_cGrnRegexpOperator;
 RB_GRN_VAR VALUE rb_cGrnExpression;
 RB_GRN_VAR VALUE rb_cGrnRecordExpressionBuilder;
 RB_GRN_VAR VALUE rb_cGrnColumnExpressionBuilder;
@@ -317,6 +334,15 @@ void           rb_grn_init_geo_point                (VALUE mGrn);
 void           rb_grn_init_record                   (VALUE mGrn);
 void           rb_grn_init_variable                 (VALUE mGrn);
 void           rb_grn_init_operator                 (VALUE mGrn);
+void           rb_grn_init_equal_operator           (VALUE mGrn);
+void           rb_grn_init_not_equal_operator       (VALUE mGrn);
+void           rb_grn_init_less_operator            (VALUE mGrn);
+void           rb_grn_init_greater_operator         (VALUE mGrn);
+void           rb_grn_init_less_equal_operator      (VALUE mGrn);
+void           rb_grn_init_greater_equal_operator   (VALUE mGrn);
+void           rb_grn_init_match_operator           (VALUE mGrn);
+void           rb_grn_init_prefix_operator          (VALUE mGrn);
+void           rb_grn_init_regexp_operator          (VALUE mGrn);
 void           rb_grn_init_expression               (VALUE mGrn);
 void           rb_grn_init_expression_builder       (VALUE mGrn);
 void           rb_grn_init_logger                   (VALUE mGrn);
@@ -359,6 +385,7 @@ grn_bool       rb_grn_equal_option                  (VALUE option,
                                                      const char *key);
 grn_bool       rb_grn_equal_string                  (const char *string1,
                                                      const char *string2);
+VALUE          rb_grn_convert_to_string             (VALUE object);
 VALUE          rb_grn_convert_to_array              (VALUE object);
 VALUE          rb_grn_check_convert_to_string       (VALUE object);
 VALUE          rb_grn_check_convert_to_array        (VALUE object);
@@ -603,7 +630,7 @@ VALUE          rb_grn_column_expression_builder_build
                                                     (VALUE self);
 
 
-#define RB_GRN_INTERN(c_string)       (rb_to_symbol(rb_str_new2(c_string)))
+#define RB_GRN_INTERN(c_string)       (rb_to_symbol(rb_str_new_cstr(c_string)))
 
 #define RVAL2CBOOL(object)            (RTEST(object))
 #define CBOOL2RVAL(boolean)           ((boolean) ? Qtrue : Qfalse)

data/ext/groonga/rb-groonga.c

@@ -62,7 +62,7 @@ rb_grn_init_runtime_version (VALUE mGrn)
     rb_ary_push(runtime_version, rb_Integer(micro));
 
     if (component_end) {
-        tag = rb_str_new2(component_end + 1);
+        tag = rb_str_new_cstr(component_end + 1);
     } else {
         tag = Qnil;
     }
@@ -84,10 +84,10 @@ rb_grn_init_version (VALUE mGrn)
 
     rb_grn_init_runtime_version(mGrn);
 
-    build_version = rb_ary_new3(3,
-                                INT2NUM(GRN_MAJOR_VERSION),
-                                INT2NUM(GRN_MINOR_VERSION),
-                                INT2NUM(GRN_MICRO_VERSION));
+    build_version = rb_ary_new_from_args(3,
+                                         INT2NUM(GRN_MAJOR_VERSION),
+                                         INT2NUM(GRN_MINOR_VERSION),
+                                         INT2NUM(GRN_MICRO_VERSION));
     rb_obj_freeze(build_version);
     /*
      * ビルドしたgroongaのバージョン。 @[メジャーバージョン,
@@ -95,10 +95,10 @@ rb_grn_init_version (VALUE mGrn)
      */
     rb_define_const(mGrn, "BUILD_VERSION", build_version);
 
-    bindings_version = rb_ary_new3(3,
-                                   INT2NUM(RB_GRN_MAJOR_VERSION),
-                                   INT2NUM(RB_GRN_MINOR_VERSION),
-                                   INT2NUM(RB_GRN_MICRO_VERSION));
+    bindings_version = rb_ary_new_from_args(3,
+                                            INT2NUM(RB_GRN_MAJOR_VERSION),
+                                            INT2NUM(RB_GRN_MINOR_VERSION),
+                                            INT2NUM(RB_GRN_MICRO_VERSION));
     rb_obj_freeze(bindings_version);
     /*
      * rroongaのバージョン。 @[メジャーバージョン, マ

data/lib/groonga/context.rb

@@ -119,6 +119,37 @@ module Groonga
       end
     end
 
+    # Unregister a registered `name` plugin.
+    #
+    # You can unregister `name` plugin by name if
+    # `name` plugin is installed to plugin directory.
+    #
+    # @example Unregister a registerd plugin by name.
+    #   context.register_plugin("token_filters/stop_word")
+    #   context.unregister_plugin("token_filters/stop_word")
+    #
+    # You can also specify the path of `name` plugin explicitly.
+    #
+    # @example Unregister a registerd plugin by path.
+    #   context.register_plugin("token_filters/stop_word")
+    #   context.unregister_plugin("/usr/local/lib/groonga/plugins/token_filters/stop_word.so")
+    #
+    # @overload unregister_plugin(name)
+    #   Unregister a registerd plugin by name.
+    #
+    #   @param [String] name The plugin name.
+    #
+    # @overload unregister_plugin(path)
+    #   Unregister a registerd plugin by path.
+    #
+    #   @param [String] path The path to plugin.
+    #
+    # @since 5.0.1
+    def unregister_plugin(name_or_path)
+      options = {:context => self}
+      Plugin.unregister(name_or_path, options)
+    end
+
     # _table_ から指定した条件にマッチするレコードの値を取得
     # する。 _table_ はテーブル名かテーブルオブジェクトを指定
     # する。

data/lib/groonga/expression-builder.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+# Copyright (C) 2015  Masafumi Yokoyama <yokoyama@clear-code.com>
 # Copyright (C) 2009-2012  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -173,7 +174,12 @@ module Groonga
           raise ArgumentError,
                  "match word should not be nil: #{full_column_name}"
         end
-        MatchExpressionBuilder.new(self, normalize(other))
+
+        if other.is_a?(Regexp)
+          RegexpExpressionBuilder.new(self, normalize(other.source))
+        else
+          MatchExpressionBuilder.new(self, normalize(other))
+        end
       end
 
       def <(other)
@@ -332,6 +338,13 @@ module Groonga
       end
     end
 
+    # @private
+    class RegexpExpressionBuilder < BinaryExpressionBuilder
+      def initialize(column_value_builder, value)
+        super(Groonga::Operation::REGEXP, column_value_builder, value)
+      end
+    end
+
     # @private
     class LessExpressionBuilder < BinaryExpressionBuilder
       def initialize(column_value_builder, value)

data/lib/groonga/record.rb

@@ -366,18 +366,20 @@ module Groonga
       @table.unlock(options.merge(:id => @id))
     end
 
-    # レコードが所属するテーブルのロックを強制的に解除する。
+    # Forces to clear lock of the table to which the record belongs.
     #
-    # 利用可能なオプションは現在は無い。
-    def clear_lock(options={})
-      @table.clear_lock(options.merge(:id => @id))
+    # @return [void]
+    def clear_lock
+      @table.clear_lock
     end
 
-    # レコードが所属するテーブルがロックされていれば +true+ を返す。
+    # Checks whether the table to which the record belongs is locked
+    # or not.
     #
-    # 利用可能なオプションは現在は無い。
-    def locked?(options={})
-      @table.locked?(options.merge(:id => @id))
+    # @return [Boolean] `true` if the table to which the record
+    #   belongs is locked, `false` otherwise.
+    def locked?
+      @table.locked?
     end
 
     # レコードが持つIDが有効なIDであれば +true+ を返す。

data/lib/groonga/schema.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
-# Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
+# Copyright (C) 2014-2015  Masafumi Yokoyama <yokoyama@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
@@ -598,6 +598,8 @@ module Groonga
         "token_trigram" => "TokenTrigram",
         "mecab" => "TokenMecab",
         "token_mecab"=> "TokenMecab",
+        "regexp" => "TokenRegexp",
+        "token_regexp"=> "TokenRegexp",
       }
       # @private
       def normalize_type(type, options={})

data/rroonga-build.rb

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

data/rroonga.gemspec

@@ -76,7 +76,7 @@ Gem::Specification.new do |s|
   end
 
   s.homepage = "http://ranguba.org/#about-rroonga"
-  s.licenses = ["LGPLv2"]
+  s.licenses = ["LGPL-2.1"]
   s.require_paths = ["lib", "ext/groonga"]
   s.rubyforge_project = "groonga"
 
@@ -89,10 +89,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency("test-unit", [">= 3.0.0"])
   s.add_development_dependency("test-unit-notify")
   s.add_development_dependency("rake")
-  s.add_development_dependency("rake-compiler")
+  s.add_development_dependency("rake-compiler", [">= 0.9.5"])
   s.add_development_dependency("bundler")
   s.add_development_dependency("yard")
   s.add_development_dependency("packnga", [">= 1.0.0"])
-  s.add_development_dependency("RedCloth")
+  s.add_development_dependency("kramdown")
 end
 

data/test/groonga-test-utils.rb

@@ -189,4 +189,8 @@ module GroongaTestUtils
   def need_encoding
     omit("Encoding is needed.") unless defined?(::Encoding)
   end
+
+  def check_mecab_availability
+    omit("MeCab isn't available") if context["TokenMecab"].nil?
+  end
 end

data/test/test-column.rb

@@ -170,16 +170,15 @@ class ColumnTest < Test::Unit::TestCase
                    record["body"]
                  end)
     assert_equal(<<-INSPECTED.chomp, result.expression.inspect)
-#<Groonga::Expression #<expr
+#<Groonga::Expression
   vars:{
     $1:#<record:hash:Posts id:(no value)>
   },
   codes:{
-    0:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
-    1:<push(), modify:0, value:"drive">,
-    2:<match(), modify:0, value:(NULL)>
-  }
->>
+    0:<get_value n_args:1, flags:0, modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
+    1:<push n_args:1, flags:0, modify:0, value:"drive">,
+    2:<match n_args:2, flags:0, modify:0, value:(NULL)>
+  }>
     INSPECTED
   end
 
@@ -210,16 +209,15 @@ class ColumnTest < Test::Unit::TestCase
                    record["body"]
                  end)
     assert_equal(<<-INSPECTED.chomp, result.expression.inspect)
-#<Groonga::Expression #<expr
+#<Groonga::Expression
   vars:{
     $1:#<record:hash:Posts id:(no value)>
   },
   codes:{
-    0:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
-    1:<push(), modify:0, value:"drive">,
-    2:<match(), modify:0, value:(NULL)>
-  }
->>
+    0:<get_value n_args:1, flags:0, modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
+    1:<push n_args:1, flags:0, modify:0, value:"drive">,
+    2:<match n_args:2, flags:0, modify:0, value:(NULL)>
+  }>
     INSPECTED
   end
 
@@ -237,17 +235,16 @@ class ColumnTest < Test::Unit::TestCase
                    record["body"]
                  end)
     assert_equal(<<-INSPECTED.chomp, result.expression.inspect)
-#<Groonga::Expression #<expr
+#<Groonga::Expression
   vars:{
     $1:#<record:hash:Posts id:(no value)>
   },
   codes:{
-    0:<push(), modify:0, value:#<record:hash:Posts id:(no value)>>,
-    1:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
-    2:<push(), modify:0, value:"drive">,
-    3:<match(), modify:0, value:(NULL)>
-  }
->>
+    0:<push n_args:1, flags:0, modify:0, value:#<record:hash:Posts id:(no value)>>,
+    1:<get_value n_args:1, flags:0, modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
+    2:<push n_args:1, flags:0, modify:0, value:"drive">,
+    3:<match n_args:2, flags:0, modify:0, value:(NULL)>
+  }>
     INSPECTED
   end
 
@@ -262,17 +259,16 @@ class ColumnTest < Test::Unit::TestCase
                    record["body"]
                  end)
     assert_equal(<<-INSPECTED.chomp, result.expression.inspect)
-#<Groonga::Expression #<expr
+#<Groonga::Expression
   vars:{
     $1:#<record:hash:Posts id:(no value)>
   },
   codes:{
-    0:<push(), modify:1, value:#<record:hash:Posts id:(no value)>>,
-    1:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
-    2:<push(), modify:0, value:"drive">,
-    3:<match(), modify:0, value:(NULL)>
-  }
->>
+    0:<push n_args:1, flags:0, modify:1, value:#<record:hash:Posts id:(no value)>>,
+    1:<get_value n_args:2, flags:0, modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
+    2:<push n_args:1, flags:0, modify:0, value:"drive">,
+    3:<match n_args:2, flags:0, modify:0, value:(NULL)>
+  }>
     INSPECTED
   end
 
@@ -344,6 +340,12 @@ class ColumnTest < Test::Unit::TestCase
     assert_not_predicate(@users_name_column, :builtin?)
   end
 
+  def test_table?
+    assert do
+      not @users_name_column.table?
+    end
+  end
+
   private
   def assert_content_search(expected_records, term)
     records = @bookmarks_index_content.search(term).records

data/test/test-exception.rb

@@ -99,6 +99,7 @@ class ExceptionTest < Test::Unit::TestCase
     assert_const_defined(Groonga, :TokenFilterError)
     assert_const_defined(Groonga, :CommandError)
     assert_const_defined(Groonga, :PluginError)
+    assert_const_defined(Groonga, :ScorerError)
   end
 end
 

data/test/test-expression-builder.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
+# Copyright (C) 2014-2015  Masafumi Yokoyama <yokoyama@clear-code.com>
 # Copyright (C) 2009-2012  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -248,6 +248,88 @@ class ExpressionBuilderTest < Test::Unit::TestCase
     end
   end
 
+  class RegexpSearchTest < self
+    def setup_tables
+      Groonga::Schema.define do |schema|
+        schema.create_table("Users",
+                            :type => :hash,
+                            :key_type => "ShortText") do |table|
+          table.short_text("name")
+        end
+
+        schema.create_table("Terms",
+                            :type => :patricia_trie,
+                            :key_type => "ShortText",
+                            :default_tokenizer => "TokenRegexp",
+                            :normalizer => "NormalizerAuto") do |table|
+          table.index("Users.name")
+        end
+      end
+
+      @users = Groonga["Users"]
+    end
+
+    def setup_data
+      @users.add("sato",   :name => "kazuki sato")
+      @users.add("suzuki", :name => "Shiro SUZUKI")
+      @users.add("ito",    :name => "Takashi Ito")
+    end
+
+    class BlockTest < self
+      def test_match
+        result = @users.select do |record|
+          record["name"] =~ /sh/
+        end
+        assert_equal(["ito", "suzuki"],
+                     result.collect {|record| record.key.key}.sort)
+      end
+
+      def test_not_match
+        result = @users.select do |record|
+          record["name"] =~ /abcabcabc/
+        end
+        assert_equal([],
+                     result.collect {|record| record.key.key}.sort)
+      end
+
+      def test_beginning_of_text
+        result = @users.select do |record|
+          record["name"] =~ /\Ash/
+        end
+        assert_equal(["suzuki"],
+                     result.collect {|record| record.key.key}.sort)
+      end
+
+      def test_end_of_text
+        result = @users.select do |record|
+          record["name"] =~ /ki\z/
+        end
+        assert_equal(["suzuki"],
+                     result.collect {|record| record.key.key}.sort)
+      end
+    end
+
+    class QueryStringTest < self
+      def test_match
+        result = @users.select("name:~t")
+        assert_equal(["ito", "sato"],
+                     result.collect {|record| record.key.key}.sort)
+      end
+
+      def test_not_match
+        result = @users.select("name:~x")
+        assert_equal([],
+                     result.collect {|record| record.key.key}.sort)
+      end
+
+      def test_beginning_of_text
+        result = @users.select("name:~\\\\As")
+        assert_equal(["suzuki"],
+                     result.collect {|record| record.key.key}.sort)
+      end
+    end
+  end
+
   class PrefixSearchTest < self
     def setup_tables
       Groonga::Schema.define do |schema|