logaling-command 0.1.9 → 0.2.0

data/CHANGES

@@ -1,3 +1,7 @@
+= 0.2.0 / 2012-10-29
+* lookup 時のオプションに --fixed を追加しました。
+* 言語対のみ異なる個人用語集を削除した場合に、削除されなかった方の個人用語集もdeindexされてしまう不具合を修正しました。
+
 = 0.1.9 / 2012-09-28
 * loga copy のショートカットを -C に、loga config のショートカットを -c にしました。
 

data/lib/logaling/command/application.rb

@@ -262,6 +262,7 @@ module Logaling::Command
     method_option "no-pager", type: :boolean, default: false
     method_option "no-color", type: :boolean, default: false
     method_option "dictionary", type: :boolean, default: false, aliases: "--dict"
+    method_option "fixed", type: :boolean, default: false
     def lookup(source_term)
       check_logaling_home_exists
       @repository.index
@@ -272,7 +273,7 @@ module Logaling::Command
       else
         glossary = nil
       end
-      terms = @repository.lookup(source_term, glossary, options["dictionary"])
+      terms = @repository.lookup(source_term, glossary, options)
       unless terms.empty?
         run_pager
         terms.each_with_index do |term, i|

data/lib/logaling/command/version.rb

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

data/lib/logaling/glossary.rb

@@ -101,12 +101,15 @@ module Logaling
       [@name, @source_language, @target_language].join('.')
     end
 
-    private
-    def index
+    def index!
+      index(force: true)
+    end
+
+    def index(options = { force: false })
       Logaling::GlossaryDB.open(@project.glossary_db_path, "utf8") do |db|
         db.recreate_table
         glossary_sources.each do |glossary_source|
-          unless db.glossary_source_exist?(glossary_source)
+          if !db.glossary_source_exist?(glossary_source) || options[:force] == true
             puts "now index #{@name}..."
             db.index_glossary_source(glossary_source)
           end
@@ -119,6 +122,7 @@ module Logaling
       end
     end
 
+    private
     def glossary_sources
       glob_condition = SUPPORTED_FILE_TYPE.map do |type|
         file_name = [self.to_s, type].join('.')

data/lib/logaling/glossary_db.rb

@@ -63,8 +63,10 @@ module Logaling
 
     def deindex_glossary(glossary, glossary_source)
       delete_translations_by_glossary_source(glossary_source.source_path)
-      delete_glossary(glossary.name)
       delete_glossary_source(glossary_source.source_path)
+      unless glossary_source_of_the_same_project_exist?(glossary_source)
+        delete_glossary(glossary.name)
+      end
     end
 
     def deindex_glossary_source(glossary_source)
@@ -437,5 +439,24 @@ module Logaling
       # use online index if LOGALING_OFFLINE_INDEX=no
       ENV["LOGALING_OFFLINE_INDEX"] != "no"
     end
+
+    def glossary_source_of_the_same_project_exist?(glossary_source)
+      glossary_source_num = 0
+      get_all_glossary_sources.each do |glossary_source_taken|
+        if glossary_source.belongs_to_personal? && glossary_source_taken.belongs_to_personal?
+          if glossary_source.glossary_name == glossary_source_taken.glossary_name
+            glossary_source_num = 1
+            break
+          end
+        elsif glossary_source.belongs_to_project? && glossary_source_taken.belongs_to_project?
+          if glossary_source.project_name == glossary_source_taken.project_name &&
+             glossary_source.glossary_name == glossary_source_taken.glossary_name
+            glossary_source_num = 1
+            break
+          end
+        end
+      end
+      glossary_source_num > 0 ? true : false
+    end
   end
 end

data/lib/logaling/glossary_sources/base.rb

@@ -37,6 +37,22 @@ module Logaling
       def mtime
         File.mtime(@source_path)
       end
+
+      def belongs_to_personal?
+        @source_path =~ /.+\/personal\/.+/ ? true : false
+      end
+
+      def belongs_to_project?
+        @source_path =~ /.+\/projects\/.+/ ? true : false
+      end
+
+      def glossary_name
+        File.basename(@source_path).split(".", 2)[0]
+      end
+
+      def project_name
+        @source_path =~ /.+\/projects\/([^\/]+).+/ ? $1 : nil
+      end
     end
   end
 end

data/lib/logaling/repository.rb

@@ -82,18 +82,25 @@ module Logaling
       raise Logaling::CommandFailed, "Failed import_tmx #{glossary_source.class.name} to #{cache_path}."
     end
 
-    def lookup(source_term, glossary, dictionary=false)
+    def lookup(source_term, glossary, options={})
       raise Logaling::GlossaryDBNotFound unless File.exist?(logaling_db_home)
 
       terms = []
       Logaling::GlossaryDB.open(logaling_db_home, "utf8") do |db|
-        if dictionary
+        if options['dictionary']
           terms = db.lookup_dictionary(source_term)
         else
           terms = db.lookup(source_term, glossary)
         end
       end
-      terms
+      options['fixed'] ? except_annotation(terms) : terms
+    end
+
+    def except_annotation(terms)
+      fixed_terms = terms.reject do |term|
+        Logaling::Glossary::SUPPORTED_ANNOTATION.any? {|ann| term[:note].index(ann) }
+      end
+      fixed_terms
     end
 
     def projects

data/spec/logaling/repository_spec.rb

@@ -54,7 +54,8 @@ module Logaling
           glossary.add("ゆーざ", "test user-logaling test text", "")
           File.stub!(:mtime).and_return(Time.now - 1)
           repository.index
-          @terms = repository.lookup("user-logaling", glossary, true)
+          options = {"dictionary"=>true}
+          @terms = repository.lookup("user-logaling", glossary, options)
           @result = [{
             :glossary_name=>"spec",
             :source_language=>"en",
@@ -89,6 +90,32 @@ module Logaling
         end
       end
 
+      context 'with fixed option' do
+        let(:annotation_word) { Logaling::Glossary::SUPPORTED_ANNOTATION.first }
+        before do
+          glossary.add("user", "ユーザ", "ユーザーではない")
+          glossary.add("user-logaling", "ユーザ", "ユーザーと迷い中 #{annotation_word}")
+          File.stub!(:mtime).and_return(Time.now - 1)
+          repository.index
+          options = {"fixed" => true}
+          @terms = repository.lookup("user", glossary, options)
+          @result = [{
+            :glossary_name=>"spec",
+            :source_language=>"en",
+            :target_language=>"ja",
+            :source_term=>"user",
+            :snipped_source_term=>["", {:keyword=>"user"}],
+            :target_term=>"ユーザ",
+            :snipped_target_term=>["ユーザ"],
+            :note=>"ユーザーではない"}]
+        end
+
+        it 'succeed at find by term without include annotation' do
+          @terms.should == @result
+        end
+
+      end
+
       context 'when tsv file as glossary exists' do
         let(:tsv_path) { glossary_source_path.sub(/yml$/, 'tsv') }
 

metadata

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