gettext_i18n_rails 0.6.1 → 0.6.2

data/Gemfile

@@ -2,8 +2,8 @@ source :rubygems
 gemspec
 
 gem 'haml'
-gem 'slim'
-gem 'hamlet'
+gem 'slim', :git => "https://github.com/grosser/slim.git", :ref => "rails2"
+gem 'hamlet', :git => "https://github.com/grosser/hamlet.rb.git", :ref => "all"
 gem 'ruby_parser'
 gem 'gettext'
 gem 'sqlite3', '~>1.3.4'

data/Gemfile.lock

@@ -1,43 +1,57 @@
+GIT
+  remote: https://github.com/grosser/hamlet.rb.git
+  revision: daf922bb40a9daa20fcc50a7e10c77cff772d688
+  ref: all
+  specs:
+    hamlet (0.5.0.1)
+      slim (~> 1.2.0)
+
+GIT
+  remote: https://github.com/grosser/slim.git
+  revision: f1b32d3b5422536b5f4f708dde55a13dc43568dc
+  ref: rails2
+  specs:
+    slim (1.2.1)
+      temple (~> 0.4.0)
+      tilt (~> 1.3.3)
+
 PATH
   remote: .
   specs:
-    gettext_i18n_rails (0.6.1)
+    gettext_i18n_rails (0.6.2)
       fast_gettext
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
-      mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
+    actionmailer (3.2.5)
+      actionpack (= 3.2.5)
+      mail (~> 2.4.4)
+    actionpack (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.5)
+      activesupport (= 3.2.5)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
+    activerecord (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
+    activeresource (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+    activesupport (3.2.5)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
-    bcrypt-ruby (3.0.1)
+    arel (3.0.2)
     builder (3.0.0)
     diff-lcs (1.1.2)
     erubis (2.7.0)
@@ -45,44 +59,43 @@ GEM
     gettext (2.1.0)
       locale (>= 2.0.5)
     haml (3.1.4)
-    hamlet (0.1)
-      slim (~> 1.0)
     hike (1.2.1)
     i18n (0.6.0)
+    journey (1.0.4)
+    json (1.7.3)
     locale (2.0.5)
-    mail (2.3.0)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    multi_json (1.0.3)
-    polyglot (0.3.2)
-    rack (1.3.2)
-    rack-cache (1.0.3)
+    mime-types (1.18)
+    multi_json (1.3.6)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0)
-      actionmailer (= 3.1.0)
-      actionpack (= 3.1.0)
-      activerecord (= 3.1.0)
-      activeresource (= 3.1.0)
-      activesupport (= 3.1.0)
+    rails (3.2.5)
+      actionmailer (= 3.2.5)
+      actionpack (= 3.2.5)
+      activerecord (= 3.2.5)
+      activeresource (= 3.2.5)
+      activesupport (= 3.2.5)
       bundler (~> 1.0)
-      railties (= 3.1.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
+      railties (= 3.2.5)
+    railties (3.2.5)
+      actionpack (= 3.2.5)
+      activesupport (= 3.2.5)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2)
-    rdoc (3.9.4)
+    rdoc (3.12)
+      json (~> 1.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -94,21 +107,18 @@ GEM
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
     sexp_processor (3.0.10)
-    slim (1.1.0)
-      temple (~> 0.3.5)
-      tilt (~> 1.3.2)
-    sprockets (2.0.0)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
-    temple (0.3.5)
-    thor (0.14.6)
+    temple (0.4.0)
+    thor (0.15.2)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
@@ -117,10 +127,10 @@ DEPENDENCIES
   gettext
   gettext_i18n_rails!
   haml
-  hamlet
-  rails (~> 3)
+  hamlet!
+  rails (= 3.2.5)
   rake
   rspec (~> 2)
   ruby_parser
-  slim
+  slim!
   sqlite3 (~> 1.3.4)

data/Rakefile

@@ -5,9 +5,10 @@ task :spec do
 end
 
 task :default do
-  sh "RAILS=2.3.14 && (bundle || bundle install) && bundle exec rake spec"
-  sh "RAILS=3.0.9 && (bundle || bundle install) && bundle exec rake spec"
-  sh "RAILS=3.1.0 && (bundle || bundle install) && bundle exec rake spec"
+  ['2.3.14', '3.0.9', '3.1.0'].each do |version|
+    sh "export RAILS='#{version}' && (bundle check || bundle install) && bundle exec rake spec"
+  end
+  sh "git checkout Gemfile.lock"
 end
 
 # extracted from https://github.com/grosser/project_template

data/lib/gettext_i18n_rails/active_record.rb

@@ -1,3 +1,11 @@
+# if running Rails 2 ActiveModel won't exist -- but we still need to load
+# our overrides for the include below to work
+begin
+  require 'active_model'
+rescue LoadError
+  require 'gettext_i18n_rails/active_model'
+end
+
 module GettextI18nRails::ActiveRecord
   include ActiveModel::Translation
 

data/lib/gettext_i18n_rails/model_attributes_finder.rb

@@ -107,6 +107,9 @@ module GettextI18nRails
         constant = name.constantize
       rescue NameError
         return nil
+      rescue LoadError => e
+        $stderr.puts "failed to load '#{name}', ignoring (#{e.class}: #{e.message})"
+        return nil
       end
 
       return constant.is_a?(Class) ? constant : nil

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '0.6.1'
+  Version = VERSION = '0.6.2'
 end

data/spec/gettext_i18n_rails/model_attributes_finder_spec.rb

@@ -13,7 +13,7 @@ describe GettextI18nRails::ModelAttributesFinder do
   let(:finder) { GettextI18nRails::ModelAttributesFinder.new }
 
   before do
-    Rails.application
+    Rails.application rescue nil
   end
 
   describe :find do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-03 00:00:00 Z
+date: 2012-06-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fast_gettext