i18n_generators 0.8.1 → 1.0.0.pre1

data/History.txt

@@ -1,3 +1,10 @@
+== 1.0.0
+
+* major enhancements:
+  * Rails 3
+* enhancements:
+  * Fixing deprectaed syntax {{error}} with %{error} for i18n_scaffold (moro)
+
 == 0.8.1
 
 * bugfixes:
@@ -106,4 +113,3 @@
 == 0.0.1
 
 * Birthday!
-

data/README.rdoc

@@ -1,83 +1,54 @@
 = I18n generators
 
-This gem plugin generates a set of locale files for Rails 2.2 and 2.3 i18n feature.
+This gem plugin generates a set of locale files for Rails 3 i18n feature.
 
-* http://github.com/amatsuda/i18n_generators/tree/master
+* http://github.com/amatsuda/i18n_generators
+* http://rubygems.org/gems/i18n_generators
 
+For Rails 2.3 and 2.2, use 0.8.x gem or rails2 branch.
 
-== FEATURES
-
-This gem/plugin provides following four script/generate commands.
-
-=== 1. Generate I18n Scaffold
-
-% ./script/generate i18n_scaffold ja (de-AT, pt-BR, etc.)
-
-Generates I18n aware scaffold.
+* http://github.com/amatsuda/i18n_generators/tree/rails2
+* http://rubygems.org/gems/i18n_generators/versions/0.8.1
 
-=== 2. Generate Locale Files for ActiveRecord/ActiveSupport/ActionPack
+== FEATURES
 
-% ./script/generate i18n_locale ja (de-AT, pt-BR, etc.)
+This gem/plugin provides following generate commands.
 
-or
+=== 1. Generate Locale Files for ActiveRecord/ActiveSupport/ActionPack
 
-% ./script/generate i18n --locale ja (de-AT, pt-BR, etc.)
+% rails g i18n_locale ja (de-AT, pt-BR, etc.)
 
-* A. If The Locale File Exists In Rails-I18n Repository
+Downloads the .yml file for the specified locale from the official rails-i18n repository:
+    http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale
 
-Firstly, the generator checks here.
-http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale
-If the spacified .yml file exists in the repository, the generator downloads and puts the file into your config/locales directory.
 Then the generater sets the application default locale to the specified locale.
 
 This will generate following locale file.
 
     config/locales/ja.yml
 
-* B. Else
-
-The generator copies the en.yml file (bundled inside Rails framework) into config/locales directory, and one-to-one localizes/translates each attribute value into the specified locale/language.
-Then the generater sets the application default locale to the specified locale.
-
-For example,
+=== 2. Generate Translation YAML File For All Models/Attributes
 
-% ./script/generate i18n_locale zh
-
-will generate following locale files.
-
-    config/locales/active_support_zh.yml
-    config/locales/active_record_zh.yml
-    config/locales/action_view_zh.yml
-
-=== 3. Generate Translation YAML File For All Models/Attributes and views/**/*.erb
-
-% ./script/generate i18n_translation ja (de-AT, pt-BR, etc.)
-
-or
-
-% ./script/generate i18n --translation ja (de-AT, pt-BR, etc.)
+% rails g i18n_translation ja (de-AT, pt-BR, etc.)
 
 This will generate following YAML file.
 
     config/locales/translation_ja.yml
 
 The generator scans your app/models directory, and generates a YAML file with all the AR model names and attributes so that you don't have to write the YAML skeleton manually or by copy/paste.
