rails_locale_sorter 0.0.7 → 0.0.8

data/bin/locale_apply

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'rails_locale_sorter'
+
+puts "Usage: scoop [source-dir] [out-dir]\n\n\n"
+
+source_dir = ARGV[0] || "new-locales"
+out_dir = ARGV[1] || "locales"
+
+lm = RailsLocaleSorter::LocaleManager.new source_dir, out_dir
+lm.apply_patches

data/bin/locale_generator

@@ -8,4 +8,4 @@ out_dir = ARGV[1] || "new-locales"
 truth_locale = ARGV[2] || "en.yml"
 
 lm = RailsLocaleSorter::LocaleManager.new source_dir, out_dir
-lm.parse_to_yaml truth_locale
+lm.create_missing_nodes truth_locale

data/bin/locale_patch

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+require 'rails_locale_sorter'
+
+puts "Usage: poop [source-path] [out-path] [default-language]\n\n\n"
+
+source_dir = ARGV[0] || "locales"
+out_dir = ARGV[1] || "new-locales"
+truth_locale = ARGV[2] || "en.yml"
+
+lm = RailsLocaleSorter::LocaleManager.new source_dir, out_dir
+lm.create_patches truth_locale

data/bin/poop

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+require 'rails_locale_sorter'
+
+puts "Usage: poop [source-path] [out-path] [default-language]\n\n\n"
+
+source_dir = ARGV[0] || "locales"
+out_dir = ARGV[1] || "new-locales"
+truth_locale = ARGV[2] || "en.yml"
+
+lm = RailsLocaleSorter::LocaleManager.new source_dir, out_dir
+lm.create_patches truth_locale

data/bin/scoop

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'rails_locale_sorter'
+
+puts "Usage: scoop [source-dir] [out-dir]\n\n\n"
+
+source_dir = ARGV[0] || "new-locales"
+out_dir = ARGV[1] || "locales"
+
+lm = RailsLocaleSorter::LocaleManager.new source_dir, out_dir
+lm.apply_patches

data/lib/rails_locale_sorter.rb

@@ -30,43 +30,67 @@ module RailsLocaleSorter
   end
 
   class LocaleManager
-    MERGER = proc do |key, v1, v2| 
+    attr_accessor :source, :out
+
+    MERGER = proc do |key, v1, v2|
       if(Hash === v1 && Hash === v2)
         v1.merge(v2, &MERGER)
       else
-        v2 
+        v2
       end
     end
 
     def initialize(source_dir, out_dir)
       @source = source_dir
       @out = out_dir
-    end
 
-    def parse_to_yaml(truth = "en.yml")
-      # for ya2yaml
-      $KCODE="UTF8"
       Dir::mkdir(@out) unless File.exists? @out
+    end
 
+    def create_missing_nodes(truth = "en.yml")
       translations = YAML::load_file("#{@source}/#{truth}")
       mergee = create_blank_copy(translations)
 
-      with_each_file do |f, filename|
-        puts "Processing #{filename}..."
-        me = YAML::load(f)
+      process_each_file do |hash, file, filename|
         unless filename == truth
-          me = create_missing_keys(me, mergee)
+          hash = create_missing_keys(hash, mergee)
         end
 
-        me = OrderFact.convert_and_sort(me, true)
-        File.open("#{@out}/#{filename}", "w+") do |fw|
-          fw.puts me.ya2yaml(:syck_compatible => true)
-        end
+        sort_and_write(filename, hash)
       end
+    end
+
+    def create_patches(truth = "en.yml")
+      translations = YAML::load_file("#{@source}/#{truth}")
 
+      process_each_file do |hash, file, filename|
+        unless filename == truth
+          hash = list_missing_keys(translations, hash)
+        end
+
+        sort_and_write(filename, hash)
+      end
     end
 
+    def apply_patches(reverse_dirs = false)
+      swap_dirs if reverse_dirs
+      
+      process_each_file do |patch, file, filename|
+        target = YAML::load_file("#{@out}/#{filename}")
+
+        merged = target.merge(patch, &MERGER)
+
+        sort_and_write(filename, merged)
+      end
+
+      swap_dirs if reverse_dirs
+    end
   private
+    def swap_dirs
+      tmp = @source
+      @source = @out
+      @out = tmp
+    end
 
     def with_file(filename, &block)
       leafname = filename.scan(/[a-zA-Z_-]*.yml/).first.to_s
@@ -81,6 +105,26 @@ module RailsLocaleSorter
       end
     end
 
+    def process_each_file(&block)
+      # for ya2yaml
+      $KCODE="UTF8"
+
+      with_each_file do |f, filename|
+        puts "Processing #{filename}..."
+        hash = YAML::load(f)
+
+        block.call(hash, f, filename)
+      end
+    end
+    
+    def sort_and_write(filename, hash)
+      hash = OrderFact.convert_and_sort(hash, true)
+
+      File.open("#{@out}/#{filename}", "w+") do |fw|
+        fw.puts hash.ya2yaml(:syck_compatible => true)
+      end
+    end
+
     def create_missing_keys(object, all_keys)
       ak_lang = all_keys.first[0]
       ob_lang = object.first[0]
@@ -90,6 +134,32 @@ module RailsLocaleSorter
       {ob_lang => new_values}
     end
 
+    def compare_keys(source, target)
+      new_hash = {}
+
+      source.each do |k, v|
+        if Hash === target[k] && Hash === v
+          res = compare_keys(v, target[k])
+          new_hash[k] = res unless res.empty?
+        elsif target[k].nil?
+          new_hash[k] = v
+        else
+          # do nothing
+          # puts "#{k} is deleted"
+        end
+      end
+
+      new_hash
+    end
+
+    def list_missing_keys(source, target)
+      source_lang = source.first[0]
+      target_lang = target.first[0]
+
+      new_values = compare_keys(source[source_lang], target[target_lang])
+      {target_lang => new_values}
+    end
+
     def blank_out_object(object)
       unless(Hash === object)
         return;

