traduction 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9008e3461cbd3d36f81d7b0e9e756f8302fb61e7
-  data.tar.gz: adaaa13c0a30bd81ca964025340a336ce372e9b6
+  metadata.gz: 629c318e186d7c51213c2de944b13a54e6787b41
+  data.tar.gz: a78f2a7d171e7fadf460de5827ad5acd209b7248
 SHA512:
-  metadata.gz: 15e40f1133311669790db05048295c046ebd9170441df26e5049d442a959fc125335ef8b7dfe216a24937900cf9a831eddc564500eb50eb3e6d22236fc9aa076
-  data.tar.gz: fbf7848a8098a682046c0aa0d8e4de25e8c2d3c5c0e64028c8ee452936a4177b3afe98dbcc649c3c47d5f12a33bf8e97f213ea1a3e0403e5cd7784fa4d856bbd
+  metadata.gz: f9f2649e1057e6c6b223c4f7ecb166751b97f6d884f5b791aea3f29e34e9e7df529026d42f2beef46fc8aedd135c60e6e525e80f33bc4f6b3019ac3f71ae563f
+  data.tar.gz: 3d6f0427004ef38cb1b99e658df588be2d61e9c42e0133f19320b0994286b1017c8fd6c27ad596dad818f77c9354a0d5cc3c4d9b9bee0d56ffe87a4b5c76ff86

data/lib/tasks/traduction.rake

@@ -1,4 +1,6 @@
 require 'git'
+require 'csv'
+require 'active_support'
 
 class Hash
   include Traduction::HashMethods
@@ -12,12 +14,11 @@ namespace :traduction do
     locale_to_check = args.locale
     default_locale = Traduction::I18n.load_default_locale
 
-    Traduction::I18n.diff_locales(from: [default_locale[:key], File.open(default_locale[:file])],
+    puts Traduction::I18n.diff_locales(
+                 from: [default_locale[:key], File.open(default_locale[:file])],
                  to: [locale_to_check, File.open(Traduction::I18n.locale_file(locale_to_check))],
                  prefix: locale_to_check,
-                 empty_message: 'No untranslated key') do |k,v|
-      "'#{k}' key missing (original value '#{v}')"
-    end
+                 header: ['Untranslated keys', 'original value'])
   end
   task :untranslated => :environment
 
@@ -27,12 +28,11 @@ namespace :traduction do
     locale_to_check = args.locale
     default_locale = Traduction::I18n.load_default_locale
 
-    Traduction::I18n.diff_locales(from: [locale_to_check, File.open(Traduction::I18n.locale_file(locale_to_check))],
+    puts Traduction::I18n.diff_locales(
+                 from: [locale_to_check, File.open(Traduction::I18n.locale_file(locale_to_check))],
                  to: [default_locale[:key], File.open(default_locale[:file])],
                  prefix: locale_to_check,
-                 empty_message: 'No obsolete key') do |k,v|
-      "'#{k}' (value \"#{v}\") key is obsolete"
-    end
+                 header: ['Obsolete key', 'value'])
   end
   task :obsolete => :environment
 
@@ -46,13 +46,38 @@ namespace :traduction do
 
     commit_sha = args.revision
 
-    Traduction::I18n.diff_locales(from: [locale_to_check, File.open(Traduction::I18n.locale_file(locale_to_check))],
+    puts Traduction::I18n.diff_locales(
+                 from: [locale_to_check, File.open(Traduction::I18n.locale_file(locale_to_check))],
                  to: [locale_to_check, g.object("#{commit_sha}:#{Traduction::I18n.locale_file(locale_to_check)}").contents],
                  prefix: default_locale[:key],
-                 empty_message: 'No added key') do |k,v|
-      "'#{k}' key has been added since #{commit_sha} (value '#{v}')"
-    end
+                 header: ["Added key since #{commit_sha}", 'value'])
   end
   task :added => :environment
 
