i18n-sequel_bitemporal 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c0b9fbde1fa26917643d8e20f17d2cee68976ad
-  data.tar.gz: 195ed0eeaa86d216c4c871778f86f5665de75ed4
+  metadata.gz: bd33458823a537773be7030596348d77748afa26
+  data.tar.gz: 2cd8bfe9ca96357fb7cc58bdef0e7ec6a6ce10df
 SHA512:
-  metadata.gz: c9bfde211f0394892bfee0d9b42359704954efdef7646ff87d6aa017ef52a8852e5fdf94f8caf8f4b256faa97d93bb844982e7abc67dab74293605158885224b
-  data.tar.gz: b9d6fc67c377bcceebf0958397e223219588cee04c61933aeef709982483045a89d3d951cec3d5e41c6b5a5c958942a9b8ba6e5190bdafb8746f9bc97aa3a041
+  metadata.gz: e4ac6a80844e7eb02fe26726035bb9969806b8a12abd80d46c75307f7666a20b68e820c388751c732045754477d89acd02633bfb7baa3153629721584edc1b6b
+  data.tar.gz: 800e91ef1b16110e16509541586e56eb5bff5b2c612c3a24ba34db1984740d2d80b6552e5bb6301ec1beba56239cbba3ca2a64922f65822f61dd7d354ac63144

data/.travis.yml

@@ -1,21 +1,33 @@
+language: ruby
+cache: bundler
+sudo: false
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
+  - 2.2
   - jruby-19mode
 env:
   - ADAPTER=sqlite3
   - ADAPTER=postgres
 gemfile:
-  - ci/Gemfile.rails-3.x
-  - ci/Gemfile.rails-3.x-i18n-0.6
+  - ci/Gemfile.rails-3.2
+  - ci/Gemfile.rails-4.0
+  - ci/Gemfile.rails-4.1
+  - ci/Gemfile.rails-4.2
 matrix:
   exclude:
     - rvm: jruby-19mode
       env: ADAPTER=sqlite3
-      gemfile: ci/Gemfile.rails-3.x
+      gemfile: ci/Gemfile.rails-3.2
     - rvm: jruby-19mode
       env: ADAPTER=sqlite3
-      gemfile: ci/Gemfile.rails-3.x-i18n-0.6
+      gemfile: ci/Gemfile.rails-4.0
+    - rvm: jruby-19mode
+      env: ADAPTER=sqlite3
+      gemfile: ci/Gemfile.rails-4.1
+    - rvm: jruby-19mode
+      env: ADAPTER=sqlite3
+      gemfile: ci/Gemfile.rails-4.2
 before_script:
   - psql -c 'create database i18n_sequel_bitemporal;' -U postgres

data/Gemfile

@@ -3,6 +3,7 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in i18n-sequel.gemspec
 gemspec
 
+gem "test-unit"
 gem "test_declarative"
 gem "mocha"
 gem "rake"

data/README.textile

@@ -1,3 +1,5 @@
+!https://travis-ci.org/TalentBox/i18n-sequel_bitemporal.svg?branch=master!:https://travis-ci.org/TalentBox/i18n-sequel_bitemporal
+
 h1. I18n::Backend::SequelBitemporal
 
 This repository contains an "I18n":http://github.com/svenfuchs/i18n Sequel
@@ -21,7 +23,7 @@ or to track master's HEAD:
 
 <pre>
   gem 'i18n-sequel_bitemporal',
-      :git => 'git://github.com/TalentBox/i18n-sequel_bitemporal.git',
+      :github => 'TalentBox/i18n-sequel_bitemporal',
       :require => 'i18n/sequel_bitemporal'
 </pre>
 
@@ -87,6 +89,23 @@ Memoization is highly recommended if you use a DB as your backend.
   I18n.backend = I18n::Backend::Chain.new(I18n::Backend::Simple.new, I18n.backend)
 </pre>
 
+You can also customize table names for the backing models:
+
+<pre>
+  require 'i18n/backend/sequel_bitemporal'
+  I18n::Backend::SequelBitemporal.master_table_name = :my_translations
+  I18n::Backend::SequelBitemporal.version_table_name = :my_translation_versions
+</pre>
+
+Please note names can be anything you can use in `Sequel::Model#set_dataset`.
+For example you want your translations table to be in a specific schema:
+
+<pre>
+  require 'i18n/backend/sequel_bitemporal'
+  I18n::Backend::SequelBitemporal.master_table_name = Sequel.qualify(:translations, :i18n_translations)
+  I18n::Backend::SequelBitemporal.version_table_name = Sequel.qualify(:translations, :i18n_translation_versions)
+</pre>
+
 h2. Usage
 
 You can now use @I18n.t('Your String')@ to lookup translations in the database.

data/ci/{Gemfile.rails-3.x → Gemfile.rails-3.2}

