groonga 0.0.6 → 0.0.7

data/lib/groonga/patricia-trie.rb

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2009  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
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+module Groonga
+  class PatriciaTrie
+    def tag_keys(text)
+      position = 0
+      result = ''
+      if text.respond_to?(:encoding)
+        encoding = text.encoding
+        bytes = text.dup.force_encoding("ascii-8bit")
+      else
+        encoding = nil
+        bytes = text
+      end
+      scan(text) do |record, word, start, length|
+        previous_text = bytes[position...start]
+        previous_text.force_encoding(encoding) if encoding
+        result << previous_text
+        result << yield(record, word)
+        position = start + length
+      end
+      result
+    end
+  end
+end

data/lib/groonga/record.rb

@@ -34,27 +34,33 @@ module Groonga
     end
 
     def [](column_name)
-      column(column_name, true)[@id]
+      column(column_name)[@id]
     end
 
     def []=(column_name, value)
-      column(column_name, true)[@id] = value
+      column(column_name)[@id] = value
     end
 
     def append(column_name, value)
-      column(column_name, true).append(@id, value)
+      column(column_name).append(@id, value)
+    end
+
+    def prepend(column_name, value)
+      column(column_name).prepend(@id, value)
     end
 
     def have_column?(name)
-      not column(name).nil?
+      column(name).is_a?(Groonga::Column)
+    rescue Groonga::InvalidArgument
+      false
     end
 
     def reference_column?(name)
-      column(name, true).range.is_a?(Groonga::Table)
+      column(name).range.is_a?(Groonga::Table)
     end
 
     def search(name, query, options={})
-      column(name, true).search(query, options)
+      column(name).search(query, options)
     end
 
     def key
@@ -74,11 +80,11 @@ module Groonga
     end
 
     def increment!(name, delta=nil)
-      column(name, true).increment!(@id, delta)
+      column(name).increment!(@id, delta)
     end
 
     def decrement!(name, delta=nil)
-      column(name, true).decrement!(@id, delta)
+      column(name).decrement!(@id, delta)
     end
 
     def columns
@@ -90,7 +96,7 @@ module Groonga
       table_name = @table.name
       columns.each do |column|
         next if column.is_a?(Groonga::IndexColumn)
-        attributes[column.name[(table_name.size + 1)..-1]] = column[@id]
+        attributes[column.local_name] = column[@id]
       end
       attributes
     end
@@ -116,11 +122,9 @@ module Groonga
     end
 
     private
-    def column(name, required=false)
+    def column(name)
       _column = @table.column(name.to_s)
-      if _column.nil? and required
-        raise Groonga::Error, "nonexistent column: <#{name.inspect}>"
-      end
+      raise InvalidArgument, "column(#{name.inspect}) is nil" if _column.nil?
       _column
     end
   end

data/misc/grnop2ruby.rb

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2009  Yuto Hayamizu <y.hayamizu@gmail.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+#
+# This script expects "groonga.h" as a first argument, extracts the
+# 'grn_operator', and write 'rb_define_const's of 'grn_operator' to
+# standard outout.
+#
+# Usage:
+#   ruby grnop2ruby.rb /path/to/groonga.h
+#
+
+replace_dictionary = {
+  "VAR" => "VARIABLE",
+  "EXPR" => "EXPRESSION",
+  "NOP" => "NO_OPERATION",
+  "REF" => "REFERENCE",
+  "OBJ" => "OBJECT",
+  "INCR" => "INCREMENT",
+  "DECR" => "DECREMENT",
+  "MOD" => "MODULO",
+  "LCP" => "LONGEST_COMMON_PREFIX",
+}
+
+ARGF.each_line do |line|
+  case line
+  when /\A\s+(GRN_OP_\w+)/
+    operator = $1
+    rb_operator = operator.gsub(/\AGRN_OP_/, "").split("_").map{ |word|
+      replace_dictionary[word] || word
+    }.join("_")
+    puts "    rb_define_const(rb_mGrnOperation, \"%s\",
+                    UINT2NUM(%s));" % [rb_operator, operator]
+  end
+end

data/pkg-config.rb

@@ -146,7 +146,7 @@ class PackageConfig
     [path_flags, other_flags]
   end
 
-  IDENTIFIER_RE = /[\w\d_.]+/
+  IDENTIFIER_RE = /[\w.]+/
   def parse_pc
     raise ".pc for #{@name} doesn't exist." unless exist?
     @variables = {}

data/test-unit/lib/test/unit/assertions.rb

@@ -880,7 +880,7 @@ EOT
             MaybeContainer.new(value, &formatter)
           end
 
-          MAX_DIFF_TARGET_STRING_SIZE = 300
+          MAX_DIFF_TARGET_STRING_SIZE = 1000
           def diff_target_string?(string)
             if string.respond_to?(:bytesize)
               string.bytesize < MAX_DIFF_TARGET_STRING_SIZE
