logaling-command 0.1.8 → 0.1.9

data/CHANGES

@@ -1,3 +1,8 @@
+= 0.1.9 / 2012-09-28
+* loga copy のショートカットを -C に、loga config のショートカットを -c にしました。
+
+* loga update 時に同じ原語・訳語のペアが登録できてしまうことがある不具合を修正しました。
+
 = 0.1.8 / 2012-08-30
 
 * 個人用途で logaling-command を使いたい時のために用語集を単体で作れるようにしました。

data/lib/logaling/command/application.rb

@@ -55,7 +55,8 @@ module Logaling::Command
         '-L' => :list,
         '-s' => :show,
         '-v' => :version,
-        '-c' => :copy
+        '-c' => :config,
+        '-C' => :copy
 
     class_option "glossary",        type: :string, aliases: "-g"
     class_option "source-language", type: :string, aliases: "-S"
@@ -188,15 +189,14 @@ module Logaling::Command
       check_logaling_home_exists
       project = @repository.find_project(@config.glossary)
       raise Logaling::ProjectNotFound unless project
-      raise Logaling::ProjectNotFound if project.class.name == 'Logaling::ImportedProject'
+      raise Logaling::ProjectNotFound if project.imported?
       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
 
       glossary.add(source_term, target_term, note)
-    rescue Logaling::CommandFailed, Logaling::TermError => e
+    rescue Logaling::CommandFailed => e
       say e.message
+    rescue Logaling::TermError => e
+      say "term '#{source_term}: #{target_term}' already exists in '#{@config.glossary}'"
     rescue Logaling::GlossaryNotFound => e
       say "Try 'loga new or register' first."
     rescue Logaling::ProjectNotFound
@@ -244,13 +244,12 @@ module Logaling::Command
       project = @repository.find_project(@config.glossary)
       raise Logaling::ProjectNotFound unless project
       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
 
       glossary.update(source_term, target_term, new_target_term, note)
-    rescue Logaling::CommandFailed, Logaling::TermError => e
+    rescue Logaling::CommandFailed => e
       say e.message
+    rescue Logaling::TermError => e
+      say "term '#{source_term}: #{new_target_term}' already exists in '#{@config.glossary}'"
     rescue Logaling::GlossaryNotFound => e
       say "Try 'loga new or register' first."
     rescue Logaling::ProjectNotFound

data/lib/logaling/command/version.rb

@@ -17,6 +17,6 @@
 
 module Logaling
   module Command
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   end
 end

data/lib/logaling/glossary.rb

@@ -39,25 +39,35 @@ module Logaling
       terms
     end
 
-    def bilingual_pair_exists?(source_term, target_term, note=nil)
+    def find_bilingual_pairs(source_term, target_term, note=nil)
       raise Logaling::GlossaryDBNotFound unless File.exist?(@project.glossary_db_path)
       index
       terms = []
       Logaling::GlossaryDB.open(@project.glossary_db_path, "utf8") do |db|
         terms = db.get_bilingual_pair(source_term, target_term, @name, note)
       end
-      !terms.empty?
+      terms.delete_if {|t| t[:target_language] != @target_language }
+    end
+
+    def bilingual_pair_exists?(source_term, target_term, note=nil)
+      !find_bilingual_pairs(source_term, target_term, note).empty?
     end
 
     def add(source_term, target_term, note)
+      raise Logaling::TermError if bilingual_pair_exists?(source_term, target_term)
       glossary_source.add(source_term, target_term, note)
     end
 
     def update(source_term, target_term, new_target_term, note)
+      if (target_term != new_target_term) && bilingual_pair_exists?(source_term, new_target_term)
+        raise Logaling::TermError
+      end
+
       glossary_source.update(source_term, target_term, new_target_term, note)
     end
 
     def delete(source_term, target_term)
+      raise Logaling::TermError unless bilingual_pair_exists?(source_term, target_term)
       glossary_source.delete(source_term, target_term)
     end
 

data/lib/logaling/glossary_sources/glossary_yaml_source.rb

@@ -122,7 +122,7 @@ module Logaling::GlossarySources
 
     def dump_glossary_source(glossary_source)
       File.open(source_path, "w") do |f|
-        YAML.dump(glossary_source, f)
+        f << YAML.dump(glossary_source)
       end
     end
   end

data/lib/logaling/project.rb

@@ -76,6 +76,10 @@ module Logaling
       glossaries.any? {|glossary| glossary.to_s == [name, source_language, target_language].join('.') }
     end
 
+    def imported?
+      false
+    end
+
     private
     def all_glossary_source_path
       Dir.glob(File.join(glossary_source_path, "*"))
@@ -95,15 +99,29 @@ module Logaling
     def glossary_source_path
       File.dirname(@path)
     end
+
+    def imported?
+      true
+    end
   end
 
   class PersonalProject < Project
-    def self.create(root_path, glossary_name, source_language, target_language)
-      project_name = [glossary_name, source_language, target_language, 'yml'].join('.')
-      project_path = File.join(root_path, project_name)
-      project = PersonalProject.new(project_path)
-      project.initialize_glossary(source_language, target_language)
-      project
+    class << self
+      def create(root_path, glossary_name, source_language, target_language, repository=nil)
+        project_name = [glossary_name, source_language, target_language, 'yml'].join('.')
+        project_path = File.join(root_path, project_name)
+        project = PersonalProject.new(project_path, repository)
+        project.initialize_glossary(source_language, target_language)
+        project
+      end
+
+      def remove(root_path, glossary_name, source_language, target_language, repository=nil)
+        project_name = [glossary_name, source_language, target_language, 'yml'].join('.')
+        project_path = File.join(root_path, project_name)
+        project = PersonalProject.new(project_path, repository)
+        FileUtils.rm_rf(project_path, :secure => true)
+        project
+      end
     end
 
     def name

