amatsuda-i18n_generators 0.3.1 → 0.4.0

data/generators/i18n/i18n_generator.rb

@@ -63,7 +63,10 @@ class I18nGenerator < Rails::Generator::NamedBase
   private
   def defined_in_rails_i18n_repository?
     begin
-      OpenURI.open_uri("http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale/#{locale_name}.yml").status == %w[200 OK]
+      uri = "http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale/#{locale_name}.yml"
+      OpenURI.open_uri(uri) do |res|
+        (res.base_uri.to_s == uri) && (res.status == %w[200 OK])
+      end
     rescue
       false
     end

data/generators/i18n/lib/yaml.rb

@@ -0,0 +1,185 @@
+require 'yaml'
+
+module I18nLocaleGeneratorModule
+  class Node
+    attr_reader :document, :indent_level
+    attr_accessor :line
+
+    def initialize(parent, line_index, text)
+      @document, @line, @text = parent.document, line_index, text.to_s
+      @text =~ /(^\s*)/
+      @indent_level = $1.nil? ? 0 : $1.size
+      @yaml = YAML.load(@text.to_s + ' ')
+    end
+
+    def parent
+      @parent ||= document.parent_of self
+    end
+
+    def children
+      @children ||= document.children_of(self)
+    end
+    alias :nodes :children
+
+    def [](node_name)
+      if node = nodes.detect {|n| n.key.to_s == node_name.to_s}
+        node
+      else
+        nodes.add "#{' ' * (@indent_level + 2)}#{node_name}: "
+        nodes.last
+      end
+    end
+
+    def key
+      @yaml.is_a?(Hash) ? @yaml.keys.first : nil
+    end
+
+    def value
+      @yaml.is_a?(Hash) ? @yaml.values.first : nil
+    end
+
+    def value=(val)
+      if @yaml[self.key] != val
+        @yaml[self.key] = val
+        @changed = true
+      end
+    end
+
+    def text
+      if @changed
+        v = if self.value.is_a?(Array)
+          "[#{self.value * ', '}]"
+        else
+          %Q["#{self.value}"]
+        end
+        "#{' ' * self.indent_level}#{self.key}: #{v}"
+      else
+        @text
+      end
+    end
+    alias :to_s :text
+
+    def changed?
+      @changed
+    end
+
+    def is_blank_or_comment?
+      @text.sub(/#.*$/, '').gsub(/\s/, '').empty?
+    end
+
+    def path
+      @path ||= "#{self.parent.path}/#{self.key}"
+    end
+
+    def descendant_nodes(&block)
+      yield self if self.value
+      self.children.each {|child| child.descendant_nodes(&block)} if self.children
+    end
+
+    def <=>(other)
+      self.line <=> other.line
+    end
+  end
+
+  class YamlDocument < Node
+    attr_accessor :lines
+    alias :nodes :lines
+
+    def initialize(yml_path, locale_name)
+      @locale_name, @lines, @current_line, @indent_level = locale_name, Nodes.new(self), -1, -2
+      if File.exists? yml_path
+        File.open(yml_path) do |file|
+          file.each_with_index do |line_text, i|
+            n = Node.new(self, i, line_text.chomp)
+            @lines << ((((n.key == 'en-US') || (n.key == 'en')) && n.value.blank?) ? Node.new(self, i, "#{locale_name}:") : n)
+          end
+          @lines.delete_at(-1) if @lines[-1].text.blank?
+        end
+      end
+    end
+
+    def next
+      return false if @lines.size == 0
+      @current_line += 1
+      return false if @current_line >= @lines.size
+      @lines[@current_line].is_blank_or_comment? ? self.next : @lines[@current_line]
+    end
+
+    def prev
+      return false if @current_line == 0
+      @current_line -= 1
+      @lines[@current_line].is_blank_or_comment? ? self.prev : @lines[@current_line]
+    end
+
+    def parent_of(child)
+      @current_line = child.line
+      while n = self.prev
+        return n if n.indent_level == child.indent_level - 2
+      end 
+      self
+    end
+
+    def children_of(parent)
+      nodes = Nodes.new(parent)
+      @current_line = parent.line
+      while n = self.next
+        if n.indent_level < parent.indent_level + 2
+          break
+        elsif n.indent_level == parent.indent_level + 2
+          nodes << n
+        end
+      end
+      nodes
+    end
+
+    def document
+      self
+    end
+
+    def path
+      ''
+    end
+
+    def line
+      @current_line
+    end
+
+    def to_s
+      @lines.inject('') do |ret, n|
+        ret << n.text + "\n"
+      end
+    end
+  end
+
+  class Nodes < Array
+    def initialize(parent)
+      super()
+      @parent = parent
+    end
+
+    def [](index)
+      if index.is_a?(String) || index.is_a?(Symbol)
+        return self.detect {|node| node.key == index} || add(index)
+      end
+      super
+    end
+
+    def last_leaf
+      c = @parent
+      loop do
+        return c if c.children.blank?
+        c = c.children.last
+      end
+    end
+
+    def add(node_name)
+      target_line = self.last_leaf.line + 1
+      @parent.document.nodes.each {|n| n.line += 1 if n.line >= target_line}
+      node = Node.new(@parent, target_line, node_name)
+      @parent.document.lines << node
+      @parent.document.lines.sort!
+      self << node unless @parent.is_a? YamlDocument
+    end
+  end
+end
+

data/generators/i18n/templates/translation.yml

@@ -1,19 +1 @@
-<%= locale_name %>:
-  activerecord:
-    models:
-<% models.each do |model| -%>
-      <%= "#{model.english_name}: #{model.translated_name}" %>
-<% end -%>
-    attributes:
-<% models.each do |model| -%>
-      <%= "#{model.english_name}:" %>
-<%   model.content_columns.each do |col| -%>
-<%     unless %w[created_at updated_at].include?(col.name) -%>
-        <%= "#{col.name}: #{col.translated_name}" %>
-<%     end -%>
-<%   end -%>
-<% end -%>
-<% translations.each do |key, value| -%>
-  <%= "#{key}: #{value}" %>
-<% end -%>
-
+<%= translations %>

data/generators/i18n_locale/i18n_locale_command.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rails_generator'
 require 'rails_generator/commands'
 require 'gettext'
-require File.join(File.dirname(__FILE__), 'lib/yaml')
+require File.join(File.dirname(__FILE__), '../i18n/lib/yaml')
 require File.join(File.dirname(__FILE__), 'lib/cldr')
 include I18nLocaleGeneratorModule
 
@@ -95,8 +95,13 @@ module I18nGenerator::Generator
             return arr.join("\n")
           end
         end
-        # hope you're all using Ruby >= 1.8.7...
-        end_row = arr.respond_to?(:rindex) ? arr.rindex {|l| l =~ /^\s*end\s*/} : arr.size - 1
+        arr.each_with_index do |l, i|
+          if l =~ /Rails::Initializer\.run do \|config\|/
+            arr[i] = "Rails::Initializer.run do |config|\n  config.i18n.default_locale = '#{locale_name}'"
+            return arr.join("\n")
+          end
+        end
+        end_row = RUBY_VERSION >= '1.8.7' ? arr.rindex {|l| l =~ /^\s*end\s*/} : arr.size - 1
         ((arr[0...end_row] << "  config.i18n.default_locale = '#{locale_name}'") + arr[end_row..-1]).join("\n")
       end
 
@@ -104,7 +109,7 @@ module I18nGenerator::Generator
         original_yml = I18n.load_path.detect {|lp| lp =~ /\/lib\/#{filename_base}\/locale\/(en|en-US)\.yml$/}
         doc = YamlDocument.new(original_yml, locale_name)
         yield doc
-        file('i18n:base.yml', "config/locale/#{filename_base}_#{locale_name}.yml") do |f|
+        file('i18n:base.yml', "config/locales/#{filename_base}_#{locale_name}.yml") do |f|
           doc.to_s
         end
       end

data/generators/i18n_locale/lib/cldr.rb

@@ -6,7 +6,10 @@ module I18nLocaleGeneratorModule
   class CldrDocument
     def initialize(locale_name)
       @locale_name = locale_name
-      @summaries = [load_cldr_data(locale_name.tr('-', '_')), load_cldr_data(locale_name.sub(/-.*/, ''))]
+      @summaries = [load_cldr_data(locale_name.tr('-', '_'))]
+      if locale_name =~ /^[a-zA-Z]{2}[-_][a-zA-Z]{2}$/
+        @summaries << load_cldr_data(locale_name.to(1))
+      end
     end
 
     def lookup(path)
@@ -108,10 +111,11 @@ module I18nLocaleGeneratorModule
     def search(n1, n2, g)
       pattern = Regexp.new /<tr><td>\d*<\/td><td class='[ng]'>#{Regexp.quote(n1)}<\/td><td class='[ng]'>#{Regexp.quote(n2)}<\/td><td class='[ng]'>#{Regexp.quote(g)}<\/td>/
       extract_pattern = /<td class='v'>(?:<span.*?>)?(.*?)(?:<\/span>)?<\/td><td>/
-      _, value = *extract_pattern.match(@summaries[0].grep(pattern).first)
-      return value unless value.nil?
-      _, value = *extract_pattern.match(@summaries[1].grep(pattern).first)
-      value
+      @summaries.each do |summary|
+        _, value = *extract_pattern.match(summary.grep(pattern).first)
+        return value unless value.nil?
+      end
+      nil
     end
 
     def convert_date_pattern(val)

data/generators/i18n_translation/i18n_translation_command.rb

@@ -3,6 +3,7 @@ require 'rails_generator/commands'
 require File.join(File.dirname(__FILE__), 'lib/translator')
 require File.join(File.dirname(__FILE__), 'lib/recording_backend')
 require File.join(File.dirname(__FILE__), 'lib/erb_executer')
+require File.join(File.dirname(__FILE__), '../i18n/lib/yaml')
 include I18nTranslationGeneratorModule
 
 module I18nGenerator::Generator
@@ -10,56 +11,41 @@ module I18nGenerator::Generator
     module Create
       def translation_yaml
         I18n.locale = locale_name
-        threads = []
-        now = Time.now
         models = model_filenames.map do |model_name|
           model = begin
             m = model_name.camelize.constantize
             next unless m.respond_to?(:content_columns)
+            m.class_eval %Q[def self.english_name; "#{model_name}"; end]
             m
           rescue
             next
           end
-          threads << Thread.new do
-            Thread.pass
-            registered_t_name = I18n.t("activerecord.models.#{model_name}", :default => model_name, :locale => locale_name)
-
-            model.class_eval <<-END
-    def self.english_name
-      "#{model_name}"
-    end
-
-    def self.translated_name
-      "#{registered_t_name != model_name ? registered_t_name : self.translator.translate(model_name)}"
-    end
-  END
-            model.content_columns.each do |col|
-              next if %w[created_at updated_at].include? col.name
-              registered_t_name = I18n.t("activerecord.attributes.#{model_name}.#{col.name}", :default => col.name, :locale => locale_name)
-              col.class_eval <<-END
-    def translated_name
-      "#{registered_t_name != col.name ? registered_t_name : self.translator.translate(col.name)}"
-    end
-  END
-            end
-          end
-          model
         end.compact
-        threads.each {|t| t.join}
-        logger.debug "took #{Time.now - now} secs to translate #{models.count} models."
+        translation_keys = []
+        translation_keys += models.map {|m| "activerecord.models.#{m.english_name}"}
+        models.each do |model|
+          translation_keys += model.content_columns.map {|c| "activerecord.attributes.#{model.english_name}.#{c.name}"}
+        end
+        logger.debug "#{models.size} models found."
+
         # pick all translated keywords from view files
+        original_backend = I18n.backend
         I18n.backend = RecordingBackend.new
 
         Dir["#{RAILS_ROOT}/app/views/**/*.erb"].each do |f|
           ErbExecuter.new.exec_erb f
         end
-        keys_in_view = I18n.backend.keys
-        keys_in_view -= models.map {|m| m.english_name.to_sym}
-        keys_in_view -= models.inject([]) {|a, m| a + m.content_columns.map {|c| "#{m.english_name}.#{c.name}".to_sym}}
+        logger.debug "#{I18n.backend.keys.size} translation keys found in views."
+        (translation_keys += I18n.backend.keys).uniq!
+        I18n.backend = original_backend
+
+        # translate all keys and generate the YAML file
         now = Time.now
-        translated_hash = translate_all keys_in_view
-        logger.debug "took #{Time.now - now} secs to translate #{keys_in_view.count} words."
-        generate_yaml(locale_name, models, translated_hash)
+        translations = translate_all(translation_keys)
+        logger.debug "took #{Time.now - now} secs to translate."
+
+        yaml = generate_yaml(locale_name, translations)
+        template 'i18n:translation.yml', "config/locales/translation_#{locale_name}.yml", :assigns => {:locale_name => locale_name, :translations => yaml.to_s}
       end
 
       private
@@ -69,22 +55,56 @@ module I18nGenerator::Generator
         end
       end
 
-      def generate_yaml(locale_name, models, translations)
-        template 'i18n:translation.yml', "config/locales/translation_#{locale_name}.yml", :assigns => {:locale_name => locale_name, :models => models, :translations => translations}
+      # mixin translations into existing yaml file
+      def generate_yaml(locale_name, translations)
+        yaml = YamlDocument.new("config/locales/translation_#{locale_name}.yml", locale_name)
+        each_value [], translations do |parents, value|
+          node = parents.inject(yaml[locale_name]) {|node, parent| node[parent]}
+          node.value = value
+        end
+        yaml
       end
 
       # receives an array of keys and returns :key => :translation hash
       def translate_all(keys)
-        threads = []
-        ret = keys.inject({}) do |hash, key|
-          threads << Thread.new do
-            Thread.pass
-            hash[key] = translator.translate key
+        returning ActiveSupport::OrderedHash.new do |oh|
+          # fix the order first(for multi thread translating)
+          keys.each do |key|
+            if key.to_s.include? '.'
+              key_prefix, key_suffix = key.to_s.split('.')[0...-1], key.to_s.split('.')[-1]
+              key_prefix.inject(oh) {|h, k| h[k] ||= ActiveSupport::OrderedHash.new}[key_suffix] = nil
+            else
+              oh[key] = nil
+            end
+          end
+          threads = []
+          keys.each do |key|
+            threads << Thread.new do
+              logger.debug "translating #{key} ..."
+              Thread.pass
+              if key.to_s.include? '.'
+                key_prefix, key_suffix = key.to_s.split('.')[0...-1], key.to_s.split('.')[-1]
+                existing_translation = I18n.t(key, :default => key_suffix, :locale => locale_name)
+                key_prefix.inject(oh) {|h, k| h[k]}[key_suffix] = existing_translation != key_suffix ? existing_translation : translator.translate(key_suffix)
+              else
+                existing_translation = I18n.t(key, :default => key, :locale => locale_name)
+                oh[key] = existing_translation != key ? existing_translation : translator.translate(key)
+              end
+            end
+          end
+          threads.each {|t| t.join}
+        end
+      end
+
+      # iterate through all values
+      def each_value(parents, src, &block)
+        src.each do |k, v|
+          if v.is_a?(ActiveSupport::OrderedHash)
+            each_value parents + [k], v, &block
+          else
+            yield parents + [k], v
           end
-          hash
         end
-        threads.each {|t| t.join}
-        ret
       end
     end
   end

data/generators/i18n_translation/lib/erb_executer.rb

@@ -9,10 +9,12 @@ module I18nTranslationGeneratorModule
           class Executer
             extend ERB::DefMethod
             include ActionView::Helpers::TranslationHelper
-            include ThroughRyoku
+            include I18nTranslationGeneratorModule::ThroughRyoku
+
             nil.class_eval do
               def method_missing(method, *args, &block); nil; end
             end
+
             def_erb_method 'execute', '#{filename}'
           end
         EOS

data/generators/i18n_translation/lib/recording_backend.rb

@@ -7,7 +7,8 @@ module I18nTranslationGeneratorModule
     end
 
     def translate(locale, key, options = {})
-      @keys << key.to_sym
+#       @keys << key.to_sym
+      @keys << (Array(options[:scope]) + [key]).map.flatten.join('.')
     end
     alias :t :translate
   end

data/generators/i18n_translation/lib/through_ryoku.rb

@@ -1,6 +1,8 @@
-module ThroughRyoku
-  def method_missing(method, *args, &block)
-    nil
+module I18nTranslationGeneratorModule
+  module ThroughRyoku
+    def method_missing(method, *args, &block)
+      nil
+    end
   end
 end
 

data/spec/i18n_locale_command_spec.rb

@@ -51,9 +51,9 @@ end"
       it 'adds the default_locale config inside the config block and sets locale_name value' do
         @command.send(:add_locale_config, @config).should == "
 Rails::Initializer.run do |config|
+  config.i18n.default_locale = 'ja'
   something goes here.
   bla bla bla...
-  config.i18n.default_locale = 'ja'
 end"
       end
     end

data/spec/i18n_translation_command_spec.rb

@@ -0,0 +1,23 @@
+require File.join(File.dirname(__FILE__), '/../generators/i18n_translation/i18n_translation_command')
+
+describe I18nGenerator::Generator::Commands::Create do
+  before do
+    (@command = Object.new).extend I18nGenerator::Generator::Commands::Create
+    @command.stub!(:locale_name).and_return('ja')
+  end
+
+  describe 'each_value' do
+    it 'iterates through each value' do
+      hash = ActiveSupport::OrderedHash.new
+      hash[:parent1] = ActiveSupport::OrderedHash.new
+      hash[:parent1][:child1] = 'child one'
+      hash[:parent2] = ActiveSupport::OrderedHash.new
+      hash[:parent2][:child2] = 'child two'
+      hash[:parent2][:child3] = 'child three'
+      @command.__send__(:each_value, [], hash) do |parents, value|
+        p "#{parents.join('.')} #{value}"
+      end
+    end
+  end
+end
+

data/spec/yaml_spec.rb

@@ -1,20 +1,20 @@
-require File.join(File.dirname(__FILE__), '/../generators/i18n_locale/lib/yaml')
+require File.join(File.dirname(__FILE__), '/../generators/i18n/lib/yaml')
 include I18nLocaleGeneratorModule
 
 describe 'Yaml' do
-  before do
-    @yaml = YamlDocument.new File.join(File.dirname(__FILE__), 'data/yml/active_record/en-US.yml'), 'ja-JP'
+  before :each do
+    @yaml = YamlDocument.new File.join(File.dirname(__FILE__), 'data/yml/active_record/en-US.yml'), 'ja'
   end
 
   describe YamlDocument do
     it 'should return the top level node with the square bracket method' do
-      node = @yaml['ja-JP']
+      node = @yaml['ja']
       node.should be_an_instance_of(Node)
-      node.key.should == 'ja-JP'
+      node.key.should == 'ja'
     end
 
     it 'should generate a path string on the top node' do
-      @yaml['ja-JP'].path.should == '/ja-JP'
+      @yaml['ja'].path.should == '/ja'
     end
   end
 
@@ -32,7 +32,7 @@ describe 'Yaml' do
     end
 
     it 'should generate a path string on any node' do
-      @yaml['ja-JP']['activerecord']['errors']['messages'].path.should == '/ja-JP/activerecord/errors/messages'
+      @yaml['ja']['activerecord']['errors']['messages'].path.should == '/ja-JP/activerecord/errors/messages'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amatsuda-i18n_generators
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-08 00:00:00 -08:00
+date: 2008-12-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,7 @@ files:
 - Rakefile
 - generators/i18n/USAGE
 - generators/i18n/i18n_generator.rb
+- generators/i18n/lib/yaml.rb
 - generators/i18n/templates/base.yml
 - generators/i18n/templates/i18n_config.rb
 - generators/i18n/templates/translation.yml
@@ -42,7 +43,6 @@ files:
 - generators/i18n_locale/i18n_locale_command.rb
 - generators/i18n_locale/i18n_locale_generator.rb
 - generators/i18n_locale/lib/cldr.rb
-- generators/i18n_locale/lib/yaml.rb
 - generators/i18n_scaffold/i18n_scaffold_generator.rb
 - generators/i18n_scaffold/templates/controller.rb
 - generators/i18n_scaffold/templates/functional_test.rb
@@ -65,6 +65,7 @@ files:
 - spec/data/cldr/ja.html
 - spec/data/yml/active_record/en-US.yml
 - spec/i18n_locale_command_spec.rb
+- spec/i18n_translation_command_spec.rb
 - spec/translator_spec.rb
 - spec/yaml_spec.rb
 has_rdoc: false

data/generators/i18n_locale/lib/yaml.rb

@@ -1,141 +0,0 @@
-require 'yaml'
-
-module I18nLocaleGeneratorModule
-  class YamlDocument
-    def initialize(yml_path, locale_name)
-      @locale_name, @nodes = locale_name, []
-      File.read(yml_path).each_with_index do |line_text, i|
-        n = Node.new(self, i, line_text.chomp)
-        @nodes << (((n.key == 'en-US') || (n.key == 'en')) ? Node.new(self, i, "#{locale_name}:") : n)
-      end
-    end
-
-    def next
-      @current_line += 1
-      return false if @current_line == @nodes.size
-      @nodes[@current_line].is_blank_or_comment? ? self.next : @nodes[@current_line]
-    end
-
-    def prev
-      return false if @current_line == 0
-      @current_line -= 1
-      @nodes[@current_line].is_blank_or_comment? ? self.prev : @nodes[@current_line]
-    end
-
-    def parent_of(child)
-      @current_line = child.line
-      while n = self.prev
-        return n if n.indent_level == child.indent_level - 2
-      end 
-      self
-    end
-
-    def children_of(parent)
-      nodes = Nodes.new
-      @current_line = parent.line
-      while n = self.next
-        if n.indent_level < parent.indent_level + 2
-          break
-        elsif n.indent_level == parent.indent_level + 2
-          nodes << n
-        end
-      end
-      nodes
-    end
-
-    def [](node_name)
-      @current_line = @nodes.detect {|n| (n.indent_level == 0) && (n.key == node_name)}.line
-      @nodes[@current_line]
-    end
-
-    def document
-      self
-    end
-
-    def path
-      ''
-    end
-
-    def to_s
-      @nodes.inject('') do |ret, n|
-        ret << n.text + "\n"
-      end
-    end
-  end
-
-  class Node
-    attr_reader :line, :indent_level
-
-    def initialize(doc, line_index, text)
-      @doc, @line, @text = doc, line_index, text
-      @text =~ /(^\s*)/
-      @indent_level = $1.nil? ? 0 : $1.size
-      @yaml = YAML.load(@text + ' ')
-    end
-
-    def parent
-      @parent ||= @doc.parent_of self
-    end
-
-    def children
-      @children ||= @doc.children_of(self)
-    end
-
-    def [](node_name)
-      children.detect {|c| c.key == node_name}
-    end
-
-    def key
-      @yaml.is_a?(Hash) ? @yaml.keys.first : nil
-    end
-
-    def value
-      @yaml.is_a?(Hash) ? @yaml.values.first : nil
-    end
-
-    def value=(val)
-      if @yaml[self.key] != val
-        @yaml[self.key] = val
-        @changed = true
-      end
-    end
-
-    def text
-      if @changed
-        v = if self.value.is_a?(Array)
-          "[#{self.value * ', '}]"
-        else
-          %Q["#{self.value}"]
-        end
-        "#{' ' * self.indent_level}#{self.key}: #{v}"
-      else
-        @text
-      end
-    end
-
-    def changed?
-      @changed
-    end
-
-    def is_blank_or_comment?
-      @text.sub(/#.*$/, '').gsub(/\s/, '').empty?
-    end
-
-    def path
-      @path ||= "#{self.parent.path}/#{self.key}"
-    end
-
-    def descendant_nodes(&block)
-      yield self if self.value
-      self.children.each {|child| child.descendant_nodes(&block)} if self.children
-    end
-  end
-
-  class Nodes < Array
-    def[](index)
-      return detect {|node| node.key == index} if index.is_a?(String)
-      super
-    end
-  end
-end
-