logaling-command 0.2.0 → 0.2.1

data/CHANGES

@@ -1,3 +1,6 @@
+= 0.2.1 / 2012-11-29
+* インデックスのタイミングを見直すことで検索速度が速くなりました
+
 = 0.2.0 / 2012-10-29
 * lookup 時のオプションに --fixed を追加しました。
 * 言語対のみ異なる個人用語集を削除した場合に、削除されなかった方の個人用語集もdeindexされてしまう不具合を修正しました。

data/lib/logaling/command/application.rb

@@ -52,6 +52,7 @@ module Logaling::Command
         '-n' => :new,
         '-r' => :register,
         '-U' => :unregister,
+        '-I' => :index,
         '-L' => :list,
         '-s' => :show,
         '-v' => :version,
@@ -80,7 +81,7 @@ module Logaling::Command
             @dotfile_path = options["logaling-config"] || Logaling::Project.find_dotfile
             @project_config_path = File.join(@dotfile_path, 'config')
             @config.load(@project_config_path)
-            register_and_index
+            @repository.register(@dotfile_path, @config.glossary)
           end
           say "Successfully created #{logaling_config_path}"
         else
@@ -89,7 +90,7 @@ module Logaling::Command
       else
         raise Logaling::CommandFailed, "[TARGET-LANGUAGE] is required when you use '--personal'" unless target_language
         personal_project = @repository.create_personal_project(project_name, source_language, target_language)
-        say "Successfully created #{personal_project.path}"
+        say "Successfully created #{personal_project.absolute_path}"
       end
     rescue Logaling::CommandFailed => e
       say e.message
@@ -114,10 +115,8 @@ module Logaling::Command
           end
           glossary = Logaling::Glossary.new(args[0], args[2], args[3])
           @repository.import_tmx(Logaling::ExternalGlossary.get(external_glossary), glossary, url)
-          @repository.index
         else
           @repository.import(Logaling::ExternalGlossary.get(external_glossary))
-          @repository.index
         end
       end
     rescue Logaling::CommandFailed => e
@@ -135,7 +134,7 @@ module Logaling::Command
       @config.check_required_option("glossary" => "Do 'loga register' at project directory.")
       raise Logaling::CommandFailed, "Try 'loga new' first." unless File.exist?(@dotfile_path)
 
-      register_and_index
+      @repository.register(@dotfile_path, @config.glossary)
       say "#{@config.glossary} is now registered to logaling."
     rescue Logaling::CommandFailed => e
       say e.message
@@ -150,7 +149,6 @@ module Logaling::Command
 
       project = @repository.find_project(@config.glossary)
       @repository.unregister(project)
-      @repository.index
       say "#{@config.glossary} is now unregistered."
     rescue Logaling::CommandFailed => e
       say e.message
@@ -158,25 +156,35 @@ module Logaling::Command
       say "#{@config.glossary} is not yet registered."
     end
 
-   desc 'config [KEY] [VALUE] [--global(optional)]', 'Set config.'
-   method_option "global", type: :boolean, default: false
-   def config(key, value)
-     if options["global"]
-       unless File.exist?(@logaling_home)
-         FileUtils.mkdir_p(@logaling_home) rescue raise Logaling::CommandFailed, "Input existing directory as logaling-home."
-       end
-       config_path = File.join(@logaling_home, "config")
-     else
-       raise Logaling::CommandFailed, "Can't found .logaling" unless @project_config_path
-       config_path = @project_config_path
-     end
-     config = Logaling::Config.load(config_path)
-     config.add(key, value)
-     config.save(config_path)
-     say "Successfully set config."
-   rescue Logaling::CommandFailed => e
-     say e.message
-   end
+    desc 'index', 'Index glossaries'
+    def index
+      check_logaling_home_exists
+
+      @repository.index
+      say 'Complete index.'
+    rescue Logaling::CommandFailed => e
+      say e.message
+    end
+
+    desc 'config [KEY] [VALUE] [--global(optional)]', 'Set config.'
+    method_option "global", type: :boolean, default: false
+    def config(key, value)
+      if options["global"]
+        unless File.exist?(@logaling_home)
+          FileUtils.mkdir_p(@logaling_home) rescue raise Logaling::CommandFailed, "Input existing directory as logaling-home."
+        end
+        config_path = File.join(@logaling_home, "config")
+      else
+        raise Logaling::CommandFailed, "Can't found .logaling" unless @project_config_path
+        config_path = @project_config_path
+      end
+      config = Logaling::Config.load(config_path)
+      config.add(key, value)
+      config.save(config_path)
+      say "Successfully set config."
+    rescue Logaling::CommandFailed => e
+      say e.message
+    end
 
     desc 'add [SOURCE TERM] [TARGET TERM] [NOTE(optional)]', 'Add term to glossary.'
     def add(source_term, target_term, note='')
