i18n-active_record 0.0.2 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 41a58e172e0e92291488fed6cf32df0733b630a1
+  data.tar.gz: 2faedc974053410c6a6b3d1d047e844e505f2e7f
+SHA512:
+  metadata.gz: ffec88d68503d22c9ddf403f69240bdc57a30e7a27f21f7dcc37d3fafb9a302da95aa96ad30eec20c9e638bdb7708001afcf43eac5b55bd5adaad274b160b851
+  data.tar.gz: f1bb77a80450ae7252e539d7d1146eef06c92a30f5f072c5b59dc871a0d7e90aefdbd3a1b7a9710cd4b9cbb340afdb03596bdbd8396fc2a8c63c5c46c133a64b

data/README.textile

@@ -43,20 +43,27 @@ To load @I18n::Backend::ActiveRecord@ into your Rails application, create a new
 A simple configuration for your locale.rb could look like this:
 
 <pre>
-  I18n.backend = I18n::Backend::Database.new
+  require 'i18n/backend/active_record'
+  I18n.backend = I18n::Backend::ActiveRecord.new
 </pre>
 
-A more adavanced example (Thanks Moritz), which uses YAML files and ActiveRecord for lookups:
+A more advanced example (Thanks Moritz), which uses YAML files and ActiveRecord for lookups:
 
 <pre>
-  I18n.backend = I18n::Backend::ActiveRecord.new
-
-  I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Memoize)
-  I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Flatten)
-  I18n::Backend::Simple.send(:include, I18n::Backend::Memoize)
-  I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
-
-  I18n.backend = I18n::Backend::Chain.new(I18n::Backend::Simple.new, I18n.backend)
+  require 'i18n/backend/active_record'
+  
+  Translation  = I18n::Backend::ActiveRecord::Translation
+  
+  if Translation.table_exists?
+    I18n.backend = I18n::Backend::ActiveRecord.new
+
+    I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Memoize)
+    I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Flatten)
+    I18n::Backend::Simple.send(:include, I18n::Backend::Memoize)
+    I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
+
+    I18n.backend = I18n::Backend::Chain.new(I18n::Backend::Simple.new, I18n.backend)
+  end
 </pre>
 
 h2. Usage

data/Rakefile

@@ -1,10 +1,43 @@
 require 'rake'
 require 'rake/testtask'
+require 'bundler/gem_tasks'
 
-Rake::TestTask.new do |t|
-  t.libs << 'lib'
+def execute(command)
+  puts command
+  system command
+end
+
+namespace :bundle do
+  task :env do
+    db = ENV['DB'].to_s
+    db = 'sqlite' if db == ''
+    ar = ENV['AR'].to_s
+
+    next if db == 'sqlite' && ar.empty?
+
+    gemfile = 'gemfiles/Gemfile'
+    gemfile += ".rails_#{ar}" unless ar.empty?
+    gemfile += ".#{db}" unless db.empty?
+    raise "Cannot find gemfile at #{gemfile}" unless File.exist?(gemfile)
+
+    ENV['BUNDLE_GEMFILE'] = gemfile
+  end
+
+  task install: :env do
+    opt = ''
+    opt +=  "--gemfile #{ENV['BUNDLE_GEMFILE']}" if ENV['BUNDLE_GEMFILE']
+    execute "bundle install #{opt}"
+  end
+end
+
+Rake::TestTask.new :_test do |t|
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end
 
-task :default => :test
+task test: 'bundle:env' do
+  Rake::Task['_test'].execute
+end
+
+task default: :test

data/lib/i18n/active_record.rb

@@ -1,3 +1 @@
 require 'i18n'
-require 'i18n/backend/active_record'
-

data/lib/i18n/active_record/version.rb

@@ -1,6 +1,5 @@
 module I18n
   module ActiveRecord
-    VERSION = "0.0.2"
+    VERSION = '0.1.0'
   end
 end
-

data/lib/i18n/backend/active_record.rb

@@ -31,7 +31,7 @@ module I18n
 
         def lookup(locale, key, scope = [], options = {})
           key = normalize_flat_keys(locale, key, scope, options[:separator])
-          result = Translation.locale(locale).lookup(key).all
+          result = Translation.locale(locale).lookup(key)
 
           if result.empty?
             nil

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

