rroonga 3.1.0-x64-mingw32 → 3.1.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60ec62df92f138ef33ad213e8ca563be675fcb21
-  data.tar.gz: 5a0d822b481017c6526cefb245b8a3ff24e942a9
+  metadata.gz: b5d5949e640aef18ecf216552d3761481d8fe12c
+  data.tar.gz: 64babba675fa1bc8766adbe77337ea4bf3896a36
 SHA512:
-  metadata.gz: 9d7fa4f573490cab4f6fa7ce583371c8b1e61e2fa7a3e76c369e30ae650a4fb248a2c846fbc48148aa6e7663b67ee248f7bd3ce2d97f4398078ff9acce018597
-  data.tar.gz: 38f1f42795f34b013841651f728f743f6bb289931b43737383d422dcaa0a78f69eff3a0c106d8f1a66cd6c18bba783018da13384d076628dfead99a1067edd42
+  metadata.gz: d455ae86e7099100dd9adf6e1c7da61b8d2afe450e3fa786316ba38046221f4e70cb8f302b8b7f5fc3a3166c5ee2dd75b2d4042600d0b9a71f553fba0ce0d540
+  data.tar.gz: b90a58694588a3dc5b1f4d2737478bb05bd8c1e63b2922ee65e3be43f00b09ee79d041d7233d6ab1154f9bf8108b2b9c0772a5a4d521004761bcabdb206d59de

data/README.textile

@@ -53,7 +53,7 @@ h2. Documents
 
 h2. Mailing list
 
-* English: "groonga-users-en":http://rubyforge.org/mailman/listinfo/groonga-users-en
+* English: "groonga-talk":http://lists.sourceforge.net/mailman/listinfo/groonga-talk
 * Japanese: "groonga-dev":http://lists.sourceforge.jp/mailman/listinfo/groonga-dev
 
 h2. Thanks

data/Rakefile

@@ -26,13 +26,6 @@ require "bundler/gem_helper"
 require "rake/extensiontask"
 require "packnga"
 
-if YAML.const_defined?(:ENGINE)
-  begin
-    YAML::ENGINE.yamler = "psych"
-  rescue LoadError
-  end
-end
-
 base_dir = File.join(File.dirname(__FILE__))
 
 groonga_ext_dir = File.join(base_dir, "ext", "groonga")
@@ -105,7 +98,7 @@ 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["GROONGA64"] != "yes"
+groonga_win32_i386_p = ENV["RROONGA_USE_GROONGA_X64"].nil?
 
 namespace :win32 do
   namespace :groonga do

data/bin/grndump

@@ -16,11 +16,11 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-require 'ostruct'
-require 'optparse'
-require 'pathname'
+require "ostruct"
+require "optparse"
+require "pathname"
 
-require 'groonga'
+require "groonga"
 
 options = OpenStruct.new
 options.tables = []
@@ -29,6 +29,7 @@ options.dump_schema = true
 options.dump_tables = true
 options.order_by = "id"
 option_parser = OptionParser.new do |parser|
