i18n_generators 1.0.2 → 1.0.3

data/.gitignore

@@ -0,0 +1,2 @@
+pkg
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+
+gemspec

data/History.txt

@@ -1,3 +1,11 @@
+== 1.0.3
+
+* bugfixes:
+  * #4 Translation generator recursive loop in ruby 1.9 + MS-Windows (memarko)
+
+* enhancements:
+  * Some Rails-3-ish cleanups
+
 == 1.0.2
 
 * bugfixes:

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 [name of plugin creator]
+Copyright (c) 2008-2011 Akira Matsuda
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -15,7 +15,7 @@ This gem/plugin provides following generate commands.
 % rails g i18n_locale ja (de-AT, pt-BR, etc.)
 
 Downloads the .yml file for the specified locale from the official rails-i18n repository:
-    http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale
+    https://github.com/svenfuchs/rails-i18n/tree/master/rails/locale
 
 Then the generater sets the application default locale to the specified locale.
 
@@ -56,11 +56,11 @@ Executes 1 and 2 at once.
 
 * With Bundler
 
-Add 'i18n_generators' to your Gemfile, then `bundle`.
+Add 'i18n_generators' to your Gemfile, then `bundle`. Restricting the group to :development would be a good idea, since the generator would probably be used only in development mode.
 
 * As a Rails plugin
 
 % rails plugin install git://github.com/amatsuda/i18n_generators.git
 
 
-Copyright (c) 2008 - 2010 Akira Matsuda, released under the MIT license
+Copyright (c) 2008 - 2011 Akira Matsuda, released under the MIT license

data/Rakefile

@@ -1,38 +1,2 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-# require 'spec/rake/spectask'
-
-desc 'Default: run the specs.'
-task :default => :spec
-
-# desc 'Run the specs for i18n_generators.'
-# Spec::Rake::SpecTask.new(:spec) do |t|
-#   t.spec_opts = ['--colour --format progress --loadby mtime --reverse']
-#   t.spec_files = FileList['spec/**/*_spec.rb']
-# end
-
-desc 'Generate documentation for the i18n_generators plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'I18nGenerators'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('generators/**/*.rb')
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = 'i18n_generators'
-    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']
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts 'Jeweler not available. Install it with: gem install jeweler'
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/i18n_generators.gemspec

@@ -1,94 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'i18n_generators/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{i18n_generators}
-  s.version = "1.0.2"
+  s.name        = 'i18n_generators'
+  s.version     = I18nGenerators::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Akira Matsuda']
+  s.email       = ['ronnie@dio.jp']
+  s.homepage    = 'https://github.com/amatsuda/i18n_generators'
+  s.summary     = 'Generates I18n locale files for Rails 3 and Rails 2'
+  s.description = 'A Rails generator plugin & gem that generates Rails I18n locale files for almost every known locale.'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Akira Matsuda"]
-  s.date = %q{2010-11-29}
-  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"
-  ]
-  s.files = [
-    "History.txt",
-    "MIT-LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "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",
-    "generators/i18n_locale/USAGE",
-    "generators/i18n_locale/i18n_locale_command.rb",
-    "generators/i18n_locale/i18n_locale_generator.rb",
-    "generators/i18n_locale/lib/cldr.rb",
-    "generators/i18n_scaffold/i18n_scaffold_generator.rb",
-    "generators/i18n_scaffold/templates/controller.rb",
-    "generators/i18n_scaffold/templates/functional_test.rb",
-    "generators/i18n_scaffold/templates/helper.rb",
-    "generators/i18n_scaffold/templates/helper_test.rb",
-    "generators/i18n_scaffold/templates/layout.html.erb",
-    "generators/i18n_scaffold/templates/style.css",
-    "generators/i18n_scaffold/templates/view_edit.html.erb",
-    "generators/i18n_scaffold/templates/view_index.html.erb",
-    "generators/i18n_scaffold/templates/view_new.html.erb",
-    "generators/i18n_scaffold/templates/view_show.html.erb",
-    "generators/i18n_translation/USAGE",
-    "generators/i18n_translation/i18n_translation_command.rb",
-    "generators/i18n_translation/i18n_translation_generator.rb",
-    "generators/i18n_translation/lib/erb_executer.rb",
-    "generators/i18n_translation/lib/recording_backend.rb",
-    "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",
-    "lib/generators/i18n_translation/lib/yaml_waml.rb",
-    "spec/cldr_spec.rb",
-    "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/spec_helper.rb",
-    "spec/translator_spec.rb",
-    "spec/yaml_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/amatsuda/i18n_generators/}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  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",
-    "spec/i18n_translation_command_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/translator_spec.rb",
-    "spec/yaml_spec.rb"
-  ]
+  s.rubyforge_project = 'i18n_generators'
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ['lib']
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.extra_rdoc_files = ['README.rdoc']
+  s.licenses = ['MIT']
 end