@@ -41,7 +41,7 @@ module I18n
           key = normalize_flat_keys(locale, key, scope, separator)
 
           unless ActiveRecord::Translation.locale(locale).lookup(key).exists?
-            interpolations = options.keys - Base::RESERVED_KEYS
+            interpolations = options.keys - I18n::RESERVED_KEYS
             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
@@ -54,13 +54,15 @@ module I18n
         end
 
         def translate(locale, key, options = {})
-          super
-        rescue I18n::MissingTranslationData => e
-          self.store_default_translations(locale, key, options)
-          raise e
+          result = catch(:exception) { super }
+          if result.is_a?(I18n::MissingTranslation)
+            self.store_default_translations(locale, key, options)
+            throw(:exception, result)
+          else
+            result
+          end
         end
       end
     end
   end
 end
-

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

@@ -49,15 +49,14 @@ module I18n
         TRUTHY_CHAR = "\001"
         FALSY_CHAR = "\002"
 
-        set_table_name 'translations'
-        attr_protected :is_proc, :interpolations
+        self.table_name = 'translations'
 
         serialize :value
         serialize :interpolations, Array
 
         class << self
           def locale(locale)
-            scoped(:conditions => { :locale => locale.to_s })
+            where(:locale => locale.to_s)
           end
 
           def lookup(keys, *separator)
@@ -70,11 +69,11 @@ module I18n
             end
 
             namespace = "#{keys.last}#{I18n::Backend::Flatten::FLATTEN_SEPARATOR}%"
-            scoped(:conditions => ["#{column_name} IN (?) OR #{column_name} LIKE ?", keys, namespace])
+            where("#{column_name} IN (?) OR #{column_name} LIKE ?", keys, namespace)
           end
 
           def available_locales
-            Translation.find(:all, :select => 'DISTINCT locale').map { |t| t.locale.to_sym }
+            Translation.select('DISTINCT locale').to_a.map { |t| t.locale.to_sym }
           end
         end
 
@@ -108,4 +107,3 @@ module I18n
     end
   end
 end
-

data/test/active_record_test.rb

@@ -1,6 +1,6 @@
-require File.expand_path('../test_helper', __FILE__)
+require 'test_helper'
 
-class I18nBackendActiveRecordTest < Test::Unit::TestCase
+class I18nBackendActiveRecordTest < I18n::TestCase
   def setup
     I18n.backend = I18n::Backend::ActiveRecord.new
     store_translations(:en, :foo => { :bar => 'bar', :baz => 'baz' })
@@ -40,15 +40,12 @@ class I18nBackendActiveRecordTest < Test::Unit::TestCase
     assert_equal "Pagina's", I18n.t(:"Pagina's", :locale => :es)
   end
 
-  with_mocha do
-    test "missing translations table does not cause an error in #available_locales" do
-      I18n::Backend::ActiveRecord::Translation.expects(:available_locales).raises(::ActiveRecord::StatementInvalid)
-      assert_equal [], I18n.backend.available_locales
-    end
+  test "missing translations table does not cause an error in #available_locales" do
+    I18n::Backend::ActiveRecord::Translation.expects(:available_locales).raises(::ActiveRecord::StatementInvalid, 'msg')
+    assert_equal [], I18n.backend.available_locales
   end
 
-  def test_expand_keys
+  test "expand_keys" do
     assert_equal %w(foo foo.bar foo.bar.baz), I18n.backend.send(:expand_keys, :'foo.bar.baz')
   end
-end if defined?(ActiveRecord)
-
+end

data/test/api_test.rb

@@ -1,6 +1,6 @@
-require File.expand_path('../test_helper', __FILE__)
+require 'test_helper'
 
-class I18nActiveRecordApiTest < Test::Unit::TestCase
+class I18nActiveRecordApiTest < I18n::TestCase
   def setup
     I18n.backend = I18n::Backend::ActiveRecord.new
     super
@@ -26,5 +26,4 @@ class I18nActiveRecordApiTest < Test::Unit::TestCase
   test "make sure we use an ActiveRecord backend" do
     assert_equal I18n::Backend::ActiveRecord, I18n.backend.class
   end
-end if defined?(ActiveRecord)
-
+end

data/test/missing_test.rb

@@ -1,6 +1,6 @@
-require File.expand_path('../test_helper', __FILE__)
+require 'test_helper'
 
