konjac 0.2.4.1 → 0.2.5

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.
data/README.rdoc CHANGED
@@ -82,7 +82,8 @@ translate as 犬:
82
82
  en: dog
83
83
  ja:
84
84
  ja: 犬
85
- en: dogs? # i.e. the regular expression /dogs?/
85
+ en: dogs?
86
+ regex: true # i.e. the regular expression /dogs?/
86
87
 
87
88
  == Extended Example
88
89
 
@@ -101,6 +102,7 @@ translate as 犬:
101
102
  ja:
102
103
  ja: 犬
103
104
  en: dogs?
105
+ regex: true # i.e. the regular expression /dogs?/
104
106
  - # Periods
105
107
  en:
106
108
  en: ". "
@@ -66,6 +66,7 @@ module Konjac
66
66
  to_term = term[to_lang][to_lang]
67
67
  case_sensitive = term[to_lang]["case_sensitive"]
68
68
  no_space = term[to_lang]["no_space"]
69
+ is_regex = term[to_lang]["regex"]
69
70
 
70
71
  if term[to_lang].has_key?(from_lang)
71
72
  from_term = term[to_lang][from_lang]
@@ -76,7 +77,11 @@ module Konjac
76
77
 
77
78
  # Build from term if it doesn't already exist
78
79
  if term.has_key?(from_lang) && from_term.nil?
79
- from_term = term[from_lang]
80
+ if term[from_lang].is_a?(Hash)
81
+ from_term = term[from_lang][from_lang]
82
+ else
83
+ from_term = term[from_lang]
84
+ end
80
85
  end
81
86
 
82
87
  unless from_term.nil?
@@ -87,8 +92,9 @@ module Konjac
87
92
  # capital letter.
88
93
  from_fuzzy = from_term
89
94
  unless from_term.is_a?(Regexp)
90
- from_term = Regexp.new(from_template % from_term,
91
- ("i" unless from_term =~ /[A-Z]/ || case_sensitive))
95
+ flags = (case_sensitive || (from_term =~ /[A-Z]/)) ? nil : "i"
96
+ from_term = Regexp.escape(from_term) unless is_regex
97
+ from_term = Regexp.new(from_template % from_term, flags)
92
98
  end
93
99
 
94
100
  to_term = to_template % to_term unless to_term =~ BLANK || no_space
@@ -1,4 +1,4 @@
1
1
  module Konjac
2
2
  # The current version number of Konjac
3
- VERSION = "0.2.4.1"
3
+ VERSION = "0.2.5"
4
4
  end
@@ -14,6 +14,7 @@ describe Dictionary do
14
14
  ja:
15
15
  ja: 猫
16
16
  en: cats?
17
+ regex: true
17
18
  -
18
19
  ja:
19
20
  ja: 。
@@ -42,7 +43,7 @@ describe Dictionary do
42
43
 
43
44
  describe "when converting from English to Japanese" do
44
45
  before :each do
45
- Dictionary.load "en", "ja", { :using => [@dictionary.path] }
46
+ Dictionary.load "en", "ja", :using => [@dictionary.path]
46
47
  end
47
48
 
48
49
  it "should correctly load a simple term" do
@@ -70,7 +71,7 @@ describe Dictionary do
70
71
 
71
72
  it "should only have a case-insensitive search if the search contains capital letters" do
72
73
  Dictionary.pairs[0][0].should == /\bdogs\b/i
73
- Dictionary.pairs[4][0].should == /\bNorth Carolina\b/
74
+ Dictionary.pairs[4][0].should == /\bNorth\ Carolina\b/
74
75
  end
75
76
 
76
77
  it "should only force a case-insensitive search if the flag is set" do
@@ -81,7 +82,7 @@ describe Dictionary do
81
82
 
82
83
  describe "when converting from Japanese to English" do
83
84
  before :each do
84
- Dictionary.load "ja", "en", { :using => [@dictionary.path] }
85
+ Dictionary.load "ja", "en", :using => [@dictionary.path]
85
86
  end
86
87
 
87
88
  it "should add whitespace to term replacement" do
@@ -92,7 +93,7 @@ describe Dictionary do
92
93
 
93
94
  describe "when converting from English to Spanish" do
94
95
  before :each do
95
- Dictionary.load "en", "es", { :using => [@dictionary.path] }
96
+ Dictionary.load "en", "es", :using => [@dictionary.path]
96
97
  end
97
98
 
98
99
  it "should not add whitespace to term replacement" do
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.2.4.1
4
+ version: 0.2.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-01-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: amatch
16
- requirement: &70330300185520 !ruby/object:Gem::Requirement
16
+ requirement: &70326487551740 !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: *70330300185520
24
+ version_requirements: *70326487551740
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: i18n
27
- requirement: &70330300185100 !ruby/object:Gem::Requirement
27
+ requirement: &70326487551280 !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: *70330300185100
35
+ version_requirements: *70326487551280
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: nokogiri
38
- requirement: &70330300184660 !ruby/object:Gem::Requirement
38
+ requirement: &70326487550840 !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: *70330300184660
46
+ version_requirements: *70326487550840
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: sdoc
49
- requirement: &70330300184200 !ruby/object:Gem::Requirement
49
+ requirement: &70326487550340 !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: *70330300184200
57
+ version_requirements: *70326487550340
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: term-ansicolor
60
- requirement: &70330300183760 !ruby/object:Gem::Requirement
60
+ requirement: &70326487549760 !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: *70330300183760
68
+ version_requirements: *70326487549760
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: trollop
71
- requirement: &70330300183160 !ruby/object:Gem::Requirement
71
+ requirement: &70326487549160 !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: :runtime
78
78
  prerelease: false
79
- version_requirements: *70330300183160
79
+ version_requirements: *70326487549160
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: autotest
82
- requirement: &70330300182620 !ruby/object:Gem::Requirement
82
+ requirement: &70326487548480 !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: *70330300182620
90
+ version_requirements: *70326487548480
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: autotest-fsevent
93
- requirement: &70330300182040 !ruby/object:Gem::Requirement
93
+ requirement: &70326487548060 !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: *70330300182040
101
+ version_requirements: *70326487548060
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: autotest-growl
104
- requirement: &70330300181440 !ruby/object:Gem::Requirement
104
+ requirement: &70326487547640 !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: *70330300181440
112
+ version_requirements: *70326487547640
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: bundler
115
- requirement: &70330300181020 !ruby/object:Gem::Requirement
115
+ requirement: &70326487547040 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70330300181020
123
+ version_requirements: *70326487547040
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: rspec
126
- requirement: &70330300180520 !ruby/object:Gem::Requirement
126
+ requirement: &70326487546420 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *70330300180520
134
+ version_requirements: *70326487546420
135
135
  description: A Ruby command-line utility for translating files using a YAML wordlist
136
136
  email:
137
137
  - bryan.mckelvey@gmail.com