chipairon-i18n-active_record 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3776f3bf880d52469fbb3146896c4b59d3231cbb
-  data.tar.gz: 9a5b7f73d95a6f43473f152dafa84597f13688a2
+  metadata.gz: a21451f4f0606b0ece514ef310c4b6b1f173f15d
+  data.tar.gz: 0db34961a29760d60c8c440e4792b3eed056d1d9
 SHA512:
-  metadata.gz: cc912db913b2b31b6be032c966f1de628eb0fc778825bfe2518a3cf7df48ba836bf9ef6ee0ff9c8a072c91c348d84024b2c4895841158de0ef010b54d81f4942
-  data.tar.gz: 49dac427adabf790374ff32bf078654145cfaddaeabb735768560d3513dec6ebe10e0244d2b1527f0d0ac9801922ca1683f4ecc786e37ee3bc760cab1c2c9e7e
+  metadata.gz: 4b17dbb4cbacaa33ad46af65a66bc0a4ef1b0c1f6e9f67d0044f7549d9a39ddc4b0c402de96b6c2f54b2a482f6b3065cc20cf7d0888b26a663a4bc8b05234f14
+  data.tar.gz: aa4e52a831e4f7ccd2a38f18d71e16ffb37fa49f1cfdd4c795b4258c671ee794c933009c68878810e14898f888ab34c0244f71d0b8cacc2de46b7845c7c06ef9

data/lib/i18n/active_record/version.rb

@@ -1,6 +1,6 @@
 module I18n
   module ActiveRecord
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end
 

data/lib/i18n/backend/active_record/missing.rb

@@ -41,6 +41,11 @@ module I18n
           key = normalize_flat_keys(locale, key, scope, separator)
           interpolations = options.keys - I18n::RESERVED_KEYS
 
+          # if already memoized, then a record already exists.
+          if @memoized_lookup and @memoized_lookup[locale.to_sym].keys.include? key.to_sym
+            return
+          end
+
           if I18n::available_locales.any?
             I18n::available_locales.each do |a_locale|
               store_if_not_exists(a_locale, key, interpolations, count)
@@ -50,13 +55,6 @@ module I18n
           end
         end
 
-        def store_if_not_exists(locale, key, interpolations, count)
-          unless ActiveRecord::Translation.locale(locale).lookup(key).exists?
-            keys = count ? I18n.t('i18n.plural.keys', :locale => locale).map { |k| [key, k].join(FLATTEN_SEPARATOR) } : [key]
-            keys.each { |key| store_default_translation(locale, key, interpolations) }
-          end
-        end
-
         def store_default_translation(locale, key, interpolations)
           translation = ActiveRecord::Translation.new :locale => locale.to_s, :key => key
           translation.interpolations = interpolations
@@ -68,6 +66,25 @@ module I18n
         ensure
           self.store_default_translations(locale, key, options) unless translation
         end
+
+        private
+
+          def store_if_not_exists(locale, key, interpolations, count)
+            unless ActiveRecord::Translation.locale(locale).lookup(key).exists?
+              keys = count ? get_plurals(locale).map { |k| [key, k].join(FLATTEN_SEPARATOR) } : [key]
+              keys.each { |key| store_default_translation(locale, key, interpolations) }
+            end
+          end
+
+          # get plural rules or use English rules as default:
+          def get_plurals(locale)
+            plurals = I18n.t('i18n.plural.keys', :locale => locale)
+            # if no rules found, plurals is a string "translation missing...."
+            if plurals.is_a?(String)
+              plurals = [:zero, :one, :other]
+            end
+            plurals
+          end
       end
     end
   end

data/lib/i18n/backend/active_record/missing.rb.orig

@@ -0,0 +1,96 @@
+#  This extension stores translation stub records for missing translations to
+#  the database.
+#
+#  This is useful if you have a web based translation tool. It will populate
+#  the database with untranslated keys as the application is being used. A
+#  translator can then go through these and add missing translations.
+#
+#  Example usage:
+#
+#     I18n::Backend::Chain.send(:include, I18n::Backend::ActiveRecord::Missing)
+#     I18n.backend = I18n::Backend::Chain.new(I18n::Backend::ActiveRecord.new, I18n::Backend::Simple.new)
+#
+#  Stub records for pluralizations will also be created for each key defined
+#  in i18n.plural.keys.
+#
+#  For example:
+#
+#    # en.yml
+#    en:
+#      i18n:
+#        plural:
+#          keys: [:zero, :one, :other]
+#
+#    # pl.yml
+#    pl:
+#      i18n:
+#        plural:
+#          keys: [:zero, :one, :few, :other]
+#
+#  It will also persist interpolation keys in Translation#interpolations so
+#  translators will be able to review and use them.
+module I18n
+  module Backend
+    class ActiveRecord
+      module Missing
+        include Flatten
+
+        def store_default_translations(locale, key, options = {})
+          count, scope, default, separator = options.values_at(:count, :scope, :default, :separator)
+          separator ||= I18n.default_separator
+          key = normalize_flat_keys(locale, key, scope, separator)
+          interpolations = options.keys - I18n::RESERVED_KEYS
+
+          # if already memoized, then a record already exists.
+          if @memoized_lookup and @memoized_lookup[locale.to_sym].keys.include? key.to_sym
+            return
+          end
+
+          if I18n::available_locales.any?
+            I18n::available_locales.each do |a_locale|
+              store_if_not_exists(a_locale, key, interpolations, count)
+            end
+          else
+            store_if_not_exists(locale, key, interpolations, count)
+          end
+        end
+
+        def store_if_not_exists(locale, key, interpolations, count)
+          unless ActiveRecord::Translation.locale(locale).lookup(key).exists?
+<<<<<<< HEAD
+            keys = count ? I18n.t('i18n.plural.keys', :locale => locale).map { |k| [key, k].join(FLATTEN_SEPARATOR) } : [key]
+=======
+            interpolations = options.keys - I18n::RESERVED_KEYS
+            keys = count ? get_plurals(locale).map { |k| [key, k].join(FLATTEN_SEPARATOR) } : [key]
+>>>>>>> e4d6427a8d4550e773199bef8410dcbe5f175f62
+            keys.each { |key| store_default_translation(locale, key, interpolations) }
+          end
+        end
+
+        def store_default_translation(locale, key, interpolations)
+          translation = ActiveRecord::Translation.new :locale => locale.to_s, :key => key
+          translation.interpolations = interpolations
+          translation.save
+        end
+
+        def translate(locale, key, options = {})
+          translation = super
+        ensure
+          self.store_default_translations(locale, key, options) unless translation
+        end
+
+        private
+          # get plural rules or use English rules as default:
+          def get_plurals(locale)
+            plurals = I18n.t('i18n.plural.keys', :locale => locale)
+            # if no rules found, plurals is a string "translation missing...."
+            if plurals.is_a?(String)
+              plurals = [:zero, :one, :other]
+            end
+            plurals
+          end
+      end
+    end
+  end
+end
+