-class I18nActiveRecordMissingTest < Test::Unit::TestCase
+class I18nActiveRecordMissingTest < I18n::TestCase
   class Backend < I18n::Backend::ActiveRecord
     include I18n::Backend::ActiveRecord::Missing
   end
@@ -20,6 +20,7 @@ class I18nActiveRecordMissingTest < Test::Unit::TestCase
 
   test "lookup persists the key" do
     I18n.t('foo.bar.baz')
+
     assert_equal 1, I18n::Backend::ActiveRecord::Translation.count
     assert I18n::Backend::ActiveRecord::Translation.locale(:en).find_by_key('foo.bar.baz')
   end
@@ -38,7 +39,7 @@ class I18nActiveRecordMissingTest < Test::Unit::TestCase
 
   test "creates one stub per pluralization" do
     I18n.t('foo', :count => 999)
-    translations = I18n::Backend::ActiveRecord::Translation.locale(:en).find_all_by_key %w{ foo.zero foo.one foo.other }
+    translations = I18n::Backend::ActiveRecord::Translation.locale(:en).where key: %w{ foo.zero foo.one foo.other }
     assert_equal 3, translations.length
   end
 
@@ -50,22 +51,20 @@ class I18nActiveRecordMissingTest < Test::Unit::TestCase
 
   test "creates a stub when a custom separator is used" do
     I18n.t('foo|baz', :separator => '|')
-    I18n::Backend::ActiveRecord::Translation.locale(:en).lookup("foo.baz").first.update_attributes!(:value => 'baz!')
+    I18n::Backend::ActiveRecord::Translation.locale(:en).lookup("foo.baz").first.update_attributes(:value => 'baz!')
     assert_equal 'baz!', I18n.t('foo|baz', :separator => '|')
   end
 
   test "creates a stub per pluralization when a custom separator is used" do
     I18n.t('foo|bar', :count => 999, :separator => '|')
-    translations = I18n::Backend::ActiveRecord::Translation.locale(:en).find_all_by_key %w{ foo.bar.zero foo.bar.one foo.bar.other }
+    translations = I18n::Backend::ActiveRecord::Translation.locale(:en).where key: %w{ foo.bar.zero foo.bar.one foo.bar.other }
     assert_equal 3, translations.length
   end
 
   test "creates a stub when a custom separator is used and the key contains the flatten separator (a dot character)" do
     key = 'foo|baz.zab'
     I18n.t(key, :separator => '|')
-    I18n::Backend::ActiveRecord::Translation.locale(:en).lookup("foo.baz\001zab").first.update_attributes!(:value => 'baz!')
+    I18n::Backend::ActiveRecord::Translation.locale(:en).lookup("foo.baz\001zab").first.update_attributes(:value => 'baz!')
     assert_equal 'baz!', I18n.t(key, :separator => '|')
   end
-
-end if defined?(ActiveRecord)
-
+end

data/test/test_helper.rb

@@ -1,36 +1,59 @@
-require 'test_setup'
+$KCODE = 'u' if RUBY_VERSION <= '1.9'
 
-I18n::Tests.parse_options!
 require 'bundler/setup'
-$:.unshift File.expand_path("../lib", File.dirname(__FILE__))
+require 'minitest/autorun'
+require 'mocha/setup'
+require 'test_declarative'
+
 require 'i18n/active_record'
 require 'i18n/tests'
-require 'mocha'
-I18n::Tests.setup_active_record
-
-class Test::Unit::TestCase
-  def self.test(name, &block)
-    test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
-    defined = instance_method(test_name) rescue false
-    raise "#{test_name} is already defined in #{self}" if defined
-    if block_given?
-      define_method(test_name, &block)
-    else
-      define_method(test_name) do
-        flunk "No implementation provided for #{name}"
-      end
+
+gemfile = ENV['BUNDLE_GEMFILE'] || 'Gemfile'
+
+begin
+  require 'active_record'
+  ::ActiveRecord::Base.connection
+rescue LoadError => e
+  puts "can't use ActiveRecord backend because: #{e.message}"
+rescue ::ActiveRecord::ConnectionNotEstablished
+  require 'i18n/backend/active_record'
+  if gemfile.end_with? 'postgres'
+    ::ActiveRecord::Base.establish_connection adapter: 'postgresql', database: 'i18n_unittest', username: 'i18n', password: '', host: 'localhost'
+  elsif gemfile.end_with? 'mysql'
+  else
+    ::ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
+  end
+  ::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 self.with_mocha
-    yield if Object.respond_to?(:expects)
+TEST_CASE = defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase
+
+class TEST_CASE
+  alias :assert_raise :assert_raises
+  alias :assert_not_equal :refute_equal
+
+  def assert_nothing_raised(*args)
+    yield
   end
