babel_diff 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 636cfb635813720ebceed48ded1eea465486bcde
-  data.tar.gz: a645857700b111c53dd4f467e87e9cd66a247e97
+  metadata.gz: 1f45964490450ee1b8fd1d63721bfe461c49ea69
+  data.tar.gz: 043788f850c467122cd044e7f21c515861197a6e
 SHA512:
-  metadata.gz: db1ff545db9294c18c2261482b90922cc71f800806a8fef30463a53af59718c54d3d71087cc78d0db887614e1ab4f874a88fec221922b6f9e706194dc70c0f0c
-  data.tar.gz: ee0c4a2297c52df41a54e851afeb89bfa42b9cce3c6d6e4086d1e4abab70b130be44c1f4a1beedcecaa83f1dbfe02c7efbc3b3ef72bed39b06e3a2897ee6d3e3
+  metadata.gz: a0692f831fb000c55c1c57862481ac1856fcfe14b8a96e68aa79a63589a9dfc84c183ce03c0fd4bb77819d4faf075cda267adef73f920c015d81db8dd94f7a81
+  data.tar.gz: 973394a45b36855c46fb240937864dbf17e17176a1ac7989b4c4a2466195a48b78ddfcf18d1aa2540601b349499bb563220011d010005dd898e61845c23f6eac

data/babel_diff.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.executables   << "babel_diff" 
+  spec.executables   << "babel_diff" << "babel_import"
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.8"

data/bin/babel_diff

@@ -1,4 +1,27 @@
 #!/usr/bin/env ruby
 require 'babel_diff'
 
-BabelDiff.run
+help = <<-HELP
+usages: 
+
+babel_import <import_dir> <phrase_dir> [defaults to 'config/locales/']
+
+Imports all phrase files in the <import_dir> and merges them with the phrase files in <phrase_dir>.
+Existing keys will be overwritten.
+
+babel_diff <phrase_file_path> [defaults to 'config/locales/phrase.en.yml']
+
+Produces two files containing all updates and all additions to the given phrase file located at <phrase_file_path> since babel_diff last ran.
+
+HELP
+
+case ARGV.first
+when "--help"
+  puts help
+  exit 0
+when nil
+  BabelDiff.generate_diffs
+else
+  BabelDiff.generate_diffs(ARGV[0])
+end
+

data/bin/babel_import

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+require 'babel_diff'
+
+help = <<-HELP
+usages: 
+
+babel_import <import_dir> <phrase_dir> [defaults to 'config/locales/']
+
+Imports all phrase files in the <import_dir> and merges them with the phrase files in <phrase_dir>.
+Existing keys will be overwritten.
+
+babel_diff <phrase_file_path> [defaults to 'config/locales/phrase.en.yml']
+
+Produces two files containing all updates and all additions to the given phrase file located at <phrase_file_path> since babel_diff last ran.
+
+HELP
+
+
+case ARGV.first
+when nil
+  puts help
+  exit 1
+when "--help"
+  puts help
+  exit 0
+else
+  if ARGV[1]
+    BabelDiff.import_translations(ARGV[0], ARGV[1])
+  else
+    BabelDiff.import_translations(ARGV[0])
+  end
+end
+
+

data/lib/babel_diff.rb

@@ -1,9 +1,12 @@
 require "babel_diff/version"
 require "babel_diff/file_handler"
+require "babel_diff/import_file_handler"
 require "babel_diff/yaml_differ"
+require "babel_diff/yaml_merger"
+require "babel_diff/hash_flattener"
 
 module BabelDiff
-  def self.run(current_version_path = "config/locales/phrase.en.yml")
+  def self.generate_diffs(current_version_path = "config/locales/phrase.en.yml")
     handler = FileHandler.new(current_version_path)
 
     yaml_differ = YamlDiffer.new(handler.current_version, handler.previous_version)
@@ -15,4 +18,13 @@ module BabelDiff
     handler.version_files
   end
 
+  def self.import_translations(import_directory, phrase_directory = "config/locales/")
+    handler = ImportFileHandler.new(import_directory, phrase_directory)
+    handler.phrases.each do |language,files|
+      phrase, import = files
+      yaml_merger = YamlMerger.new(phrase, import)
+      handler.update_phrase(language,yaml_merger.merged_yaml)
+    end
+  end
+
 end

data/lib/babel_diff/hash_flattener.rb

@@ -0,0 +1,32 @@
+module BabelDiff
+  class HashFlattener < Struct.new(:hash)
+    def flat_hash
+      @_flat_hash ||= {}
+    end
+
+    def flatten(current_hash = hash, keys = [])
+      current_hash.each do |key, value|
+        new_keys = keys.dup << key
+        if value.is_a? Hash
+          flatten(value, new_keys)
+        else
+          flat_hash[new_keys.join(".")] = value
+        end
+      end
+      flat_hash
+    end
+
+    def unflatten
+      {}.tap do |unflattened_hash|
+        hash.each do |k,v|
+          keys = k.split(".")
+          current_hash = unflattened_hash
+
+          keys[0...-1].each { |key| current_hash = current_hash[key] ||= {} }
+
+          current_hash[keys.last] = v
+        end
+      end
+    end
+  end
+end

