groonga/groonga-command at 5f6f43a [fix-travis-ci-error] load_header -> load_columns (Groonga-commit) - Groonga - fulltext search engine.

Kouhei Sutou	2012-11-28 13:00:27 +0900 (Wed, 28 Nov 2012)

  New Revision: 5f6f43a748a88db33f0e3e7e20a2efb56abfe2eb
  https://github.com/groonga/groonga-command/commit/5f6f43a748a88db33f0e3e7e20a2efb56abfe2eb

  Message:
    load_header -> load_columns

  Modified files:
    lib/groonga/command/parser.rb
    test/test-parser.rb

  Modified: lib/groonga/command/parser.rb (+11 -11)
===================================================================

--- lib/groonga/command/parser.rb    2012-11-28 12:57:18 +0900 (86ce9ad)
+++ lib/groonga/command/parser.rb    2012-11-28 13:00:27 +0900 (ddbfc30)
@@ -88,8 +88,8 @@ module Groonga
           parser.on_load_start do |command|
             yield(:on_load_start, command)
           end
-          parser.on_load_header do |command, header|
-            yield(:on_load_header, command, header)
+          parser.on_load_columns do |command, header|
+            yield(:on_load_columns, command, header)
           end
           parser.on_load_value do |command, value|
             yield(:on_load_value, command, value)
@@ -177,13 +177,13 @@ module Groonga
         end
       end
 
-      # @overload on_load_header(command)
-      # @overload on_load_header {|command| }
-      def on_load_header(*arguments, &block)
+      # @overload on_load_columns(command)
+      # @overload on_load_columns {|command| }
+      def on_load_columns(*arguments, &block)
         if block_given?
-          @on_load_header_hook = block
+          @on_load_columns_hook = block
         else
-          @on_load_header_hook.call(*arguments) if @on_load_header_hook
+          @on_load_columns_hook.call(*arguments) if @on_load_columns_hook
         end
       end
 
@@ -282,7 +282,7 @@ module Groonga
             @json_parser.on_parse_complete = lambda do |object|
               if object.is_a?(Array) and****@comma*****?
                 @command.columns = object
-                on_load_header(@command, object)
+                on_load_columns(@command, object)
               else
                 on_load_value(@command, object)
               end
@@ -335,14 +335,14 @@ module Groonga
         if****@comma***** == "load"
           on_load_start(@command)
           if****@comma*****
-            on_load_header(@command, @command.columns)
+            on_load_columns(@command, @command.columns)
           end
           if @command[:values]
             values = Yajl::Parser.parse(@command[:values])
             if****@comma*****? and values.first.is_a?(Array)
               header = values.shift
               @command.columns = header
-              on_load_header(@command, header)
+              on_load_columns(@command, header)
             end
             values.each do |value|
               on_load_value(@command, value)
@@ -415,7 +415,7 @@ module Groonga
       def initialize_hooks
         @on_command_hook = nil
         @on_load_start_hook = nil
-        @on_load_header_hook = nil
+        @on_load_columns_hook = nil
         @on_load_value_hook = nil
         @on_load_complete_hook = nil
       end

  Modified: test/test-parser.rb (+6 -6)
===================================================================
--- test/test-parser.rb    2012-11-28 12:57:18 +0900 (5a1734c)
+++ test/test-parser.rb    2012-11-28 13:00:27 +0900 (0191c32)
@@ -116,8 +116,8 @@ class ParserTest < Test::Unit::TestCase
           @parser.on_load_start do |command|
             @events << [:load_start, command.original_source.dup]
           end
-          @parser.on_load_header do |command, header|
-            @events << [:load_header, command.original_source.dup, header]
+          @parser.on_load_columns do |command, header|
+            @events << [:load_columns, command.original_source.dup, header]
           end
           @parser.on_load_value do |command, value|
             @events << [:load_value, command.original_source.dup, value]
@@ -140,7 +140,7 @@ class ParserTest < Test::Unit::TestCase
               @parser << "\n"
               assert_equal([
                              [:load_start, command_line],
-                             [:load_header, command_line, ["_key", "name"]],
+                             [:load_columns, command_line, ["_key", "name"]],
                              [:load_value, command_line, ["alice", "Alice"]],
                              [:load_complete, command_line],
                            ],
@@ -154,7 +154,7 @@ class ParserTest < Test::Unit::TestCase
               @parser << "\n"
               assert_equal([
                              [:load_start, command_line],
-                             [:load_header, command_line, ["_key"]],
+                             [:load_columns, command_line, ["_key"]],
                              [:load_value, command_line, [1]],
                              [:load_complete, command_line],
                            ],
@@ -189,7 +189,7 @@ EOC
               expected_events << [:load_start, <<-EOC.chomp]
 load --table Users --columns "_key, name"
 EOC
-              expected_events << [:load_header, <<-EOC.chomp, ["_key", "name"]]
+              expected_events << [:load_columns, <<-EOC.chomp, ["_key", "name"]]
 load --table Users --columns "_key, name"
 EOC
               expected_events << [:load_value, <<-EOC.chomp, ["alice", "Alice"]]
@@ -218,7 +218,7 @@ EOC
               expected_events << [:load_start, <<-EOC.chomp]
 load --table Users
 EOC
-              expected_events << [:load_header, <<-EOC.chomp, ["_key", "name"]]
+              expected_events << [:load_columns, <<-EOC.chomp, ["_key", "name"]]
 load --table Users
 [
 ["_key", "name"]
-------------- next part --------------
HTML����������������������������...
Descargar 


Groonga - fulltext search engine.

[Groonga-commit] groonga/groonga-command at 5f6f43a [fix-travis-ci-error] load_header -> load_columns