konjac 0.1.8.6 → 0.1.8.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/lib/konjac/cli.rb +2 -1
  2. data/lib/konjac/config.rb +17 -11
  3. data/lib/konjac/dictionary.rb +1 -1
  4. data/lib/konjac/version.rb +1 -1
  5. data/spec/config_spec.rb +35 -0
  6. metadata +23 -21
data/lib/konjac/cli.rb CHANGED
@@ -91,7 +91,8 @@ eos
91
91
  opt :to, I18n.t(:to, :scope => :opts), :type => :string
92
92
  opt :using, I18n.t(:using, :scope => :opts), :type => :string,
93
93
  :default => "dict", :multi => true
94
- opt :use_cache, I18n.t(:use_cache, :scope => :opts), :default => false
94
+ opt :use_cache, I18n.t(:use_cache, :scope => :opts),
95
+ :default => false, :short => :c
95
96
  opt :word, I18n.t(:word, :scope => :opts), :default => false
96
97
  opt :help, I18n.t(:help, :scope => :opts)
97
98
  end
data/lib/konjac/config.rb CHANGED
@@ -10,20 +10,17 @@ module Konjac
10
10
  Utils.verify_file CONFIG_PATH, "--- {}"
11
11
  config = YAML.load_file(CONFIG_PATH)
12
12
  config = {} unless config.is_a?(Hash)
13
- @opts = {
14
- :language => :en
15
- }.merge config
16
13
 
17
- set_language
14
+ set_language config[:language], ENV["LANG"], :en
18
15
  save
19
16
  end
20
17
 
21
18
  def language
22
- @opts[:language]
19
+ I18n.locale
23
20
  end
24
21
 
25
22
  def language=(lang)
26
- @opts[:language] = Language.find(lang).to_sym || @opts[:language]
23
+ set_language lang, I18n.locale
27
24
  save
28
25
  end
29
26
 
@@ -35,14 +32,23 @@ module Konjac
35
32
 
36
33
  private
37
34
 
38
- def set_language
35
+ def set_language(*params)
39
36
  I18n.load_path = Dir[File.join(File.dirname(__FILE__), "..", "..", "locales", "*.yml")]
40
37
  I18n.default_locale = :en
41
- if I18n.available_locales.include?(@opts[:language])
42
- I18n.locale = @opts[:language]
43
- else
44
- I18n.locale = I18n.default_locale
38
+
39
+ # Check each parameter to see whether it matches with an available
40
+ # language
41
+ params.each do |param|
42
+ if !param.nil?
43
+ lang = Language.find(param).to_sym rescue nil
44
+ if I18n.available_locales.include?(lang)
45
+ I18n.locale = lang
46
+ return I18n.locale
47
+ end
48
+ end
45
49
  end
50
+
51
+ I18n.locale = I18n.default_locale
46
52
  end
47
53
  end
48
54
  end
data/lib/konjac/dictionary.rb CHANGED
@@ -197,7 +197,7 @@ module Konjac
197
197
  file_name = File.expand_path("~/.konjac/marshal/%s_%s_%s" %
198
198
  [from_lang, to_lang, dictionaries.join("_")])
199
199
  if File.exists?(file_name)
200
- Marshal.load file_name
200
+ Marshal.load File.read(file_name)
201
201
  else
202
202
  nil
203
203
  end
data/lib/konjac/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Konjac
2
- VERSION = "0.1.8.6"
2
+ VERSION = "0.1.8.7"
3
3
  end
data/spec/config_spec.rb ADDED
@@ -0,0 +1,35 @@
1
+ # coding: utf-8
2
+ require File.dirname(__FILE__) + "/spec_helper"
3
+ require "tempfile"
4
+
5
+ describe Config do
6
+ before :all do
7
+ @config_path = File.expand_path("~/.konjac/config.yml")
8
+ @backup_path = File.expand_path("~/.konjac/config.yml.bak")
9
+ FileUtils.mv @config_path, @backup_path if File.exists?(@config_path)
10
+ @env_language = ENV["LANG"]
11
+ end
12
+
13
+ after :all do
14
+ FileUtils.mv @backup_path, @config_path if File.exists?(@backup_path)
15
+ ENV["LANG"] = @env_language || ""
16
+ end
17
+
18
+ it "should default to English when no system language is found" do
19
+ ENV["LANG"] = ""
20
+ Konjac::Config.load
21
+ Konjac::Config.language.should == :en
22
+ end
23
+
24
+ it "should default to English when specified" do
25
+ ENV["LANG"] = "en"
26
+ Konjac::Config.load
27
+ Konjac::Config.language.should == :en
28
+ end
29
+
30
+ it "should default to a foreign language when specified" do
31
+ ENV["LANG"] = "ja"
32
+ Konjac::Config.load
33
+ Konjac::Config.language.should == :ja
34
+ end
35
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: konjac
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.6
4
+ version: 0.1.8.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-01-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: i18n
16
- requirement: &70228797658140 !ruby/object:Gem::Requirement
16
+ requirement: &70230529874200 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70228797658140
24
+ version_requirements: *70230529874200
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: nokogiri
27
- requirement: &70228797657720 !ruby/object:Gem::Requirement
27
+ requirement: &70230529873780 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70228797657720
35
+ version_requirements: *70230529873780
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: sdoc
38
- requirement: &70228797657300 !ruby/object:Gem::Requirement
38
+ requirement: &70230529873360 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70228797657300
46
+ version_requirements: *70230529873360
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: term-ansicolor
49
- requirement: &70228797656880 !ruby/object:Gem::Requirement
49
+ requirement: &70230529872940 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70228797656880
57
+ version_requirements: *70230529872940
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: trollop
60
- requirement: &70228797656460 !ruby/object:Gem::Requirement
60
+ requirement: &70230529872460 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70228797656460
68
+ version_requirements: *70230529872460
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: autotest
71
- requirement: &70228797656040 !ruby/object:Gem::Requirement
71
+ requirement: &70230529872020 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70228797656040
79
+ version_requirements: *70230529872020
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: autotest-fsevent
82
- requirement: &70228797655620 !ruby/object:Gem::Requirement
82
+ requirement: &70230529871480 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70228797655620
90
+ version_requirements: *70230529871480
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: autotest-growl
93
- requirement: &70228797655140 !ruby/object:Gem::Requirement
93
+ requirement: &70230529870940 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70228797655140
101
+ version_requirements: *70230529870940
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: bundler
104
- requirement: &70228797654720 !ruby/object:Gem::Requirement
104
+ requirement: &70230529870360 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70228797654720
112
+ version_requirements: *70230529870360
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: rspec
115
- requirement: &70228797654120 !ruby/object:Gem::Requirement
115
+ requirement: &70230529885720 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70228797654120
123
+ version_requirements: *70230529885720
124
124
  description: A Ruby command-line utility for translating files using a YAML wordlist
125
125
  email:
126
126
  - bryan.mckelvey@gmail.com
@@ -154,6 +154,7 @@ files:
154
154
  - locales/en.yml
155
155
  - locales/ja.yml
156
156
  - spec/cli_spec.rb
157
+ - spec/config_spec.rb
157
158
  - spec/dictionary_spec.rb
158
159
  - spec/language_spec.rb
159
160
  - spec/spec_helper.rb
@@ -185,6 +186,7 @@ specification_version: 3
185
186
  summary: A Ruby command-line utility for translating files using a YAML wordlist
186
187
  test_files:
187
188
  - spec/cli_spec.rb
189
+ - spec/config_spec.rb
188
190
  - spec/dictionary_spec.rb
189
191
  - spec/language_spec.rb
190
192
  - spec/spec_helper.rb