data/lib/rails_locale_sorter/version.rb

@@ -1,3 +1,3 @@
 module RailsLocaleSorter
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/resources/locale_tests/en-target.yml

@@ -0,0 +1,8 @@
+en:
+  text:
+    javascript:
+      provide: Provide
+      reactivate: Reactivate
+    shared:
+      fixed: Fixed
+      hello: Hello

data/spec/resources/locale_tests/en.yml

@@ -0,0 +1,10 @@
+en:
+  text:
+    javascript:
+      invalid: Invalid
+      provide: Provide
+      reactivate: Reactivate
+    shared:
+      oops: Oops
+      fixed: Fixed
+      hello: Hello

data/spec/rls-spec.rb

@@ -3,6 +3,7 @@ require "spec_helper"
 
 describe RailsLocaleSorter::LocaleManager do
   FIXTURE_DIR = "resources/locale_fixtures"
+  TEST_DIR = "resources/locale_tests"
   SRC_DIR = "resources/src"
   OUT_DIR = "resources/out"
 
@@ -17,14 +18,60 @@ describe RailsLocaleSorter::LocaleManager do
     @lm = RailsLocaleSorter::LocaleManager.new SRC_DIR, OUT_DIR
   end
 
-  it "writes blank keys for new values" do
-    @lm.parse_to_yaml "src.yml"
+  describe "create missing nodes" do
+    it "writes blank keys for new values" do
+      @lm.create_missing_nodes "src.yml"
 
-    result = File.open("#{OUT_DIR}/out.yml").read
-    result.should include "source_only: ~"
-    result.should include "src_only: ~"
-    result.should include "both: Both"
-    result.should include "exotic: 下一页！След"
-    result.should include "out:"
+      result = File.open("#{OUT_DIR}/out.yml").read
+      result.should include "source_only: ~"
+      result.should include "src_only: ~"
+      result.should include "both: Both"
+      result.should include "exotic: 下一页！След"
+      result.should include "out:"
+    end
+  end
+
+  describe "create_patches" do
+    it "creates a file of differences only" do
+      @lm.create_patches "src.yml"
+
+      result = File.open("#{OUT_DIR}/out.yml").read
+      result.should include "out:"
+      result.should include "text:"
+      result.should include "source_only: "
+      result.should include "date:"
+      result.should include "src_only: "
+      result.should_not include "both: Both"
+      result.should_not include "exotic: 下一页！След"
+    end
+  end
+
+  describe "poop and scoop" do
+    before :each do
+      # setup test folders
+      FileUtils.rm_r(SRC_DIR) if File.exists? SRC_DIR
+      FileUtils.cp_r(TEST_DIR, SRC_DIR)
+      FileUtils.rm_r(OUT_DIR) if File.exists? OUT_DIR
+      @lm = RailsLocaleSorter::LocaleManager.new SRC_DIR, OUT_DIR
+    end
+
+    it "goes through the full cycle" do
+      @lm.create_patches "en.yml"
+
+      result = File.open("#{OUT_DIR}/en-target.yml").read
+      result.should include "en:"
+      result.should include "text:"
+      result.should include "invalid: "
+      result.should include "shared:"
+      result.should include "oops:"
+      result.should_not include "fixed:"
+      result.should_not include "provide:"
+
+      @lm.apply_patches true
+      patched = File.open("#{SRC_DIR}/en-target.yml").read
+      source = File.open("#{SRC_DIR}/en.yml").read
+
+      patched.should == source
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_locale_sorter
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Michael Wheeler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 -08:00
+date: 2012-03-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,7 +69,11 @@ description: "Manage Rails Locale YAML: Sort, remove duplicates, and create stub
 email: 
 - michael.wheeler@tapjoy.com
 executables: 
+- locale_apply
 - locale_generator
+- locale_patch
+- poop
+- scoop
 extensions: []
 
 extra_rdoc_files: []
@@ -79,16 +83,18 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/locale_apply
 - bin/locale_generator
+- bin/locale_patch
+- bin/poop
+- bin/scoop
 - lib/rails_locale_sorter.rb
 - lib/rails_locale_sorter/version.rb
 - rails_locale_sorter.gemspec
 - spec/resources/locale_fixtures/out.yml
 - spec/resources/locale_fixtures/src.yml
-- spec/resources/locale_tests/source.yml
-- spec/resources/locale_tests/target.yml
-- spec/resources/src/out.yml
-- spec/resources/src/src.yml
+- spec/resources/locale_tests/en-target.yml
+- spec/resources/locale_tests/en.yml
 - spec/rls-spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -128,9 +134,7 @@ summary: "Manage Rails Locale YAML: Sort, remove duplicates, and create stubs fo
 test_files: 
 - spec/resources/locale_fixtures/out.yml
 - spec/resources/locale_fixtures/src.yml
-- spec/resources/locale_tests/source.yml
-- spec/resources/locale_tests/target.yml
-- spec/resources/src/out.yml
-- spec/resources/src/src.yml
+- spec/resources/locale_tests/en-target.yml
+- spec/resources/locale_tests/en.yml
 - spec/rls-spec.rb
 - spec/spec_helper.rb

data/spec/resources/locale_tests/source.yml

@@ -1,4 +0,0 @@
-source:
-  text:
-    source_only: Source Only
-    both: Both

data/spec/resources/locale_tests/target.yml

@@ -1,3 +0,0 @@
-target:
-  text:
-    both: Both