@@ -930,7 +930,10 @@ EOM
               if use_pp
                 begin
                   require 'pp' unless defined?(PP)
-                  return PP.pp(object, '').chomp
+                  begin
+                    return PP.pp(object, '').chomp
+                  rescue NameError
+                  end
                 rescue LoadError
                   self.use_pp = false
                 end

data/test-unit/lib/test/unit/autorunner.rb

@@ -102,15 +102,23 @@ module Test
         @to_run = []
         @color_scheme = ColorScheme.default
         @runner_options = {}
+        @default_arguments = []
         @workdir = nil
-        default_config_file = "test-unit.yml"
-        load_config(default_config_file) if File.exist?(default_config_file)
+        config_file = "test-unit.yml"
+        if File.exist?(config_file)
+          load_config(config_file)
+        else
+          global_config_file = File.expand_path("~/.test-unit.xml")
+          load_config(global_config_file) if File.exist?(global_config_file)
+        end
         yield(self) if block_given?
       end
 
       def process_args(args = ARGV)
+        default_arguments = @default_arguments.dup
         begin
-          options.order!(args) {|arg| @to_run << arg}
+          @default_arguments.concat(args)
+          options.order!(@default_arguments) {|arg| @to_run << arg}
         rescue OptionParser::ParseError => e
           puts e
           puts options
@@ -119,6 +127,8 @@ module Test
           @filters << proc{false} unless(@filters.empty?)
         end
         not @to_run.empty?
+      ensure
+        @default_arguments = default_arguments
       end
 
       def options
@@ -304,7 +314,11 @@ module Test
         (config["#{runner_name}_options"] || {}).each do |key, value|
           key = key.to_sym
           value = ColorScheme[value] if key == :color_scheme
-          runner_options[key.to_sym] = value
+          if key == :arguments
+            @default_arguments.concat(value.split)
+          else
+            runner_options[key.to_sym] = value
+          end
         end
         @runner_options = @runner_options.merge(runner_options)
       end
@@ -327,3 +341,4 @@ end
 
 require 'test/unit/runner/console'
 require 'test/unit/runner/emacs'
+require 'test/unit/runner/tap'

data/test-unit/lib/test/unit/collector/load.rb

@@ -76,7 +76,9 @@ module Test
               sub_test_suites << sub_test_suite unless sub_test_suite.empty?
             end
           else
-            collect_file(path, sub_test_suites, already_gathered)
+            unless excluded_file?(path.basename.to_s)
+              collect_file(path, sub_test_suites, already_gathered)
+            end
           end
 
           test_suite = TestSuite.new(path.basename.to_s)

data/test-unit/lib/test/unit/color-scheme.rb

@@ -14,7 +14,11 @@ module Test
                             "omission" => Color.new("blue", :bold => true),
                             "notification" => Color.new("cyan", :bold => true),
                             "error" => Color.new("yellow", :bold => true) +
-                                       Color.new("black", :foreground => false))
+                                       Color.new("black", :foreground => false),
+                            "case" => Color.new("white", :bold => true) +
+                                       Color.new("blue", :foreground => false),
+                            "suite" => Color.new("white", :bold => true) +
+                                       Color.new("green", :foreground => false))
         end
 
         @@schemes = {}

data/test-unit/lib/test/unit/error.rb

@@ -69,18 +69,20 @@ module Test
         end
       end
 
+      NOT_PASS_THROUGH_EXCEPTIONS = []
       PASS_THROUGH_EXCEPTIONS = [NoMemoryError, SignalException, Interrupt,
                                  SystemExit]
       private
       def handle_all_exception(exception)
         case exception
+        when *NOT_PASS_THROUGH_EXCEPTIONS
         when *PASS_THROUGH_EXCEPTIONS
-          false
-        else
-          problem_occurred
-          add_error(exception)
-          true
+          return false
         end
+
+        problem_occurred
+        add_error(exception)
+        true
       end
 
       def add_error(exception)

data/test-unit/lib/test/unit/runner/tap.rb

@@ -0,0 +1,8 @@
+module Test
+  module Unit
+    AutoRunner.register_runner(:tap) do |auto_runner|
+      require 'test/unit/ui/tap/testrunner'
+      Test::Unit::UI::Tap::TestRunner
+    end
+  end
+end

data/test-unit/lib/test/unit/ui/console/testrunner.rb

@@ -1,7 +1,9 @@
 #--
 #
 # Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# Copyright::
+#   * Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+#   * Copyright (c) 2008-2009 Kouhei Sutou <kou@clear-code.com>
 # License:: Ruby license.
 
 require 'test/unit/color-scheme'
@@ -36,6 +38,9 @@ module Test
             @progress_row_max = @options[:progress_row_max]
             @progress_row_max ||= guess_progress_row_max
             @already_outputted = false
+            @n_successes = 0
+            @indent = 0
+            @top_level = true
             @faults = []
           end
 
@@ -68,6 +73,8 @@ module Test
             @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
             @mediator.add_listener(TestCase::STARTED, &method(:test_started))
             @mediator.add_listener(TestCase::FINISHED, &method(:test_finished))