data/test/mi_test.rb

@@ -0,0 +1,97 @@
+# test setup:
+require 'rubygems'
+require 'test/unit'
+require 'optparse'
+
+module I18n
+  module Tests
+    class << self
+      def options
+        @options ||= { :with => [], :adapter => 'sqlite3' }
+      end
+
+      def parse_options!
+        OptionParser.new do |o|
+          o.on('-w', '--with DEPENDENCIES', 'Define dependencies') do |dep|
+            options[:with] = dep.split(',').map { |group| group.to_sym }
+          end
+        end.parse!
+
+        options[:with].each do |dep|
+          case dep
+          when :sqlite3, :mysql, :postgres
+            @options[:adapter] = dep
+          when :r23, :'rails-2.3.x'
+            ENV['BUNDLE_GEMFILE'] = 'ci/Gemfile.rails-2.3.x'
+          when :r3, :'rails-3.0.x'
+            ENV['BUNDLE_GEMFILE'] = 'ci/Gemfile.rails-3.x'
+          when :'no-rails'
+            ENV['BUNDLE_GEMFILE'] = 'ci/Gemfile.no-rails'
+          end
+        end
+
+        ENV['BUNDLE_GEMFILE'] ||= 'Gemfile'
+      end
+
+      def setup_active_record
+        begin
+          require 'active_record'
+          ActiveRecord::Base.connection
+          true
+        rescue LoadError => e
+          puts "can't use ActiveRecord backend because: #{e.message}"
+        rescue ActiveRecord::ConnectionNotEstablished
+          require 'i18n/backend/active_record'
+          require 'i18n/backend/active_record/store_procs'
+          connect_active_record
+          true
+        end
+      end
+
+      def connect_active_record
+        connect_adapter
+        ActiveRecord::Migration.verbose = false
+        ActiveRecord::Schema.define(:version => 1) do
+          create_table :translations, :force => true do |t|
+            t.string :locale
+            t.string :key
+            t.text :value
+            t.text :interpolations
+            t.boolean :is_proc, :default => false
+          end
+          add_index :translations, [:locale, :key], :unique => true
+        end
+      end
+
+      def connect_adapter
+        case options[:adapter].to_sym
+        when :sqlite3
+          ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+        when :mysql
+          # CREATE DATABASE i18n_unittest;
+          # CREATE USER 'i18n'@'localhost' IDENTIFIED BY '';
+          # GRANT ALL PRIVILEGES ON i18n_unittest.* to 'i18n'@'localhost';
+          ActiveRecord::Base.establish_connection(:adapter => "mysql", :database => "i18n_unittest", :username => "i18n", :password => "", :host => "localhost")
+        end
+      end
+    end
+  end
+end
+
+# test_helper:
+require 'bundler/setup'
+$:.unshift File.expand_path("../lib", File.dirname(__FILE__))
+require 'i18n/active_record'
+
+require 'i18n/tests'
+I18n::Tests.setup_active_record
+
+class MiTest < Test::Unit::TestCase
+  class Backend < I18n::Backend::ActiveRecord
+    include I18n::Backend::ActiveRecord::Missing
+  end
+
+  def test_add
+    assert_equal 2, 5
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chipairon-i18n-active_record
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sven Fuchs
@@ -37,6 +37,7 @@ files:
 - lib/i18n/backend/active_record/missing.rb
 - lib/i18n/backend/active_record/store_procs.rb
 - lib/i18n/backend/active_record/translation.rb
+- lib/i18n/backend/active_record/missing.rb.orig
 - lib/i18n/active_record.rb
 - lib/i18n/active_record/version.rb
 - test/test_setup.rb
@@ -44,11 +45,12 @@ files:
 - test/missing_test.rb
 - test/active_record_test.rb
 - test/all.rb
+- test/mi_test.rb
 - test/api_test.rb
 - MIT-LICENSE
 - README.textile
 - Rakefile
-homepage: http://github.com/Chipairon/i18n-active_record
+homepage: http://github.com/svenfuchs/i18n-active_record
 licenses:
 - MIT
 metadata: {}