data/lib/babel_diff/import_file_handler.rb

@@ -0,0 +1,52 @@
+require 'pry'
+module BabelDiff
+  class ImportFileHandler < Struct.new(:import_directory, :phrase_directory)
+
+    def phrases
+      phrase_files = Dir.glob(phrase_directory + '/*.yml').map {|f| PhraseFile.new(f) }
+      import_files = Dir.glob(import_directory + '/*/*.yml').map {|f| ImportFile.new(f) }
+
+      matched_files = {}
+
+      phrase_files.each do |phrase|
+        if matched_import = import_files.detect {|i| i.language == phrase.language }
+          matched_files[phrase.language] = [phrase.contents, matched_import.contents]
+        end
+      end
+
+      matched_files
+    end
+
+    def update_phrase(language, contents)
+      File.open(phrase_directory + "/phrase.#{language}.yml", "w+") do |file|
+        file.write(contents)
+      end
+    end
+
+    class PhraseFile < Struct.new(:path)
+
+      def language
+        path.split("/").last.match(/phrase.(.*).yml/)[1]
+      end
+
+      def contents
+        File.read(path)
+      end
+
+    end
+
+    class ImportFile < Struct.new(:path)
+
+      def language
+        path.split("/")[-2]
+      end
+
+      def contents
+        File.read(path)
+      end
+
+    end
+
+
+  end
+end

data/lib/babel_diff/version.rb

@@ -1,3 +1,3 @@
 module BabelDiff
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/lib/babel_diff/yaml_differ.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'pry'
 
 module BabelDiff
   class YamlDiffer < Struct.new(:current_version, :previous_version)
@@ -7,14 +6,14 @@ module BabelDiff
       process_difference unless @processed
       @processed = true
 
-      unflatten(updates_hash).to_yaml
+      HashFlattener.new(updates_hash).unflatten.to_yaml
     end
 
     def additions
       process_difference unless @processed
       @processed = true
 
-      unflatten(additions_hash).to_yaml
+      HashFlattener.new(additions_hash).unflatten.to_yaml
     end
 
     def process_difference
@@ -30,22 +29,8 @@ module BabelDiff
       end
     end
 
-
     private
 
-    def unflatten(hash)
-      {}.tap do |unflattened_hash|
-        hash.each do |k,v|
-          keys = k.split(".")
-          current_hash = unflattened_hash
-
-          keys[0...-1].each { |key| current_hash = current_hash[key] ||= {} }
-
-          current_hash[keys.last] = v
-        end
-      end
-    end
-
     def updates_hash
       @updated_hash ||= {}
     end
@@ -63,23 +48,4 @@ module BabelDiff
     end
   end
 
-  class HashFlattener < Struct.new(:hash)
-
-    def flatten(current_hash = hash, keys = [])
-      current_hash.each do |key, value|
-        new_keys = keys.dup << key
-        if value.is_a? Hash
-          flatten(value, new_keys)
-        else
-          flat_hash[new_keys.join(".")] = value
-        end
-      end
-
-      flat_hash
-    end
-
-    def flat_hash
-      @_flat_hash ||= {}
-    end
-  end
 end

data/lib/babel_diff/yaml_merger.rb

@@ -0,0 +1,20 @@
+module BabelDiff
+  class YamlMerger < Struct.new(:original_contents, :flattened_contents_to_merge)
+
+    def merged_yaml
+      flat_original = HashFlattener.new(original_hash).flatten
+
+      flat_original.merge!(contents_to_merge)
+      HashFlattener.new(flat_original).unflatten.to_yaml
+    end
+
+    def original_hash
+      YAML.load(original_contents)
+    end
+
+    def contents_to_merge
+      YAML.load(flattened_contents_to_merge)
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babel_diff
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan McGarvey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ email:
 - devs@gust.com
 executables:
 - babel_diff
+- babel_import
 extensions: []
 extra_rdoc_files: []
 files:
@@ -75,12 +76,16 @@ files:
 - Rakefile
 - babel_diff.gemspec
 - bin/babel_diff
+- bin/babel_import
 - bin/console
 - bin/setup
 - lib/babel_diff.rb
 - lib/babel_diff/file_handler.rb
+- lib/babel_diff/hash_flattener.rb
+- lib/babel_diff/import_file_handler.rb
 - lib/babel_diff/version.rb
 - lib/babel_diff/yaml_differ.rb
+- lib/babel_diff/yaml_merger.rb
 homepage: https://github.com/zephyr-dev/babel_diff
 licenses:
 - MIT