aigu 0.6.1 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fd41e4a3b35261dae66ad6e7a8559e0c9481589
-  data.tar.gz: 80d3f8950a1d643f67613dca3a392a1a1ac3d324
+  metadata.gz: 616ab0c8f167d1882b848067e0f431300ae11e8b
+  data.tar.gz: eabdfe2a5a75e12e6aab5c86e4da964f09609d56
 SHA512:
-  metadata.gz: af1cefce92cf401d729749554e61f06a50323d6dca5c80b68abce6853d762ef20b322476610a014d030d73bb5873a807c8d67a010ed50b968e4a9814fa80a4e8
-  data.tar.gz: 3fa916fd2a79476fd73313d1ccebacd827f37777ec48b0c52f4a4958fd94c7b4a40dcfb650630b8dfd0bd120a76b97d62df5d9128a1dc546eac68353f7d6ff2d
+  metadata.gz: 1deffeb18fa97f7e6351e106d8271da63aa67c19a65254e69757d7605fa445ba1e4bb501b4f04d67ddb561f96fc964be5db5ff5c964187a933713bfa47a688d0
+  data.tar.gz: 8efe81cf8c5ce9d153d098681117f98eb010d264619c84d0ac7fae9d34aa45e78cf50b5a3ad52cea4eec0d5eda2c23c73c637b76c6b6dac2abd6a9c1072e27c8

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2014, Mirego
+Copyright (c) 2014-2017, Mirego
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -44,13 +44,14 @@ $ aigu <export-command> --locale=fr --input-directory=config/locales --output-fi
 | `output-file`     | The path to the JSON file that will be written by `aigu`               |
 | `ignore`          | The patterns `aigu` will use to skip ignored files (eg. `routes.yml`)  |
 
-| Command           | File format                |
-|-------------------|----------------------------|
-| `rails-export`    | Rails YAML                 |
-| `android-export`  | Android XML                |
-| `core-export`     | Java Enum Core             |
-| `ios-export`      | iOS strings & stringsdict  |
-| `ember-export`    | Ember.js JavaScript        |
+| Command            | File format                |
+|--------------------|----------------------------|
+| `rails-export`     | Rails YAML                 |
+| `android-export`   | Android XML                |
+| `core-export`      | Java Enum Core             |
+| `ios-export`       | iOS strings & stringsdict  |
+| `ember-export`     | Ember.js JavaScript        |
+| `ember-pod-export` | Ember.js pods JSON         |
 
 ### Importing the JSON file from Accent
 
@@ -69,12 +70,14 @@ $ aigu <import-command> --locale=fr --input-file=file-from-accent.json --output-
 | `input-file`       | The path to the Accent-generated JSON file                                                        |
 | `output-directory` | The directory where the localization YAML files will be generated                                 |
 
-| Command           | File format                |
-|-------------------|----------------------------|
-| `rails-import`    | Rails YAML                 |
-| `android-import`  | Android XML                |
-| `core-import`     | Java Enum Core             |
-| `ios-import`      | iOS strings & stringsdict  |
+| Command            | File format                |
+|--------------------|----------------------------|
+| `rails-import`     | Rails YAML                 |
+| `android-import`   | Android XML                |
+| `core-import`      | Java Enum Core             |
+| `ios-import`       | iOS strings & stringsdict  |
+| `ember-import`     | Ember.js JavaScript        |
+| `ember-pod-import` | Ember.js pods JSON         |
 
 ### Merge
 
@@ -154,7 +157,7 @@ the commit if there are errors.
 
 ## License
 