+  desc "List keys from csv file returned by translators"
+  task :import, [:locale, :filename] do |t, args|
+    default_locale = Traduction::I18n.load_default_locale
+    args.with_defaults(:locale => default_locale[:key], :filename => nil)
+    locale_to_check = args.locale
+
+    keys_to_import = {}
+
+    csv = CSV.foreach(args.filename, Traduction::CSV_FORMAT) do |row|
+      yaml_full = row[0].split('.')
+      keys = {}
+      yaml_full.reverse.each_with_index do |key, idx|
+        if idx == 0
+          keys[key] = row[1]
+        else
+          keys = {key => keys}
+        end
+      end
+      keys_to_import.deep_merge!(keys)
+    end
+
+    origin_content = YAML::load(File.open(Traduction::I18n.locale_file(locale_to_check)))
+    puts origin_content.to_hash.deep_merge(keys_to_import).sort_by_key(true).to_yaml
+  end
+  task :import => :environment
+
 end

data/lib/traduction.rb

@@ -3,6 +3,7 @@ require "traduction/hash_methods"
 require "traduction/i18n"
 
 module Traduction
+  CSV_FORMAT = { :col_sep => ';', :force_quotes=>true, :quote_char => '"' }
   class Engine < Rails::Engine
   end if defined?(Rails) && Rails::VERSION::MAJOR >= 3
 end

data/lib/traduction/hash_methods.rb

@@ -38,5 +38,15 @@ module Traduction
       diff_hash
     end
 
+    def sort_by_key(recursive=false, &block)
+      self.keys.sort(&block).reduce({}) do |seed, key|
+        seed[key] = self[key]
+        if recursive && seed[key].is_a?(Hash)
+          seed[key] = seed[key].sort_by_key(true, &block)
+        end 
+        seed
+      end
+    end
+
   end
 end

data/lib/traduction/i18n.rb

@@ -7,23 +7,30 @@ module Traduction
         from_prefix, from_content = options[:from].to_a
         to_prefix, to_content = options[:to].to_a
         prefix = options[:prefix]
+        header = options[:header]
+        format = options[:format] || :csv
 
         from = YAML::load(from_content)[from_prefix]
         to = YAML::load(to_content)[to_prefix]
 
-        messages = diff_yaml(from, to, prefix: prefix) do |k,v|
-          yield k,v
-        end
+        data = diff_yaml(from, to, prefix: prefix)
 
-        display_messages(messages, empty_message: 'No added keys')
+        generate_csv(data, header: header)
       end
 
-      def display_messages(messages, options = {})
-        empty_message = options[:empty_message] || 'Nothing found'
-        if messages.present?
-          messages.each { |m| puts m }
-        else
-          puts empty_message
+      def generate_csv(data, options = {})
+        header = options[:header] || nil
+
+        CSV.generate(Traduction::CSV_FORMAT) do |csv|
+          unless header.nil?
+            case header
+            when String
+              csv << [header]
+            when Array
+              csv << header
+            end
+          end
+          data.each { |m| csv << m } if data.present?
         end
       end
 
@@ -40,15 +47,27 @@ module Traduction
       end
 
       def diff_yaml(from, to, options = {}, &block)
-        messages = []
         prefix = options[:prefix] || nil
+        data = []
+
         from.diff_more(to, :ignore_values => true).flatten_keys(prefix).each do |k,v|
-          messages << yield(k,v)
+          data << [k,v]
         end
-        messages
+
+        data
       end
     end
 
     extend I18nMethods
   end
 end
+#
+# 
+#text: (CSV.generate do |csv|
+# 63           csv << @header
+# 64           @ragreements.each do |o|
+# 65             csv << o.values.map { |l| l.is_a?(Array) ? l.join("\n") : l }
+# 66           end
+# 67         end)
+#
+#

data/lib/traduction/version.rb

@@ -1,3 +1,3 @@
 module Traduction
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/traduction.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_dependency "rake"
   spec.add_dependency "git"
+  spec.add_dependency "fastercsv"
+  spec.add_dependency "activesupport"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traduction
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Thomas Kienlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fastercsv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple tool to ease synchronization of locale files
 email:
 - thomas.kienlen@lafourmi-immo.com