localeapp 0.3.2 → 0.4.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# Version 0.4.0
+
+* Use Psych to generate the yaml if it's available (This will completely change
+  your yaml the first time you do a localeapp pull and Psych is available)
+* Report when the directory to write the yml to doesn't exist (Thanks Robin
+  Mehner)
+
 # Version 0.3.2
 
 * Use yml rather than json when making api calls to localeapp.com. This avoids

data/README.md

@@ -137,6 +137,17 @@ You can also add a new locale to a project via localeapp.com. This will create
 missing translations for every translation key. You will need to restart any
 listeners completely to pick up the new locale.
 
+## Syck, Psych, and creating YAML
+
+Since ruby 1.9.3-p0 Psych has been the default YAML engine in Ruby. Psych is
+based on libyaml and fixes a number of issues with the previous YAML library,
+Syck. localeapp.com uses 1.9.3 and Psych for all its YAML processing. The
+localeapp gem will use Psych if it is available but falls back to the ya2yaml
+library if not. ya2yaml supports UTF-8 (which Syck doesn't handle very well)
+but it does write YAML differently to Psych so you will notice differences
+between exporting directly from localeapp.com and doing localeapp pull on the
+command line unless you're using 1.9.3+ or have installed Psych as a gem.
+
 ### Proxies
 
 If you need to go through a proxy server, you can configure it with:
@@ -159,5 +170,5 @@ See [this article on Ruby Inside][1] for some more details.
 
 ### Support and feedback
 
-You can contact us via the support link at the bottom of the page, emailing
-info@localeapp.com, or on campfire at https://localeapp.campfirenow.com/d77b5
+You can contact us via the support link at the bottom of the page or emailing
+info@localeapp.com

data/features/localeapp_binary.feature

@@ -99,6 +99,16 @@ Feature: localeapp executable
     And help should not be displayed
     And a file named "config/locales/en.yml" should exist
 
+  Scenario: Running pull without having a locales dir
+    In order to retreive my translations
+    Given I have a translations on localeapp.com for the project with api key "MYAPIKEY"
+    And an initializer file
+    When I run `localeapp pull`
+    Then the output should contain:
+    """
+    Could not write locale file, please make sure that config/locales exists and is writeable
+    """
+
   Scenario: Running push on a file
     In order to send my translations
     When I have a valid project on localeapp.com with api key "MYAPIKEY"

data/lib/localeapp/sender.rb

@@ -8,7 +8,7 @@ module Localeapp
 
     def post_translation(locale, key, options, value = nil)
       options ||= {}
-      translation = { :key => key, :locale => locale, :substitutions => options.keys, :description => value}
+      translation = { :key => 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

@@ -25,13 +25,22 @@ module Localeapp
 
         if translations[short_code]
           atomic_write(filename) do |file|
-            file.write translations.ya2yaml[5..-1]
+            file.write generate_yaml(translations)
           end
         end
       end
     end
 
     private
+
+    def generate_yaml(translations)
+      if defined? Psych
+        Psych.dump(translations)[4..-1]
+      else
+        translations.ya2yaml[5..-1]
+      end
+    end
+
     def remove_flattened_key!(hash, locale, key)
       keys = I18n.normalize_keys(locale, key, '').map(&:to_s)
       current_key = keys.shift
@@ -57,6 +66,11 @@ module Localeapp
 
     # originally from ActiveSupport
     def atomic_write(file_name, temp_dir = Dir.tmpdir)
+      target_dir = File.dirname(file_name)
+      unless File.directory?(target_dir)
+        raise "Could not write locale file, please make sure that #{target_dir} exists and is writeable"
+      end
+
       temp_file = Tempfile.new(File.basename(file_name), temp_dir)
       yield temp_file
       temp_file.close

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/localeapp.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Christopher Dell", "Chris McGrath"]
   s.email       = ["chris@tigrish.com", "chris@octopod.info"]
-  s.homepage    = "http://rubygems.org/gems/localeapp"
-  s.summary     = %q{Add missing translation keys to localeapp.com}
-  s.description = %q{Post any unfound translation keys to the Locale SaaS}
+  s.homepage    = "http://www.localeapp.com"
+  s.summary     = %q{Easy i18n translation management with localeapp.com}
+  s.description = %q{Synchronizes i18n translation keys and content with localeapp.com so you don't have to manage translations by hand.}
 
   s.rubyforge_project = "localeapp"
 

data/spec/localeapp/sender_spec.rb

@@ -12,7 +12,7 @@ describe Localeapp::Sender, "#post_translation(locale, key, options, value = nil
       :translation => {
         :key => "test.key",
         :locale => "en",
-        :substitutions => ['foo', 'bar'],
+        :substitutions => ['bar', 'foo'],
         :description => "test content"
       }
     }

data/spec/localeapp/updater_spec.rb

@@ -21,7 +21,7 @@ describe Localeapp::Updater, ".update(data)" do
     do_update({
       'translations' => {
         'en' => {
-          'foo' => { 'monkey' => 'hello', 'night' => 'night' }
+          'foo' => { 'monkey' => 'hello', 'night' => 'the night' }
         },
         'es' => {
           'foo' => { 'monkey' => 'hola', 'night' => 'noche' }
@@ -34,18 +34,21 @@ describe Localeapp::Updater, ".update(data)" do
       ],
       'locales' => %w{en es}
     })
-    File.read(File.join(@yml_dir, 'en.yml')).should == <<-EN
+    if defined? Psych
+      File.read(File.join(@yml_dir, 'en.yml')).should == <<-EN
+en:
+  foo:
+    monkey: hello
+    night: the night
+EN
+    else
+      File.read(File.join(@yml_dir, 'en.yml')).should == <<-EN
 en: 
   foo: 
     monkey: hello
-    night: night
+    night: "the night"
 EN
-    File.read(File.join(@yml_dir, 'es.yml')).should == <<-ES
-es: 
-  foo: 
-    monkey: hola
-    night: noche
-ES
+    end
   end
 
   it "deletes keys in the yml files when updates are empty" do
@@ -58,11 +61,19 @@ ES
       ],
       'locales' => %w{es}
     })
