rroonga 1.1.0 → 1.2.0

data/lib/groonga/schema.rb

@@ -386,9 +386,11 @@ module Groonga
         end
       end
 
-      # スキーマの内容を文字列で返す。返された値は
-      # Groonga::Schema.restoreすることによりスキーマ内に組
-      # み込むことができる。
+      # スキーマの内容を文字列をRubyスクリプト形式またはgrn式
+      # 形式で返す。デフォルトはRubyスクリプト形式である。
+      # Rubyスクリプト形式で返された値は
+      # Groonga::Schema.restoreすることによりスキーマ内に組み
+      # 込むことができる。
       #
       #   dump.rb:
       #     File.open("/tmp/groonga-schema.rb", "w") do |schema|
@@ -400,14 +402,36 @@ module Groonga
       #     Groonga::Database.create(:path => "/tmp/new-db.grn")
       #     Groonga::Schema.restore(dumped_text)
       #
+      # grn式形式で返された値はgroongaコマンドで読み込むこと
+      # ができる。
+      #
+      #   dump.rb:
+      #     File.open("/tmp/groonga-schema.grn", "w") do |schema|
+      #       dumped_text = Groonga::Schema.dump(:syntax => :command)
+      #     end
+      #
+      #   % groonga db/path < /tmp/groonga-schema.grn
+      #
       # _options_に指定可能な値は以下の通り。
       #
       # [+:context+]
       #   スキーマ定義時に使用するGroonga::Contextを指定する。
       #   省略した場合はGroonga::Context.defaultを使用する。
+      #
+      # [+:syntax+]
+      #   スキーマの文字列の形式を指定する。指定可能な値は以
+      #   下の通り。
+      #
+      #   [+:ruby+]
+      #     Rubyスクリプト形式。省略した場合、+nil+の場合も
+      #     Rubyスクリプト形式になる。
+      #
+      #   [+:command+]
+      #     groongaコマンド形式。groongaコマンドで読み込むこ
+      #     とができる。
       def dump(options={})
-        options = options.dup
-        schema = new(:context => options.delete(:context))
+        schema = new(:context => options[:context],
+                     :syntax => options[:syntax])
         schema.dump
       end
 
@@ -473,10 +497,11 @@ module Groonga
         "mecab" => "TokenMecab",
         "token_mecab"=> "TokenMecab",
       }
-      def normalize_type(type) # :nodoc:
+      def normalize_type(type, options={}) # :nodoc:
         return type if type.nil?
         return type if type.is_a?(Groonga::Object)
         type = type.to_s if type.is_a?(Symbol)
+        return type if (options[:context] || Groonga::Context.default)[type]
         NORMALIZE_TYPE_TABLE[type] || type
       end
     end
@@ -515,7 +540,8 @@ module Groonga
     # スキーマの内容を文字列で返す。返された値は
     # Groonga::Schema#restoreすることによりスキーマ内に組み込むことができる。
     def dump
-      dumper = Dumper.new(:context => @options[:context])
+      dumper = SchemaDumper.new(:context => @options[:context],
+                                :syntax => @options[:syntax] || :ruby)
       dumper.dump
     end
 
@@ -1121,7 +1147,7 @@ module Groonga
         key_support_table_common = {
           :key_type => normalize_key_type(@options[:key_type] || "ShortText"),
           :key_normalize => @options[:key_normalize],
-          :default_tokenizer => @options[:default_tokenizer],
+          :default_tokenizer => normalize_type(@options[:default_tokenizer]),
         }
 
         if @table_type == Groonga::Array
@@ -1181,7 +1207,9 @@ module Groonga
         sub_records = false if sub_records.nil?
         return false unless table.support_sub_records? == sub_records
         path = options[:path]
-        return false if path and table.path != path
+        if path and File.expand_path(table.path) != File.expand_path(path)
+          return false
+        end
 
         case table
         when Groonga::Array
@@ -1189,7 +1217,8 @@ module Groonga
         when Groonga::Hash, Groonga::PatriciaTrie
           key_type = normalize_key_type(options[:key_type])
           return false unless table.domain == resolve_name(key_type)
-          default_tokenizer = resolve_name(options[:default_tokenizer])
+          default_tokenizer = normalize_type(options[:default_tokenizer])
+          default_tokenizer = resolve_name(default_tokenizer)
           return false unless table.default_tokenizer == default_tokenizer
           key_normalize = options[:key_normalize]
           key_normalize = false if key_normalize.nil?
@@ -1206,7 +1235,11 @@ module Groonga
       end
 
       def normalize_key_type(key_type)
-        Schema.normalize_type(key_type || "ShortText")
+        normalize_type(key_type || "ShortText")
+      end
+
+      def normalize_type(type)
+        Schema.normalize_type(type, :context => context)
       end
 
       def resolve_name(type)
@@ -1250,13 +1283,20 @@ module Groonga
       end
 
       def define