+            @mediator.add_listener(TestSuite::STARTED, &method(:test_suite_started))
+            @mediator.add_listener(TestSuite::FINISHED, &method(:test_suite_finished))
           end
           
           def start_mediator
@@ -91,8 +98,6 @@ module Test
 
           def finished(elapsed_time)
             nl if output?(NORMAL) and !output?(VERBOSE)
-            nl
-            output("Finished in #{elapsed_time} seconds.")
             @faults.each_with_index do |fault, index|
               nl
               output_single("%3d) " % (index + 1))
@@ -101,25 +106,75 @@ module Test
               output(detail)
             end
             nl
+            output("Finished in #{elapsed_time} seconds.")
+            nl
             output(@result, result_color)
+            n_tests = @result.run_count
+            if n_tests.zero?
+              pass_percentage = 0
+            else
+              pass_percentage = 100.0 * (@n_successes / n_tests.to_f)
+            end
+            output("%g%% passed" % pass_percentage, result_color)
           end
 
           def format_fault(fault)
             fault.long_display
           end
-          
+
           def test_started(name)
-            output_single(name + ": ", nil, VERBOSE)
+            return unless output?(VERBOSE)
+
+            name = name.sub(/\(.+?\)\z/, '')
+            right_space = 8 * 2
+            left_space = @progress_row_max - right_space
+            left_space = left_space - indent.size - name.size
+            tab_stop = "\t" * ((left_space - 1) / 8)
+            output_single("#{indent}#{name}:#{tab_stop}", nil, VERBOSE)
+            @test_start = Time.now
           end
-          
+
           def test_finished(name)
             unless @already_outputted
+              @n_successes += 1
               output_progress(".", color("success"))
             end
-            nl(VERBOSE)
             @already_outputted = false
+
+            return unless output?(VERBOSE)
+
+            output(": (%f)" % (Time.now - @test_start), nil, VERBOSE)
           end
-          
+
+          def test_suite_started(name)
+            if @top_level
+              @top_level = false
+              return
+            end
+
+            output_single(indent, nil, VERBOSE)
+            if /\A[A-Z]/ =~ name
+              _color = color("case")
+            else
+              _color = color("suite")
+            end
+            output_single(name, _color, VERBOSE)
+            output(": ", nil, VERBOSE)
+            @indent += 2
+          end
+
+          def test_suite_finished(name)
+            @indent -= 2
+          end
+
+          def indent
+            if output?(VERBOSE)
+              " " * @indent
+            else
+              ""
+            end
+          end
+
           def nl(level=NORMAL)
             output("", nil, level)
           end

data/test-unit/lib/test/unit/ui/tap/testrunner.rb

@@ -0,0 +1,92 @@
+#--
+#
+# Author:: Kouhei Sutou.
+# Copyright:: Copyright (c) 2009 Kouhei Sutou <kou@clear-code.com>.
+# License:: Ruby license.
+
+require 'test/unit/ui/testrunner'
+require 'test/unit/ui/testrunnermediator'
+
+module Test
+  module Unit
+    module UI
+      module Tap
+
+        # Runs a Test::Unit::TestSuite and outputs result
+        # as TAP format.
+        class TestRunner < UI::TestRunner
+          def initialize(suite, options={})
+            super
+            @output = @options[:output] || STDOUT
+            @n_tests = 0
+            @already_outputted = false
+          end
+
+          # Begins the test run.
+          def start
+            setup_mediator
+            result = start_mediator
+            def result.passed?
+              true # for prove commend :<
+            end
+            result
+          end
+
+          private
+          def setup_mediator
+            @mediator = TestRunnerMediator.new(@suite)
+            attach_to_mediator
+          end
+
+          def attach_to_mediator
+            @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
+            @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
+            @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
+            @mediator.add_listener(TestCase::STARTED, &method(:test_started))
+            @mediator.add_listener(TestCase::FINISHED, &method(:test_finished))
+          end
+
+          def start_mediator
+            @mediator.run_suite
+          end
+
+          def add_fault(fault)
+            puts("not ok #{@n_tests} - #{fault.short_display}")
+            fault.long_display.each_line do |line|
+              puts("# #{line}")
+            end
+            @already_outputted = true
+          end
+
+          def started(result)
+            @result = result
+            puts("1..#{@suite.size}")
+          end
+
+          def finished(elapsed_time)
+            puts("# Finished in #{elapsed_time} seconds.")
+            @result.to_s.each_line do |line|
+              puts("# #{line}")
+            end
+          end
+
+          def test_started(name)
+            @n_tests += 1
+          end
+
+          def test_finished(name)
+            unless @already_outputted
+              puts("ok #{@n_tests} - #{name}")
+            end
+            @already_outputted = false
+          end
+
+          def puts(*args)
+            @output.puts(*args)
+            @output.flush
+          end
+        end
+      end
+    end
+  end
+end