gettext_i18n_rails 0.8.0 → 0.9.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (16) hide show
  1. data/.travis.yml +0 -2
  2. data/Gemfile +1 -1
  3. data/Gemfile.lock +53 -50
  4. data/Readme.md +1 -0
  5. data/gemfiles/rails.2.3.gemfile +1 -1
  6. data/gemfiles/rails.2.3.gemfile.lock +23 -21
  7. data/gemfiles/rails.3.0.gemfile +1 -1
  8. data/gemfiles/rails.3.0.gemfile.lock +24 -22
  9. data/gemfiles/rails.3.1.gemfile +1 -1
  10. data/gemfiles/rails.3.1.gemfile.lock +24 -22
  11. data/gemfiles/rails.3.2.gemfile +1 -1
  12. data/gemfiles/rails.3.2.gemfile.lock +53 -50
  13. data/lib/gettext_i18n_rails/ruby_gettext_extractor.rb +20 -2
  14. data/lib/gettext_i18n_rails/version.rb +1 -1
  15. data/spec/gettext_i18n_rails/haml_parser_spec.rb +7 -4
  16. metadata +37 -49
data/.travis.yml CHANGED
@@ -2,5 +2,3 @@ rvm:
2
2
  - ree
3
3
  - 1.9.2
4
4
  - 1.9.3
5
- - jruby
6
- - rbx
data/Gemfile CHANGED
@@ -7,7 +7,7 @@ gem 'gettext'
7
7
  gem 'haml'
8
8
  gem 'rails'
9
9
  gem 'rake'
10
- gem 'ruby_parser', '~> 2.3' # 3 breaks haml/slim parsing
10
+ gem 'ruby_parser', '>= 3'
11
11
  gem 'rspec'
12
12
  gem 'slim'
13
13
  gem 'sqlite3'
data/Gemfile.lock CHANGED
@@ -1,37 +1,37 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- gettext_i18n_rails (0.8.0)
4
+ gettext_i18n_rails (0.9.0)
5
5
  fast_gettext (>= 0.4.8)
6
6
 
7
7
  GEM
8
8
  remote: http://rubygems.org/
9
9
  specs:
10
- actionmailer (3.2.8)
11
- actionpack (= 3.2.8)
10
+ actionmailer (3.2.11)
11
+ actionpack (= 3.2.11)
12
12
  mail (~> 2.4.4)
13
- actionpack (3.2.8)
14
- activemodel (= 3.2.8)
15
- activesupport (= 3.2.8)
13
+ actionpack (3.2.11)
14
+ activemodel (= 3.2.11)
15
+ activesupport (= 3.2.11)
16
16
  builder (~> 3.0.0)
17
17
  erubis (~> 2.7.0)
18
18
  journey (~> 1.0.4)
19
19
  rack (~> 1.4.0)
20
20
  rack-cache (~> 1.2)
21
21
  rack-test (~> 0.6.1)
22
- sprockets (~> 2.1.3)
23
- activemodel (3.2.8)
24
- activesupport (= 3.2.8)
22
+ sprockets (~> 2.2.1)
23
+ activemodel (3.2.11)
24
+ activesupport (= 3.2.11)
25
25
  builder (~> 3.0.0)
26
- activerecord (3.2.8)
27
- activemodel (= 3.2.8)
28
- activesupport (= 3.2.8)
26
+ activerecord (3.2.11)
27
+ activemodel (= 3.2.11)
28
+ activesupport (= 3.2.11)
29
29
  arel (~> 3.0.2)
30
30
  tzinfo (~> 0.3.29)
31
- activeresource (3.2.8)
32
- activemodel (= 3.2.8)
33
- activesupport (= 3.2.8)
34
- activesupport (3.2.8)
31
+ activeresource (3.2.11)
32
+ activemodel (= 3.2.11)
33
+ activesupport (= 3.2.11)
34
+ activesupport (3.2.11)
35
35
  i18n (~> 0.6)
36
36
  multi_json (~> 1.0)
37
37
  appraisal (0.5.1)
@@ -39,70 +39,73 @@ GEM
39
39
  rake
40
40
  arel (3.0.2)
41
41
  builder (3.0.4)
42
- bump (0.3.5)
42
+ bump (0.3.9)
43
43
  diff-lcs (1.1.3)
