localeapp 0.6.10 → 0.6.12

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # master
 
+# Version 0.6.12
+
+* Fix an error creating the folder for the syncfile
+
+# Version 0.6.11 (yanked)
+
+* Handle sending fallbacks
+* Create the schronization data file even if the containing folder is
+  missing
+* Fix bug where deleting a namespace and then recreating a key inside
+  of it wasn't getting added.
+* Normalize keys so that the scope is added to missing translations
+* Throw a Localeapp::MissingApiKey exception when an API key has not
+  been set
+
 # Version 0.6.10
 
 * Don't send the :default param with a MissingTranslation when not in

data/lib/localeapp.rb

@@ -56,6 +56,7 @@ module Localeapp
 
   class LocaleappError < StandardError; end
   class PotentiallyInsecureYaml < LocaleappError; end
+  class MissingApiKey < LocaleappError; end
 
   class << self
     # An Localeapp configuration object.

data/lib/localeapp/default_value_handler.rb

@@ -3,13 +3,25 @@ module I18n::Backend::Base
 
   def default(locale, object, subject, options = {})
     result = default_without_handler(locale, object, subject, options)
+
+    original_object = object
+    object ||= Thread.current[:i18n_default_object]
     case subject # case is what i18n gem uses here so doing the same
-    when Array, Symbol
-      # Do nothing, we only send missing translations with text defaults
-    else
-      value = locale == I18n.default_locale ? subject : nil
+    when String
+      value = locale.to_s == I18n.default_locale.to_s ? subject : nil
       Localeapp.missing_translations.add(locale, object, value, options)
+    when Array
+      text_default = subject.detect{|item| item.is_a? String }
+      if text_default
+        value = locale.to_s == I18n.default_locale.to_s ? text_default : nil
+        Localeapp.missing_translations.add(locale, object, value, options)
+      end
+    when Symbol
+      # Do nothing, we only send missing translations with text defaults
     end
+
+    # Remember the object because it will be nil after the fallback
+    Thread.current[:i18n_default_object] = original_object
     return result
   end
 end

data/lib/localeapp/rails.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Localeapp
   module Rails
     def self.initialize
@@ -36,8 +38,10 @@ module Localeapp
     end
 
     def self.initialize_synchronization_data_file
-      if !File.exists?(Localeapp.configuration.synchronization_data_file)
-        File.open(Localeapp.configuration.synchronization_data_file, 'w') do |f|
+      sync_file = Localeapp.configuration.synchronization_data_file
+      if !File.exists?(sync_file)
+        FileUtils.mkdir_p(File.dirname(sync_file))
+        File.open(sync_file, 'w') do |f|
           f.write({:polled_at => Time.now.to_i, :updated_at => Time.now.to_i}.to_yaml)
         end
       end

data/lib/localeapp/rails/controller.rb

@@ -7,6 +7,7 @@ module Localeapp
       end
 
       def handle_translation_updates
+        raise Localeapp::MissingApiKey unless ::Localeapp.configuration.api_key
         unless ::Localeapp.configuration.polling_disabled?
           ::Localeapp.log_with_time 'Handling translation updates'
           if ::Localeapp.poller.needs_polling?

data/lib/localeapp/sender.rb

@@ -9,8 +9,10 @@ module Localeapp
     def post_translation(locale, key, options, value = nil)
       options ||= {}
       options.delete(:default)
-      options.delete(:scope)
-      translation = { :key => key, :locale => locale, :substitutions => options.keys.sort, :description => value}
+      scope = options.delete(:scope)
+      normalized_key = I18n.normalize_keys(nil, key, scope).join('.')
+
+      translation = { :key => normalized_key, :locale => locale, :substitutions => options.keys.sort, :description => value}
       @data = { :translation => translation }
       api_call :create_translation,
         :payload => @data.to_json,

data/lib/localeapp/updater.rb

@@ -61,7 +61,10 @@ module Localeapp
       return if sub_hash.nil?
       current_key = keys.shift
       if keys.empty?
-        sub_hash.delete(current_key)
+        # delete key except if key is now used as a namespace for a child_hash
+        unless sub_hash[current_key].is_a?(Hash)
+          sub_hash.delete(current_key)
+        end
       else
         child_hash = sub_hash[current_key]
         unless child_hash.nil?

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "0.6.10"
+  VERSION = "0.6.12"
 end

data/spec/localeapp/default_value_handler_spec.rb

@@ -4,6 +4,10 @@ class Klass
   include I18n::Backend::Base
 end
 
+class I18nWithFallbacks < I18n::Backend::Simple
+  include I18n::Backend::Fallbacks
+end
+
 describe I18n::Backend::Base, '#default' do
   let(:klass) { Klass.new }
 
@@ -27,16 +31,35 @@ describe I18n::Backend::Base, '#default' do
         klass.default(:fr, 'foo', 'bar', :baz => 'bam')
       end
     end
+
+    it "adds translations to missing translations when using a string as the locale" do
+      allow_sending do
+        Localeapp.missing_translations.should_receive(:add).with('en', 'foo', 'bar', :baz => 'bam')
+        klass.default('en', 'foo', 'bar', :baz => 'bam')
+      end
+    end
   end
 
   describe "when subject is an Array" do
