null+****@clear*****
null+****@clear*****
2012年 6月 6日 (水) 13:53:47 JST
Haruka Yoshihara 2012-06-06 13:53:47 +0900 (Wed, 06 Jun 2012)
New Revision: e9fdc0cabbfcff50c73874fe5535837a94e26bdb
Log:
Don't remove new lines
Modified files:
lib/groonga/tester.rb
test/test-executor.rb
Modified: lib/groonga/tester.rb (+14 -4)
===================================================================
--- lib/groonga/tester.rb 2012-06-06 13:39:38 +0900 (16ea964)
+++ lib/groonga/tester.rb 2012-06-06 13:53:47 +0900 (86fb3c9)
@@ -631,10 +631,20 @@ module Groonga
line[/\[.+\]/] = "--values #{json.gsub(/\s/, "")}"
end
- now_command, *arguments = Shellwords.split(line)
+ command = nil
+ arguments = nil
+ load_values = ""
+ @gqtp_command.each_line.with_index do |line, i|
+ if i.zero?
+ command, *arguments = Shellwords.split(line)
+ else
+ load_values << line
+ end
+ end
+ arguments.concat(["--values", load_values]) unless load_values.empty?
- translated_values = translate_arguments(now_command, arguments)
- url = build_url(now_command, translated_values)
+ translated_values = translate_arguments(command, arguments)
+ url = build_url(command, translated_values)
url
end
@@ -660,7 +670,7 @@ module Groonga
query_parameter = last_command
end
- value = argument.gsub(/\s/, "")
+ value = argument
translated_values =
translated_values.merge(query_parameter => value)
arguments_count += 1
Modified: test/test-executor.rb (+4 -6)
===================================================================
--- test/test-executor.rb 2012-06-06 13:39:38 +0900 (072f4c9)
+++ test/test-executor.rb 2012-06-06 13:53:47 +0900 (67c6c4a)
@@ -92,8 +92,7 @@ class TestExecutor < Test::Unit::TestCase
["razil","http://razil.jp/"]
]
EOF
- load_values = load_values.gsub(/\n/, "")
- command = "#{load_command} #{load_values}"
+ command = "#{load_command}\n#{load_values}"
actual_url = convert(command)
arguments = {
"table" => "Sites",
@@ -111,13 +110,12 @@ EOF
{"_key": "ruby", "uri": "http://ruby-lang.org/"}
]
EOF
- load_values = load_values.gsub(/\n/, "")
- command = "#{load_command} #{load_values}"
+ command = "#{load_command}\n#{load_values}"
actual_url = convert(command)
arguments = {
"table" => "Sites",
- "values" => load_values.gsub(/\s/, "")
+ "values" => load_values
}
expected_url = build_url("load", arguments)
@@ -128,7 +126,7 @@ EOF
command = "select Sites --output_columns '_key, uri'"
arguments = {
"table" => "Sites",
- "output_columns" => "_key,uri",
+ "output_columns" => "_key, uri",
}
actual_url = convert(command)
expected_url = build_url("select", arguments)