-

data/lib/generators/i18n_locale/i18n_locale_generator.rb

@@ -35,15 +35,7 @@ class I18nLocaleGenerator < Rails::Generators::NamedBase
   def fetch_from_rails_i18n_repository
     log "fetching #{locale_name}.yml from rails-i18n repository..."
     begin
-      uri = URI.parse "https://github.com/svenfuchs/rails-i18n/raw/master/rails/locale/#{locale_name}.yml"
-      http = Net::HTTP.new uri.host, uri.port
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      req = Net::HTTP::Get.new uri.request_uri
-      res = http.request req
-      raise unless res.code == '200'
-
-      create_file "config/locales/#{locale_name}.yml", res.body
+      get "https://github.com/svenfuchs/rails-i18n/raw/master/rails/locale/#{locale_name}.yml", "config/locales/#{locale_name}.yml"
     rescue
       log "could not find #{locale_name}.yml on rails-i18n repository"
     end

data/lib/generators/i18n_translation/i18n_translation_generator.rb

@@ -10,6 +10,7 @@ class I18nTranslationGenerator < Rails::Generators::NamedBase
     end
     log "translating models to #{locale_name}..."
     I18n.locale = locale_name
+    Rails.application.eager_load!
 
     keys = aggregate_keys
     translations = translate_all(keys)
@@ -32,23 +33,21 @@ class I18nTranslationGenerator < Rails::Generators::NamedBase
 
   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
+    models = ActiveRecord::Base.descendants.map do |m|
+      begin
+        m if m.table_exists? && m.respond_to?(:content_columns)
+      rescue => e
+        p e
         next
       end
     end.compact
 
     translation_keys = []
-    translation_keys += models.map {|m| "activerecord.models.#{m._english_name}"}
+    translation_keys += models.map {|m| "activerecord.models.#{m.model_name.underscore}"}
     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}"}
+      translation_keys += cols.map {|c| "activerecord.attributes.#{model.model_name.underscore}.#{c.name}"}
     end
     translation_keys
   end
@@ -94,12 +93,6 @@ class I18nTranslationGenerator < Rails::Generators::NamedBase
     !!@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|

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

@@ -1,4 +1,8 @@
-require File.join(File.dirname(__FILE__), 'yaml_waml')
+begin
+  require 'psych'
+rescue LoadError
+  require File.join(File.dirname(__FILE__), 'yaml_waml')
+end
 
 module I27r
   class Line
@@ -44,7 +48,7 @@ module I27r
 
     private
     def generate_text(indent)
-      @text = indent + @yaml.to_yaml.sub("--- \n", '').chomp.rstrip
+      @text = indent + @yaml.to_yaml.sub(/--- ?\n/, '').chomp.rstrip
     end
   end
 

data/lib/i18n_generators/version.rb

@@ -0,0 +1,3 @@
+module I18nGenerators
+  VERSION = '1.0.3'
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: i18n_generators
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -15,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 +09:00
-default_executable: 
+date: 2011-06-24 00:00:00 Z
 dependencies: []
 
 description: A Rails generator plugin & gem that generates Rails I18n locale files for almost every known locale.
-email: ronnie@dio.jp
+email: 
+- ronnie@dio.jp
 executables: []
 
 extensions: []
@@ -28,11 +28,12 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
+- Gemfile
 - History.txt
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - generators/i18n/USAGE
 - generators/i18n/i18n_generator.rb
 - generators/i18n/lib/yaml.rb
@@ -71,6 +72,7 @@ files:
 - lib/generators/i18n_translation/lib/translator.rb
 - lib/generators/i18n_translation/lib/yaml.rb
 - lib/generators/i18n_translation/lib/yaml_waml.rb
+- lib/i18n_generators/version.rb
 - spec/cldr_spec.rb
 - spec/data/cldr/ja.html
 - spec/data/yml/active_record/en-US.yml
@@ -79,10 +81,9 @@ files:
 - spec/spec_helper.rb
 - spec/translator_spec.rb
 - spec/yaml_spec.rb
-has_rdoc: true
-homepage: http://github.com/amatsuda/i18n_generators/
-licenses: []
-
+homepage: https://github.com/amatsuda/i18n_generators
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -108,13 +109,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: i18n_generators
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Generates I18n locale files for Rails 3 and Rails 2
 test_files: 
 - spec/cldr_spec.rb
+- 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/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-1.0.2