@@ -2,8 +2,9 @@ source "https://rubygems.org"
 
 gemspec :path => "../"
 
-gem "i18n", "~> 0.5.0"
+gem 'railties', '~> 3.2.0'
 
+gem "test-unit"
 gem "test_declarative"
 gem "mocha"
 gem "rake"

data/ci/{Gemfile.rails-3.x-i18n-0.6 → Gemfile.rails-4.0}

@@ -2,8 +2,9 @@ source "https://rubygems.org"
 
 gemspec :path => "../"
 
-gem "i18n", "~> 0.6.0"
+gem 'railties', '~> 4.0.0'
 
+gem "test-unit"
 gem "test_declarative"
 gem "mocha"
 gem "rake"

data/ci/Gemfile.rails-4.1

@@ -0,0 +1,23 @@
+source "https://rubygems.org"
+
+gemspec :path => "../"
+
+gem 'railties', '~> 4.1.0'
+
+gem "test-unit"
+gem "test_declarative"
+gem "mocha"
+gem "rake"
+gem "timecop"
+
+platforms :ruby do
+  gem "pg"
+  gem "mysql"
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "jdbc-postgres"
+  gem "jdbc-mysql"
+  gem "jdbc-sqlite3"
+end

data/ci/Gemfile.rails-4.2

@@ -0,0 +1,23 @@
+source "https://rubygems.org"
+
+gemspec :path => "../"
+
+gem 'railties', '~> 4.2.0'
+
+gem "test-unit"
+gem "test_declarative"
+gem "mocha"
+gem "rake"
+gem "timecop"
+
+platforms :ruby do
+  gem "pg"
+  gem "mysql"
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "jdbc-postgres"
+  gem "jdbc-mysql"
+  gem "jdbc-sqlite3"
+end

data/i18n-sequel_bitemporal.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "i18n", ">= 0.5", "< 0.7.0"
+  s.add_dependency "i18n", ">= 0.6", "< 0.8.0"
   s.add_dependency "sequel_bitemporal", "~> 0.8.0"
 end

data/lib/i18n/backend/sequel_bitemporal.rb

@@ -7,6 +7,22 @@ module I18n
       autoload :StoreProcs,  'i18n/backend/sequel_bitemporal/store_procs'
       autoload :Translation, 'i18n/backend/sequel_bitemporal/translation'
 
+      def self.master_table_name=(table_name)
+        @master_table_name = table_name
+      end
+
+      def self.master_table_name
+        @master_table_name || :i18n_translations
+      end
+
+      def self.version_table_name=(table_name)
+        @version_table_name = table_name
+      end
+
+      def self.version_table_name
+        @version_table_name || :i18n_translation_versions
+      end
+
       module Implementation
         include Base, Flatten
 

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

@@ -57,7 +57,7 @@ module I18n
     #   Translation.find_by_locale_and_key('en', 'foo').value
     #   # => 'FOO'
     class SequelBitemporal
-      class TranslationVersion < ::Sequel::Model(:i18n_translation_versions)
+      class TranslationVersion < ::Sequel::Model(::I18n::Backend::SequelBitemporal.version_table_name)
         plugin :serialization
 
         TRUTHY_CHAR = "\001"
@@ -100,7 +100,7 @@ module I18n
         end
       end
 
-      class Translation < ::Sequel::Model(:i18n_translations)
+      class Translation < ::Sequel::Model(::I18n::Backend::SequelBitemporal.master_table_name)
         extend Forwardable
         plugin :bitemporal, version_class: TranslationVersion
 

data/lib/i18n/sequel_bitemporal/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module SequelBitemporal
-    VERSION = "0.8.0"
+    VERSION = "0.9.0"
   end
 end

data/test/api_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../test_helper', __FILE__)
 
-class I18nSequelBitemporalApiTest < Test::Unit::TestCase
+class I18nSequelBitemporalApiTest < I18nBitemporalTest
   def setup
     I18n::Backend::SequelBitemporal::Translation.dataset.delete
     I18n.backend = I18n::Backend::SequelBitemporal.new
@@ -28,4 +28,3 @@ class I18nSequelBitemporalApiTest < Test::Unit::TestCase
     assert_equal I18n::Backend::SequelBitemporal, I18n.backend.class
   end
 end if defined?(Sequel)
-

data/test/missing_test.rb

@@ -1,11 +1,12 @@
 require File.expand_path('../test_helper', __FILE__)
 
-class I18nSequelBitemporalMissingTest < Test::Unit::TestCase
+class I18nSequelBitemporalMissingTest < I18nBitemporalTest
   class Backend < I18n::Backend::SequelBitemporal
     include I18n::Backend::SequelBitemporal::Missing
   end
 
   def setup