+  parser.version = Groonga::BINDINGS_VERSION
   parser.banner += " DB_PATH"
 
   parser.on("--no-dump-schema",

data/bin/grntest-log-analyze

@@ -16,11 +16,11 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-require 'ostruct'
-require 'optparse'
-require 'pathname'
+require "ostruct"
+require "optparse"
+require "pathname"
 
-require 'groonga/grntest-log'
+require "groonga/grntest-log"
 
 options = OpenStruct.new
 options.format = "tsv"
@@ -28,6 +28,7 @@ options.resolution = 1
 options.output_items = ["qps"]
 options.output_path = nil
 option_parser = OptionParser.new do |parser|
+  parser.version = Groonga::BINDINGS_VERSION
   parser.banner += " LOG1 ..."
 
   available_formats = ["tsv", "csv"]

data/bin/groonga-database-inspect

@@ -22,10 +22,19 @@ require "pathname"
 
 require "groonga"
 
-options = OpenStruct.new
+options = Groonga::DatabaseInspector::Options.new
 
 parser = OptionParser.new
+parser.version = Groonga::BINDINGS_VERSION
 parser.banner += " DB_PATH"
+parser.on("--no-tables",
+          "Don't show table information") do |boolean|
+  options.show_tables = boolean
+end
+parser.on("--no-columns",
+          "Don't show column information") do |boolean|
+  options.show_columns = boolean
+end
 args = parser.parse!(ARGV)
 
 if args.size != 1
@@ -35,6 +44,6 @@ end
 db_path = args[0]
 
 Groonga::Database.open(db_path) do |database|
-  inspector = Groonga::DatabaseInspector.new(database)
+  inspector = Groonga::DatabaseInspector.new(database, options)
   inspector.report
 end

data/bin/groonga-index-dump

@@ -26,6 +26,7 @@ options = OpenStruct.new
 options.output_directory = "index-dump"
 
 option_parser = OptionParser.new do |parser|
+  parser.version = Groonga::BINDINGS_VERSION
   parser.banner += " DB_PATH"
 
   parser.on("--output-directory=DIRECTORY",

data/doc/text/news.textile

@@ -1,5 +1,24 @@
 h1. NEWS
 
+h2(#3-1-1). 3.1.1: 2013-12-29
+
+h3. Improvements
+
+* Supported Groonga 3.1.1.
+* [groonga-database-inspect]: Added @--no-tables@ option for hiding
+  all table information.
+* [groonga-database-inspect]: Added @--no-columns@ option for hiding
+  all column information.
+* [doc] Updated English mailing list to use groonga-users-en.
+  [GitHub#14] [Patch by Masafumi Yokoyama]
+* {Groonga::Expression#append_operation} supports operator name.
+* {Groonga::Expression#append_constant} supports operator name.
+* {Groonga::Expression#append_object} supports operator name.
+
+h3. Thanks
+
+* Masafumi Yokoyama
+
 h2(#3-1-0). 3.1.0: 2013-11-29
 
 h3. Improvements
@@ -7,6 +26,7 @@ h3. Improvements
 * Reduced build failure by automatically Groonga build.
   [Reported by SHIMADA Koji]
 * Added @groonga-database-inspect@ command that inspects passed database.
+  [Suggested by Genki Takiuchi]
 * {Groonga::Database#tables} ignores missing objects rather than raising
   an exception. Because the method is interested in only existing tables.
 
@@ -18,6 +38,7 @@ h3. Fixes
 h3. Thanks
 
 * SHIMADA Koji
+* Genki Takiuchi
 
 h2(#3-0-9). 3.0.9: 2013-10-29
 

data/ext/groonga/extconf.rb

@@ -22,12 +22,7 @@ require "fileutils"
 require "shellwords"
 require "open-uri"
 
-begin
-  require "pkg-config"
-rescue LoadError
-  require "rubygems"
-  require "pkg-config"
-end
+require "pkg-config"
 
 base_dir = Pathname(__FILE__).dirname.parent.parent.expand_path
 $LOAD_PATH.unshift(base_dir.to_s)

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

@@ -184,7 +184,7 @@ rb_grn_expression_append_object (int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "12", &rb_object, &rb_operation, &rb_n_arguments);
     if (!NIL_P(rb_operation))
-        operation = NUM2INT(rb_operation);
+        operation = RVAL2GRNOPERATOR(rb_operation);
     if (!NIL_P(rb_n_arguments))
         n_arguments = NUM2INT(rb_n_arguments);
 
@@ -222,7 +222,7 @@ rb_grn_expression_append_constant (int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "12", &rb_constant, &rb_operator, &rb_n_arguments);
     if (!NIL_P(rb_operator))
-        operator = NUM2INT(rb_operator);
+        operator = RVAL2GRNOPERATOR(rb_operator);
     if (!NIL_P(rb_n_arguments))
         n_arguments = NUM2INT(rb_n_arguments);
 
@@ -259,7 +259,7 @@ rb_grn_expression_append_operation (VALUE self, VALUE rb_operation,
                                   NULL, NULL,
                                   NULL, NULL, NULL);
 
-    operation = NUM2INT(rb_operation);
+    operation = RVAL2GRNOPERATOR(rb_operation);
     n_arguments = NUM2INT(rb_n_arguments);
     grn_expr_append_op(context, expression, operation, n_arguments);
     rb_grn_context_check(context, self);

data/ext/groonga/rb-grn.h

@@ -84,7 +84,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 3
 #define RB_GRN_MINOR_VERSION 1
-#define RB_GRN_MICRO_VERSION 0
+#define RB_GRN_MICRO_VERSION 1
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 

data/lib/groonga/database-inspector.rb

@@ -20,8 +20,10 @@ module Groonga
   # of the database.
   class DatabaseInspector
     # @param database [Database] The database to be inspected.
-    def initialize(database)
+    # @param options [Options] The options to custom this inspector behavior.
+    def initialize(database, options=nil)
       @database = database
+      @options = options || Options.new
     end
 
     # Report inspected result of the database.
@@ -30,15 +32,42 @@ module Groonga
     #   If it is @nil@, @$stdout@ is used.
     def report(output=nil)
       output ||= $stdout
-      reporter = Reporter.new(@database, output)
+      reporter = Reporter.new(@database, @options, output)
       reporter.report
     end
 
+    # It is a class that keeps options for {DatabaseInspector}.
+    class Options
+      # @return [Boolean] (true) Shows information about tables if true,
+      #   doesn't show it otherwise.
+      attr_writer :show_tables
+
+      # @return [Boolean] (true) Shows information about columns if true,
+      #   doesn't show it otherwise. If {#show_tables} is false, information
+      #   about columns isn't always shown.
+      attr_writer :show_columns
+      def initialize
+        @show_tables = true
+        @show_columns = true
+      end
+
+      # (see #show_tables=)
+      def show_tables?
+        @show_tables
+      end
+
+      # (see #show_columns=)
+      def show_columns?
+        @show_columns
+      end
+    end
+
     # @private
     class Reporter
-      def initialize(database, output)
+      def initialize(database, options, output)
         @database = database
         @context = @database.context
+        @options = options
         @output = output
         @indent_width = 0
       end
@@ -75,6 +104,7 @@ module Groonga
       end
 
       def report_tables
+        return unless @options.show_tables?
         write("Tables:\n")
         indent do
           tables = @database.tables
@@ -109,6 +139,7 @@ module Groonga
       end
 
       def report_columns(table)
+        return unless @options.show_columns?
         write("Columns:\n")
         indent do
           columns = table.columns
@@ -127,7 +158,6 @@ module Groonga
         indent do
           write("ID:         #{column.id}\n")
           write("Type:       #{inspect_column_type(column)}\n")
-          write("Value type: #{inspect_column_value_type(column)}\n")
           write("Path:       #{inspect_path(column.path)}\n")
           write("Disk usage: #{inspect_sub_disk_usage(column.disk_usage)}\n")
         end
@@ -270,10 +300,6 @@ module Groonga
           "scalar"
         end
       end
-
-      def inspect_column_value_type(column)
-        column.domain.name
-      end
     end
   end
 end

data/rroonga-build.rb

@@ -27,7 +27,7 @@ module RroongaBuild
   module LatestGroongaVersion
     MAJOR = 3
     MINOR = 1
-    MICRO = 0
+    MICRO = 1
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-database-inspector.rb

@@ -18,14 +18,23 @@ class DatabaseInspectorTest < Test::Unit::TestCase
 
   setup :setup_database, :before => :append
 
+  setup
+  def setup_options
+    @options = Groonga::DatabaseInspector::Options.new
+  end
+
   private
   def report
     output = StringIO.new
-    inspector = Groonga::DatabaseInspector.new(@database)
+    inspector = Groonga::DatabaseInspector.new(@database, @options)
     inspector.report(output)
     output.string
   end
 
+  def create_reporter(output)
+    Groonga::DatabaseInspector::Reporter.new(@database, @options, output)
+  end
+
   def total_disk_usage
     @database.tables.inject(@database.disk_usage) do |previous, table|
       previous + total_table_disk_usage(table)
@@ -135,7 +144,6 @@ class DatabaseInspectorTest < Test::Unit::TestCase
         #{column.local_name}:
           ID:         #{column.id}
           Type:       #{inspect_column_type(column)}
-          Value type: #{column.domain.name}
           Path:       <#{column.path}>
           Disk usage: #{inspect_sub_disk_usage(column.disk_usage)}
     INSPECTED
@@ -173,6 +181,21 @@ Database
       INSPECTED
     end
 
+    def test_no_show_tables
+      @options.show_tables = false
+      assert_equal(<<-INSPECTED, report)
+Database
+  Path:             <#{@database_path}>
+  Total disk usage: #{inspect_disk_usage(total_disk_usage)}
+  Disk usage:       #{inspect_sub_disk_usage(@database.disk_usage)}
+  N records:        0
+  N tables:         0
+  N columns:        0
+  Plugins:
+    None
+      INSPECTED
+    end
+
     class NRecordsTest < self
       setup
       def setup_tables
@@ -353,7 +376,7 @@ Database
     private
     def report
       output = StringIO.new
-      reporter = Groonga::DatabaseInspector::Reporter.new(@database, output)
+      reporter = create_reporter(output)
       reporter.send(:report_table, @table)
       output.string
     end
@@ -607,13 +630,41 @@ Database
         INSPECTED
       end
     end
+
+    class ColumnsTest < self
+      setup
+      def setup_tables
+        Groonga::Schema.create_table("Users") do |table|
+          table.short_text("name")
+          table.int8("age")
+        end
+        @table = Groonga["Users"]
+      end
+
+      def test_no_show_columns
+        @options.show_columns = false
+        assert_equal(<<-INSPECTED, report)
+#{@table.name}:
+  ID:               #{@table.id}
+  Type:             #{inspect_table_type(@table)}
+  Key type:         #{inspect_key_type(@table)}
+  Tokenizer:        #{inspect_tokenizer(@table)}
+  Normalizer:       #{inspect_normalizer(@table)}
+  Path:             <#{@table.path}>
+  Total disk usage: #{inspect_sub_disk_usage(total_table_disk_usage(@table))}
+  Disk usage:       #{inspect_sub_disk_usage(@table.disk_usage)}
+  N records:        #{@table.size}
+  N columns:        #{@table.columns.size}
+        INSPECTED
+      end
+    end
   end
 
   class ColumnTest < self
     private
     def report
       output = StringIO.new
-      reporter = Groonga::DatabaseInspector::Reporter.new(@database, output)
+      reporter = create_reporter(output)
       reporter.send(:report_column, @column)
       output.string
     end
@@ -666,7 +717,6 @@ Database
 #{@column.local_name}:
   ID:         #{@column.id}
   Type:       #{type}
-  Value type: #{@column.domain.name}
   Path:       <#{@column.path}>
   Disk usage: #{inspect_sub_disk_usage(@column.disk_usage)}
         INSPECTED