-`Aigu` is © 2014-2015 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the [`LICENSE.md`](https://github.com/mirego/aigu/blob/master/LICENSE.md) file.
+`Aigu` is © 2014-2017 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the [`LICENSE.md`](https://github.com/mirego/aigu/blob/master/LICENSE.md) file.
 
 ## About Mirego
 

data/aigu.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '~> 2.1'
+
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/aigu.rb

@@ -24,6 +24,8 @@ require 'aigu/ios_exporter'
 require 'aigu/ios_importer'
 require 'aigu/ember_exporter'
 require 'aigu/ember_importer'
+require 'aigu/ember_pod_exporter'
+require 'aigu/ember_pod_importer'
 
 require 'aigu/unmerger'
 require 'aigu/merger'

data/lib/aigu/cli.rb

@@ -11,16 +11,18 @@ module Aigu
       'ios-export' => 'IOSExporter',
       'ember-import' => 'EmberImporter',
       'ember-export' => 'EmberExporter',
+      'ember-pod-import' => 'EmberPodImporter',
+      'ember-pod-export' => 'EmberPodExporter',
       'merge' => 'Merger',
       'unmerge' => 'Unmerger',
       'pull' => 'Puller',
       'push' => 'Pusher'
-    }
+    }.freeze
 
     def initialize(env, argv)
       @env = env
       @command = argv.first =~ /^[^-]/ ? argv.shift : nil
-      @command = @command.gsub('_', '-') if @command
+      @command = @command.tr('_', '-') if @command
       @argv = argv
       @options = {}
       @options = parse_options_from_yaml(@options)
@@ -103,7 +105,6 @@ DOC
           puts opts
           exit
         end
-
       end.parse! @argv
 
       options

data/lib/aigu/ember_pod_exporter.rb

