localeapp 0.4.1 → 0.4.2

data/.travis.yml

@@ -1,5 +1,6 @@
 rvm:
   - 1.8.7
+  - 1.9.2
   - 1.9.3
 gemfile:
   - Gemfile.i18n_037

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # HEAD
 
+# Version 0.4.1
+
+* Improve compatibility of Psych with ruby 1.9.2 (Thanks @ardpac)
+* Ignore HUP when backgrounded. (Thanks @xijo)
 * Add --standalone option to install to generate a .localeapp/ config
   directory. This enables usage outside of rails.
 

data/bin/localeapp

@@ -125,8 +125,10 @@ command :daemon do |c|
 
       STDOUT.reopen(File.open(Localeapp.configuration.daemon_log_file, 'a'))
       pid = fork do
+        Signal.trap('HUP', 'IGNORE')
         command.call
       end
+      Process.detach(pid)
 
       File.open(Localeapp.configuration.daemon_pid_file, 'w') {|f| f << pid}
     else

data/lib/localeapp/cli/pull.rb

@@ -21,7 +21,7 @@ module Localeapp
       def update_backend(response)
         @output.puts "Success!"
         @output.puts "Updating backend:"
-        Localeapp.updater.update(YAML.load(response))
+        Localeapp.updater.update(Localeapp.load_yaml(response))
         @output.puts "Success!"
         Localeapp.poller.write_synchronization_data!(Time.now.to_i, Time.now.to_i)
       end

data/lib/localeapp/poller.rb

@@ -19,7 +19,7 @@ module Localeapp
 
     def synchronization_data
       if File.exists?(Localeapp.configuration.synchronization_data_file)
-        YAML.load_file(Localeapp.configuration.synchronization_data_file) || {}
+        Localeapp.load_yaml_file(Localeapp.configuration.synchronization_data_file) || {}
       else
         {}
       end
@@ -50,7 +50,7 @@ module Localeapp
 
     def handle_success(response)
       @success = true
-      Localeapp.updater.update(YAML.load(response))
+      Localeapp.updater.update(Localeapp.load_yaml(response))
       write_synchronization_data!(Time.now.to_i, Time.parse(response.headers[:date]).to_i)
     end
 

data/lib/localeapp/tasks/localeapp.rake

@@ -3,7 +3,7 @@ namespace :localeapp do
   task :import => :environment do
     require 'flatten'
     include I18n::Backend::Flatten
-    yml = YAML.load_file(ENV['LOCALE_FILE'])
+    yml = Locale.load_yaml_file(ENV['LOCALE_FILE'])
 
     yml.each do |locale, translations|
       flatten_translations(

data/lib/localeapp/updater.rb

@@ -8,7 +8,7 @@ module Localeapp
         filename = File.join(Localeapp.configuration.translation_data_directory, "#{short_code}.yml")
 
         if File.exist?(filename)
-          translations = YAML.load(File.read(filename))
+          translations = Localeapp.load_yaml_file(filename)
           if data['translations'] && data['translations'][short_code]
             new_data = { short_code => data['translations'][short_code] }
             translations.deep_merge!(new_data)

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/localeapp.rb

@@ -110,5 +110,34 @@ module Localeapp
       false
     end
 
+    def load_yaml(contents)
+      if defined? Psych
+        Psych.load(contents)
+      else
+        normalize_results(YAML.load(contents))
+      end
+    end
+
+    def load_yaml_file(filename)
+      load_yaml(File.read(filename))
+    end
+
+    private
+
+    def normalize_results(results)
+      if results.is_a?(YAML::PrivateType) && results.type_id == 'null'
+        nil
+      elsif results.is_a?(Array)
+        results.each_with_index do |value, i|
+          results[i] = normalize_results(value)
+        end
+      elsif results.is_a?(Hash)
+        results.each_pair do |key, value|
+          results[key] = normalize_results(value)
+        end
+      else
+        results
+      end
+    end
   end
 end

data/spec/fixtures/en.yml

@@ -4,3 +4,8 @@ en:
   foo:
     delete_me: Delete
     monkey: Monkey
+  space: 
+  blank: ''
+  tilde: ~
+  scalar1: !null
+  scalar2: !!null

data/spec/localeapp/updater_spec.rb

@@ -34,19 +34,44 @@ describe Localeapp::Updater, ".update(data)" do
       ],
       'locales' => %w{en es}
     })
+
     if defined? Psych
-      File.read(File.join(@yml_dir, 'en.yml')).should == <<-EN
+      if Psych::VERSION == '1.0.0'
+        File.read(File.join(@yml_dir, 'en.yml')).should == <<-EN
+en:
+  foo:
+    monkey: hello
+    night: the night
+  space: !!null 
+  blank: ''
+  tilde: !!null 
+  scalar1: !!null 
+  scalar2: !!null 
+EN
+      else
+        File.read(File.join(@yml_dir, 'en.yml')).should == <<-EN
 en:
   foo:
     monkey: hello
     night: the night
+  space: 
+  blank: ''
+  tilde: 
+  scalar1: 
+  scalar2: 
 EN
+      end
     else
       File.read(File.join(@yml_dir, 'en.yml')).should == <<-EN
 en: 
+  blank: ""
   foo: 
     monkey: hello
     night: "the night"
+  scalar1: ~
+  scalar2: ~
+  space: ~
+  tilde: ~
 EN
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Christopher Dell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-02 00:00:00 Z
+date: 2012-03-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n