logaling-command 0.2.1 → 0.2.2

data/CHANGES

@@ -1,3 +1,6 @@
+= 0.2.2 / 2012-12-25
+* 内部構造の見直し
+
 = 0.2.1 / 2012-11-29
 * インデックスのタイミングを見直すことで検索速度が速くなりました
 

data/lib/logaling/command/version.rb

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

data/lib/logaling/glossary.rb

@@ -53,10 +53,10 @@ module Logaling
       !find_bilingual_pairs(source_term, target_term, note).empty?
     end
 
-    def add(source_term, target_term, note)
+    def add(source_term, target_term, note, index_after_adding=true)
       raise Logaling::TermError if bilingual_pair_exists?(source_term, target_term)
       glossary_source.add(source_term, target_term, note)
-      index!
+      index! if index_after_adding
     end
 
     def update(source_term, target_term, new_target_term, note)

data/lib/logaling/project.rb

@@ -123,13 +123,17 @@ module Logaling
       File.basename(@path).split(/\./).first
     end
 
+    def bilingualr_pair
+      File.basename(@path).split(/\./)[1, 2]
+    end
+
     def glossary_sources
-      name, source_language, target_language, type = File.basename(@path).split(/\./)
+      source_language, target_language = bilingualr_pair
       [GlossarySource.create(@path, glossary(source_language, target_language))]
     end
 
     def has_glossary?(source_language, target_language)
-      glossary_source_language, glossary_target_language = File.basename(@path).split(/\./)[1..2]
+      glossary_source_language, glossary_target_language = bilingualr_pair
       glossary_source_language == source_language && glossary_target_language == target_language
     end
 
@@ -151,6 +155,24 @@ module Logaling
     def imported?
       true
     end
+
+    def description
+      external_glossary.class.description
+    end
+
+    def url
+      external_glossary.class.url
+    end
+
+    private
+    def external_glossary
+      unless @external_glossary
+        require 'logaling/external_glossary'
+        Logaling::ExternalGlossary.load
+        @external_glossary = Logaling::ExternalGlossary.get(name)
+      end
+      @external_glossary
+    end
   end
 
   class PersonalProject < FileBasedProject

data/lib/logaling/repository.rb

@@ -117,10 +117,14 @@ module Logaling
       projects += personal_glossary_paths.map do |personal_glossary_path|
         Logaling::PersonalProject.new(relative_path(personal_glossary_path), self)
       end
-      projects += imported_glossary_paths.map do |imported_project_path|
+      projects += imported_projects
+      projects.sort_by(&:path)
+    end
+
+    def imported_projects
+      imported_glossary_paths.map do |imported_project_path|
         Logaling::ImportedProject.new(relative_path(imported_project_path), self)
       end
-      projects.sort_by(&:path)
     end
 
     def index

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logaling-command
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor