gettext_i18n_rails 0.6.1 → 0.6.2

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 (8) hide show
  1. data/Gemfile +2 -2
  2. data/Gemfile.lock +68 -58
  3. data/Rakefile +4 -3
  4. data/lib/gettext_i18n_rails/active_record.rb +8 -0
  5. data/lib/gettext_i18n_rails/model_attributes_finder.rb +3 -0
  6. data/lib/gettext_i18n_rails/version.rb +1 -1
  7. data/spec/gettext_i18n_rails/model_attributes_finder_spec.rb +1 -1
  8. metadata +4 -4
data/Gemfile CHANGED
@@ -2,8 +2,8 @@ source :rubygems
2
2
  gemspec
3
3
 
4
4
  gem 'haml'
5
- gem 'slim'
6
- gem 'hamlet'
5
+ gem 'slim', :git => "https://github.com/grosser/slim.git", :ref => "rails2"
6
+ gem 'hamlet', :git => "https://github.com/grosser/hamlet.rb.git", :ref => "all"
7
7
  gem 'ruby_parser'
8
8
  gem 'gettext'
9
9
  gem 'sqlite3', '~>1.3.4'
data/Gemfile.lock CHANGED
@@ -1,43 +1,57 @@
1
+ GIT
2
+ remote: https://github.com/grosser/hamlet.rb.git
3
+ revision: daf922bb40a9daa20fcc50a7e10c77cff772d688
4
+ ref: all
5
+ specs:
6
+ hamlet (0.5.0.1)
7
+ slim (~> 1.2.0)
8
+
9
+ GIT
10
+ remote: https://github.com/grosser/slim.git
11
+ revision: f1b32d3b5422536b5f4f708dde55a13dc43568dc
12
+ ref: rails2
13
+ specs:
14
+ slim (1.2.1)
15
+ temple (~> 0.4.0)
16
+ tilt (~> 1.3.3)
17
+
1
18
  PATH
2
19
  remote: .
3
20
  specs:
4
- gettext_i18n_rails (0.6.1)
21
+ gettext_i18n_rails (0.6.2)
5
22
  fast_gettext
6
23
 
7
24
  GEM
8
25
  remote: http://rubygems.org/
9
26
  specs:
10
- actionmailer (3.1.0)
11
- actionpack (= 3.1.0)
12
- mail (~> 2.3.0)
13
- actionpack (3.1.0)
14
- activemodel (= 3.1.0)
15
- activesupport (= 3.1.0)
27
+ actionmailer (3.2.5)
28
+ actionpack (= 3.2.5)
29
+ mail (~> 2.4.4)
30
+ actionpack (3.2.5)
31
+ activemodel (= 3.2.5)
32
+ activesupport (= 3.2.5)
16
33
  builder (~> 3.0.0)
17
34
  erubis (~> 2.7.0)
18
- i18n (~> 0.6)
19
- rack (~> 1.3.2)
20
- rack-cache (~> 1.0.3)
21
- rack-mount (~> 0.8.2)
35
+ journey (~> 1.0.1)
36
+ rack (~> 1.4.0)
37
+ rack-cache (~> 1.2)
22
38
  rack-test (~> 0.6.1)
23
- sprockets (~> 2.0.0)
24
- activemodel (3.1.0)
25
- activesupport (= 3.1.0)
26
- bcrypt-ruby (~> 3.0.0)
39
+ sprockets (~> 2.1.3)
40
+ activemodel (3.2.5)
41
+ activesupport (= 3.2.5)
27
42
  builder (~> 3.0.0)
28
- i18n (~> 0.6)
29
- activerecord (3.1.0)
30
- activemodel (= 3.1.0)
31
- activesupport (= 3.1.0)
32
- arel (~> 2.2.1)
43
+ activerecord (3.2.5)
44
+ activemodel (= 3.2.5)
45
+ activesupport (= 3.2.5)
46
+ arel (~> 3.0.2)
33
47
  tzinfo (~> 0.3.29)
34
- activeresource (3.1.0)
35
- activemodel (= 3.1.0)
36
- activesupport (= 3.1.0)
37
- activesupport (3.1.0)
48
+ activeresource (3.2.5)
49
+ activemodel (= 3.2.5)
50
+ activesupport (= 3.2.5)
51
+ activesupport (3.2.5)
52
+ i18n (~> 0.6)
38
53
  multi_json (~> 1.0)
39
- arel (2.2.1)
40
- bcrypt-ruby (3.0.1)
54
+ arel (3.0.2)
41
55
  builder (3.0.0)
42
56
  diff-lcs (1.1.2)
43
57
  erubis (2.7.0)
@@ -45,44 +59,43 @@ GEM
45
59
  gettext (2.1.0)
46
60
  locale (>= 2.0.5)
47
61
  haml (3.1.4)
48
- hamlet (0.1)
49
- slim (~> 1.0)
50
62
  hike (1.2.1)
51
63
  i18n (0.6.0)
64
+ journey (1.0.4)
65
+ json (1.7.3)
52
66
  locale (2.0.5)
53
- mail (2.3.0)
67
+ mail (2.4.4)
54
68
  i18n (>= 0.4.0)
55
69
  mime-types (~> 1.16)
56
70
  treetop (~> 1.4.8)
57
- mime-types (1.16)
58
- multi_json (1.0.3)
59
- polyglot (0.3.2)
60
- rack (1.3.2)
61
- rack-cache (1.0.3)
71
+ mime-types (1.18)
72
+ multi_json (1.3.6)
73
+ polyglot (0.3.3)
74
+ rack (1.4.1)
75
+ rack-cache (1.2)
62
76
  rack (>= 0.4)
63
- rack-mount (0.8.3)
64
- rack (>= 1.0.0)
65
77
  rack-ssl (1.3.2)
66
78
  rack
67
79
  rack-test (0.6.1)
68
80
  rack (>= 1.0)
69
- rails (3.1.0)
70
- actionmailer (= 3.1.0)
71
- actionpack (= 3.1.0)
72
- activerecord (= 3.1.0)
73
- activeresource (= 3.1.0)
74
- activesupport (= 3.1.0)
81
+ rails (3.2.5)
82
+ actionmailer (= 3.2.5)
83
+ actionpack (= 3.2.5)
84
+ activerecord (= 3.2.5)
85
+ activeresource (= 3.2.5)
86
+ activesupport (= 3.2.5)
75
87
  bundler (~> 1.0)
76
- railties (= 3.1.0)
77
- railties (3.1.0)
78
- actionpack (= 3.1.0)
79
- activesupport (= 3.1.0)
88
+ railties (= 3.2.5)
89
+ railties (3.2.5)
90
+ actionpack (= 3.2.5)
91
+ activesupport (= 3.2.5)
80
92
  rack-ssl (~> 1.3.2)
81
93
  rake (>= 0.8.7)
82
94
  rdoc (~> 3.4)
83
- thor (~> 0.14.6)
95
+ thor (>= 0.14.6, < 2.0)
84
96
  rake (0.9.2)
85
- rdoc (3.9.4)
97
+ rdoc (3.12)
98
+ json (~> 1.4)
86
99
  rspec (2.6.0)
87
100
  rspec-core (~> 2.6.0)
88
101
  rspec-expectations (~> 2.6.0)
@@ -94,21 +107,18 @@ GEM
94
107
  ruby_parser (2.3.1)
95
108
  sexp_processor (~> 3.0)
96
109
  sexp_processor (3.0.10)
97
- slim (1.1.0)
98
- temple (~> 0.3.5)
99
- tilt (~> 1.3.2)
100
- sprockets (2.0.0)
110
+ sprockets (2.1.3)
101
111
  hike (~> 1.2)
102
112
  rack (~> 1.0)
103
113
  tilt (~> 1.1, != 1.3.0)
104
114
  sqlite3 (1.3.4)
105
- temple (0.3.5)
106
- thor (0.14.6)
115
+ temple (0.4.0)
116
+ thor (0.15.2)
107
117
  tilt (1.3.3)
108
118
  treetop (1.4.10)
109
119
  polyglot
110
120
  polyglot (>= 0.3.1)
111
- tzinfo (0.3.29)
121
+ tzinfo (0.3.33)
112
122
 
113
123
  PLATFORMS
114
124
  ruby
@@ -117,10 +127,10 @@ DEPENDENCIES
117
127
  gettext
118
128
  gettext_i18n_rails!
119
129
  haml
120
- hamlet
121
- rails (~> 3)
130
+ hamlet!
131
+ rails (= 3.2.5)
122
132
  rake
123
133
  rspec (~> 2)
124
134
  ruby_parser
125
- slim
135
+ slim!
126
136
  sqlite3 (~> 1.3.4)
data/Rakefile CHANGED
@@ -5,9 +5,10 @@ task :spec do
5
5
  end
6
6
 
7
7
  task :default do
8
- sh "RAILS=2.3.14 && (bundle || bundle install) && bundle exec rake spec"
9
- sh "RAILS=3.0.9 && (bundle || bundle install) && bundle exec rake spec"
10
- sh "RAILS=3.1.0 && (bundle || bundle install) && bundle exec rake spec"
8
+ ['2.3.14', '3.0.9', '3.1.0'].each do |version|
9
+ sh "export RAILS='#{version}' && (bundle check || bundle install) && bundle exec rake spec"
10
+ end
11
+ sh "git checkout Gemfile.lock"
11
12
  end
12
13
 
13
14
  # extracted from https://github.com/grosser/project_template
data/lib/gettext_i18n_rails/active_record.rb CHANGED
@@ -1,3 +1,11 @@
1
+ # if running Rails 2 ActiveModel won't exist -- but we still need to load
2
+ # our overrides for the include below to work
3
+ begin
4
+ require 'active_model'
5
+ rescue LoadError
6
+ require 'gettext_i18n_rails/active_model'
7
+ end
8
+
1
9
  module GettextI18nRails::ActiveRecord
2
10
  include ActiveModel::Translation
3
11
 
data/lib/gettext_i18n_rails/model_attributes_finder.rb CHANGED
@@ -107,6 +107,9 @@ module GettextI18nRails
107
107
  constant = name.constantize
108
108
  rescue NameError
109
109
  return nil
110
+ rescue LoadError => e
111
+ $stderr.puts "failed to load '#{name}', ignoring (#{e.class}: #{e.message})"
112
+ return nil
110
113
  end
111
114
 
112
115
  return constant.is_a?(Class) ? constant : nil
data/lib/gettext_i18n_rails/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module GettextI18nRails
2
- Version = VERSION = '0.6.1'
2
+ Version = VERSION = '0.6.2'
3
3
  end
data/spec/gettext_i18n_rails/model_attributes_finder_spec.rb CHANGED
@@ -13,7 +13,7 @@ describe GettextI18nRails::ModelAttributesFinder do
13
13
  let(:finder) { GettextI18nRails::ModelAttributesFinder.new }
14
14
 
15
15
  before do
16
- Rails.application
16
+ Rails.application rescue nil
17
17
  end
18
18
 
19
19
  describe :find do
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gettext_i18n_rails
3
3
  version: !ruby/object:Gem::Version
4
- hash: 5
4
+ hash: 3
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 6
9
- - 1
10
- version: 0.6.1
9
+ - 2
10
+ version: 0.6.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-06-03 00:00:00 Z
18
+ date: 2012-06-15 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: fast_gettext