aigu 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2399c45ee60052b0923ec680f270da427d9fbf13
-  data.tar.gz: 25faad74c5700510c038818e99001a9f2106bdf1
+  metadata.gz: 6ac2a67491e84fbc1d670cedb00f2e37b656e8ba
+  data.tar.gz: ce9901efe5d99728af69b52d6632f7b04657c25a
 SHA512:
-  metadata.gz: 675100dddff32390a6806e3036ff778f6566a8ac5d36c6fb2e82ed4ded2c6ef6b17994769bb5c4cdae58af9a3757224b7404b4cd33fbc9422a2451729785780d
-  data.tar.gz: e61bd39dca2aa76a4c5c479c083f7bd997351555563f8f92823d7054e930e6b9fa7d5f4cf212ca7bc2a3f798cbadd9d8be2de5cc4818cdb389f40096f8407361
+  metadata.gz: 57f233c1aadd127fe41c0f320dff136ebb3bc3f0928d7526160dcf5bd2baa038815054a40115bf47f45157bd19aa162366ebdcd42133254f3ead6d8119712e2e
+  data.tar.gz: 72b57913979746214ad05df58dc7091a99c18ade41ace5a9408dcd96f3a913a6b942b32dbff140f510892e1614724d26c669c31296163110b8bb9f93885a7f17

data/README.md

@@ -31,7 +31,7 @@ $ aigu export --locale=fr --input-directory=config/locales --output-file=my-proj
 
 | Option            | Description                                                                                                               |
 |-------------------|---------------------------------------------------------------------------------------------------------------------------|
-| `locale`          | The locale used to find localization files. Files that match `*.<locale>.yml` into the input directory will be processed. |
+| `locale`          | The locale used to find localization files. Files that match `*.<locale>.yml` in the input directory will be processed. |
 | `input-directory` | The directory used to find localization files                                                                             |
 | `output-file`     | The path to the JSON file that will be written by `aigu`                                                                  |
 
@@ -41,15 +41,16 @@ The `import` command takes a generated JSON file from Accent and generates
 the original YAML file structure.
 
 ```bash
-$ aigu import --input-file=file-from-accent.json --output-directory=config/locales
+$ aigu import --locale=fr --input-file=file-from-accent.json --output-directory=config/locales
 ```
 
 ### Options
 
 | Option             | Description                                                                                                               |
-|--------------------|-------------------------------------------------------------------|
-| `input-file`       | The path to the Accent-generated JSON file                        |
-| `output-directory` | The directory where the localization YAML files will be generated |
+|--------------------|---------------------------------------------------------------------------------------------------|
+| `locale`           | The locale used to generate localization files. Files will be generated as `<file>.<locale>.yml`  |
+| `input-file`       | The path to the Accent-generated JSON file                                                        |
+| `output-directory` | The directory where the localization YAML files will be generated                                 |
 
 ## License
 

data/SPEC.md

@@ -54,12 +54,14 @@ fr:
 
 ### Output
 
+With `--locale=fr` option.
+
 ```json
 {
-  "app/users.fr|fr.app.users.index.new": "Nouvel utilisateur",
-  "app/users.fr|fr.app.users.index.edit": "Modifier l’utilisateur %{user}",
-  "app/shared/comments.fr|fr.app.shared.comments.title": "Tous les commentaires",
-  "admin/shared.fr|fr.admin.shared.footer.copyright": "Copyright © %{year}",
-  "layouts.fr|fr.layouts.application.title": "Mon Application"
+  "app/users|app.users.index.new": "Nouvel utilisateur",
+  "app/users|app.users.index.edit": "Modifier l’utilisateur %{user}",
+  "app/shared/comments|app.shared.comments.title": "Tous les commentaires",
+  "admin/shared|admin.shared.footer.copyright": "Copyright © %{year}",
+  "layouts|layouts.application.title": "Mon Application"
 }
 ```

data/lib/aigu/cli.rb

@@ -2,7 +2,7 @@ module Aigu
   class CLI
     def initialize(env, argv)
       @env = env
-      @command = argv.first =~ /[^-]/ ? argv.shift : nil
+      @command = argv.first =~ /^[^-]/ ? argv.shift : nil
       @argv = argv
       parse_options
     end
@@ -43,6 +43,10 @@ module Aigu
           @options[:output_file] = file
         end
 
+        opts.on('--locale=', 'The locale to use. Files will be processed/generated using the "<file>.<locale>.yml" pattern.') do |locale|
+          @options[:locale] = locale
+        end
+
         opts.on_tail('-h', '--help', 'Show this message') do
           puts opts
           exit

data/lib/aigu/exporter.rb

@@ -1,8 +1,9 @@
 module Aigu
   class Exporter
-    def initialize(output_file: nil, input_directory: nil)
+    def initialize(output_file: nil, input_directory: nil, locale: nil)
       @output_file = output_file
       @input_directory = input_directory
+      @locale = locale
     end
 
     def process!
@@ -21,13 +22,14 @@ module Aigu
     def build_output
       @output = {}
 