-        context = @options[:context]
-        table = context[@name]
+        table = removed_table
         dir = columns_directory_path(table)
         result = table.remove
         rmdir_if_dir_exists(dir)
         result
       end
+
+      private
+      def removed_table
+        context = @options[:context]
+        table = context[@name]
+        raise TableNotExists.new(@name) if table.nil?
+        table
+      end
     end
 
     # スキーマ定義時にGroonga::Schema.create_viewや
@@ -1382,7 +1422,7 @@ module Groonga
         else
           resolved_type = @type
         end
-        Schema.normalize_type(resolved_type)
+        Schema.normalize_type(resolved_type, :context => context)
       end
 
       def same_column?(context, column)
@@ -1533,172 +1573,5 @@ module Groonga
         File.join(columns_dir, name)
       end
     end
-
-    class Dumper # :nodoc:
-      def initialize(options={})
-        @options = (options || {}).dup
-      end
-
-      def dump
-        context = @options[:context] || Groonga::Context.default
-        database = context.database
-        return nil if database.nil?
-
-        header + dump_schema(database) + footer
-      end
-
-      def dump_schema(database)
-        index_columns = []
-        reference_columns = []
-        definitions = []
-        database.each do |object|
-          next unless object.is_a?(Groonga::Table)
-          table = object
-          schema = create_table_header(table)
-          table.columns.sort_by {|column| column.local_name}.each do |column|
-            if column.is_a?(Groonga::IndexColumn)
-              index_columns << column
-            else
-              if column.range.is_a?(Groonga::Table)
-                reference_columns << column
-              else
-                schema << define_column(table, column)
-              end
-            end
-          end
-          schema << create_table_footer(table)
-          definitions << schema
-        end
-
-        reference_columns.group_by do |column|
-          column.table
-        end.each do |table, columns|
-          schema = change_table_header(table)
-          columns.each do |column|
-            schema << define_reference_column(table, column)
-          end
-          schema << change_table_footer(table)
-          definitions << schema
-        end
-
-        index_columns.group_by do |column|
-          column.table
-        end.each do |table, columns|
-          schema = change_table_header(table)
-          columns.each do |column|
-            schema << define_index_column(table, column)
-          end
-          schema << change_table_footer(table)
-          definitions << schema
-        end
-
-        if definitions.empty?
-          ""
-        else
-          definitions.join("\n\n") + "\n"
-        end
-      end
-
-      private
-      def header
-        ""
-      end
-
-      def footer
-        ""
-      end
-
-      def create_table_header(table)
-        parameters = []
-        unless table.is_a?(Groonga::Array)
-          case table
-          when Groonga::Hash
-            parameters << ":type => :hash"
-          when Groonga::PatriciaTrie
-            parameters << ":type => :patricia_trie"
-          end
-          if table.domain
-            parameters << ":key_type => #{table.domain.name.dump}"
-            if table.normalize_key?
-              parameters << ":key_normalize => true"
-            end
-          end
-          default_tokenizer = table.default_tokenizer
-          if default_tokenizer
-            parameters << ":default_tokenizer => #{default_tokenizer.name.dump}"
-          end
-        end
-        parameters << ":force => true"
-        parameters.unshift("")
-        parameters = parameters.join(",\n             ")
-        "create_table(#{table.name.dump}#{parameters}) do |table|\n"
-      end
-
-      def create_table_footer(table)
-        "end"
-      end
-
-      def change_table_header(table)
-        "change_table(#{table.name.inspect}) do |table|\n"
-      end
-
-      def change_table_footer(table)
-        "end"
-      end
-
-      def define_column(table, column)
-        type = column_method(column)
-        name = column.local_name
-        "  table.#{type}(#{name.inspect})\n"
-      end
-
-      def define_reference_column(table, column)
-        name = column.local_name
-        reference = column.range
-        "  table.reference(#{name.dump}, #{reference.name.dump})\n"
-      end
-
-      def define_index_column(table, column)
-        target_table_name = column.range.name
-        sources = column.sources
-        source_names = sources.collect do |source|
-          if source.is_a?(table.class)
-            "_key".dump
-          else
-            source.local_name.dump
-          end
-        end.join(", ")
-        arguments = [target_table_name.dump,
-                     sources.size == 1 ? source_names : "[#{source_names}]",
-                     ":name => #{column.local_name.dump}"]
-        "  table.index(#{arguments.join(', ')})\n"
-      end
-
-      def column_method(column)
-        range = column.range
-        case range.name
-        when "Int32"
-          "integer32"
-        when "Int64"
-          "integer64"
-        when "UInt32"
-          "unsigned_integer32"
-        when "UInt64"
-          "unsigned_integer64"
-        when "Float"
-          "float"
-        when "Time"
-          "time"
-        when "ShortText"
-          "short_text"
-        when "Text"
-          "text"
-        when "LongText"
-          "long_text"
-        else
-          raise ArgumentError, "unsupported column: #{column.inspect}"
-        end
-      end
-    end
   end
 end