44
44
  erubis (2.7.0)
45
- fast_gettext (0.6.11)
46
- gettext (2.3.3)
45
+ fast_gettext (0.7.0)
46
+ gettext (2.3.7)
47
+ levenshtein
47
48
  locale
48
49
  haml (3.1.7)
49
50
  hike (1.2.1)
50
51
  i18n (0.6.1)
51
52
  journey (1.0.4)
52
- json (1.7.5)
53
+ json (1.7.6)
54
+ levenshtein (0.2.2)
53
55
  locale (2.0.8)
54
56
  mail (2.4.4)
55
57
  i18n (>= 0.4.0)
56
58
  mime-types (~> 1.16)
57
59
  treetop (~> 1.4.8)
58
60
  mime-types (1.19)
59
- multi_json (1.3.7)
61
+ multi_json (1.5.0)
60
62
  polyglot (0.3.3)
61
- rack (1.4.1)
63
+ rack (1.4.4)
62
64
  rack-cache (1.2)
63
65
  rack (>= 0.4)
64
66
  rack-ssl (1.3.2)
65
67
  rack
66
68
  rack-test (0.6.2)
67
69
  rack (>= 1.0)
68
- rails (3.2.8)
69
- actionmailer (= 3.2.8)
70
- actionpack (= 3.2.8)
71
- activerecord (= 3.2.8)
72
- activeresource (= 3.2.8)
73
- activesupport (= 3.2.8)
70
+ rails (3.2.11)
71
+ actionmailer (= 3.2.11)
72
+ actionpack (= 3.2.11)
73
+ activerecord (= 3.2.11)
74
+ activeresource (= 3.2.11)
75
+ activesupport (= 3.2.11)
74
76
  bundler (~> 1.0)
75
- railties (= 3.2.8)
76
- railties (3.2.8)
77
- actionpack (= 3.2.8)
78
- activesupport (= 3.2.8)
77
+ railties (= 3.2.11)
78
+ railties (3.2.11)
79
+ actionpack (= 3.2.11)
80
+ activesupport (= 3.2.11)
79
81
  rack-ssl (~> 1.3.2)
80
82
  rake (>= 0.8.7)
81
83
  rdoc (~> 3.4)
82
84
  thor (>= 0.14.6, < 2.0)
83
- rake (0.9.2.2)
85
+ rake (10.0.3)
84
86
  rdoc (3.12)
85
87
  json (~> 1.4)
86
- rspec (2.11.0)
87
- rspec-core (~> 2.11.0)
88
- rspec-expectations (~> 2.11.0)
89
- rspec-mocks (~> 2.11.0)
90
- rspec-core (2.11.1)
91
- rspec-expectations (2.11.3)
88
+ rspec (2.12.0)
89
+ rspec-core (~> 2.12.0)
90
+ rspec-expectations (~> 2.12.0)
91
+ rspec-mocks (~> 2.12.0)
92
+ rspec-core (2.12.2)
93
+ rspec-expectations (2.12.1)
92
94
  diff-lcs (~> 1.1.3)
93
- rspec-mocks (2.11.3)
94
- ruby_parser (2.3.1)
95
- sexp_processor (~> 3.0)
96
- sexp_processor (3.2.0)
97
- slim (1.0.4)
98
- temple (~> 0.3.4)
99
- tilt (~> 1.3.2)
100
- sprockets (2.1.3)
95
+ rspec-mocks (2.12.1)
96
+ ruby_parser (3.1.1)
97
+ sexp_processor (~> 4.1)
98
+ sexp_processor (4.1.3)
99
+ slim (1.3.6)
100
+ temple (~> 0.5.5)
101
+ tilt (~> 1.3.3)
102
+ sprockets (2.2.2)
101
103
  hike (~> 1.2)
104
+ multi_json (~> 1.0)
102
105
  rack (~> 1.0)
103
106
  tilt (~> 1.1, != 1.3.0)
104
- sqlite3 (1.3.6)
105
- temple (0.3.5)
107
+ sqlite3 (1.3.7)
108
+ temple (0.5.5)
106
109
  thor (0.16.0)
107
110
  tilt (1.3.3)
108
111
  treetop (1.4.12)
