localeapp 0.0.8 → 0.0.10

data/.gitignore

@@ -2,6 +2,7 @@ pkg/*
 *.gem
 .bundle
 Gemfile.lock
+Gemfile.*.lock
 .yardoc/*
 doc/*
 tmp/*

data/.travis.yml

@@ -1,6 +1,10 @@
 rvm:
   - 1.8.7
   - 1.9.2
+gemfile:
+  - Gemfile.i18n_037
+  - Gemfile.i18n_050
+  - Gemfile.i18n_060
 branches:
   only:
     - master

data/Gemfile.i18n_037

@@ -0,0 +1,5 @@
+source :rubyforge
+gemspec
+
+gem 'i18n', '0.3.7'
+gem 'activesupport', '2.3.14'

data/Gemfile.i18n_050

@@ -0,0 +1,4 @@
+source :rubyforge
+gemspec
+
+gem 'i18n', '0.5.0'

data/Gemfile.i18n_060

@@ -0,0 +1,4 @@
+source :rubyforge
+gemspec
+
+gem 'i18n', '~> 0.6.0'

data/lib/localeapp.rb

@@ -5,15 +5,24 @@ rescue LoadError
   # we're in 2.3 and we need to load rails to get the vendored i18n
   require 'thread' # for rubygems > 1.6.0 support
   require 'active_support'
+  # This ugliness so we can load AS in the travis env
+  @loaded_active_support = true
 end
 
 begin
   require 'i18n/core_ext/hash'
 rescue LoadError
+  # This ugliness so we can load AS in the travis env
   # Assume that we're in rails 2.3 and AS supplies deep_merge
+  # Load AS if we need to
+  unless @loaded_active_support 
+    # we're in 2.3 and we need to load rails to get the vendored i18n
+    require 'thread' # for rubygems > 1.6.0 support
+    require 'active_support'
+  end
 end
 
-
+require 'localeapp/i18n_shim'
 require 'localeapp/version'
 require 'localeapp/configuration'
 require 'localeapp/routes'

data/lib/localeapp/exception_handler.rb

@@ -2,11 +2,12 @@ module Localeapp
   class ExceptionHandler
     def self.call(exception, locale, key, options)
       Localeapp.log(exception.message)
-      if I18n::MissingTranslationData === exception
+      # Which exact exception is set up by our i18n shims
+      if exception.is_a? Localeapp::I18nMissingTranslationException
         Localeapp.log("Detected missing translation for key(s) #{key.inspect}")
 
         [*key].each do |key|
-          Localeapp.missing_translations.add(locale, key, options)
+          Localeapp.missing_translations.add(locale, key, options || {})
         end
 
         [locale, key].join(', ')

data/lib/localeapp/i18n_shim.rb

@@ -0,0 +1,5 @@
+if defined? I18n::MissingTranslation 
+  Localeapp::I18nMissingTranslationException = I18n::MissingTranslation
+else
+  Localeapp::I18nMissingTranslationException = I18n::MissingTranslationData
+end

data/lib/localeapp/updater.rb

@@ -38,6 +38,7 @@ module Localeapp
     end
 
     def remove_child_keys!(sub_hash, keys)
+      return if sub_hash.nil?
       current_key = keys.shift
       if keys.empty?
         sub_hash.delete(current_key)

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "0.0.8"
+  VERSION = "0.0.10"
 end

data/localeapp.gemspec

@@ -19,13 +19,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency('i18n')
   s.add_dependency('json')
   s.add_dependency('rest-client')
   s.add_dependency('ya2yaml')
 
-  # i18n is a dev dependency as we'll use whichever version is in rails
-  # when the gem runs
-  s.add_development_dependency('i18n', '0.5.0')
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec', '2.5.0')
   s.add_development_dependency('yard', '0.6.7')

data/spec/localeapp/exception_handler_spec.rb

@@ -18,4 +18,11 @@ describe Localeapp::ExceptionHandler, '#call(exception, locale, key, options)' d
     Localeapp.missing_translations.should_receive(:add).with(:en, 'bar', {})
     I18n.t(['foo', 'bar'])
   end
+
+  it "handles missing translation exception" do
+    expect {
+      exception = Localeapp::I18nMissingTranslationException.new(:en, 'foo', {})
+      Localeapp::ExceptionHandler.call(exception, :en, 'foo', {})
+    }.to_not raise_error
+  end
 end

data/spec/localeapp/updater_spec.rb

@@ -81,9 +81,9 @@ JA
   it "doesn't create a new yml file if an unknown locale is passed but it has no translations" do
     do_update({
       'translations' => {},
-      'deletes' => ['foo.delete_me'],
+      'deleted' => ['foo.delete_me'],
       'locales' => ['ja']
     })
     File.exist?(File.join(@yml_dir, 'ja.yml')).should be_false
   end
-end
+end

data/spec/spec_helper.rb

@@ -3,12 +3,13 @@ require 'localeapp'
 require 'fakeweb'
 require 'support/localeapp_integration_data'
 require 'support/localeapp_synchronization_data'
+require 'support/i18n/missing_translation'
 require 'logger'
 
 def with_configuration(options = {})
   Localeapp.configuration = nil
   Localeapp.configure do |configuration|
-    options.each do |option, value| 
+    options.each do |option, value|
       configuration.send("#{option}=", value)
     end
   end

data/spec/support/i18n/missing_translation.rb

@@ -0,0 +1,22 @@
+module I18n
+  class MissingTranslation
+    attr_reader :locale, :key, :options
+
+    def initialize(locale, key, options = nil)
+      @key, @locale, @options = key, locale, options.dup || {}
+      options.each { |k, v| self.options[k] = v.inspect if v.is_a?(Proc) }
+    end
+
+    def keys
+      @keys ||= I18n.normalize_keys(locale, key, options[:scope]).tap do |keys|
+        keys << 'no key' if keys.size < 2
+      end
+    end
+
+    def message
+      "translation missing: #{keys.join('.')}"
+    end
+    alias :to_s :message
+
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Christopher Dell
@@ -16,10 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 Z
+date: 2011-08-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: i18n
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,7 +47,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ya2yaml
+  name: rest-client
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,20 +61,18 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: ya2yaml
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
         - 0
-        - 5
-        - 0
-        version: 0.5.0
-  type: :development
+        version: "0"
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -187,6 +185,9 @@ files:
 - .rvmrc
 - .travis.yml
 - Gemfile
+- Gemfile.i18n_037
+- Gemfile.i18n_050
+- Gemfile.i18n_060
 - README.textile
 - Rakefile
 - bin/localeapp
@@ -205,6 +206,7 @@ files:
 - lib/localeapp/cli/update.rb
 - lib/localeapp/configuration.rb
 - lib/localeapp/exception_handler.rb
+- lib/localeapp/i18n_shim.rb
 - lib/localeapp/key_checker.rb
 - lib/localeapp/missing_translations.rb
 - lib/localeapp/poller.rb
@@ -237,6 +239,7 @@ files:
 - spec/localeapp/sender_spec.rb
 - spec/localeapp/updater_spec.rb
 - spec/spec_helper.rb
+- spec/support/i18n/missing_translation.rb
 - spec/support/localeapp_integration_data.rb
 - spec/support/localeapp_synchronization_data.rb
 homepage: http://rubygems.org/gems/localeapp
@@ -295,5 +298,6 @@ test_files:
 - spec/localeapp/sender_spec.rb
 - spec/localeapp/updater_spec.rb
 - spec/spec_helper.rb
+- spec/support/i18n/missing_translation.rb
 - spec/support/localeapp_integration_data.rb
 - spec/support/localeapp_synchronization_data.rb