+end
 
+class I18n::TestCase < TEST_CASE
   def teardown
-    I18n.locale = nil
+    I18n.enforce_available_locales = false
+    I18n.available_locales = []
+    I18n.locale = :en
     I18n.default_locale = :en
     I18n.load_path = []
-    I18n.available_locales = nil
     I18n.backend = nil
   end
 
@@ -48,9 +71,3 @@ class Test::Unit::TestCase
     File.dirname(__FILE__) + '/test_data/locales'
   end
 end
-
-Object.class_eval do
-  def meta_class
-    class << self; self; end
-  end
-end unless Object.method_defined?(:meta_class)

metadata

@@ -1,98 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: i18n-active_record
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-27 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-03-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: i18n
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
-  version_requirements: *id001
-description: "[description]"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: I18n ActiveRecord backend. Allows to store translations in a database
+  using ActiveRecord, e.g. for providing a web-interface for managing translations.
 email: svenfuchs@artweb-design.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- ci/Gemfile.rails-3.x
-- ci/Gemfile.rails-3.x.lock
-- lib/i18n/active_record/version.rb
+files:
+- MIT-LICENSE
+- README.textile
+- Rakefile
 - lib/i18n/active_record.rb
+- lib/i18n/active_record/version.rb
+- lib/i18n/backend/active_record.rb
 - 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.rb
 - test/active_record_test.rb
-- test/all.rb
 - test/api_test.rb
 - test/missing_test.rb
 - test/test_helper.rb
-- test/test_setup.rb
-- MIT-LICENSE
-- README.textile
-- Rakefile
-has_rdoc: true
 homepage: http://github.com/svenfuchs/i18n-active_record
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: "[none]"
-rubygems_version: 1.3.7
+rubygems_version: 2.5.2
 signing_key: 
-specification_version: 3
-summary: "[summary]"
+specification_version: 4
+summary: I18n ActiveRecord backend
 test_files: []
-

data/ci/Gemfile.rails-3.x

@@ -1,10 +0,0 @@
-source :rubygems
-
-# gem 'i18n', '~> 0.5.0'
-gem 'i18n', :path => '~/Development/projects/i18n/i18n'
-
-gem 'activerecord', '~> 3.0.0'
-gem 'activesupport', '~> 3.0.0'
-gem 'sqlite3-ruby'
-gem 'mocha'
-

data/ci/Gemfile.rails-3.x.lock

@@ -1,36 +0,0 @@
-PATH
-  remote: ~/Development/projects/i18n/i18n
-  specs:
-    i18n (0.4.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    mocha (0.9.9)
-      rake
-    rake (0.8.7)
-    sqlite3-ruby (1.3.1)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.0.0)
-  activesupport (~> 3.0.0)
-  i18n!
-  mocha
-  sqlite3-ruby

data/test/all.rb

@@ -1,7 +0,0 @@
-dir = File.dirname(__FILE__)
-$:.unshift(dir)
-
-Dir["#{dir}/**/*_test.rb"].sort.each do |file|
-  require file.sub(/^#{dir}\/(.*)\.rb$/, '\1')
-end
-

data/test/test_setup.rb

@@ -1,92 +0,0 @@
-$KCODE = 'u' if RUBY_VERSION <= '1.9'
-
-require 'rubygems'
-require 'test/unit'
-require 'optparse'
-
-# Do not load the i18n gem from libraries like active_support.
-#
-# This is required for testing against Rails 2.3 because active_support/vendor.rb#24 tries
-# to load I18n using the gem method. Instead, we want to test the local library of course.
-alias :gem_for_ruby_19 :gem # for 1.9. gives a super ugly seg fault otherwise
-def gem(gem_name, *version_requirements)
-  puts("skipping loading the i18n gem ...") && return if gem_name =='i18n'
-  super(gem_name, *version_requirements)
-end
-
-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'] ||= 'ci/Gemfile.all'
-      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
-
-