amatsuda-i18n_generators 0.4.1 → 0.5.0

data/History.txt

@@ -1,3 +1,13 @@
+== 0.5.0
+
+* bugfixes:
+  * Could not fetch the locale files via GitHub (GitHub changed the URL?)
+* major enhancements:
+  * Ruby 1.9 ready!
+  * Never connect to CLDR site when the locale file found in Sven's rails-i18n repository
+* enhancements:
+  * Use Ruby 1.9 built-in JSON parser if Ruby 1.9
+
 == 0.4.1
 
 * bugfixes:

data/generators/i18n/i18n_generator.rb

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

data/generators/i18n_locale/i18n_locale_command.rb

@@ -25,7 +25,7 @@ module I18nGenerator::Generator
 
       def fetch_from_rails_i18n_repository
         file('i18n:base.yml', "config/locales/#{locale_name}.yml") do |f|
-          OpenURI.open_uri("http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale/#{locale_name}.yml?raw=true").read
+          OpenURI.open_uri("http://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/#{locale_name}.yml?raw=true").read
         end
       end
 

data/generators/i18n_locale/lib/cldr.rb

@@ -1,15 +1,14 @@
+# encoding: utf-8
 $KCODE = 'U'
 
 require 'open-uri'
 
 module I18nLocaleGeneratorModule
   class CldrDocument
+    extend ActiveSupport::Memoizable
+
     def initialize(locale_name)
       @locale_name = locale_name
-      @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)
@@ -98,6 +97,14 @@ module I18nLocaleGeneratorModule
     end 
 
     private
+    def summaries
+      s = [load_cldr_data(@locale_name.tr('-', '_'))]
+      if @locale_name =~ /^[a-zA-Z]{2}[-_][a-zA-Z]{2}$/
+        s << load_cldr_data(@locale_name.to(1))
+      end
+    end
+    memoize :summaries
+
     def load_cldr_data(locale_name)
       cldr = begin
         OpenURI.open_uri("http://www.unicode.org/cldr/data/charts/summary/#{locale_name}.html").read
@@ -105,13 +112,15 @@ module I18nLocaleGeneratorModule
         puts "WARNING: Couldn't find locale data for #{locale_name} on the web."
         ''
       end
-      cldr.split("\n").grep(/^<tr>/).delete_if {|r| r =~ /^<tr><td>\d*<\/td><td class='[gn]'>names<\/td>/}
+      lines = cldr.split("\n").grep(/^<tr>/)
+      lines.delete_if {|r| r =~ /^<tr><td>\d*<\/td><td class='[gn]'>names<\/td>/}
+      'Ruby 1.9'.respond_to?(:force_encoding) ? lines.map {|l| l.force_encoding 'UTF-8'} : lines
     end
 
     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>/
-      @summaries.each do |summary|
+      summaries.each do |summary|
         _, value = *extract_pattern.match(summary.grep(pattern).first)
         return value unless value.nil?
       end

data/generators/i18n_translation/i18n_translation_command.rb

@@ -29,7 +29,7 @@ module I18nGenerator::Generator
         logger.debug "#{models.size} models found."
 
         # pick all translated keywords from view files
-        original_backend = I18n.backend
+        original_backend = I18n.backend.dup
         I18n.backend = RecordingBackend.new
 
         Dir["#{RAILS_ROOT}/app/views/**/*.erb"].each do |f|

data/generators/i18n_translation/lib/erb_executer.rb

@@ -11,23 +11,19 @@ module I18nTranslationGeneratorModule
             include ActionView::Helpers::TranslationHelper
             include I18nTranslationGeneratorModule::ThroughRyoku
 
-            nil.class_eval do
-              def method_missing(method, *args, &block); nil; end
-            end
-
             fname = '#{filename}'
             erb = nil
             File.open(fname) {|f| erb = ERB.new(f.read, nil, '-') }
             erb.def_method(self, 'execute', fname)
           end
         EOS
+        nil.class_eval {def method_missing(method, *args, &block); nil; end}
         m.const_get('Executer').new.execute { }
-        nil.class_eval do
-          undef :method_missing
-        end
       rescue => e
         p e
         # do nothing
+      ensure
+        nil.class_eval {undef :method_missing} if nil.respond_to? :method_missing
       end
     end
   end

data/generators/i18n_translation/lib/recording_backend.rb

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

data/generators/i18n_translation/lib/translator.rb

@@ -1,4 +1,5 @@
 require 'open-uri'
+require 'json' if RUBY_VERSION >= '1.9'
 
 module I18nTranslationGeneratorModule
   class Translator
@@ -11,7 +12,11 @@ module I18nTranslationGeneratorModule
       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 = ActiveSupport::JSON.decode(json)
+        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.]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amatsuda-i18n_generators
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-21 00:00:00 -08:00
+date: 2009-02-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gettext
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -21,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: A Rails generator plugin & gem that generates Rails 2.2 I18n locale files for almost every known locale.
+description: A Rails generator plugin & gem that generates Rails 2.2 and 2.3 I18n locale files for almost every known locale.
 email: ronnie@dio.jp
 executables: []
 
@@ -94,6 +95,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Generates I18n locale files for Rails 2.2
+summary: Generates I18n locale files for Rails 2.2 and 2.3
 test_files: []