@@ -265,7 +273,6 @@ module Logaling::Command
     method_option "fixed", type: :boolean, default: false
     def lookup(source_term)
       check_logaling_home_exists
-      @repository.index
       if @config.glossary
         project = @repository.find_project(@config.glossary)
         raise Logaling::ProjectNotFound unless project
@@ -408,10 +415,5 @@ module Logaling::Command
         raise Logaling::CommandFailed, "Do 'loga import tmx <glossary name> <url or path>'"
       end
     end
-
-    def register_and_index
-      @repository.register(@dotfile_path, @config.glossary)
-      @repository.index
-    end
   end
 end

data/lib/logaling/command/version.rb

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

data/lib/logaling/glossary.rb

@@ -19,7 +19,7 @@ module Logaling
     SUPPORTED_FILE_TYPE = %w(yml tsv csv)
     SUPPORTED_ANNOTATION = %w(wip)
 
-    attr_reader :name, :source_language, :target_language
+    attr_reader :name, :source_language, :target_language, :project
 
     def initialize(name, source_language, target_language, project=nil)
       @name = name
@@ -56,6 +56,7 @@ module Logaling
     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)
+      index!
     end
 
     def update(source_term, target_term, new_target_term, note)
@@ -64,25 +65,28 @@ module Logaling
       end
 
       glossary_source.update(source_term, target_term, new_target_term, note)
+      index!
     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)
+      index!
     end
 
     def delete_all(source_term, force=false)
       glossary_source.delete_all(source_term, force)
+      index!
     end
 
     def glossary_source
       if @glossary_source
         @glossary_source
       else
+        FileUtils.mkdir_p(@project.source_directory_path)
+
         file_name = [@name, @source_language, @target_language, 'yml'].join('.')
-        source_dir = @project.glossary_source_path
-        FileUtils.mkdir_p(source_dir)
-        source_path = File.join(source_dir, file_name)
+        source_path = @project.relative_path(file_name)
         @glossary_source = Logaling::GlossarySource.create(source_path, self)
       end
     end
@@ -122,13 +126,21 @@ module Logaling
       end
     end
 
+    def same?(glossary)
+      name == glossary.name
+    end
+
     private
     def glossary_sources
       glob_condition = SUPPORTED_FILE_TYPE.map do |type|
         file_name = [self.to_s, type].join('.')
-        File.join(@project.glossary_source_path, file_name)
+        File.join(@project.source_directory_path, file_name)
+      end
+      Dir.glob(glob_condition).map do |source_path|
+        file_name = File.basename(source_path)
+        source_path = @project.relative_path(file_name)
+        GlossarySource.create(source_path, self)
       end
-      Dir.glob(glob_condition).map {|source_path| GlossarySource.create(source_path, self)}
     end
   end
 end

data/lib/logaling/glossary_db.rb

@@ -20,7 +20,7 @@ require 'cgi'
 
 module Logaling
   class GlossaryDB
-    VERSION = 1
+    VERSION = 3
 
     def self.open(base_path, encoding, &blk)
       blk ? GlossaryDB.new.open(base_path, encoding, &blk) : GlossaryDB.new.open(base_path, encoding)
@@ -229,10 +229,11 @@ module Logaling
     def get_all_glossary_sources
       source_paths = Groonga["glossary_sources"].sort([
         {:key=>"_key", :order=>'ascending'}
-      ]).map{|record| record.key}
-      source_paths.map do |source_path|
+      ]).map{|record| [record.key, record.project_type]}
+      source_paths.map do |source_path, project_type|
         glossary_name, source_language, target_language = File.basename(source_path).split(/\./)
