konjac 0.1.8.6 → 0.1.8.7

data/lib/konjac/cli.rb

@@ -91,7 +91,8 @@ eos
               opt :to, I18n.t(:to, :scope => :opts), :type => :string
               opt :using, I18n.t(:using, :scope => :opts), :type => :string,
                 :default => "dict", :multi => true
-              opt :use_cache, I18n.t(:use_cache, :scope => :opts), :default => false
+              opt :use_cache, I18n.t(:use_cache, :scope => :opts),
+                :default => false, :short => :c
               opt :word, I18n.t(:word, :scope => :opts), :default => false
               opt :help, I18n.t(:help, :scope => :opts)
             end

data/lib/konjac/config.rb

@@ -10,20 +10,17 @@ module Konjac
         Utils.verify_file CONFIG_PATH, "--- {}"
         config = YAML.load_file(CONFIG_PATH)
         config = {} unless config.is_a?(Hash)
-        @opts = {
-          :language => :en
-        }.merge config
 
-        set_language
+        set_language config[:language], ENV["LANG"], :en
         save
       end
 
       def language
-        @opts[:language]
+        I18n.locale
       end
 
       def language=(lang)
-        @opts[:language] = Language.find(lang).to_sym || @opts[:language]
+        set_language lang, I18n.locale
         save
       end
 
@@ -35,14 +32,23 @@ module Konjac
 
       private
 
-      def set_language
+      def set_language(*params)
         I18n.load_path = Dir[File.join(File.dirname(__FILE__), "..", "..", "locales", "*.yml")]
         I18n.default_locale = :en
-        if I18n.available_locales.include?(@opts[:language])
-          I18n.locale = @opts[:language]
-        else
-          I18n.locale = I18n.default_locale
+
+        # Check each parameter to see whether it matches with an available
+        # language
+        params.each do |param|
+          if !param.nil?
+            lang = Language.find(param).to_sym rescue nil
+            if I18n.available_locales.include?(lang)
+              I18n.locale = lang
+              return I18n.locale
+            end
+          end
         end
+
+        I18n.locale = I18n.default_locale
       end
     end
   end

data/lib/konjac/dictionary.rb

@@ -197,7 +197,7 @@ module Konjac
         file_name = File.expand_path("~/.konjac/marshal/%s_%s_%s" %
           [from_lang, to_lang, dictionaries.join("_")])
         if File.exists?(file_name)
-          Marshal.load file_name
+          Marshal.load File.read(file_name)
         else
           nil
         end

data/lib/konjac/version.rb

@@ -1,3 +1,3 @@
 module Konjac
-  VERSION = "0.1.8.6"
+  VERSION = "0.1.8.7"
 end

data/spec/config_spec.rb

@@ -0,0 +1,35 @@
+# coding: utf-8
+require File.dirname(__FILE__) + "/spec_helper"
+require "tempfile"
+
+describe Config do
+  before :all do
+    @config_path = File.expand_path("~/.konjac/config.yml")
+    @backup_path = File.expand_path("~/.konjac/config.yml.bak")
+    FileUtils.mv @config_path, @backup_path if File.exists?(@config_path)
+    @env_language = ENV["LANG"]
+  end
+
+  after :all do
+    FileUtils.mv @backup_path, @config_path if File.exists?(@backup_path)
+    ENV["LANG"] = @env_language || ""
+  end
+
+  it "should default to English when no system language is found" do
+    ENV["LANG"] = ""
+    Konjac::Config.load
+    Konjac::Config.language.should == :en
+  end
+
+  it "should default to English when specified" do
+    ENV["LANG"] = "en"
+    Konjac::Config.load
+    Konjac::Config.language.should == :en
+  end
+
+  it "should default to a foreign language when specified" do
+    ENV["LANG"] = "ja"
+    Konjac::Config.load
+    Konjac::Config.language.should == :ja
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.1.8.6
+  version: 0.1.8.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70228797658140 !ruby/object:Gem::Requirement
+  requirement: &70230529874200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70228797658140
+  version_requirements: *70230529874200
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70228797657720 !ruby/object:Gem::Requirement
+  requirement: &70230529873780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70228797657720
+  version_requirements: *70230529873780
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70228797657300 !ruby/object:Gem::Requirement
+  requirement: &70230529873360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70228797657300
+  version_requirements: *70230529873360
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70228797656880 !ruby/object:Gem::Requirement
+  requirement: &70230529872940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70228797656880
+  version_requirements: *70230529872940
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70228797656460 !ruby/object:Gem::Requirement
+  requirement: &70230529872460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70228797656460
+  version_requirements: *70230529872460
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70228797656040 !ruby/object:Gem::Requirement
+  requirement: &70230529872020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70228797656040
+  version_requirements: *70230529872020
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70228797655620 !ruby/object:Gem::Requirement
+  requirement: &70230529871480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70228797655620
+  version_requirements: *70230529871480
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70228797655140 !ruby/object:Gem::Requirement
+  requirement: &70230529870940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70228797655140
+  version_requirements: *70230529870940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70228797654720 !ruby/object:Gem::Requirement
+  requirement: &70230529870360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70228797654720
+  version_requirements: *70230529870360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70228797654120 !ruby/object:Gem::Requirement
+  requirement: &70230529885720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70228797654120
+  version_requirements: *70230529885720
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com
@@ -154,6 +154,7 @@ files:
 - locales/en.yml
 - locales/ja.yml
 - spec/cli_spec.rb
+- spec/config_spec.rb
 - spec/dictionary_spec.rb
 - spec/language_spec.rb
 - spec/spec_helper.rb
@@ -185,6 +186,7 @@ specification_version: 3
 summary: A Ruby command-line utility for translating files using a YAML wordlist
 test_files:
 - spec/cli_spec.rb
+- spec/config_spec.rb
 - spec/dictionary_spec.rb
 - spec/language_spec.rb
 - spec/spec_helper.rb