+    super
     I18n.backend.store_translations(:en, :bar => 'Bar', :i18n => { :plural => { :keys => [:zero, :one, :other] } })
     I18n.backend = I18n::Backend::Chain.new(Backend.new, I18n.backend)
     I18n::Backend::SequelBitemporal::Translation.dataset.delete
@@ -68,4 +69,3 @@ class I18nSequelBitemporalMissingTest < Test::Unit::TestCase
   end
 
 end if defined?(Sequel)
-

data/test/sequel_cache_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../test_helper', __FILE__)
 
-class I18nBackendSequelBitemporalCacheTest < Test::Unit::TestCase
+class I18nBackendSequelBitemporalCacheTest < I18nBitemporalTest
   def clear_all
     I18n::Backend::SequelBitemporal::Translation.dataset.delete
   end

data/test/sequel_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../test_helper', __FILE__)
 
-class I18nBackendSequelBitemporalTest < Test::Unit::TestCase
+class I18nBackendSequelBitemporalTest < I18nBitemporalTest
   def clear_all
     I18n::Backend::SequelBitemporal::Translation.dataset.delete
   end
@@ -63,4 +63,59 @@ class I18nBackendSequelBitemporalTest < Test::Unit::TestCase
     assert_equal %w(foo foo.bar foo.bar.baz), I18n.backend.send(:expand_keys, :'foo.bar.baz')
   end
 
+  test "allows to override the table names" do
+    ::Sequel::Model.db.transaction :rollback => :always do
+      begin
+        ::Sequel.migration do
+          change do
+            create_table :another_i18n_translations do
+              primary_key :id
+              String :locale, :null => false
+              String :key, :null => false
+              index [:locale, :key], :unique => true
+            end
+
+            create_table :another_i18n_translation_versions do
+              primary_key :id
+              foreign_key :master_id, :another_i18n_translations, :on_delete => :cascade
+              Time        :created_at
+              Time        :expired_at
+              Date        :valid_from
+              Date        :valid_to
+              String :value, :text => true
+              String :interpolations, :text => true
+              TrueClass :is_proc, :null => false, :default => false
+            end
+          end
+        end.apply(::Sequel::Model.db, :up)
+        change_table_names(
+          :another_i18n_translations,
+          :another_i18n_translation_versions
+        )
+
+        assert_equal(
+          ::I18n::Backend::SequelBitemporal::Translation.table_name,
+          :another_i18n_translations
+        )
+        assert_equal(
+          ::I18n::Backend::SequelBitemporal::TranslationVersion.table_name,
+          :another_i18n_translation_versions
+        )
+      ensure
+        change_table_names nil, nil
+      end
+    end
+  end
+
+  def change_table_names(master_name, version_name)
+    ::I18n::Backend::SequelBitemporal.master_table_name = master_name
+    ::I18n::Backend::SequelBitemporal.version_table_name = version_name
+    ::I18n::Backend::SequelBitemporal.send :remove_const, :Translation
+    ::I18n::Backend::SequelBitemporal.send :remove_const, :TranslationVersion
+    load File.expand_path(
+      "../../lib/i18n/backend/sequel_bitemporal/translation.rb",
+      __FILE__
+    )
+  end
+
 end if defined?(Sequel)

data/test/test_helper.rb

@@ -12,17 +12,25 @@ require 'test_declarative'
 require 'timecop'
 I18n::Tests.setup_sequel
 
-class Test::Unit::TestCase
+class I18nBitemporalTest < Test::Unit::TestCase
   def self.with_mocha
     yield if Object.respond_to?(:expects)
   end
 
+  def setup
+    super
+    I18n.enforce_available_locales = false
+  end
+
   def teardown
     I18n.locale = nil
-    I18n.default_locale = :en
-    I18n.load_path = []
+    I18n.default_locale = nil
+    I18n.load_path = nil
     I18n.available_locales = nil
     I18n.backend = nil
+    I18n.default_separator = nil
+    I18n.enforce_available_locales = true
+    super
   end
 
   def translations

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Jonathan Tron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: sequel_bitemporal
   requirement: !ruby/object:Gem::Requirement
@@ -60,8 +60,10 @@ files:
 - MIT-LICENSE
 - README.textile
 - Rakefile
-- ci/Gemfile.rails-3.x
-- ci/Gemfile.rails-3.x-i18n-0.6
+- ci/Gemfile.rails-3.2
+- ci/Gemfile.rails-4.0
+- ci/Gemfile.rails-4.1
+- ci/Gemfile.rails-4.2
 - i18n-sequel_bitemporal.gemspec
 - lib/i18n/backend/sequel_bitemporal.rb
 - lib/i18n/backend/sequel_bitemporal/missing.rb
@@ -95,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: I18n Bitemporal Sequel backend
@@ -107,3 +109,4 @@ test_files:
 - test/sequel_test.rb
 - test/test_helper.rb
 - test/test_setup.rb
+has_rdoc: