null+****@clear*****
null+****@clear*****
Tue Jul 3 23:26:34 JST 2012
SHIMADA Koji 2012-07-03 23:26:34 +0900 (Tue, 03 Jul 2012) New Revision: c9e206e5982c2021117dc29f86332b6bcb7c59da https://github.com/logaling/logaling-command/commit/c9e206e5982c2021117dc29f86332b6bcb7c59da Log: Rename Project#find_glossary to Project#glossary because that's behavior is not in accord with name Modified files: lib/logaling/command/application.rb lib/logaling/project.rb spec/logaling/command_spec.rb spec/logaling/glossary_spec.rb spec/logaling/repository_spec.rb Modified: lib/logaling/command/application.rb (+5 -5) =================================================================== --- lib/logaling/command/application.rb 2012-07-03 16:53:02 +0900 (8e4bb4e) +++ lib/logaling/command/application.rb 2012-07-03 23:26:34 +0900 (7e2f1e1) @@ -176,7 +176,7 @@ module Logaling::Command check_logaling_home_exists project =****@repos*****_project(@config.glossary) raise Logaling::ProjectNotFound unless project - glossary = project.find_glossary(@config.source_language, @config.target_language) + glossary = project.glossary(@config.source_language, @config.target_language) if glossary.bilingual_pair_exists?(source_term, target_term) raise Logaling::TermError, "term '#{source_term}: #{target_term}' already exists in '#{@config.glossary}'" end @@ -203,7 +203,7 @@ module Logaling::Command check_logaling_home_exists project =****@repos*****_project(@config.glossary) raise Logaling::ProjectNotFound unless project - glossary = project.find_glossary(@config.source_language, @config.target_language) + glossary = project.glossary(@config.source_language, @config.target_language) if target_term glossary.delete(source_term, target_term) @@ -230,7 +230,7 @@ module Logaling::Command check_logaling_home_exists project =****@repos*****_project(@config.glossary) raise Logaling::ProjectNotFound unless project - glossary = project.find_glossary(@config.source_language, @config.target_language) + glossary = project.glossary(@config.source_language, @config.target_language) if glossary.bilingual_pair_exists?(source_term, new_target_term, note) raise Logaling::TermError, "term '#{source_term}: #{new_target_term}' already exists in '#{@config.glossary}'" end @@ -256,7 +256,7 @@ module Logaling::Command if****@confi***** project =****@repos*****_project(@config.glossary) raise Logaling::ProjectNotFound unless project - glossary = project.find_glossary(@config.source_language, @config.target_language) + glossary = project.glossary(@config.source_language, @config.target_language) else glossary = nil end @@ -307,7 +307,7 @@ module Logaling::Command check_logaling_home_exists project =****@repos*****_project(@config.glossary) raise Logaling::ProjectNotFound unless project - glossary = project.find_glossary(@config.source_language, @config.target_language) + glossary = project.glossary(@config.source_language, @config.target_language) terms = glossary.terms unless terms.empty? run_pager Modified: lib/logaling/project.rb (+4 -4) =================================================================== --- lib/logaling/project.rb 2012-07-03 16:53:02 +0900 (e7fe5a1) +++ lib/logaling/project.rb 2012-07-03 23:26:34 +0900 (5b03ad9) @@ -49,12 +49,12 @@ module Logaling all_glossary_source_path = Dir.glob(File.join(glossary_source_path, "*")) glossaries = all_glossary_source_path.map do |source_path| name, source_language, target_language, type = File.basename(source_path).split(/\./) - find_glossary(source_language, target_language) + glossary(source_language, target_language) end glossaries.uniq{|glossary| glossary.to_s } end - def find_glossary(source_language, target_language) + def glossary(source_language, target_language) Logaling::Glossary.new(name, source_language, target_language, self) end @@ -70,7 +70,7 @@ module Logaling all_glossary_source_path = Dir.glob(File.join(glossary_source_path, "*")) all_glossary_source_path.map do |source_path| name, source_language, target_language, type = File.basename(source_path).split(/\./) - GlossarySource.create(source_path, find_glossary(source_language, target_language)) + GlossarySource.create(source_path, glossary(source_language, target_language)) end end end @@ -82,7 +82,7 @@ module Logaling def glossary_sources name, source_language, target_language, type = File.basename(@path).split(/\./) - [GlossarySource.create(@path, find_glossary(source_language, target_language))] + [GlossarySource.create(@path, glossary(source_language, target_language))] end end end Modified: spec/logaling/command_spec.rb (+1 -1) =================================================================== --- spec/logaling/command_spec.rb 2012-07-03 16:53:02 +0900 (7f6afad) +++ spec/logaling/command_spec.rb 2012-07-03 23:26:34 +0900 (4aaec17) @@ -24,7 +24,7 @@ describe Logaling::Command::Application do let(:command) { Logaling::Command::Application.new([], base_options) } let(:target_project_path) { File.join(logaling_home, "projects", "spec") } let(:repository) { Logaling::Repository.new(logaling_home) } - let(:glossary) { repository.find_project('spec').find_glossary('en', 'ja') } + let(:glossary) { repository.find_project('spec').glossary('en', 'ja') } let(:glossary_source_path) { glossary.glossary_source.source_path } before do Modified: spec/logaling/glossary_spec.rb (+1 -1) =================================================================== --- spec/logaling/glossary_spec.rb 2012-07-03 16:53:02 +0900 (97ffdd5) +++ spec/logaling/glossary_spec.rb 2012-07-03 23:26:34 +0900 (d083eb2) @@ -22,7 +22,7 @@ module Logaling describe Glossary do let(:logaling_home) { @logaling_home } let(:repository) { Logaling::Repository.new(logaling_home) } - let(:glossary) { repository.find_project('spec').find_glossary('en', 'ja') } + let(:glossary) { repository.find_project('spec').glossary('en', 'ja') } let(:glossary_source_path) { glossary.glossary_source.source_path } before do Modified: spec/logaling/repository_spec.rb (+1 -1) =================================================================== --- spec/logaling/repository_spec.rb 2012-07-03 16:53:02 +0900 (4a88e37) +++ spec/logaling/repository_spec.rb 2012-07-03 23:26:34 +0900 (7a64098) @@ -22,7 +22,7 @@ module Logaling describe Repository do let(:logaling_home) { @logaling_home } let(:repository) { Logaling::Repository.new(logaling_home) } - let(:glossary) { repository.find_project('spec').find_glossary('en', 'ja') } + let(:glossary) { repository.find_project('spec').glossary('en', 'ja') } let(:glossary_source_path) { glossary.glossary_source.source_path } before do -------------- next part -------------- An HTML attachment was scrubbed...다운로드