data/lib/logaling/repository.rb

@@ -48,7 +48,18 @@ module Logaling
       if glossary_exists?(project_name, source_language, target_language)
         raise Logaling::GlossaryAlreadyRegistered, "The glossary '#{project_name}' already exists."
       end
-      PersonalProject.create(personal_glossary_root_path, project_name, source_language, target_language)
+      PersonalProject.create(personal_glossary_root_path, project_name, source_language, target_language, self)
+    end
+
+    def remove_personal_project(project_name, source_language, target_language)
+      unless glossary_exists?(project_name, source_language, target_language)
+        raise Logaling::GlossaryNotFound, "The glossary '#{project_name}' not found."
+      end
+      PersonalProject.remove(personal_glossary_root_path, project_name, source_language, target_language, self)
+    rescue Logaling::GlossaryNotFound => e
+      raise e
+    rescue
+      raise Logaling::CommandFailed, "Failed remove the glossary #{project_name}."
     end
 
     def import(glossary_source)
@@ -99,7 +110,7 @@ module Logaling
     end
 
     def index
-      all_glossary_sources = projects.map{|project| project.glossary_sources}.flatten
+      all_glossary_sources = projects.map {|project| project.glossary_sources }.flatten
 
       Logaling::GlossaryDB.open(logaling_db_home, "utf8") do |db|
         db.recreate_table
@@ -128,7 +139,7 @@ module Logaling
     end
 
     def find_project(project_name)
-      project = projects.detect{|project| project.name == project_name}
+      projects.detect {|project| project.name == project_name }
     end
 
     def find_glossary(project_name, source_language, target_language)

data/spec/logaling/command_spec.rb

@@ -341,11 +341,12 @@ describe Logaling::Command::Application do
 
     context 'with exisiting bilingual pair and note' do
       before do
-        @stdout = capture(:stdout) { command.update("spec", "テスト", "テスト", "備考") }
+        command.update("spec", "テスト", "テスト", "備考")
+        @yaml = YAML::load_file(glossary_source_path).find{|h| h["source_term"] == "spec" }
       end
 
-      it 'should show error message' do
-        @stdout.should include "already exists"
+      it "term's target_term should not be updated" do
+        @yaml.should == {"source_term"=>"spec", "target_term"=>"テスト", "note"=>"備考"}
       end
     end
 

data/spec/logaling/glossary_spec.rb

@@ -89,7 +89,16 @@ module Logaling
           term = yaml.index({"source_term"=>"user", "target_term"=>"ユーザ", "note"=>""})
           term.should_not be_nil
         end
+      end
+
+      context 'same [source-term, taget-term] pair can not exist' do
+        before do
+          glossary.add("user", "ゆーざー", "")
+        end
 
+        it {
+          -> { glossary.update("user", "ゆーざー", "ユーザ", "") }.should raise_error(Logaling::TermError)
+        }
       end
     end
 
@@ -98,6 +107,8 @@ module Logaling
         before do
           glossary.add("delete_logaling", "てすと1", "備考")
           glossary.add("delete_logaling", "てすと2", "備考")
+          # in order to index certainly
+          sleep(1)
           glossary.delete("delete_logaling", "てすと1")
           repository.index
           @result = repository.lookup("delete_logaling", glossary)

data/spec/logaling/repository_spec.rb

@@ -118,6 +118,8 @@ module Logaling
           File.open(glossary_source_path, 'w') do |f|
             YAML.dump([], f)
           end
+          # in order to index certainly
+          sleep(1)
           glossary.add("spec_logaling", "スペック", "備考")
           repository.index
           @terms = repository.lookup("spec_logaling", glossary)
@@ -167,6 +169,36 @@ module Logaling
       end
     end
 
+    describe "#remove_personal_project" do
+      let(:rm_glossary_name) { "rm_personal_project" }
+      let(:rm_source_language) { "en" }
+      let(:rm_target_language) { "ja" }
+      before do
+        FileUtils.rm_rf(File.join(logaling_home, 'personal'), :secure => true)
+        repository.create_personal_project(rm_glossary_name, rm_source_language, rm_target_language)
+      end
+
+      context "when target personal project exists" do
+        before do
+          repository.remove_personal_project(rm_glossary_name, rm_source_language, rm_target_language)
+          @projects = repository.projects
+        end
+
+        it "should remove personal project" do
+          @projects.size.should == 1
+        end
+      end
+
+      context "when target personal project not exist" do
+        it "should raise Logaling::GlossaryNotFound" do
+          @name = rm_glossary_name + "foo"
+          lambda{
+            repository.remove_personal_project(@name, rm_source_language, rm_target_language)
+          }.should raise_error(Logaling::GlossaryNotFound)
+        end
+      end
+    end
+
     after do
       FileUtils.rm_rf(File.join(logaling_home, 'projects', 'spec'), :secure => true)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logaling-command
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor