null+****@clear*****
null+****@clear*****
Fri Jun 8 09:43:17 JST 2012
SHIMADA Koji 2012-06-08 09:43:17 +0900 (Fri, 08 Jun 2012)
New Revision: ae2d5dd766115afcaef237b2ce9d3ef77e232e73
Log:
Always not empty the snippet when use GlossaryDB#lookup
Modified files:
lib/logaling/command/renderers.rb
lib/logaling/glossary_db.rb
spec/logaling/repository_spec.rb
Modified: lib/logaling/command/renderers.rb (+1 -1)
===================================================================
--- lib/logaling/command/renderers.rb 2012-06-08 10:54:29 +0900 (be893e7)
+++ lib/logaling/command/renderers.rb 2012-06-08 09:43:17 +0900 (09fae8c)
@@ -36,7 +36,7 @@ module Logaling::Command
private
def extract_keyword_and_coloring(snipped_term, term)
- return term if snipped_term.empty? || @options["no-color"]
+ return term if @options["no-color"]
build_term_string_from_snippets(snipped_term)
end
Modified: lib/logaling/glossary_db.rb (+1 -1)
===================================================================
--- lib/logaling/glossary_db.rb 2012-06-08 10:54:29 +0900 (8d6f1cf)
+++ lib/logaling/glossary_db.rb 2012-06-08 09:43:17 +0900 (446f5ff)
@@ -385,7 +385,7 @@ module Logaling
def struct_snipped_term(term, snippet)
snipped_text = snippet.execute(term).join
- struct_snipped_text(snipped_text)
+ snipped_text.empty? ? [term] : struct_snipped_text(snipped_text)
end
def latest_version?
Modified: spec/logaling/repository_spec.rb (+3 -3)
===================================================================
--- spec/logaling/repository_spec.rb 2012-06-08 10:54:29 +0900 (4699edd)
+++ spec/logaling/repository_spec.rb 2012-06-08 09:43:17 +0900 (2012e8f)
@@ -63,7 +63,7 @@ module Logaling
:source_term=>"user-logaling",
:snipped_source_term=>["", {:keyword=>"user-logaling"}],
:target_term=>"ユーザ",
- :snipped_target_term=>[],
+ :snipped_target_term=>["ユーザ"],
:note=>"ユーザーではない"},
{
:glossary_name=>"spec",
@@ -72,14 +72,14 @@ module Logaling
:source_term=>"user-logaling test",
:snipped_source_term=>["", {:keyword=>"user-logaling"}, " test"],
:target_term=>"ユーザーてすと",
- :snipped_target_term=>[],
+ :snipped_target_term=>["ユーザーてすと"],
:note=>""},
{
:glossary_name=>"spec",
:source_language=>"en",
:target_language=>"ja",
:source_term=>"ゆーざ",
- :snipped_source_term=>[],
+ :snipped_source_term=>["ゆーざ"],
:target_term=>"test user-logaling test text",
:snipped_target_term=>["test", {:keyword=>" user-logaling"}, " test text"],
:note=>""}]