@@ -0,0 +1,86 @@
+module Aigu
+  class EmberPodExporter < Exporter
+  protected
+
+    def build_output
+      @output = build_output_from_global_translations(@input_directory, @locale)
+      @output.merge! build_output_from_pods(@input_directory, @locale)
+
+      @output
+    end
+
+    def build_output_from_global_translations(input_directory, locale)
+      pattern = File.join(input_directory, '**', 'locales', locale, 'translations.*.json')
+
+      Dir[pattern].reduce({}) do |memo, file|
+        content = read_or_ignore(file, input_directory)
+
+        return nil unless content
+
+        root_key = file.match(/translations\.([a-z]+)\.json/)[1]
+
+        base_key = file.gsub(input_directory, '').gsub(/^\//, '').gsub(/[a-z]+\/translations\.[a-z]+\.json$/, "__LOCALE__/translations.#{root_key}.json|")
+
+        content = flattenize_hash(content, base_key)
+
+        memo.merge! content
+      end
+    end
+
+    def build_output_from_pods(input_directory, locale)
+      pattern = File.join(input_directory, '**', "translations.#{locale}.json")
+
+      Dir[pattern].reduce({}) do |memo, file|
+        content = read_or_ignore(file, input_directory)
+
+        return nil unless content
+
+        base_key = file.gsub(input_directory, '').gsub(/^\//, '').gsub(/\/translations.#{locale}.json$/, '/translations.__LOCALE__.json|')
+
+        content = flattenize_hash(content, base_key)
+
+        memo.merge! content
+      end
+    end
+
+    def write_json_file
+      file_path = @output_file
+      puts "Generating #{file_path}"
+      FileUtils.mkdir_p(File.dirname(file_path))
+
+      File.open(file_path, 'w+') do |file|
+        file << @output.to_json
+      end
+    end
+
+    def read_or_ignore(file, input_directory)
+      filepath = file.gsub(/\A#{input_directory}\//, '')
+
+      if ignored_filepath?(filepath)
+        puts "Ignoring #{filepath}"
+        false
+      else
+        puts "Processing #{filepath}"
+        content = File.read(file)
+        JSON.parse(content)
+      end
+    end
+
+    def flattenize_hash(hash, base_key = '')
+      if hash.is_a?(Hash)
+        hash.reduce({}) do |memo, (key, value)|
+          new_base_key = [base_key, key].join('.').gsub(/\|\.+/, '|')
+          memo.merge! flattenize_hash(value, new_base_key)
+        end
+      else
+        { base_key.gsub(/^\./, '') => hash }
+      end
+    end
+
+    def ignored_filepath?(filepath)
+      @ignore && @ignore.any? do |pattern|
+        File.fnmatch(pattern, filepath, File::FNM_PATHNAME | File::FNM_DOTMATCH)
+      end
+    end
+  end
+end

data/lib/aigu/ember_pod_importer.rb

@@ -0,0 +1,57 @@
+module Aigu
+  class EmberPodImporter < Importer
+    def process!
+      puts "Generating JSON files in `#{@output_directory}` based on Accent-generated `#{@input_file}` file"
+      puts '---'
+
+      object = sorted_object_from_json(@input_file)
+      blob = build_blob(object)
+      write_json_files(blob, @output_directory)
+
+      puts '---'
+      puts 'Done'
+    end
+
+  protected
+
+    def sorted_object_from_json(input_file)
+      json = File.read(input_file)
+      JSON.parse(json).sort_with_keys
+    end
+
+    def write_json_files(blob, output_directory)
+      blob.each_pair do |file_name, translations|
+        file_path = File.join(output_directory, file_name.gsub('__LOCALE__', @locale))
+        puts "Generating #{file_path}"
+        FileUtils.mkdir_p(File.dirname(file_path))
+
+        content = JSON.pretty_generate(translations)
+
+        File.open(file_path, 'w+') do |file|
+          file << content
+        end
+      end
+    end
+
+    def build_blob(object)
+      blob = Hash.recursive
+
+      object.each_pair do |key, value|
+        filename, flat_key = key.split('|')
+
+        parts = flat_key.split('.')
+        hash = blob[filename]
+
+        parts.each_with_index do |part, index|
+          if index + 1 < parts.length
+            hash = hash[part]
+          else
+            hash[part] = value
+          end
+        end
+      end
+
+      blob
+    end
+  end
+end

data/lib/aigu/version.rb

@@ -1,3 +1,3 @@
 module Aigu
-  VERSION = '0.6.1'
+  VERSION = '0.7'
 end

data/spec/aigu/ember_pod_exporter_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Aigu::EmberPodExporter do
+  describe :build_output do
+    let(:input_directory) { File.join(File.dirname(__FILE__), '..', 'fixtures', 'ember_pod_files') }
+    let(:exporter) { Aigu::EmberPodExporter.new(:'input-directory' => input_directory, locale: 'en') }
+    let(:output) { exporter.send(:build_output) }
+
+    let(:expected_output) do
+      {
+        'app/locales/__LOCALE__/translations.general.json|hello' => 'Hello from general.hello',
+        'app/pods/component-a/nested-component-a/translations.__LOCALE__.json|errors.general' => 'Nested A) An error occured.',
+        'app/pods/component-a/nested-component-a/translations.__LOCALE__.json|errors.network' => 'Nested A) A network error occured.',
+        'app/pods/component-a/nested-component-a/translations.__LOCALE__.json|labels.first_name' => 'Nested A) First Name',
+        'app/pods/component-a/nested-component-a/translations.__LOCALE__.json|labels.last_name' => 'Nested A) Last Name',
+        'app/pods/component-a/translations.__LOCALE__.json|errors.general' => 'A) An error occured.',
+        'app/pods/component-a/translations.__LOCALE__.json|errors.network' => 'A) A network error occured.',
+        'app/pods/component-a/translations.__LOCALE__.json|labels.first_name' => 'A) First Name',
+        'app/pods/component-a/translations.__LOCALE__.json|labels.last_name' => 'A) Last Name',
+        'app/pods/component-b/translations.__LOCALE__.json|errors.general' => 'B) An error occured.',
+        'app/pods/component-b/translations.__LOCALE__.json|errors.network' => 'B) A network error occured.',
+        'app/pods/component-b/translations.__LOCALE__.json|labels.first_name' => 'B) First Name',
+        'app/pods/component-b/translations.__LOCALE__.json|labels.last_name' => 'B) Last Name'
+      }
+    end
+
+    it { expect(output).to eql expected_output }
+  end
+end

data/spec/aigu/ember_pod_importer_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Aigu::EmberPodImporter do
+  describe :build_blob do
+    let(:importer) { Aigu::EmberPodImporter.new }
+    let(:blob) { importer.send(:build_blob, content) }
+
+    let(:content) do
+      {
+        'app/locales/__LOCALE__/translations.general.json|hello' => 'Hello from general.hello',
+        'app/pods/component-a/nested-component-a/translations.__LOCALE__.json|labels.first_name' => 'Nested A) First Name',
+        'app/pods/component-a/nested-component-a/translations.__LOCALE__.json|labels.last_name' => 'Nested A) Last Name',
+        'app/pods/component-a/nested-component-a/translations.__LOCALE__.json|errors.general' => 'Nested A) An error occured.',
+        'app/pods/component-a/nested-component-a/translations.__LOCALE__.json|errors.network' => 'Nested A) A network error occured.',
+        'app/pods/component-a/translations.__LOCALE__.json|labels.first_name' => 'A) First Name',
+        'app/pods/component-a/translations.__LOCALE__.json|labels.last_name' => 'A) Last Name',
+        'app/pods/component-a/translations.__LOCALE__.json|errors.general' => 'A) An error occured.',
+        'app/pods/component-a/translations.__LOCALE__.json|errors.network' => 'A) A network error occured.',
+        'app/pods/component-b/translations.__LOCALE__.json|labels.first_name' => 'B) First Name',
+        'app/pods/component-b/translations.__LOCALE__.json|labels.last_name' => 'B) Last Name',
+        'app/pods/component-b/translations.__LOCALE__.json|errors.general' => 'B) An error occured.',
+        'app/pods/component-b/translations.__LOCALE__.json|errors.network' => 'B) A network error occured.'
+      }
+    end
+
+    let(:expected_blob) do
+      {
+        'app/locales/__LOCALE__/translations.general.json' => {
+          'hello' => 'Hello from general.hello'
+        },
+        'app/pods/component-a/nested-component-a/translations.__LOCALE__.json' => {
+          'errors' => {
+            'general' => 'Nested A) An error occured.',
+            'network' => 'Nested A) A network error occured.'
+          },
+          'labels' => {
+            'first_name' => 'Nested A) First Name',
+            'last_name' => 'Nested A) Last Name'
+          }
+        },
+        'app/pods/component-a/translations.__LOCALE__.json' => {
+          'errors' => {
+            'general' => 'A) An error occured.',
+            'network' => 'A) A network error occured.'
+          },
+          'labels' => {
+            'first_name' => 'A) First Name',
+            'last_name' => 'A) Last Name'
+          }
+        },
+        'app/pods/component-b/translations.__LOCALE__.json' => {
+          'errors' => {
+            'general' => 'B) An error occured.',
+            'network' => 'B) A network error occured.'
+          },
+          'labels' => {
+            'first_name' => 'B) First Name',
+            'last_name' => 'B) Last Name'
+          }
+        }
+      }
+    end
+
+    it { expect(blob).to eql expected_blob }
+  end
+end

data/spec/fixtures/ember_pod_files/app/locales/en/translations.general.json

@@ -0,0 +1,3 @@
+{
+  "hello": "Hello from general.hello"
+}

data/spec/fixtures/ember_pod_files/app/locales/fr/translations.general.json

@@ -0,0 +1,3 @@
+{
+  "hello": "Bonjour de general.hello"
+}

data/spec/fixtures/ember_pod_files/app/pods/component-a/nested-component-a/translations.en.json

@@ -0,0 +1,10 @@
+{
+  "labels": {
+    "first_name": "Nested A) First Name",
+    "last_name": "Nested A) Last Name"
+  },
+  "errors": {
+    "general": "Nested A) An error occured.",
+    "network": "Nested A) A network error occured."
+  }
+}

data/spec/fixtures/ember_pod_files/app/pods/component-a/nested-component-a/translations.fr.json

@@ -0,0 +1,10 @@
+{
+  "labels": {
+    "first_name": "Nested A) Prénom",
+    "last_name": "Nested A) Nom"
+  },
+  "errors": {
+    "general": "Nested A) Une erreur est survenue.",
+    "network": "Nested A) Une erreur réseau est survenue."
+  }
+}

data/spec/fixtures/ember_pod_files/app/pods/component-a/translations.en.json

@@ -0,0 +1,10 @@
+{
+  "labels": {
+    "first_name": "A) First Name",
+    "last_name": "A) Last Name"
+  },
+  "errors": {
+    "general": "A) An error occured.",
+    "network": "A) A network error occured."
+  }
+}

data/spec/fixtures/ember_pod_files/app/pods/component-a/translations.fr.json

@@ -0,0 +1,10 @@
+{
+  "labels": {
+    "first_name": "A) Prénom",
+    "last_name": "A) Nom"
+  },
+  "errors": {
+    "general": "A) Une erreur est survenue.",
+    "network": "A) Une erreur réseau est survenue."
+  }
+}

data/spec/fixtures/ember_pod_files/app/pods/component-b/translations.en.json

@@ -0,0 +1,10 @@
+{
+  "labels": {
+    "first_name": "B) First Name",
+    "last_name": "B) Last Name"
+  },
+  "errors": {
+    "general": "B) An error occured.",
+    "network": "B) A network error occured."
+  }
+}

data/spec/fixtures/ember_pod_files/app/pods/component-b/translations.fr.json

@@ -0,0 +1,10 @@
+{
+  "labels": {
+    "first_name": "B) Prénom",
+    "last_name": "B) Nom"
+  },
+  "errors": {
+    "general": "B) Une erreur est survenue.",
+    "network": "B) Une erreur réseau est survenue."
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aigu
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: '0.7'
 platform: ruby
 authors:
 - Rémi Prévost
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,8 @@ files:
 - lib/aigu/core_importer.rb
 - lib/aigu/ember_exporter.rb
 - lib/aigu/ember_importer.rb
+- lib/aigu/ember_pod_exporter.rb
+- lib/aigu/ember_pod_importer.rb
 - lib/aigu/exporter.rb
 - lib/aigu/extensions/hash.rb
 - lib/aigu/importer.rb
@@ -143,10 +145,20 @@ files:
 - spec/aigu/core_importer_spec.rb
 - spec/aigu/ember_exporter_spec.rb
 - spec/aigu/ember_importer_spec.rb
+- spec/aigu/ember_pod_exporter_spec.rb
+- spec/aigu/ember_pod_importer_spec.rb
 - spec/aigu/ios_exporter_spec.rb
 - spec/aigu/ios_importer_spec.rb
 - spec/aigu/rails_exporter_spec.rb
 - spec/aigu/rails_importer_spec.rb
+- spec/fixtures/ember_pod_files/app/locales/en/translations.general.json
+- spec/fixtures/ember_pod_files/app/locales/fr/translations.general.json
+- spec/fixtures/ember_pod_files/app/pods/component-a/nested-component-a/translations.en.json
+- spec/fixtures/ember_pod_files/app/pods/component-a/nested-component-a/translations.fr.json
+- spec/fixtures/ember_pod_files/app/pods/component-a/translations.en.json
+- spec/fixtures/ember_pod_files/app/pods/component-a/translations.fr.json
+- spec/fixtures/ember_pod_files/app/pods/component-b/translations.en.json
+- spec/fixtures/ember_pod_files/app/pods/component-b/translations.fr.json
 - spec/spec_helper.rb
 homepage: https://github.com/mirego/aigu
 licenses:
@@ -158,9 +170,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -168,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Aigu converts a directory of Rails localization files into a single JSON
@@ -180,8 +192,18 @@ test_files:
 - spec/aigu/core_importer_spec.rb
 - spec/aigu/ember_exporter_spec.rb
 - spec/aigu/ember_importer_spec.rb
+- spec/aigu/ember_pod_exporter_spec.rb
+- spec/aigu/ember_pod_importer_spec.rb
 - spec/aigu/ios_exporter_spec.rb
 - spec/aigu/ios_importer_spec.rb
 - spec/aigu/rails_exporter_spec.rb
 - spec/aigu/rails_importer_spec.rb
+- spec/fixtures/ember_pod_files/app/locales/en/translations.general.json
+- spec/fixtures/ember_pod_files/app/locales/fr/translations.general.json
+- spec/fixtures/ember_pod_files/app/pods/component-a/nested-component-a/translations.en.json
+- spec/fixtures/ember_pod_files/app/pods/component-a/nested-component-a/translations.fr.json
+- spec/fixtures/ember_pod_files/app/pods/component-a/translations.en.json
+- spec/fixtures/ember_pod_files/app/pods/component-a/translations.fr.json
+- spec/fixtures/ember_pod_files/app/pods/component-b/translations.en.json
+- spec/fixtures/ember_pod_files/app/pods/component-b/translations.fr.json
 - spec/spec_helper.rb