-In addition, the generator scans all the *.erb files in your app/views/** directory, and picks all the keys for I18n.translate, then adds them to the YAML file.
 In addition, the generator tries to translate each of them into the specified language.
-The generator doesn't overwrite the existing value so that you can rerun the generator again and again just like Annotate Model command.
+The generator doesn't overwrite the existing value so that you can rerun the generator again and again.
 
-=== 4. Generate All
+=== 3. Generate All
 
-% ./script/generate i18n ja (de-AT, pt-BR, etc.)
+% rails g i18n ja (de-AT, pt-BR, etc.)
 
-Executes 2 and 3 at once.
+Executes 1 and 2 at once.
 
 
 == REQUIREMENTS:
 
-* Ruby on Rails (>= 2.2)
-* Ruby-GetText-Package ( http://rubyforge.org/projects/gettext/ )
-* high speed Internet connection
+* Ruby on Rails (>= 3.0)
 
 
 == INSTALL:
@@ -88,14 +59,7 @@ Executes 2 and 3 at once.
 
 * As a Rails plugin
 
-% ./script/plugin install git://github.com/amatsuda/i18n_generators.git
-
-
-== CAUTION
-
-Current version of this plugin is very very very roughly implemented just for experiment.
-Every time you execute the generate command, the plugin connects to the Unicode CLDR website and scrapes the huge amount of its contents.
-Please be careful not to harm your network environment and CLDR website by running this plugin too many times.
+% rails plugin install git://github.com/amatsuda/i18n_generators.git
 
 
 Copyright (c) 2008  Akira Matsuda, released under the MIT license

data/Rakefile

@@ -26,11 +26,12 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = 'i18n_generators'
-    gemspec.summary = 'Generates I18n locale files for Rails 2.2 and 2.3'
-    gemspec.description = 'A Rails generator plugin & gem that generates Rails 2.2 and 2.3 I18n locale files for almost every known locale.'
+    gemspec.summary = 'Generates I18n locale files for Rails 3 and Rails 2'
+    gemspec.description = 'A Rails generator plugin & gem that generates Rails I18n locale files for almost every known locale.'
     gemspec.email = 'ronnie@dio.jp'
     gemspec.homepage = 'http://github.com/amatsuda/i18n_generators/'
     gemspec.authors = ['Akira Matsuda']
+    gemspec.add_dependency 'yaml_waml'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.8.1
+1.0.0.pre1

data/generators/i18n/USAGE

@@ -10,4 +10,3 @@ Example:
         lib/locale/active_record_ja-JP.yml
         lib/locale/active_support_ja-JP.yml
         lib/locale/models_ja-JP.yml
-

data/generators/i18n/i18n_generator.rb

@@ -82,4 +82,3 @@ end
 require File.join(File.dirname(__FILE__), '../i18n_locale/i18n_locale_command')
 require File.join(File.dirname(__FILE__), '../i18n_translation/i18n_translation_command')
 Rails::Generator::Commands::Create.send :include, I18nGenerator::Generator::Commands::Create
-

data/generators/i18n/templates/i18n_config.rb

@@ -2,4 +2,3 @@ I18n.load_path += Dir.glob("#{RAILS_ROOT}/lib/locale/*.yml")
 
 I18n.default_locale = '<%= locale_name %>'
 I18n.locale         = '<%= locale_name %>'
-

data/generators/i18n/templates/translation.yml

@@ -1 +1 @@
-<%= translations %>
+<%= translations %>

data/generators/i18n_locale/USAGE

@@ -9,4 +9,3 @@ Example:
         lib/locale/action_view_ja-JP.yml
         lib/locale/active_record_ja-JP.yml
         lib/locale/active_support_ja-JP.yml
-

data/generators/i18n_locale/i18n_locale_command.rb

@@ -132,4 +132,3 @@ module I18nGenerator::Generator
     end
   end
 end
-

data/generators/i18n_locale/i18n_locale_generator.rb

@@ -6,4 +6,3 @@ class I18nLocaleGenerator < I18nGenerator
     options[:generate_locale_only] = true
   end
 end
-

data/generators/i18n_locale/lib/cldr.rb

@@ -136,4 +136,3 @@ module I18nLocaleGeneratorModule
     end
   end
 end
-

data/generators/i18n_scaffold/i18n_scaffold_generator.rb

@@ -1,3 +1,2 @@
 class I18nScaffoldGenerator < ScaffoldGenerator
 end
-

data/generators/i18n_scaffold/templates/controller.rb

@@ -44,7 +44,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       if @<%= file_name %>.save
-        flash[:notice] = I18n.t(:created_success, :default => '{{model}} was successfully created.', :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold])
+        flash[:notice] = I18n.t(:created_success, :default => '%{model} was successfully created.', :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold])
         format.html { redirect_to(@<%= file_name %>) }
         format.xml  { render :xml => @<%= file_name %>, :status => :created, :location => @<%= file_name %> }
       else
@@ -61,7 +61,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       if @<%= file_name %>.update_attributes(params[:<%= file_name %>])
-        flash[:notice] = I18n.t(:updated_success, :default => '{{model}} was successfully updated.', :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold])
+        flash[:notice] = I18n.t(:updated_success, :default => '%{model} was successfully updated.', :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold])
         format.html { redirect_to(@<%= file_name %>) }
         format.xml  { head :ok }
       else

data/generators/i18n_scaffold/templates/view_edit.html.erb

@@ -1,4 +1,4 @@
-<h1><%% translate(:editing, :default => "Editing {{model}}", :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold]) %></h1>
+<h1><%% translate(:editing, :default => "Editing %{model}", :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold]) %></h1>
 
 <%% form_for(@<%= singular_name %>) do |f| %>
   <%%= f.error_messages %>

data/generators/i18n_scaffold/templates/view_index.html.erb

@@ -1,4 +1,4 @@
-<h1><%%= translate(:listing, :default => "Listing {{model}}", :model => <%= class_name %>.human_name(:count => @<%= plural_name %>.size), :count => @<%= plural_name %>.size, :scope => [:railties, :scaffold]) %></h1>
+<h1><%%= translate(:listing, :default => "Listing %{model}", :model => <%= class_name %>.human_name(:count => @<%= plural_name %>.size), :count => @<%= plural_name %>.size, :scope => [:railties, :scaffold]) %></h1>
 
 <table>
   <tr>

data/generators/i18n_scaffold/templates/view_new.html.erb

@@ -1,4 +1,4 @@
-<h1><%%= translate(:new, :default => "New {{model}}", :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold]) %></h1>
+<h1><%%= translate(:new, :default => "New %{model}", :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold]) %></h1>
 
 <%% form_for(@<%= singular_name %>) do |f| %>
   <%%= f.error_messages %>

data/generators/i18n_translation/USAGE

@@ -6,4 +6,3 @@ Example:
 
     This will create:
         lib/locale/models_ja-JP.yml
-

data/generators/i18n_translation/i18n_translation_command.rb

@@ -122,4 +122,3 @@ module I18nGenerator::Generator
     end
   end
 end
-

data/generators/i18n_translation/i18n_translation_generator.rb

@@ -6,4 +6,3 @@ class I18nTranslationGenerator < I18nGenerator
     options[:generate_translation_only] = true
   end
 end
-

data/generators/i18n_translation/lib/erb_executer.rb

@@ -28,4 +28,3 @@ module I18nTranslationGeneratorModule
     end
   end
 end
-

data/generators/i18n_translation/lib/recording_backend.rb

@@ -13,4 +13,3 @@ module I18nTranslationGeneratorModule
     alias :t :translate
   end
 end
-

data/generators/i18n_translation/lib/through_ryoku.rb

@@ -5,4 +5,3 @@ module I18nTranslationGeneratorModule
     end
   end
 end
-

data/generators/i18n_translation/lib/translator.rb

@@ -25,4 +25,3 @@ module I18nTranslationGeneratorModule
     end
   end
 end
-

data/i18n_generators.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{i18n_generators}
-  s.version = "0.8.1"
+  s.version = "1.0.0.pre1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akira Matsuda"]
-  s.date = %q{2010-10-23}
-  s.description = %q{A Rails generator plugin & gem that generates Rails 2.2 and 2.3 I18n locale files for almost every known locale.}
+  s.date = %q{2010-10-27}
+  s.description = %q{A Rails generator plugin & gem that generates Rails I18n locale files for almost every known locale.}
   s.email = %q{ronnie@dio.jp}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -51,6 +51,14 @@ Gem::Specification.new do |s|
      "generators/i18n_translation/lib/through_ryoku.rb",
      "generators/i18n_translation/lib/translator.rb",
      "i18n_generators.gemspec",
+     "lib/generators/i18n/USAGE",
+     "lib/generators/i18n/i18n_generator.rb",
+     "lib/generators/i18n_locale/USAGE",
+     "lib/generators/i18n_locale/i18n_locale_generator.rb",
+     "lib/generators/i18n_translation/USAGE",
+     "lib/generators/i18n_translation/i18n_translation_generator.rb",
+     "lib/generators/i18n_translation/lib/translator.rb",
+     "lib/generators/i18n_translation/lib/yaml.rb",
      "spec/cldr_spec.rb",
      "spec/data/cldr/ja.html",
      "spec/data/yml/active_record/en-US.yml",
@@ -64,7 +72,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Generates I18n locale files for Rails 2.2 and 2.3}
+  s.summary = %q{Generates I18n locale files for Rails 3 and Rails 2}
   s.test_files = [
     "spec/cldr_spec.rb",
      "spec/i18n_locale_command_spec.rb",
@@ -79,9 +87,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<yaml_waml>, [">= 0"])
     else
+      s.add_dependency(%q<yaml_waml>, [">= 0"])
     end
   else
+    s.add_dependency(%q<yaml_waml>, [">= 0"])
   end
 end
 

data/lib/generators/i18n/USAGE

@@ -0,0 +1,12 @@
+Description:
+    Generates a config file and locale files and a model/attributes translation file for Rails i18n feature.
+    In other words, executes i18n_locale and i18n_translation at once.
+
+Example:
+    % rails g i18n locale_name (ja, pt-BR, etc.)
+
+    This will create:
+        config/locales/ja.yml
+        config/locales/translation_ja.yml
+    And update:
+        config/application.rb

data/lib/generators/i18n/i18n_generator.rb

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), '../i18n_translation/i18n_translation_generator')
+require File.join(File.dirname(__FILE__), '../i18n_locale/i18n_locale_generator')
+
+class I18nGenerator < Rails::Generators::NamedBase
+  def initialize(args, *options)
+    super
+    @_args, @_options = args, options
+  end
+
+  def main
+    locale_gen = I18nLocaleGenerator.new(@_args, @_options)
+    locale_gen.main
+
+    translation_gen = I18nTranslationGenerator.new(@_args, @_options)
+    translation_gen.main
+  end
+end

data/lib/generators/i18n_locale/USAGE

@@ -0,0 +1,10 @@
+Description:
+    Generates a config file and locale files for Rails i18n feature.
+
+Example:
+    % rails g i18n locale_name (ja, pt-BR, etc.)
+
+    This will create:
+        config/locales/ja.yml
+    And update:
+        config/application.rb

data/lib/generators/i18n_locale/i18n_locale_generator.rb

@@ -0,0 +1,46 @@
+class I18nLocaleGenerator < Rails::Generators::NamedBase
+  def main
+    unless file_name =~ /^[a-zA-Z]{2}([-_][a-zA-Z]+)?$/
+      log 'ERROR: Wrong locale format. Please input in ?? or ??-?? format.'
+      exit
+    end
+    generate_configuration
+    fetch_from_rails_i18n_repository
+  end
+
+  private
+  def generate_configuration
+    return if I18n.default_locale.to_s == locale_name
+    log 'updating application.rb...'
+#     environment "config.i18n.default_locale = :#{locale_name}"
+    config = add_locale_config File.read(File.join(Rails.root, 'config/application.rb'))
+    create_file 'config/application.rb', config
+  end
+
+  def add_locale_config(config_contents)
+    new_line = "    config.i18n.default_locale = '#{locale_name}'"
+    if config_contents =~ /\n *config\.i18n\.default_locale *=/
+      config_contents.sub(/ *config\.i18n\.default_locale *=.*/, new_line)
+    elsif config_contents =~ /\n *#? *config\.i18n\.default_locale *=/
+      config_contents.sub(/ *#? *config\.i18n\.default_locale *=.*/, new_line)
+    elsif sentinel = config_contents.scan(/class [a-z_:]+ < Rails::Application/i).first
+      config_contents.sub sentinel, "#{sentinel}\n#{new_line}"
+    else
+      config_contents
+    end
+  end
+
+  def fetch_from_rails_i18n_repository
+    log "fetching #{locale_name}.yml from rails-i18n repository..."
+    begin
+      yml = OpenURI.open_uri("http://github.com/svenfuchs/rails-i18n/raw/master/rails/locale/#{locale_name}.yml").read
+      create_file "config/locales/#{locale_name}.yml", yml
+    rescue
+      log "could not find #{locale_name}.yml on rails-i18n repository"
+    end
+  end
+
+  def locale_name
+    @_locale_name ||= file_name.gsub('_', '-').split('-').each.with_index.map {|s, i| i == 0 ? s : s.upcase}.join('-')
+  end
+end

data/lib/generators/i18n_translation/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Generates a model/attributes translation file for Rails i18n feature.
+
+Example:
+    % rails g i18n locale_name (ja, pt-BR, etc.)
+
+    This will create:
+        config/locales/translation_ja.yml

data/lib/generators/i18n_translation/i18n_translation_generator.rb

@@ -0,0 +1,111 @@
+require File.join(File.dirname(__FILE__), 'lib/yaml')
+require File.join(File.dirname(__FILE__), 'lib/translator')
+
+class I18nTranslationGenerator < Rails::Generators::NamedBase
+  # option: include_timestamps
+  def main
+    unless file_name =~ /^[a-zA-Z]{2}([-_][a-zA-Z]+)?$/
+      log 'ERROR: Wrong locale format. Please input in ?? or ??-?? format.'
+      exit
+    end
+    log "translating models to #{locale_name}..."
+    I18n.locale = locale_name
+
+    keys = aggregate_keys
+    translations = translate_all(keys)
+
+    yaml = I27r::YamlDocument.load_yml_file "config/locales/translation_#{locale_name}.yml"
+    each_value [], translations do |parents, value|
+      if value.is_a? String
+        yaml[[locale_name.to_s] + parents] = value
+      else
+        value.each do |key, val|
+          yaml[[locale_name.to_s] + parents + [key]] = val
+        end
+      end
+    end
+
+    create_file "config/locales/translation_#{locale_name}.yml", yaml.to_s(true)
+  end
+
+  private
+  def aggregate_keys
+    models = model_filenames.map do |model_name|
+      model = begin
+        m = model_name.camelize.constantize rescue LoadError
+        next if m.nil? || !m.table_exists? || !m.respond_to?(:content_columns)
+        m.class_eval %Q[def self._english_name; "#{model_name}"; end]
+        m
+      rescue
+        next
+      end
+    end.compact
+
+    translation_keys = []
+    translation_keys += models.map {|m| "activerecord.models.#{m._english_name}"}
+    models.each do |model|
+      cols = model.content_columns + model.reflect_on_all_associations
+      cols.delete_if {|c| %w[created_at updated_at].include? c.name} unless include_timestamps?
+      translation_keys += cols.map {|c| "activerecord.attributes.#{model._english_name}.#{c.name}"}
+    end
+    translation_keys
+  end
+
+  # receives an array of keys and returns :key => :translation hash
+  def translate_all(keys)
+    translator = I27r::Translator.new locale_name.sub(/\-.*/, '')
+
+    ActiveSupport::OrderedHash.new.tap 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
+          Rails.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.backend.send(:lookup, locale_name, key_suffix, key_prefix)
+            key_prefix.inject(oh) {|h, k| h[k]}[key_suffix] = existing_translation ? existing_translation : translator.translate(key_suffix)
+          else
+            existing_translation = I18n.backend.send(:lookup, locale_name, key)
+            oh[key] = existing_translation ? existing_translation : translator.translate(key)
+          end
+        end
+      end
+      threads.each {|t| t.join}
+    end
+  end
+
+  def locale_name
+    @_locale_name ||= file_name.gsub('_', '-').split('-').each.with_index.map {|s, i| i == 0 ? s : s.upcase}.join('-')
+  end
+
+  def include_timestamps?
+    !!@include_timestamps
+  end
+
+  def model_filenames
+    Dir.chdir("#{Rails.root}/app/models/") do
+      Dir["**/*.rb"].map {|m| m.sub(/\.rb$/, '')}
+    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
+    end
+  end
+end

data/lib/generators/i18n_translation/lib/translator.rb

@@ -0,0 +1,27 @@
+require 'open-uri'
+require 'json' if RUBY_VERSION >= '1.9'
+
+module I27r
+  class Translator
+    def initialize(lang)
+      @lang, @cache = lang, {}
+    end
+
+    def translate(word)
+      return @cache[word] if @cache[word]
+      begin
+        w = CGI.escape ActiveSupport::Inflector.humanize(word)
+        json = OpenURI.open_uri("http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=#{w}&langpair=en%7C#{@lang}").read
+        result = if RUBY_VERSION >= '1.9'
+          ::JSON.parse json
+        else
+          ActiveSupport::JSON.decode(json)
+        end
+        result['responseStatus'] == 200 ? (@cache[word] = result['responseData']['translatedText']) : word
+      rescue => e
+        puts %Q[failed to translate "#{word}" into "#{@lang}" language.]
+        word
+      end
+    end
+  end
+end

data/lib/generators/i18n_translation/lib/yaml.rb

@@ -0,0 +1,133 @@
+require 'yaml_waml'
+
+module I27r
+  class Line
+    attr_reader :text
+    delegate :scan, :to => :@text
+
+    def initialize(text, options = {})
+      @generated = !!options[:generated] || text.ends_with?('  #g')
+      @yaml = YAML.load text.to_s + ' '
+      @text = text
+    end
+
+    def key
+      yaml? ? @yaml.keys.first : nil
+    end
+
+    def value
+      yaml? ? @yaml.values.first : nil
+    end
+
+    def indent
+      yaml? ? @text.scan(/^ */).first : ''
+    end
+
+    def generated?
+      @generated
+    end
+
+    def yaml?
+      @yaml.is_a?(Hash) && @yaml.keys.first.is_a?(String)
+    end
+
+    def value=(val)
+      if @yaml[self.key] != val
+        @yaml[self.key] = val
+        generate_text self.indent
+      end
+    end
+
+    def to_s
+      "#{@text}#{'  #g' if generated? && yaml? && !value.nil? && !@text.ends_with?('  #g')}"
+    end
+
+    private
+    def generate_text(indent)
+      @text = indent + @yaml.to_yaml.sub("--- \n", '').chomp.rstrip
+    end
+  end
+
+  class YamlDocument
+    attr_accessor :root
+
+    def initialize(yaml = '')
+      @lines = yaml.split("\n").map {|s| Line.new s}
+    end
+
+    def self.load_yml_file(yml_path)
+      if File.exists? yml_path
+        self.new File.read(yml_path)
+      else
+        self.new
+      end
+    end
+
+    def [](*path)
+      find_line_by_path(path.flatten).try :value
+    end
+
+    def find_line_by_path(path, line_num = -1, add_new = false)
+      key = path.shift
+      indent = line_num == -1 ? '' : @lines[line_num].scan(/^ */).first + '  '
+      @lines[(line_num + 1)..-1].each do |line|
+        line_num += 1
+        next unless line.yaml?
+
+        if (line.indent == indent) && (line.key == key)
+          if path.empty?
+            return line
+          else
+            return find_line_by_path path, line_num, add_new
+          end
+        elsif line.indent < indent
+          if add_new
+            new_line = Line.new("#{indent}#{key}:", :generated => true)
+            if @lines[line_num - 1].try(:text) == ''
+              @lines.insert line_num - 1, new_line
+            else
+              @lines.insert line_num, new_line
+            end
+            return new_line if path.empty?
+            return find_line_by_path path, line_num, add_new
+          else
+            return
+          end
+        end
+      end
+      if add_new
+        new_line = Line.new("#{indent}#{key}:", :generated => true)
+        @lines.insert @lines.count, new_line
+        return new_line if path.empty?
+        return find_line_by_path path, @lines.count - 1, add_new
+      end
+    end
+
+    def []=(*args)
+      value = args.pop
+      path = args.flatten
+#       return if value && (value == self[path])
+
+      line = find_line_by_path path.dup
+      if line
+        if line.generated?
+          line.value = value
+        end
+      else
+        line = find_line_by_path path, -1, true
+        line.value = value
+      end
+    end
+
+    def to_s(add_blank_line = false)
+      previous_indent = ''
+      ''.tap do |ret|
+        @lines.each do |line|
+          ret << "\n" if add_blank_line && (line.indent < previous_indent) && !line.to_s.blank? && !ret.ends_with?("\n\n")
+          previous_indent = line.indent
+          ret << line.to_s << "\n"
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,39 +1,10 @@
-# This file is copied to ~/spec when you run 'ruby script/generate rspec'
-# from the project root directory.
-require 'rubygems'
-require 'spec'
-require 'activesupport'
+require 'active_support/all'
 
-Spec::Runner.configure do |config|
-  # == Fixtures
-  #
-  # You can declare fixtures for each example_group like this:
-  #   describe "...." do
-  #     fixtures :table_a, :table_b
-  #
-  # Alternatively, if you prefer to declare them only once, you can
-  # do so right here. Just uncomment the next line and replace the fixture
-  # names with your fixtures.
-  #
-  # config.global_fixtures = :table_a, :table_b
-  #
-  # If you declare global fixtures, be aware that they will be declared
-  # for all of your examples, even those that don't use them.
-  #
-  # You can also declare which fixtures to use (for example fixtures for test/fixtures):
-  #
-  # config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
-  #
-  # == Mock Framework
-  #
-  # RSpec uses it's own mocking framework by default. If you prefer to
-  # use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
   # config.mock_with :rr
-  #
-  # == Notes
-  # 
-  # For more information take a look at Spec::Example::Configuration and Spec::Runner
+  config.mock_with :rspec
 end

data/spec/yaml_spec.rb

@@ -1,59 +1,123 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
-require File.join(File.dirname(__FILE__), '/../generators/i18n/lib/yaml')
+require File.join(File.dirname(__FILE__), '../lib/generators/i18n_translation/lib/yaml')
 
-include I18nLocaleGeneratorModule
-
-describe 'Yaml' do
-  before :each do
-    @yaml = YamlDocument.new File.join(File.dirname(__FILE__), 'data/yml/active_record/en-US.yml'), 'ja'
-  end
+describe I27r::YamlDocument do
+  context 'when loading an existing file' do
+    before do
+      @yaml_string = <<YAML
+ja:
+  hoge:
+    fuga: piyo  #g
+    numbers:
+      one: "いち"  #g
+      two: "に"
 
-  describe YamlDocument do
-    it 'should return the top level node with the square bracket method' do
-      node = @yaml['ja']
-      node.should be_an_instance_of(Node)
-      node.key.should == 'ja'
+    aaa:
+      foo: "ふー"
+      bar: "ばー"
+YAML
+      @yaml = I27r::YamlDocument.new @yaml_string
     end
 
-    it 'should generate a path string on the top node' do
-      @yaml['ja'].path.should == '/ja'
-    end
-  end
+    subject { @yaml }
+    it { should be }
 
-  describe Node do
-    before do
-      @node = Node.new @yaml, 100, 'foo: bar'
-    end
+    its(:to_s) { should == @yaml_string }
 
-    it 'should return a key string from input text' do
-      @node.key.should == 'foo'
+    describe '[]' do
+      specify '[]' do
+        @yaml['ja', 'hoge', 'fuga'].should == 'piyo'
+        @yaml[['ja', 'hoge', 'fuga']].should == 'piyo'
+      end
     end
 
-    it 'should return a value string from input text' do
-      @node.value.should == 'bar'
+    describe 'find_line_by_path' do
+      subject { @yaml.find_line_by_path(['ja', 'hoge', 'fuga']) }
+      its(:value) { should == 'piyo' }
     end
 
-    it 'should generate a path string on any node' do
-      @yaml['ja']['activerecord']['errors']['messages'].path.should == '/ja/activerecord/errors/messages'
+    describe 'find_line_by_path' do
+      subject { @yaml.find_line_by_path(['ja', 'aho', 'hage'], -1, true) }
+      it { should be }
+      its(:key) { should == 'hage' }
+      its(:value) { should_not be }
     end
 
-    describe '[] method' do
-      describe 'when a child with the specified key exists' do
-        it 'should return a child which has the specified key'
-
-        it 'should not modify the YAML contents'
+    describe '[]=' do
+      context 'rewriting an existing value' do
+        before { @yaml['ja', 'hoge', 'fuga'] = 'puyo' }
+        subject { @yaml['ja', 'hoge', 'fuga'] }
+        it { should == 'puyo' }
       end
 
-      describe 'when a child with the specified key exists' do
-        it 'should return a new node with the specified key'
+      context 'an existing value without #g mark' do
+        before { @yaml['ja', 'hoge', 'numbers', 'two'] = 'ツー' }
+        subject { @yaml['ja', 'hoge', 'numbers', 'two'] }
+        it { should == 'に' }
+      end
 
-        it 'should append the created node under the current node'
+      context 'creating a new node in the middle' do
+        before { @yaml['ja', 'hoge', 'numbers', 'three'] = 'さん' }
+        subject { @yaml['ja', 'hoge', 'numbers', 'three'] }
+        it { should == 'さん' }
+        specify do
+          @yaml.to_s.should ==  <<YAML
+ja:
+  hoge:
+    fuga: piyo  #g
+    numbers:
+      one: "いち"  #g
+      two: "に"
+      three: "さん"  #g
 
-        it 'should append the created line to the YAML document'
+    aaa:
+      foo: "ふー"
+      bar: "ばー"
+YAML
+        end
+      end
 
-        it 'should increment the line number of the succeeding lines of the newly added line'
+      context 'creating a new node at the bottom' do
+        before { @yaml['ja', 'aho', 'hage'] = 'hige' }
+        subject { @yaml['ja', 'aho', 'hage'] }
+        it { should == 'hige' }
       end
+
     end
   end
-end
 
+  context 'when loading an existing file with alias' do
+    before do
+      @yaml_string = <<YAML
+ja:
+  activerecord:
+    attributes:
+      hoge: &hoge
+        foo: FOO
+        bar: BAR
+      hoge2: &hoge2
+        hoge:
+        <<:  *hogege
+YAML
+      @yaml = I27r::YamlDocument.new @yaml_string
+      @yaml['ja', 'activerecord', 'hoge2', 'hoge'] = 'foo'
+    end
+
+    specify '' do
+      puts @yaml.to_s
+    end
+  end
+
+  context 'creating a new file' do
+    before do
+
+    end
+
+    specify 'that' do
+      yaml = I27r::YamlDocument.new
+      yaml['ja', 'hoge', 'fuga'] = 'piyo'
+      yaml['ja', 'hoge', 'foo'] = 'bar'
+      puts yaml
+    end
+  end
+end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: i18n_generators
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: false
+  hash: -1876988176
+  prerelease: true
   segments: 
-  - 0
-  - 8
   - 1
-  version: 0.8.1
+  - 0
+  - 0
+  - pre1
+  version: 1.0.0.pre1
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -15,11 +16,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-23 00:00:00 +09:00
+date: 2010-10-27 00:00:00 +09:00
 default_executable: 
-dependencies: []
-
-description: A Rails generator plugin & gem that generates Rails 2.2 and 2.3 I18n locale files for almost every known locale.
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: yaml_waml
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+description: A Rails generator plugin & gem that generates Rails I18n locale files for almost every known locale.
 email: ronnie@dio.jp
 executables: []
 
@@ -63,6 +77,14 @@ files:
 - generators/i18n_translation/lib/through_ryoku.rb
 - generators/i18n_translation/lib/translator.rb
 - i18n_generators.gemspec
+- lib/generators/i18n/USAGE
+- lib/generators/i18n/i18n_generator.rb
+- lib/generators/i18n_locale/USAGE
+- lib/generators/i18n_locale/i18n_locale_generator.rb
+- lib/generators/i18n_translation/USAGE
+- lib/generators/i18n_translation/i18n_translation_generator.rb
+- lib/generators/i18n_translation/lib/translator.rb
+- lib/generators/i18n_translation/lib/yaml.rb
 - spec/cldr_spec.rb
 - spec/data/cldr/ja.html
 - spec/data/yml/active_record/en-US.yml
@@ -92,19 +114,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Generates I18n locale files for Rails 2.2 and 2.3
+summary: Generates I18n locale files for Rails 3 and Rails 2
 test_files: 
 - spec/cldr_spec.rb
 - spec/i18n_locale_command_spec.rb