@@ -122,6 +125,6 @@ DEPENDENCIES
122
125
  rails
123
126
  rake
124
127
  rspec
125
- ruby_parser (~> 2.3)
128
+ ruby_parser (>= 3)
126
129
  slim
127
130
  sqlite3
data/Readme.md CHANGED
@@ -230,6 +230,7 @@ If want to use your .PO files on client side javascript you should have a look a
230
230
  - [Seb Bacon](https://github.com/sebbacon)
231
231
  - [Ramón Cahenzli](https://github.com/psy-q)
232
232
  - [rustygeldmacher](https://github.com/rustygeldmacher)
233
+ - [Jeroen Knoops](https://github.com/JeroenKnoops)
233
234
 
234
235
  [Michael Grosser](http://grosser.it)<br/>
235
236
  grosser.michael@gmail.com<br/>
data/gemfiles/rails.2.3.gemfile CHANGED
@@ -7,7 +7,7 @@ gem "bump"
7
7
  gem "gettext"
8
8
  gem "haml"
9
9
  gem "rake"
10
- gem "ruby_parser", "~> 2.3"
10
+ gem "ruby_parser", ">= 3"
11
11
  gem "rspec"
12
12
  gem "slim"
13
13
  gem "sqlite3"
data/gemfiles/rails.2.3.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: /Users/mgrosser/code/tools/gettext_i18n_rails
3
3
  specs:
4
- gettext_i18n_rails (0.7.2)
4
+ gettext_i18n_rails (0.8.0)
5
5
  fast_gettext (>= 0.4.8)
6
6
 
7
7
  GEM
@@ -20,12 +20,14 @@ GEM
20
20
  appraisal (0.5.1)
21
21
  bundler
22
22
  rake
23
- bump (0.3.5)
23
+ bump (0.3.9)
24
24
  diff-lcs (1.1.3)
25
- fast_gettext (0.6.11)
26
- gettext (2.3.3)
25
+ fast_gettext (0.7.0)
26
+ gettext (2.3.7)
27
+ levenshtein
27
28
  locale
28
29
  haml (3.1.7)
30
+ levenshtein (0.2.2)
29
31
  locale (2.0.8)
30
32
  rack (1.1.3)
31
33
  rails (2.3.14)
@@ -35,23 +37,23 @@ GEM
35
37
  activeresource (= 2.3.14)
36
38
  activesupport (= 2.3.14)
37
39
  rake (>= 0.8.3)
38
- rake (0.9.2.2)
39
- rspec (2.11.0)
40
- rspec-core (~> 2.11.0)
41
- rspec-expectations (~> 2.11.0)
42
- rspec-mocks (~> 2.11.0)
43
- rspec-core (2.11.1)
44
- rspec-expectations (2.11.3)
40
+ rake (10.0.3)
41
+ rspec (2.12.0)
42
+ rspec-core (~> 2.12.0)
43
+ rspec-expectations (~> 2.12.0)
44
+ rspec-mocks (~> 2.12.0)
45
+ rspec-core (2.12.2)
46
+ rspec-expectations (2.12.1)
45
47
  diff-lcs (~> 1.1.3)
46
- rspec-mocks (2.11.3)
47
- ruby_parser (2.3.1)
48
- sexp_processor (~> 3.0)
49
- sexp_processor (3.2.0)
50
- slim (1.0.4)
51
- temple (~> 0.3.4)
52
- tilt (~> 1.3.2)
53
- sqlite3 (1.3.6)
54
- temple (0.3.5)
48
+ rspec-mocks (2.12.1)
49
+ ruby_parser (3.1.1)
50
+ sexp_processor (~> 4.1)
51
+ sexp_processor (4.1.3)
52
+ slim (1.3.6)
53
+ temple (~> 0.5.5)
54
+ tilt (~> 1.3.3)
55
+ sqlite3 (1.3.7)
56
+ temple (0.5.5)
55
57
  tilt (1.3.3)
56
58
 
57
59
  PLATFORMS
@@ -66,6 +68,6 @@ DEPENDENCIES
66
68
  rails (~> 2.3.0)
67
69
  rake
68
70
  rspec
69
- ruby_parser (~> 2.3)
71
+ ruby_parser (>= 3)
70
72
  slim
71
73
  sqlite3
data/gemfiles/rails.3.0.gemfile CHANGED
@@ -7,7 +7,7 @@ gem "bump"
7
7
  gem "gettext"
8
8
  gem "haml"
9
9
  gem "rake"
10
- gem "ruby_parser", "~> 2.3"
10
+ gem "ruby_parser", ">= 3"
11
11
  gem "rspec"
12
12
  gem "slim"
13
13
  gem "sqlite3"
data/gemfiles/rails.3.0.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: /Users/mgrosser/code/tools/gettext_i18n_rails
3
3
  specs:
4
- gettext_i18n_rails (0.7.2)
4
+ gettext_i18n_rails (0.8.0)
5
5
  fast_gettext (>= 0.4.8)
6
6
 
7
7
  GEM
@@ -39,16 +39,18 @@ GEM
39
39
  rake
40
40
  arel (2.0.10)
41
41
  builder (2.1.2)
42
- bump (0.3.5)
42
+ bump (0.3.9)
43
43
  diff-lcs (1.1.3)
44
44
  erubis (2.6.6)
45
45
  abstract (>= 1.0.0)
46
- fast_gettext (0.6.11)
47
- gettext (2.3.3)
46
+ fast_gettext (0.7.0)
47
+ gettext (2.3.7)
48
+ levenshtein
48
49
  locale
49
50
  haml (3.1.7)
50
51
  i18n (0.5.0)
51
- json (1.7.5)
52
+ json (1.7.6)
53
+ levenshtein (0.2.2)
52
54
  locale (2.0.8)
53
55
  mail (2.2.19)
54
56
  activesupport (>= 2.3.6)
@@ -76,25 +78,25 @@ GEM
76
78
  rake (>= 0.8.7)
77
79
  rdoc (~> 3.4)
78
80
  thor (~> 0.14.4)
79
- rake (0.9.2.2)
81
+ rake (10.0.3)
80
82
  rdoc (3.12)
81
83
  json (~> 1.4)
82
- rspec (2.11.0)
83
- rspec-core (~> 2.11.0)
84
- rspec-expectations (~> 2.11.0)
85
- rspec-mocks (~> 2.11.0)
86
- rspec-core (2.11.1)
87
- rspec-expectations (2.11.3)
84
+ rspec (2.12.0)
85
+ rspec-core (~> 2.12.0)
86
+ rspec-expectations (~> 2.12.0)
87
+ rspec-mocks (~> 2.12.0)
88
+ rspec-core (2.12.2)
89
+ rspec-expectations (2.12.1)
88
90
  diff-lcs (~> 1.1.3)
89
- rspec-mocks (2.11.3)
90
- ruby_parser (2.3.1)
91
- sexp_processor (~> 3.0)
92
- sexp_processor (3.2.0)
93
- slim (1.0.4)
94
- temple (~> 0.3.4)
95
- tilt (~> 1.3.2)
96
- sqlite3 (1.3.6)
97
- temple (0.3.5)
91
+ rspec-mocks (2.12.1)
92
+ ruby_parser (3.1.1)
93
+ sexp_processor (~> 4.1)
94
+ sexp_processor (4.1.3)
95
+ slim (1.3.6)
96
+ temple (~> 0.5.5)
97
+ tilt (~> 1.3.3)
98
+ sqlite3 (1.3.7)
99
+ temple (0.5.5)
98
100
  thor (0.14.6)
99
101
  tilt (1.3.3)
100
102
  treetop (1.4.12)
@@ -114,6 +116,6 @@ DEPENDENCIES
114
116
  rails (~> 3.0.0)
115
117
  rake
116
118
  rspec
117
- ruby_parser (~> 2.3)
119
+ ruby_parser (>= 3)
118
120
  slim
119
121
  sqlite3
data/gemfiles/rails.3.1.gemfile CHANGED
@@ -7,7 +7,7 @@ gem "bump"
7
7
  gem "gettext"
8
8
  gem "haml"
9
9
  gem "rake"
10
- gem "ruby_parser", "~> 2.3"
10
+ gem "ruby_parser", ">= 3"
11
11
  gem "rspec"
12
12
  gem "slim"
13
13
  gem "sqlite3"
data/gemfiles/rails.3.1.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: /Users/mgrosser/code/tools/gettext_i18n_rails
3
3
  specs:
4
- gettext_i18n_rails (0.7.2)
4
+ gettext_i18n_rails (0.8.0)
5
5
  fast_gettext (>= 0.4.8)
6
6
 
7
7
  GEM
@@ -40,16 +40,18 @@ GEM
40
40
  rake
41
41
  arel (2.2.3)
42
42
  builder (3.0.4)
43
- bump (0.3.5)
43
+ bump (0.3.9)
44
44
  diff-lcs (1.1.3)
45
45
  erubis (2.7.0)
46
- fast_gettext (0.6.11)
47
- gettext (2.3.3)
46
+ fast_gettext (0.7.0)
47
+ gettext (2.3.7)
48
+ levenshtein
48
49
  locale
49
50
  haml (3.1.7)
50
51
  hike (1.2.1)
51
52
  i18n (0.6.1)
52
- json (1.7.5)
53
+ json (1.7.6)
54
+ levenshtein (0.2.2)
53
55
  locale (2.0.8)
54
56
  mail (2.3.3)
55
57
  i18n (>= 0.4.0)
@@ -82,29 +84,29 @@ GEM
82
84
  rake (>= 0.8.7)
83
85
  rdoc (~> 3.4)
84
86
  thor (~> 0.14.6)
85
- rake (0.9.2.2)
87
+ rake (10.0.3)
86
88
  rdoc (3.12)
87
89
  json (~> 1.4)
88
- rspec (2.11.0)
89
- rspec-core (~> 2.11.0)
90
- rspec-expectations (~> 2.11.0)
91
- rspec-mocks (~> 2.11.0)
92
- rspec-core (2.11.1)
93
- rspec-expectations (2.11.3)
90
+ rspec (2.12.0)
91
+ rspec-core (~> 2.12.0)
92
+ rspec-expectations (~> 2.12.0)
93
+ rspec-mocks (~> 2.12.0)
94
+ rspec-core (2.12.2)
95
+ rspec-expectations (2.12.1)
94
96
  diff-lcs (~> 1.1.3)
95
- rspec-mocks (2.11.3)
96
- ruby_parser (2.3.1)
97
- sexp_processor (~> 3.0)
98
- sexp_processor (3.2.0)
99
- slim (1.0.4)
100
- temple (~> 0.3.4)
101
- tilt (~> 1.3.2)
97
+ rspec-mocks (2.12.1)
98
+ ruby_parser (3.1.1)
99
+ sexp_processor (~> 4.1)
100
+ sexp_processor (4.1.3)
101
+ slim (1.3.6)
102
+ temple (~> 0.5.5)
103
+ tilt (~> 1.3.3)
102
104
  sprockets (2.0.4)
103
105
  hike (~> 1.2)
104
106
  rack (~> 1.0)
105
107
  tilt (~> 1.1, != 1.3.0)
106
- sqlite3 (1.3.6)
107
- temple (0.3.5)
108
+ sqlite3 (1.3.7)
109
+ temple (0.5.5)
108
110
  thor (0.14.6)
109
111
  tilt (1.3.3)
110
112
  treetop (1.4.12)
@@ -124,6 +126,6 @@ DEPENDENCIES
124
126
  rails (~> 3.1.0)
125
127
  rake
126
128
  rspec
127
- ruby_parser (~> 2.3)
129
+ ruby_parser (>= 3)
128
130
  slim
129
131
  sqlite3
data/gemfiles/rails.3.2.gemfile CHANGED
@@ -7,7 +7,7 @@ gem "bump"
7
7
  gem "gettext"
8
8
  gem "haml"
9
9
  gem "rake"
10
- gem "ruby_parser", "~> 2.3"
10
+ gem "ruby_parser", ">= 3"
11
11
  gem "rspec"
12
12
  gem "slim"
13
13
  gem "sqlite3"
data/gemfiles/rails.3.2.gemfile.lock CHANGED
@@ -1,37 +1,37 @@
1
1
  PATH
2
2
  remote: /Users/mgrosser/code/tools/gettext_i18n_rails
3
3
  specs:
4
- gettext_i18n_rails (0.7.2)
4
+ gettext_i18n_rails (0.8.0)
5
5
  fast_gettext (>= 0.4.8)
6
6
 
7
7
  GEM
8
8
  remote: http://rubygems.org/
9
9
  specs:
10
- actionmailer (3.2.8)
11
- actionpack (= 3.2.8)
10
+ actionmailer (3.2.11)
11
+ actionpack (= 3.2.11)
12
12
  mail (~> 2.4.4)
13
- actionpack (3.2.8)
14
- activemodel (= 3.2.8)
15
- activesupport (= 3.2.8)
13
+ actionpack (3.2.11)
14
+ activemodel (= 3.2.11)
15
+ activesupport (= 3.2.11)
16
16
  builder (~> 3.0.0)
17
17
  erubis (~> 2.7.0)
18
18
  journey (~> 1.0.4)
19
19
  rack (~> 1.4.0)
20
20
  rack-cache (~> 1.2)
21
21
  rack-test (~> 0.6.1)
22
- sprockets (~> 2.1.3)
23
- activemodel (3.2.8)
24
- activesupport (= 3.2.8)
22
+ sprockets (~> 2.2.1)
23
+ activemodel (3.2.11)
24
+ activesupport (= 3.2.11)
25
25
  builder (~> 3.0.0)
26
- activerecord (3.2.8)
27
- activemodel (= 3.2.8)
28
- activesupport (= 3.2.8)
26
+ activerecord (3.2.11)
27
+ activemodel (= 3.2.11)
28
+ activesupport (= 3.2.11)
29
29
  arel (~> 3.0.2)
30
30
  tzinfo (~> 0.3.29)
31
- activeresource (3.2.8)
32
- activemodel (= 3.2.8)
33
- activesupport (= 3.2.8)
34
- activesupport (3.2.8)
31
+ activeresource (3.2.11)
32
+ activemodel (= 3.2.11)
33
+ activesupport (= 3.2.11)
34
+ activesupport (3.2.11)
35
35
  i18n (~> 0.6)
36
36
  multi_json (~> 1.0)
37
37
  appraisal (0.5.1)
@@ -39,70 +39,73 @@ GEM
39
39
  rake
40
40
  arel (3.0.2)
41
41
  builder (3.0.4)
42
- bump (0.3.5)
42
+ bump (0.3.9)
43
43
  diff-lcs (1.1.3)
44
44
  erubis (2.7.0)
45
- fast_gettext (0.6.11)
46
- gettext (2.3.3)
45
+ fast_gettext (0.7.0)
46
+ gettext (2.3.7)
47
+ levenshtein
47
48
  locale
48
49
  haml (3.1.7)
49
50
  hike (1.2.1)
50
51
  i18n (0.6.1)
51
52
  journey (1.0.4)
52
- json (1.7.5)
53
+ json (1.7.6)
54
+ levenshtein (0.2.2)
53
55
  locale (2.0.8)
54
56
  mail (2.4.4)
55
57
  i18n (>= 0.4.0)
56
58
  mime-types (~> 1.16)
57
59
  treetop (~> 1.4.8)
58
60
  mime-types (1.19)
59
- multi_json (1.3.7)
61
+ multi_json (1.5.0)
60
62
  polyglot (0.3.3)
61
- rack (1.4.1)
63
+ rack (1.4.4)
62
64
  rack-cache (1.2)
63
65
  rack (>= 0.4)
64
66
  rack-ssl (1.3.2)
65
67
  rack
66
68
  rack-test (0.6.2)
67
69
  rack (>= 1.0)
68
- rails (3.2.8)
69
- actionmailer (= 3.2.8)
70
- actionpack (= 3.2.8)
71
- activerecord (= 3.2.8)
72
- activeresource (= 3.2.8)
73
- activesupport (= 3.2.8)
70
+ rails (3.2.11)
71
+ actionmailer (= 3.2.11)
72
+ actionpack (= 3.2.11)
73
+ activerecord (= 3.2.11)
74
+ activeresource (= 3.2.11)
75
+ activesupport (= 3.2.11)
74
76
  bundler (~> 1.0)
75
- railties (= 3.2.8)
76
- railties (3.2.8)
77
- actionpack (= 3.2.8)
78
- activesupport (= 3.2.8)
77
+ railties (= 3.2.11)
78
+ railties (3.2.11)
79
+ actionpack (= 3.2.11)
80
+ activesupport (= 3.2.11)
79
81
  rack-ssl (~> 1.3.2)
80
82
  rake (>= 0.8.7)
81
83
  rdoc (~> 3.4)
82
84
  thor (>= 0.14.6, < 2.0)
83
- rake (0.9.2.2)
85
+ rake (10.0.3)
84
86
  rdoc (3.12)
85
87
  json (~> 1.4)
86
- rspec (2.11.0)
87
- rspec-core (~> 2.11.0)
88
- rspec-expectations (~> 2.11.0)
89
- rspec-mocks (~> 2.11.0)
90
- rspec-core (2.11.1)
91
- rspec-expectations (2.11.3)
88
+ rspec (2.12.0)
89
+ rspec-core (~> 2.12.0)
90
+ rspec-expectations (~> 2.12.0)
91
+ rspec-mocks (~> 2.12.0)
92
+ rspec-core (2.12.2)
93
+ rspec-expectations (2.12.1)
92
94
  diff-lcs (~> 1.1.3)
93
- rspec-mocks (2.11.3)
94
- ruby_parser (2.3.1)
95
- sexp_processor (~> 3.0)
96
- sexp_processor (3.2.0)
97
- slim (1.0.4)
98
- temple (~> 0.3.4)
99
- tilt (~> 1.3.2)
100
- sprockets (2.1.3)
95
+ rspec-mocks (2.12.1)
96
+ ruby_parser (3.1.1)
97
+ sexp_processor (~> 4.1)
98
+ sexp_processor (4.1.3)
99
+ slim (1.3.6)
100
+ temple (~> 0.5.5)
101
+ tilt (~> 1.3.3)
102
+ sprockets (2.2.2)
101
103
  hike (~> 1.2)
104
+ multi_json (~> 1.0)
102
105
  rack (~> 1.0)
103
106
  tilt (~> 1.1, != 1.3.0)
104
- sqlite3 (1.3.6)
105
- temple (0.3.5)
107
+ sqlite3 (1.3.7)
108
+ temple (0.5.5)
106
109
  thor (0.16.0)
107
110
  tilt (1.3.3)
108
111
  treetop (1.4.12)
@@ -122,6 +125,6 @@ DEPENDENCIES
122
125
  rails (~> 3.2.0)
123
126
  rake
124
127
  rspec
125
- ruby_parser (~> 2.3)
128
+ ruby_parser (>= 3)
126
129
  slim
127
130
  sqlite3
data/lib/gettext_i18n_rails/ruby_gettext_extractor.rb CHANGED
@@ -11,7 +11,15 @@ module RubyGettextExtractor
11
11
 
12
12
  def parse_string(content, file, targets=[])
13
13
  # file is just for information in error messages
14
- parser = Extractor.new(file, targets)
14
+
15
+ case RUBY_VERSION
16
+ when /^1\.8/ then
17
+ parser = Extractor18.new(file, targets)
18
+ when /^1\.9/ then
19
+ parser = Extractor19.new(file, targets)
20
+ else
21
+ raise "unrecognized RUBY_VERSION #{RUBY_VERSION}"
22
+ end
15
23
  parser.run(content)
16
24
  end
17
25
 
@@ -19,7 +27,7 @@ module RubyGettextExtractor
19
27
  return file =~ /\.rb$/
20
28
  end
21
29
 
22
- class Extractor < RubyParser
30
+ module ExtractorMethods
23
31
  def initialize(filename, targets)
24
32
  @filename = filename
25
33
  @targets = Hash.new
@@ -130,4 +138,14 @@ module RubyGettextExtractor
130
138
  super recv, meth, args
131
139
  end
132
140
  end
141
+
142
+ class Extractor18 < Ruby18Parser
143
+ include ExtractorMethods
144
+ end
145
+
146
+ class Extractor19 < Ruby19Parser
147
+ include ExtractorMethods
148
+ end
149
+
150
+
133
151
  end
data/lib/gettext_i18n_rails/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module GettextI18nRails
2
- Version = VERSION = '0.8.0'
2
+ Version = VERSION = '0.9.0'
3
3
  end
data/spec/gettext_i18n_rails/haml_parser_spec.rb CHANGED
@@ -23,10 +23,13 @@ describe GettextI18nRails::HamlParser do
23
23
  end
24
24
  end
25
25
 
26
- it "ignores 1.9 errors and shows the paths of offending files" do
27
- with_file '= _("xxxx", x: 1)' do |path|
28
- $stderr.should_receive(:puts).with{|x| x =~ /file ignored.*#{path}/ }
29
- parser.parse(path, [1]).should == [1]
26
+ it "should parse the 1.9 if ruby_version is 1.9" do
27
+ if RUBY_VERSION =~ /^1\.9/
28
+ with_file '= _("xxxx", x: 1)' do |path|
29
+ parser.parse(path, []).should == [
30
+ ["xxxx", "#{path}:1"]
31
+ ]
32
+ end
30
33
  end
31
34
  end
32
35
 
metadata CHANGED
@@ -1,47 +1,38 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: gettext_i18n_rails
3
- version: !ruby/object:Gem::Version
4
- hash: 63
3
+ version: !ruby/object:Gem::Version
5
4
  prerelease:
6
- segments:
7
- - 0
8
- - 8
9
- - 0
10
- version: 0.8.0
5
+ version: 0.9.0
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Michael Grosser
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2012-11-10 00:00:00 Z
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
21
- name: fast_gettext
22
- version_requirements: &id001 !ruby/object:Gem::Requirement
12
+ date: 2013-01-21 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
15
+ version_requirements: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - ! '>='
18
+ - !ruby/object:Gem::Version
19
+ version: 0.4.8
23
20
  none: false
24
- requirements:
25
- - - ">="
26
- - !ruby/object:Gem::Version
27
- hash: 31
28
- segments:
29
- - 0
30
- - 4
31
- - 8
21
+ prerelease: false
22
+ name: fast_gettext
23
+ requirement: !ruby/object:Gem::Requirement
24
+ requirements:
25
+ - - ! '>='
26
+ - !ruby/object:Gem::Version
32
27
  version: 0.4.8
28
+ none: false
33
29
  type: :runtime
34
- requirement: *id001
35
- prerelease: false
36
30
  description:
37
31
  email: michael@grosser.it
38
32
  executables: []
39
-
40
33
  extensions: []
41
-
42
34
  extra_rdoc_files: []
43
-
44
- files:
35
+ files:
45
36
  - .gitignore
46
37
  - .travis.yml
47
38
  - Appraisals
@@ -96,37 +87,34 @@ files:
96
87
  - spec/gettext_i18n_rails_spec.rb
97
88
  - spec/spec_helper.rb
98
89
  homepage: http://github.com/grosser/gettext_i18n_rails
99
- licenses:
90
+ licenses:
100
91
  - MIT
101
92
  post_install_message:
102
93
  rdoc_options: []
103
-
104
- require_paths:
94
+ require_paths:
105
95
  - lib
106
- required_ruby_version: !ruby/object:Gem::Requirement
107
- none: false
108
- requirements:
109
- - - ">="
110
- - !ruby/object:Gem::Version
111
- hash: 3
112
- segments:
96
+ required_ruby_version: !ruby/object:Gem::Requirement
97
+ requirements:
98
+ - - ! '>='
99
+ - !ruby/object:Gem::Version
100
+ version: '0'
101
+ segments:
113
102
  - 0
114
- version: "0"
115
- required_rubygems_version: !ruby/object:Gem::Requirement
103
+ hash: 559872636697096172
116
104
  none: false
117
- requirements:
118
- - - ">="
119
- - !ruby/object:Gem::Version
120
- hash: 3
121
- segments:
105
+ required_rubygems_version: !ruby/object:Gem::Requirement
106
+ requirements:
107
+ - - ! '>='
108
+ - !ruby/object:Gem::Version
109
+ version: '0'
110
+ segments:
122
111
  - 0
123
- version: "0"
112
+ hash: 559872636697096172
113
+ none: false
124
114
  requirements: []
125
-
126
115
  rubyforge_project:
127
116
  rubygems_version: 1.8.24
128
117
  signing_key:
129
118
  specification_version: 3
130
119
  summary: Simple FastGettext Rails integration.
131
120
  test_files: []
132
-