-    it "doesn't send anything to Locale" do
-      allow_sending do
-        Localeapp.missing_translations.should_not_receive(:add)
-        I18n.stub!(:translate) do |subject, _|
-          subject == :not_missing ? "not missing" : nil
+
+    describe "and there is a text inside the array" do
+      it "add translations to missing translations to send to Locale" do
+        allow_sending do
+          Localeapp.missing_translations.should_receive(:add).with(:en, 'foo', 'correct default', :baz => 'bam')
+          klass.default(:en, 'foo', [:missing, 'correct default'], :baz => 'bam')
+        end
+      end
+    end
+
+    describe "and there is not a text inside the array" do
+      it "doesn't send anything to Locale" do
+        allow_sending do
+          Localeapp.missing_translations.should_not_receive(:add)
+          I18n.stub!(:translate) do |subject, _|
+            subject == :not_missing ? "not missing" : nil
+          end
+          klass.default(:en, 'foo', [:missing, :not_missing], :baz => 'bam')
         end
-        klass.default(:en, 'foo', [:missing, :not_missing], :baz => 'bam')
       end
     end
   end
@@ -49,4 +72,13 @@ describe I18n::Backend::Base, '#default' do
       end
     end
   end
+
+  it "records missing translations when fallbacks are enabled" do
+    i18n = I18nWithFallbacks.new
+
+    with_configuration(:sending_environments => ['my_env'], :environment_name => 'my_env' ) do
+      Localeapp.missing_translations.should_receive(:add).with(:en, 'my.object', 'my default', {:default => 'my default'})
+      i18n.translate(:en, 'my.object', :default => 'my default')
+    end
+  end
 end

data/spec/localeapp/rails/controller_spec.rb

@@ -12,7 +12,11 @@ require 'localeapp/rails/controller'
 describe Localeapp::Rails::Controller, '#handle_translation_updates' do
   before do
     TestController.send(:include, Localeapp::Rails::Controller)
-    with_configuration(:synchronization_data_file => LocaleappSynchronizationData::setup) do
+    configuration = {
+      :synchronization_data_file => LocaleappSynchronizationData::setup,
+      :api_key => "my_key"
+    }
+    with_configuration(configuration) do
       @controller = TestController.new
     end
   end
@@ -89,6 +93,16 @@ describe Localeapp::Rails::Controller, '#handle_translation_updates' do
       @controller.handle_translation_updates
     end
   end
+
+  context "when an api_key is missing" do
+    before do
+      Localeapp.configuration.api_key = nil
+    end
+
+    it "raises an exception" do
+      expect { @controller.handle_translation_updates }.to raise_error Localeapp::MissingApiKey
+    end
+  end
 end
 
 describe Localeapp::Rails::Controller, '#send_missing_translations' do

data/spec/localeapp/sender_spec.rb

@@ -7,15 +7,16 @@ describe Localeapp::Sender, "#post_translation(locale, key, options, value = nil
     end
   end
 
-  it "posts the missing translation data to the backend" do
-    data = {
-      :translation => {
-        :key => "test.key",
-        :locale => "en",
-        :substitutions => ['bar', 'foo'],
-        :description => "test content"
-      }
-    }
+  let(:response) { double('response', :code => 200) }
+  let(:data) { { :translation => {
+    :key => "test.key",
+    :locale => "en",
+    :substitutions => ['bar', 'foo'],
+    :description => "test content"
+    }}
+  }
+
+  def expect_execute
     # have to stub RestClient here as FakeWeb doesn't support looking at the post body yet
     RestClient::Request.should_receive(:execute).with(hash_including(
       :url => @sender.translations_url,
@@ -23,8 +24,18 @@ describe Localeapp::Sender, "#post_translation(locale, key, options, value = nil
       :headers => {
         :x_localeapp_gem_version => Localeapp::VERSION,
         :content_type => :json },
-      :method => :post)).and_return(double('response', :code => 200))
-    @sender.post_translation('en', 'test.key', { 'foo' => 'foo', 'bar' => 'bar', :default => 'default', :scope => 'scope' }, 'test content')
+      :method => :post)).and_return(response)
+  end
+
+  it "posts the missing translation data to the backend" do
+    expect_execute
+    @sender.post_translation('en', 'test.key', { 'foo' => 'foo', 'bar' => 'bar', :default => 'default' }, 'test content')
+  end
+
+  it "normalizes keys sent with a scope" do
+    data[:translation][:key] = 'my.custom.scope.test.key'
+    expect_execute
+    @sender.post_translation('en', 'test.key', { 'foo' => 'foo', 'bar' => 'bar', :scope => 'my.custom.scope' }, 'test content')
   end
 end
 

data/spec/localeapp/updater_spec.rb

@@ -89,6 +89,30 @@ describe Localeapp::Updater, ".update(data)" do
     }
   end
 
+  it "doesn't delete a namespace having the same name as a previously deleted key" do
+    do_update({
+      'translations' => {
+        'az' => {
+          'once_deleted' => {
+            'but_not' => 'anymore'
+          }
+        }
+      },
+      'deleted' => [
+        'once_deleted'
+      ],
+      'locales' => ['az']
+    })
+
+    load_yaml('az').should == {
+      'az' => {
+        'once_deleted' => {
+          'but_not' => 'anymore'
+        }
+      }
+    }
+  end
+
   it "doesn't create a new yml file if an unknown locale is passed but it has no translations" do
     do_update({
       'translations' => {},

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 6
-  - 10
-  version: 0.6.10
+  - 12
+  version: 0.6.12
 platform: ruby
 authors: 
 - Christopher Dell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-25 00:00:00 Z
+date: 2013-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n