-    File.read(File.join(@yml_dir, 'es.yml')).should == <<-ES
+    if defined? Psych
+      File.read(File.join(@yml_dir, 'es.yml')).should == <<-ES
+es:
+  foo:
+    monkey: Mono
+ES
+    else
+      File.read(File.join(@yml_dir, 'es.yml')).should == <<-ES
 es: 
   foo: 
     monkey: Mono
 ES
+    end
   end
 
   it "creates a new yml file if an unknown locale is passed" do
@@ -72,10 +83,17 @@ ES
       },
       'locales' => ['ja']
     })
-    File.read(File.join(@yml_dir, 'ja.yml')).should == <<-JA
+    if defined? Psych
+      File.read(File.join(@yml_dir, 'ja.yml')).should == <<-JA
+ja:
+  foo: bar
+JA
+    else
+      File.read(File.join(@yml_dir, 'ja.yml')).should == <<-JA
 ja: 
   foo: bar
 JA
+    end
   end
 
   it "doesn't create a new yml file if an unknown locale is passed but it has no translations" do
@@ -86,4 +104,4 @@ JA
     })
     File.exist?(File.join(@yml_dir, 'ja.yml')).should be_false
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Christopher Dell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-20 00:00:00 Z
+date: 2012-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
@@ -182,7 +182,7 @@ dependencies:
         version: 1.3.0
   type: :development
   version_requirements: *id011
-description: Post any unfound translation keys to the Locale SaaS
+description: Synchronizes i18n translation keys and content with localeapp.com so you don't have to manage translations by hand.
 email: 
 - chris@tigrish.com
 - chris@octopod.info
@@ -236,7 +236,6 @@ files:
 - lib/localeapp/updater.rb
 - lib/localeapp/version.rb
 - localeapp.gemspec
-- run_ci
 - spec/fixtures/empty_log.yml
 - spec/fixtures/en.yml
 - spec/fixtures/es.yml
@@ -260,7 +259,7 @@ files:
 - spec/support/i18n/missing_translation.rb
 - spec/support/localeapp_integration_data.rb
 - spec/support/localeapp_synchronization_data.rb
-homepage: http://rubygems.org/gems/localeapp
+homepage: http://www.localeapp.com
 licenses: []
 
 post_install_message: 
@@ -289,10 +288,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: localeapp
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Add missing translation keys to localeapp.com
+summary: Easy i18n translation management with localeapp.com
 test_files: 
 - features/localeapp_binary.feature
 - features/step_definitions/cli_steps.rb

data/run_ci

@@ -1,5 +0,0 @@
-#!/bin/sh
-source "$HOME/.rvm/scripts/rvm"
-rvm gemset use $BUILD_RUBY_VERSION@localeapp
-bundle install
-rake