-        glossary = Glossary.new(glossary_name, source_language, target_language)
+        project = Logaling.const_get(project_type).new(Logaling::Project.find_path(source_path))
+        glossary = Glossary.new(glossary_name, source_language, target_language, project)
         GlossarySource.create(source_path, glossary)
       end
     end
@@ -262,7 +263,10 @@ module Logaling
     end
 
     def add_glossary_source(glossary_source)
-      Groonga["glossary_sources"].add(glossary_source.source_path, :indexed_at => glossary_source.mtime)
+      Groonga["glossary_sources"].add(
+        glossary_source.source_path, {
+        :indexed_at => glossary_source.mtime,
+        :project_type => glossary_source.glossary.project.type})
     end
 
     def delete_glossary(glossary_name)
@@ -341,6 +345,7 @@ module Logaling
                            :type => :hash,
                            :key_type => "ShortText") do |table|
           table.time("indexed_at")
+          table.short_text("project_type")
         end
 
         schema.create_table("glossaries",
@@ -441,16 +446,18 @@ module Logaling
     end
 
     def glossary_source_of_the_same_project_exist?(glossary_source)
+      project = glossary_source.glossary.project
       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
+        project_taken = glossary_source_taken.glossary.project
+        if project.personal? && project_taken.personal?
+          if glossary_source.glossary.same?(glossary_source_taken.glossary)
             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
+        elsif project.normal_project? && project_taken.normal_project?
+          if project.same?(project_taken) &&
+             glossary_source.glossary.same?(glossary_source_taken.glossary)
             glossary_source_num = 1
             break
           end

data/lib/logaling/glossary_sources/base.rb

@@ -20,14 +20,14 @@ module Logaling
     class Base
       attr_reader :source_path, :glossary
 
-      def initialize(source_path, glossary)
-        @source_path = source_path
+      def initialize(relative_source_path, glossary)
+        @source_path = relative_source_path
         @glossary = glossary
       end
 
       def eql?(other)
         return false unless self.class == other.class
-        @source_path == other.source_path
+        source_path == other.source_path
       end
 
       def hash
@@ -35,23 +35,11 @@ module Logaling
       end
 
       def mtime
-        File.mtime(@source_path)
+        File.mtime(absolute_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
+      def absolute_path
+        @glossary.project.repository.expand_path(@source_path)
       end
     end
   end

data/lib/logaling/glossary_sources/glossary_csv_source.rb

@@ -22,7 +22,7 @@ module Logaling::GlossarySources
   class GlossaryCsvSource < Base
     def load
       glossary_source = []
-      CSV.open(source_path, "r:utf-8",  {:col_sep => ','}) do |csv|
+      CSV.open(absolute_path, "r:utf-8",  {:col_sep => ','}) do |csv|
         csv.each do |row|
           glossary_source << {"source_term" => row[0], "target_term" => row[1], "note" => ""} if row.size >= 2
         end

data/lib/logaling/glossary_sources/glossary_tsv_source.rb

@@ -22,7 +22,7 @@ module Logaling::GlossarySources
   class GlossaryTsvSource < Base
     def load
       glossary_source = []
-      CSV.open(source_path, "r:utf-8",  {:col_sep => "\t"}) do |tsv|
+      CSV.open(absolute_path, "r:utf-8",  {:col_sep => "\t"}) do |tsv|
         tsv.each do |row|
           glossary_source << {"source_term" => row[0], "target_term" => row[1], "note" => ""} if row.size >= 2
         end

data/lib/logaling/glossary_sources/glossary_yaml_source.rb

@@ -28,13 +28,13 @@ require "fileutils"
 module Logaling::GlossarySources
   class GlossaryYamlSource < Base
     def load
-      YAML::load_file(source_path) || []
+      YAML::load_file(absolute_path) || []
     rescue TypeError
       []
     end
 
     def add(source_term, target_term, note)
-      initialize_source unless File.exist?(source_path)
+      initialize_source unless File.exist?(absolute_path)
 
       glossary_source = self.load
       glossary_source << build_term(source_term, target_term, note)
@@ -44,7 +44,7 @@ module Logaling::GlossarySources
     end
 
     def update(source_term, target_term, new_target_term, note)
-      raise Logaling::GlossaryNotFound unless File.exist?(source_path)
+      raise Logaling::GlossaryNotFound unless File.exist?(absolute_path)
 
       glossary_source = self.load
       target_index = find_term_index(glossary_source, source_term, target_term)
@@ -57,7 +57,7 @@ module Logaling::GlossarySources
     end
 
     def delete(source_term, target_term)
-      raise Logaling::GlossaryNotFound unless File.exist?(source_path)
+      raise Logaling::GlossaryNotFound unless File.exist?(absolute_path)
 
       glossary_source = self.load
       target_index = find_term_index(glossary_source, source_term, target_term)
@@ -70,7 +70,7 @@ module Logaling::GlossarySources
     end
 
     def delete_all(source_term, force=false)
-      raise Logaling::GlossaryNotFound unless File.exist?(source_path)
+      raise Logaling::GlossaryNotFound unless File.exist?(absolute_path)
 
       glossary_source = self.load
       delete_candidates = target_terms(glossary_source, source_term)
@@ -121,7 +121,7 @@ module Logaling::GlossarySources
     end
 
     def dump_glossary_source(glossary_source)
-      File.open(source_path, "w") do |f|
+      File.open(absolute_path, "w") do |f|
         f << YAML.dump(glossary_source)
       end
     end

data/lib/logaling/project.rb

@@ -33,11 +33,19 @@ module Logaling
           end
         end
       end
+
+      def find_path(source_path)
+        if source_path =~ /(.+\/projects\/[^\/]+).+/
+          $1
+        else
+          source_path
+        end
+      end
     end
     attr_reader :path, :repository
 
-    def initialize(path, repository=nil)
-      @path = path
+    def initialize(relative_path, repository=nil)
+      @path = relative_path
       @repository = repository
     end
 
@@ -50,7 +58,14 @@ module Logaling
     end
 
     def glossary_source_path
-      File.join(@path, "glossary")
+      File.join(@repository.expand_path(@path), "glossary")
+    end
+    alias_method :source_directory_path, :glossary_source_path
+
+    # relative_path_from_logaling_home みたいな名前でGlossarySourceにある方が良いかも...
+    def relative_path(glossary_source_file_name)
+      source_path = File.join(source_directory_path, glossary_source_file_name)
+      @repository.relative_path(source_path)
     end
 
     def glossary_db_path
@@ -66,8 +81,9 @@ module Logaling
     end
 
     def glossary_sources
-      all_glossary_source_path.map do |source_path|
-        name, source_language, target_language, type = File.basename(source_path).split(/\./)
+      all_glossary_source_path.map do |source_path_full|
+        name, source_language, target_language, type = File.basename(source_path_full).split(/\./)
+        source_path = @repository.relative_path(source_path_full)
         GlossarySource.create(source_path, glossary(source_language, target_language))
       end
     end
@@ -80,13 +96,29 @@ module Logaling
       false
     end
 
+    def personal?
+      false
+    end
+
+    def normal_project?
+      true
+    end
+
+    def type
+      self.class.to_s.sub('Logaling::', '')
+    end
+
+    def same?(project)
+      name == project.name
+    end
+
     private
     def all_glossary_source_path
       Dir.glob(File.join(glossary_source_path, "*"))
     end
   end
 
-  class ImportedProject < Project
+  class FileBasedProject < Project
     def name
       File.basename(@path).split(/\./).first
     end
@@ -96,49 +128,56 @@ module Logaling
       [GlossarySource.create(@path, glossary(source_language, target_language))]
     end
 
-    def glossary_source_path
-      File.dirname(@path)
+    def has_glossary?(source_language, target_language)
+      glossary_source_language, glossary_target_language = File.basename(@path).split(/\./)[1..2]
+      glossary_source_language == source_language && glossary_target_language == target_language
     end
 
+    def absolute_path
+      @repository.expand_path(@path)
+    end
+    alias_method :glossary_source_path, :absolute_path
+
+    def normal_project?
+      false
+    end
+
+    def source_directory_path
+      File.dirname(glossary_source_path)
+    end
+  end
+
+  class ImportedProject < FileBasedProject
     def imported?
       true
     end
   end
 
-  class PersonalProject < Project
+  class PersonalProject < FileBasedProject
     class << self
-      def create(root_path, glossary_name, source_language, target_language, repository=nil)
+      def create(relative_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_path = File.join(relative_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)
+      def remove(relative_root_path, glossary_name, source_language, target_language, repository)
         project_name = [glossary_name, source_language, target_language, 'yml'].join('.')
-        project_path = File.join(root_path, project_name)
+        project_path = File.join(relative_root_path, project_name)
         project = PersonalProject.new(project_path, repository)
-        FileUtils.rm_rf(project_path, :secure => true)
+        FileUtils.rm_rf(repository.expand_path(project_path), :secure => true)
         project
       end
     end
 
-    def name
-      File.basename(@path).split(/\./).first
-    end
-
-    def glossary_sources
-      name, source_language, target_language, type = File.basename(@path).split(/\./)
-      [GlossarySource.create(@path, glossary(source_language, target_language))]
-    end
-
-    def glossary_source_path
-      File.dirname(@path)
-    end
-
     def initialize_glossary(source_language, target_language)
       glossary(source_language, target_language).initialize_glossary_source
     end
+
+    def personal?
+      true
+    end
   end
 end

data/lib/logaling/repository.rb

@@ -33,6 +33,7 @@ module Logaling
       else
         raise Logaling::GlossaryAlreadyRegistered, register_name
       end
+      index
     rescue Logaling::GlossaryAlreadyRegistered => e
       raise e
     rescue
@@ -41,21 +42,25 @@ module Logaling
 
     def unregister(project)
       raise Logaling::ProjectNotFound unless project
-      FileUtils.rm_rf(project.path, :secure => true)
+      FileUtils.rm_rf(expand_path(project.path), :secure => true)
+      index
     end
 
     def create_personal_project(project_name, source_language, target_language)
       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, self)
+      personal_project_path = relative_path(personal_glossary_root_path)
+      PersonalProject.create(personal_project_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)
+      personal_project_path = relative_path(personal_glossary_root_path)
+      PersonalProject.remove(personal_project_path, project_name, source_language, target_language, self)
+      index
     rescue Logaling::GlossaryNotFound => e
       raise e
     rescue
@@ -67,6 +72,7 @@ module Logaling
       Dir.chdir(cache_path) do
         glossary_source.import
       end
+      index
     rescue
       raise Logaling::CommandFailed, "Failed import #{glossary_source.class.name} to #{cache_path}."
     end
@@ -76,6 +82,7 @@ module Logaling
       Dir.chdir(cache_path) do
         glossary_source.import(glossary, url)
       end
+      index
     rescue Logaling::GlossaryNotFound => e
       raise e
     rescue
@@ -105,13 +112,13 @@ module Logaling
 
     def projects
       projects = registered_project_paths.map do |project_path|
-        Logaling::Project.new(project_path, self)
+        Logaling::Project.new(relative_path(project_path), self)
       end
       projects += personal_glossary_paths.map do |personal_glossary_path|
-        Logaling::PersonalProject.new(personal_glossary_path, self)
+        Logaling::PersonalProject.new(relative_path(personal_glossary_path), self)
       end
       projects += imported_glossary_paths.map do |imported_project_path|
-        Logaling::ImportedProject.new(imported_project_path, self)
+        Logaling::ImportedProject.new(relative_path(imported_project_path), self)
       end
       projects.sort_by(&:path)
     end
@@ -140,11 +147,6 @@ module Logaling
       [registered_project_paths, imported_glossary_paths].map(&:size).inject(&:+)
     end
 
-    def config_path
-      path = File.join(@path, "config")
-      File.exist?(path) ? path : nil
-    end
-
     def find_project(project_name)
       projects.detect {|project| project.name == project_name }
     end
@@ -156,21 +158,41 @@ module Logaling
       project ? project.glossary(source_language, target_language) : nil
     end
 
+    def config_path
+      path = File.join(logaling_home, "config")
+      File.exist?(path) ? path : nil
+    end
+
     def logaling_db_home
-      File.join(@path, "db")
+      File.join(logaling_home, "db")
+    end
+
+    def expand_path(relative_path)
+      File.expand_path(File.join(logaling_home, relative_path))
+    end
+
+    def relative_path(full_path)
+      require 'pathname'
+      path = Pathname.new(full_path)
+      base = Pathname.new(logaling_home)
+      path.relative_path_from(base).to_s
     end
 
     private
+    def logaling_home
+      @path
+    end
+
     def logaling_projects_path
-      File.join(@path, "projects")
+      File.join(logaling_home, "projects")
     end
 
     def personal_glossary_root_path
-      File.join(@path, "personal")
+      File.join(logaling_home, "personal")
     end
 
     def cache_path
-      File.join(@path, "cache")
+      File.join(logaling_home, "cache")
     end
 
     def registered_project_paths

data/spec/logaling/command_spec.rb

@@ -25,7 +25,7 @@ describe Logaling::Command::Application do
   let(:target_project_path) { File.join(logaling_home, "projects", "spec") }
   let(:repository) { Logaling::Repository.new(logaling_home) }
   let(:glossary) { repository.find_project('spec').glossary('en', 'ja') }
-  let(:glossary_source_path) { glossary.glossary_source.source_path }
+  let(:glossary_source_path) { glossary.glossary_source.absolute_path }
 
   before do
     FileUtils.rm_rf(File.join(logaling_home, 'projects', 'spec'))
@@ -83,7 +83,6 @@ describe Logaling::Command::Application do
 
   describe '#register' do
     before do
-      sleep(1)
       @n_projects = Dir[File.join(logaling_home, "projects", "*")].size
     end
 
@@ -178,6 +177,40 @@ describe Logaling::Command::Application do
     end
   end
 
+  describe '#index' do
+    before do
+      command.options = base_options.merge("output" => "terminal", "no-pager" => true)
+      command.new('spec', 'en', 'ja')
+    end
+
+    context 'when new term added' do
+      before do
+        command.add("spec", "スペック", "備考")
+        command.index
+        @stdout = capture(:stdout) { command.lookup("spec") }
+      end
+
+      it 'should be indexed' do
+        @stdout.should include "spec"
+        @stdout.should include "スペック"
+        @stdout.should include "# 備考"
+        @stdout.should_not include "now index spec..."
+      end
+    end
+
+    context 'when logaling_home does not exists' do
+      before do
+        command.add("spec", "スペック", "備考")
+        FileUtils.rm_rf(logaling_home)
+        @stdout = capture(:stdout) { command.index }
+      end
+
+      it 'should print message and failed index' do
+        @stdout.should include "Input existing directory as logaling-home."
+      end
+    end
+  end
+
   describe '#config' do
     let(:project_config) { File.join(logaling_config, 'config') }
     let(:global_config) { File.join(logaling_home, 'config') }

data/spec/logaling/glossary_db_spec.rb

@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012  Miho SUZUKI
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+#require "fileutils"
+
+module Logaling
+  describe Project do
+    let(:logaling_home) { @logaling_home }
+    let(:logaling_db_home) { File.join(@logaling_home, 'db') }
+    let(:logaling_config) { File.join(File.dirname(__FILE__), "..", "tmp", ".logaling") }
+    let(:base_options) { {"glossary"=>"spec", "source-language"=>"en", "target-language"=>"ja", "logaling-config" => logaling_config} }
+    let(:command) { Logaling::Command::Application.new([], base_options) }
+    let(:project_path) { File.join(logaling_home, 'projects') }
+    let(:cache_path) { File.join(logaling_home, 'cache') }
+    let(:personal_path) { File.join(logaling_home, 'personal') }
+
+    before do
+      FileUtils.rm_rf(File.join(project_path, 'spec'))
+      FileUtils.mkdir_p(cache_path)
+      FileUtils.mkdir_p(personal_path)
+    end
+
+    describe "#get_all_glossary_sources" do
+      before do
+        command.new('spec', 'en', 'fr')
+        command.add('spec', 'スペック')
+        command.copy('spec', 'en', 'fr', 'personal_spec', 'en', 'ja')
+        csv_path = File.join(cache_path, 'imported_spec.en.ja.csv')
+        FileUtils.touch(csv_path)
+        File.open(csv_path, "w"){|f| f.puts "test_logaling,テストろがりん"}
+        command.index
+
+        Logaling::GlossaryDB.open(logaling_db_home, "utf8") do |db|
+          db.recreate_table
+          @glossary_sources = db.get_all_glossary_sources
+        end
+      end
+
+      it "should be set project correctly" do
+        methods = ['personal?', 'normal_project?', 'imported?']
+        methods.each do |method|
+          project_get = nil
+          @glossary_sources.each do |glossary_source|
+            if glossary_source.glossary.project.send(method)
+              project_get = glossary_source.glossary.project
+            end
+          end
+          project_get.should_not be nil
+        end
+      end
+    end
+
+    after do
+      FileUtils.rm_rf(File.join(project_path, 'spec'))
+      FileUtils.rm_rf(cache_path)
+      FileUtils.rm_rf(personal_path)
+      FileUtils.rm_rf(logaling_config)
+    end
+  end
+end

data/spec/logaling/glossary_spec.rb

@@ -21,13 +21,20 @@ require "fileutils"
 module Logaling
   describe Glossary do
     let(:logaling_home) { @logaling_home }
+    let(:logaling_db_home) { File.join(logaling_home, 'db') }
     let(:repository) { Logaling::Repository.new(logaling_home) }
     let(:glossary) { repository.find_project('spec').glossary('en', 'ja') }
     let(:glossary_source_path) { glossary.glossary_source.source_path }
+    let(:glossary_source_absolute_path) { glossary.glossary_source.absolute_path }
 
     before do
+      # clear directories and files
       FileUtils.rm_rf(File.join(logaling_home, 'projects', 'spec'), :secure => true)
-      FileUtils.mkdir_p(File.join(logaling_home, 'projects', 'spec'))
+      FileUtils.mkdir_p(File.join(logaling_home, 'projects', 'spec', 'glossary'))
+      FileUtils.touch(glossary_source_absolute_path)
+      File.open(glossary_source_absolute_path, "w") {|f| f << YAML.dump([]) }
+      # and clear db too
+      glossary.index!
     end
 
     describe '#add' do
@@ -37,7 +44,7 @@ module Logaling
         end
 
         it 'glossary yaml should have that bilingual pair' do
-          yaml = YAML::load_file(glossary_source_path)
+          yaml = YAML::load_file(glossary_source_absolute_path)
           term = yaml.index({"source_term"=>"spec", "target_term"=>"スペック", "note"=>"テストスペック"})
           term.should_not be_nil
         end
@@ -49,7 +56,7 @@ module Logaling
         end
 
         it "should create the glossary and add term" do
-          yaml = YAML::load_file(glossary_source_path)
+          yaml = YAML::load_file(glossary_source_absolute_path)
           term = yaml.index({"source_term"=>"test", "target_term"=>"テスト", "note"=>"テスト"})
           term.should_not be_nil
         end
@@ -85,7 +92,7 @@ module Logaling
         end
 
         it 'should clear note' do
-          yaml = YAML::load_file(glossary_source_path)
+          yaml = YAML::load_file(glossary_source_absolute_path)
           term = yaml.index({"source_term"=>"user", "target_term"=>"ユーザ", "note"=>""})
           term.should_not be_nil
         end
@@ -97,7 +104,7 @@ module Logaling
         end
 
         it {
-          -> { glossary.update("user", "ゆーざー", "ユーザ", "") }.should raise_error(Logaling::TermError)
+          -> { glossary.update("user", "ゆーざ", "ユーザ", "") }.should raise_error(Logaling::TermError)
         }
       end
     end
@@ -107,10 +114,7 @@ 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)
         end
 
@@ -147,7 +151,6 @@ module Logaling
           before do
             glossary.add("user_logaling", "ユーザ", "備考")
             glossary.delete_all("user_logaling")
-            repository.index
             @result = repository.lookup("user_logaling", glossary)
           end
 

data/spec/logaling/repository_spec.rb

@@ -25,10 +25,12 @@ module Logaling
     let(:repository) { Logaling::Repository.new(logaling_home) }
     let(:glossary) { repository.find_project('spec').glossary('en', 'ja') }
     let(:glossary_source_path) { glossary.glossary_source.source_path }
+    let(:glossary_source_absolute_path) { glossary.glossary_source.absolute_path }
 
     before do
       FileUtils.rm_rf(File.join(logaling_home, 'projects', 'spec'), :secure => true)
       FileUtils.mkdir_p(File.join(logaling_home, 'projects', 'spec'))
+      repository.index
     end
 
     describe '#lookup' do
@@ -117,7 +119,7 @@ module Logaling
       end
 
       context 'when tsv file as glossary exists' do
-        let(:tsv_path) { glossary_source_path.sub(/yml$/, 'tsv') }
+        let(:tsv_path) { glossary_source_absolute_path.sub(/yml$/, 'tsv') }
 
         before do
           FileUtils.touch(tsv_path)
@@ -137,16 +139,14 @@ module Logaling
     end
 
     describe '#index' do
-      let(:tsv_path) { File.join(File.dirname(glossary_source_path), "spec.en.ja.tsv") }
-      let(:csv_path) { File.join(File.dirname(glossary_source_path), "spec.en.ja.csv") }
+      let(:tsv_path) { File.join(File.dirname(glossary_source_absolute_path), "spec.en.ja.tsv") }
+      let(:csv_path) { File.join(File.dirname(glossary_source_absolute_path), "spec.en.ja.csv") }
 
       context 'when yml file as glossary exists' do
         before do
-          File.open(glossary_source_path, 'w') do |f|
+          File.open(glossary_source_absolute_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)
@@ -157,7 +157,7 @@ module Logaling
         end
 
         after do
-          FileUtils.rm_rf(glossary_source_path, :secure => true)
+          FileUtils.rm_rf(glossary_source_absolute_path, :secure => true)
         end
       end
 
@@ -196,6 +196,46 @@ module Logaling
       end
     end
 
+    describe "#create_personal_repository" do
+      let(:glossary_name) { "personal_project" }
+      let(:source_language) { "en" }
+      let(:target_language) { "ja" }
+      before do
+        FileUtils.rm_rf(File.join(logaling_home, 'personal'), :secure => true)
+        repository.create_personal_project(glossary_name, source_language, target_language)
+      end
+
+      context "when just create personal project" do
+        before do
+          glossary = repository.find_glossary(glossary_name, source_language, target_language)
+          Logaling::GlossaryDB.open(repository.logaling_db_home, "utf8") do |db|
+            @ret = db.glossary_source_exist?(glossary.glossary_source)
+          end
+        end
+
+        it "should not be indexed on db" do
+          @ret.should be_false
+        end
+      end
+
+      context "when create personal project and index" do
+        before do
+          glossary = repository.find_glossary(glossary_name, source_language, target_language)
+          glossary.index!
+          Logaling::GlossaryDB.open(repository.logaling_db_home, "utf8") do |db|
+            @ret = db.glossary_source_exist?(glossary.glossary_source)
+          end
+        end
+
+        it "should be indexed on db" do
+          @ret.should be_true
+        end
+      end
+      after do
+        repository.remove_personal_project(glossary_name, source_language, target_language)
+      end
+    end
+
     describe "#remove_personal_project" do
       let(:rm_glossary_name) { "rm_personal_project" }
       let(:rm_source_language) { "en" }
@@ -203,6 +243,7 @@ module Logaling
       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)
+        repository.index
       end
 
       context "when target personal project exists" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logaling-command
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -193,6 +193,7 @@ files:
 - lib/logaling/repository.rb
 - logaling-command.gemspec
 - spec/logaling/command_spec.rb
+- spec/logaling/glossary_db_spec.rb
 - spec/logaling/glossary_spec.rb
 - spec/logaling/project_spec.rb
 - spec/logaling/repository_spec.rb
@@ -223,6 +224,7 @@ specification_version: 3
 summary: A command line interface for logaling.
 test_files:
 - spec/logaling/command_spec.rb
+- spec/logaling/glossary_db_spec.rb
 - spec/logaling/glossary_spec.rb
 - spec/logaling/project_spec.rb
 - spec/logaling/repository_spec.rb