data/rroonga-build.rb

@@ -18,7 +18,7 @@
 module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     MICRO = 0
     VERSION = [MAJOR, MINOR, MICRO]
   end

data/test-unit-notify/Rakefile

@@ -0,0 +1,47 @@
+# -*- ruby -*-
+
+require 'pathname'
+
+base_dir = Pathname(__FILE__).dirname.expand_path
+test_unit_dir = (base_dir.parent + "test-unit").expand_path
+test_unit_lib_dir = test_unit_dir + "lib"
+lib_dir = base_dir + "lib"
+
+$LOAD_PATH.unshift(test_unit_lib_dir.to_s)
+$LOAD_PATH.unshift(lib_dir.to_s)
+
+require 'test/unit/notify'
+
+require 'rubygems'
+require 'hoe'
+
+Test::Unit.run = true
+
+version = Test::Unit::Notify::VERSION
+ENV["VERSION"] = version
+Hoe.spec('test-unit-notify') do
+  self.version = version
+  self.rubyforge_name = "test-unit"
+
+  developer('Kouhei Sutou', 'kou@clear-code.com')
+
+  extra_deps << ["test-unit"]
+end
+
+task :docs do
+  doc_dir = base_dir + "doc"
+  doc_screenshot_dir = doc_dir + "screenshot"
+  mkdir_p(doc_screenshot_dir.to_s)
+  (base_dir + "screenshot").children.each do |file|
+    next if file.directory?
+    cp(file.to_s, doc_screenshot_dir.to_s)
+  end
+end
+
+task :tag do
+  message = "Released Test::Unit::Notify #{version}!"
+  base = "svn+ssh://#{ENV['USER']}@rubyforge.org/var/svn/test-unit/extensions/test-unit-notify/"
+  sh 'svn', 'copy', '-m', message, "#{base}trunk", "#{base}tags/#{version}"
+end
+
+# vim: syntax=Ruby

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

@@ -0,0 +1,104 @@
+#--
+#
+# Author:: Kouhei Sutou
+# Copyright::
+#   * Copyright (c) 2010 Kouhei Sutou <kou@clear-code.com>
+# License:: Ruby license.
+
+require 'pathname'
+require 'erb'
+require 'test/unit'
+
+module Test
+  module Unit
+    AutoRunner.setup_option do |auto_runner, options|
+      options.on("--[no-]notify",
+                 "Notify test result at the last.") do |use_notify|
+        auto_runner.listeners.reject! do |listener|
+          listener.is_a?(Notify::Notifier)
+        end
+        auto_runner.listeners << Notify::Notifier.new if use_notify
+      end
+    end
+
+    module Notify
+      VERSION = "0.0.2"
+
+      class Notifier
+        include ERB::Util
+
+        base_dir = Pathname(__FILE__).dirname.parent.parent.parent.expand_path
+        ICON_DIR = base_dir + "data" + "icons"
+        def initialize
+          @theme = "kinotan"
+        end
+
+        def attach_to_mediator(mediator)
+          mediator.add_listener(UI::TestRunnerMediator::STARTED,
+                                &method(:started))
+          mediator.add_listener(UI::TestRunnerMediator::FINISHED,
+                                &method(:finished))
+        end
+
+        def started(result)
+          @result = result
+        end
+
+        def finished(elapsed_time)
+          case RUBY_PLATFORM
+          when /mswin|mingw|cygwin/
+            # how?
+          when /darwin/
+            # growl?
+          else
+            notify_by_notify_send(elapsed_time)
+          end
+        end
+
+        def notify_by_notify_send(elapsed_time)
+          icon = guess_suitable_icon
+          args = ["notify-send",
+                  "--expire-time", "5000",
+                  "--urgency", urgency]
+          args.concat(["--icon", icon.to_s]) if icon
+          title = "%s [%g%%] (%gs)" % [@result.status,
+                                       @result.pass_percentage,
+                                       elapsed_time]
+          args << title
+          args << h(@result.summary)
+          system(*args)
+        end
+
+        def guess_suitable_icon
+          icon_dir = ICON_DIR + @theme
+          status = @result.status
+          icon_base_names = [status]
+          if @result.passed?
+            icon_base_names << "pass"
+          else
+            case status
+            when "failure"
+              icon_base_names << "error"
+            when "error"
+              icon_base_names << "failure"
+            end
+          end
+          icon_base_names << "default"
+          icon_base_names.each do |base_name|
+            icon = icon_dir + "#{base_name}.png"
+            return icon if icon.exist?
+          end
+          nil
+        end
+
+        def urgency
+          if @result.passed?
+            "normal"
+          else
+            "critical"
+          end
+        end
+      end
+    end
+  end
+end