-      Dir[File.join(@input_directory, '**', '*.yml')].each do |file|
+      Dir[File.join(@input_directory, '**', "*.#{@locale}.yml")].each do |file|
         content = YAML.load_file(file)
         base_key = file.gsub(@input_directory, '').gsub(/^\/*/, '').gsub(/\.yml$/, '|')
 
-        content = flattenize_hash(content)
+        content = flattenize_hash(content, base_key)
         content = flattenize_content_values(content)
-        @output.merge! flattenize_hash(content, base_key)
+        content = globalize_content_keys(content)
+        @output.merge! content
       end
     end
 
@@ -41,6 +43,13 @@ module Aigu
       end
     end
 
+    def globalize_content_keys(content)
+      content.reduce({}) do |memo, (key, value)|
+        globalized_key = key.gsub(/\.#{@locale}\|#{@locale}\./, '|')
+        memo.merge globalized_key => value
+      end
+    end
+
     def flattenize_content_values(hash)
       result = {}
 

data/lib/aigu/importer.rb

@@ -2,9 +2,10 @@ module Aigu
   class Importer
     ARRAY_REGEX = /___KEY___(?<index>\d+)$/
 
-    def initialize(input_file: nil, output_directory: nil)
+    def initialize(input_file: nil, output_directory: nil, locale: nil)
       @input_file = input_file
       @output_directory = output_directory
+      @locale = locale
     end
 
     def process!
@@ -25,11 +26,12 @@ module Aigu
       json = File.read(@input_file)
       @object = JSON.parse(json)
       @object = expand_content_values(@object)
+      @object = localize_content_keys(@object)
     end
 
     def write_yaml_files
       @blob.each_pair do |file_name, hash|
-        file_path = File.join(@output_directory, "#{file_name}.yml")
+        file_path = File.join(@output_directory, "#{file_name}.#{@locale}yml")
         puts "Generating #{file_path}"
         FileUtils.mkdir_p(File.dirname(file_path))
 
@@ -58,6 +60,13 @@ module Aigu
       end
     end
 
+    def localized_content_keys(content)
+      content.reduce({}) do |memo, (key, value)|
+        localized_key = key.gsub(/^([^|]+)\|/, "\\1.#{@locale}|#{@locale}.")
+        memo.merge localized_key => value
+      end
+    end
+
     def expand_content_values(content)
       content.reduce({}) do |memo, (key, value)|
         match_data = key.match(ARRAY_REGEX)

data/lib/aigu/version.rb

@@ -1,3 +1,3 @@
 module Aigu
-  VERSION = '0.1.1'
+  VERSION = '0.2'
 end

data/spec/aigu/exporter_spec.rb

@@ -35,4 +35,32 @@ describe Aigu::Exporter do
 
     it { expect(flattenized_content).to eql expected_content }
   end
+
+  describe :globalize_content_keys do
+    let(:exporter) { described_class.new }
+    let(:globalized_keys) { exporter.send(:globalize_content_keys, content).keys }
+    before { exporter.instance_variable_set(:@locale, 'fr') }
+
+    let(:content) do
+      {
+        'users.fr|fr.users.index.title' => 'Foo',
+        'users.fr|fr.users.index.footer' => 'Bla',
+        'users.fr|fr.users.index.fr.shown' => false,
+        'users.fr|fr.users.index.hidden' => true,
+        'users.fr|fr.users.index.what' => nil
+      }
+    end
+
+    let(:expected_keys) do
+      [
+        'users|users.index.title',
+        'users|users.index.footer',
+        'users|users.index.fr.shown',
+        'users|users.index.hidden',
+        'users|users.index.what'
+      ]
+    end
+
+    it { expect(globalized_keys).to eql expected_keys }
+  end
 end

data/spec/aigu/importer_spec.rb

@@ -35,4 +35,32 @@ describe Aigu::Importer do
 
     it { expect(expanded_content).to eql expected_content }
   end
+
+  describe :localize_content_keys do
+    let(:exporter) { described_class.new }
+    let(:localized_keys) { exporter.send(:localized_content_keys, content).keys }
+    before { exporter.instance_variable_set(:@locale, 'fr') }
+
+    let(:content) do
+      {
+        'users|users.index.title' => 'Foo',
+        'users|users.index.footer' => 'Bla',
+        'users|users.index.fr.shown' => false,
+        'users|users.index.hidden' => true,
+        'foo/users|users.index.what' => nil
+      }
+    end
+
+    let(:expected_keys) do
+      [
+        'users.fr|fr.users.index.title',
+        'users.fr|fr.users.index.footer',
+        'users.fr|fr.users.index.fr.shown',
+        'users.fr|fr.users.index.hidden',
+        'foo/users.fr|fr.users.index.what'
+      ]
+    end
+
+    it { expect(localized_keys).to eql expected_keys }
+  end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: aigu
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta2
 description: Aigu converts a directory of Rails localization files into a single JSON
@@ -61,8 +61,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -89,17 +89,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Aigu converts a directory of Rails localization files into a single JSON