i18n-sequel_bitemporal 0.4.2 → 0.4.3

data/ci/Gemfile.rails-3.x

@@ -7,3 +7,4 @@ gem 'sqlite3-ruby'
 gem 'mocha'
 gem 'test_declarative'
 gem 'rake'
+gem 'timecop'

data/ci/Gemfile.rails-3.x-i18n-0.6

@@ -7,3 +7,4 @@ gem 'sqlite3-ruby'
 gem 'mocha'
 gem 'test_declarative'
 gem 'rake'
+gem 'timecop'

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

@@ -3,16 +3,17 @@ GEM
   specs:
     i18n (0.6.0)
     metaclass (0.0.1)
-    mocha (0.10.0)
+    mocha (0.11.3)
       metaclass (~> 0.0.1)
     rake (0.9.2.2)
     sequel (3.30.0)
-    sequel_bitemporal (0.4.1)
+    sequel_bitemporal (0.4.9)
       sequel (~> 3.30.0)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     test_declarative (0.0.5)
+    timecop (0.3.5)
 
 PLATFORMS
   ruby
@@ -24,3 +25,4 @@ DEPENDENCIES
   sequel_bitemporal (~> 0.4.0)
   sqlite3-ruby
   test_declarative
+  timecop

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

@@ -2,14 +2,18 @@ GEM
   remote: http://rubygems.org/
   specs:
     i18n (0.5.0)
-    mocha (0.9.9)
-      rake
-    rake (0.8.7)
+    metaclass (0.0.1)
+    mocha (0.11.3)
+      metaclass (~> 0.0.1)
+    rake (0.9.2.2)
     sequel (3.30.0)
-    sequel_bitemporal (0.4.0)
+    sequel_bitemporal (0.4.9)
       sequel (~> 3.30.0)
-    sqlite3-ruby (1.3.1)
+    sqlite3 (1.3.6)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
     test_declarative (0.0.5)
+    timecop (0.3.5)
 
 PLATFORMS
   ruby
@@ -21,3 +25,4 @@ DEPENDENCIES
   sequel_bitemporal (~> 0.4.0)
   sqlite3-ruby
   test_declarative
+  timecop

data/i18n-sequel_bitemporal.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mocha"
   s.add_development_dependency "rake"
   s.add_development_dependency "sqlite3"
+  s.add_development_dependency "timecop"
 end

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

@@ -140,6 +140,10 @@ module I18n
           def available_locales
             Translation.distinct.select(:locale).map { |t| t.locale.to_sym }
           end
+
+          def all_for_locale(locale)
+            self.locale(locale).with_current_version.all
+          end
         end
       end
     end

data/lib/i18n/backend/sequel_bitemporal.rb

@@ -13,6 +13,7 @@ module I18n
         def initialize(opts= {})
           @preload_all = opts.fetch(:preload_all, false)
           @translations = {}
+          @cache_times = {}
         end
 
         def available_locales
@@ -40,10 +41,13 @@ module I18n
           end
         end
 
-        def clear(locale=:all)
+        def clear(locale=:all, options={})
           if locale==:all
-            @translations = {}
+            @translations.keys.each{|loc| clear loc, options }
           else
+            last_update = options[:last_update]
+            cache_time = @cache_times[locale]
+            return if last_update && cache_time && last_update < cache_time
             @translations[locale] = nil
           end
         end
@@ -52,7 +56,10 @@ module I18n
 
         def fetch_all_translations(locale)
           @translations ||= {}
-          @translations[locale] ||= Translation.locale(locale).with_current_version.all
+          @translations[locale] ||= begin
+            @cache_times[locale] = Time.now
+            Translation.all_for_locale(locale)
+          end
           @translations[locale]
         end
 

data/lib/i18n/sequel_bitemporal/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module SequelBitemporal
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
 end

data/test/sequel_cache_test.rb

@@ -0,0 +1,141 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class I18nBackendSequelBitemporalCacheTest < Test::Unit::TestCase
+  def clear_all
+    I18n::Backend::SequelBitemporal::Translation.delete
+  end
+
+  def setup
+    I18n.backend = I18n::Backend::SequelBitemporal.new :preload_all => true
+    store_translations(:en, :foo => { :bar => 'bar', :baz => 'baz' })
+    store_translations(:fr, :foo => { :bar => 'bar', :baz => 'baz' })
+  end
+
+  def teardown
+    clear_all
+    super
+  end
+
+  with_mocha do
+    test "cache all translation for current locales" do
+      translations_en = I18n::Backend::SequelBitemporal::Translation.locale(:en).lookup('foo').all
+      translations_fr = I18n::Backend::SequelBitemporal::Translation.locale(:fr).lookup('foo').all
+      I18n::Backend::SequelBitemporal::Translation.expects(:all_for_locale).
+        with(:en).
+        returns(translations_en)
+      I18n.t(:foo)
+      I18n.t(:foo)
+
+      I18n::Backend::SequelBitemporal::Translation.expects(:all_for_locale).
+        with(:fr).
+        returns(translations_fr)
+      I18n.with_locale :fr do
+        I18n.t(:foo)
+        I18n.t(:foo)
+      end
+    end
+
+    test "clear all locales" do
+      translations_en = translations_for :en
+      translations_fr = translations_for :fr
+
+      I18n.t(:foo)
+      I18n.with_locale(:fr) { I18n.t(:foo) }
+
+      I18n.backend.clear
+
+      I18n::Backend::SequelBitemporal::Translation.expects(:all_for_locale).
+        with(:en).
+        returns(translations_en)
+      I18n.t(:foo) # load from db
+
+      I18n.with_locale :fr do
+        I18n::Backend::SequelBitemporal::Translation.expects(:all_for_locale).
+          with(:fr).
+          returns(translations_fr)
+        I18n.t(:foo) # load from db
+      end
+    end
+
+    test "clear specified locale only" do
+      translations_en = translations_for :en
+      translations_fr = translations_for :fr
+
+      I18n::Backend::SequelBitemporal::Translation.expects(:all_for_locale).
+        with(:en).returns(translations_en)
+      I18n::Backend::SequelBitemporal::Translation.expects(:all_for_locale).
+        with(:fr).returns(translations_fr)
+      I18n.t(:foo)
+      I18n.with_locale(:fr) { I18n.t(:foo) }
+
+      I18n.backend.clear :en
+      I18n::Backend::SequelBitemporal::Translation.expects(:all_for_locale).
+        with(:en).returns(translations_en)
+      I18n.t(:foo)
+      I18n.with_locale(:fr) { I18n.t(:foo) }
+    end
+
+    test "clear all locales with stale cache" do
+      translations_en = translations_for :en
+      translations_fr = translations_for :fr
+
+      last_update = Time.now
+      en_cache_time = last_update-60
+      fr_cache_time = last_update-10
+
+      I18n::Backend::SequelBitemporal::Translation.expects(:all_for_locale).
+        with(:en).returns(translations_en)
+      I18n::Backend::SequelBitemporal::Translation.expects(:all_for_locale).
+        with(:fr).returns(translations_fr)
+
+      Timecop.freeze(en_cache_time){ I18n.t(:foo) }
+      Timecop.freeze(fr_cache_time) do
+        I18n.with_locale(:fr) { I18n.t(:foo) }
+      end
+
+      I18n.backend.clear :all, :last_update => last_update-65
+      I18n.t(:foo)
+      I18n.with_locale(:fr) { I18n.t(:foo) }
+
+      I18n.backend.clear :all, :last_update => last_update-15
+      I18n::Backend::SequelBitemporal::Translation.expects(:all_for_locale).
+        with(:en).returns(translations_en)
+      I18n.t(:foo)
+      I18n.with_locale(:fr) { I18n.t(:foo) }
+    end
+
+    test "clear specific locale with stale cache" do
+      translations_en = translations_for :en
+      translations_fr = translations_for :fr
+
+      last_update = Time.now
+      en_cache_time = last_update-60
+      fr_cache_time = last_update-10
+
+      I18n::Backend::SequelBitemporal::Translation.expects(:all_for_locale).
+        with(:en).returns(translations_en)
+      I18n::Backend::SequelBitemporal::Translation.expects(:all_for_locale).
+        with(:fr).returns(translations_fr)
+
+      Timecop.freeze(en_cache_time){ I18n.t(:foo) }
+      Timecop.freeze(fr_cache_time) do
+        I18n.with_locale(:fr) { I18n.t(:foo) }
+      end
+
+      I18n.backend.clear :fr, :last_update => last_update-65
+      I18n.t(:foo)
+      I18n.with_locale(:fr) { I18n.t(:foo) }
+
+      I18n.backend.clear :fr, :last_update => last_update
+      I18n::Backend::SequelBitemporal::Translation.expects(:all_for_locale).
+        with(:fr).returns(translations_en)
+      I18n.t(:foo)
+      I18n.with_locale(:fr) { I18n.t(:foo) }
+    end
+  end
+
+  def translations_for(locale)
+    I18n::Backend::SequelBitemporal::Translation.locale(:locale).all
+  end
+
+end if defined?(Sequel)

data/test/sequel_test.rb

@@ -14,7 +14,7 @@ class I18nBackendSequelBitemporalTest < Test::Unit::TestCase
     clear_all
     super
   end
-  
+
   test "store_translations does not allow ambiguous keys (1)" do
     clear_all
     I18n.backend.store_translations(:en, :foo => 'foo')
@@ -57,7 +57,8 @@ class I18nBackendSequelBitemporalTest < Test::Unit::TestCase
     end
   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?(Sequel)
+
+end if defined?(Sequel)

data/test/test_helper.rb

@@ -9,6 +9,7 @@ require 'i18n/sequel_bitemporal'
 require 'i18n/tests'
 require 'mocha'
 require 'test_declarative'
+require 'timecop'
 I18n::Tests.setup_sequel
 
 class Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n-sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-29 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2151823340 !ruby/object:Gem::Requirement
+  requirement: &2166051280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151823340
+  version_requirements: *2166051280
 - !ruby/object:Gem::Dependency
   name: sequel_bitemporal
-  requirement: &2151821980 !ruby/object:Gem::Requirement
+  requirement: &2166050220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151821980
+  version_requirements: *2166050220
 - !ruby/object:Gem::Dependency
   name: test_declarative
-  requirement: &2151820720 !ruby/object:Gem::Requirement
+  requirement: &2166049420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151820720
+  version_requirements: *2166049420
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2151819340 !ruby/object:Gem::Requirement
+  requirement: &2166048120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151819340
+  version_requirements: *2166048120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151818520 !ruby/object:Gem::Requirement
+  requirement: &2166057160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151818520
+  version_requirements: *2166057160
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2151812440 !ruby/object:Gem::Requirement
+  requirement: &2166072120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,7 +79,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151812440
+  version_requirements: *2166072120
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &2166070140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2166070140
 description: I18n Bitemporal Sequel backend. Allows to store translations in a database
   using Sequel using a bitemporal approach, e.g. for providing a web-interface for
   managing translations.
@@ -109,6 +120,7 @@ files:
 - test/all.rb
 - test/api_test.rb
 - test/missing_test.rb
+- test/sequel_cache_test.rb
 - test/sequel_test.rb
 - test/test_helper.rb
 - test/test_setup.rb
@@ -126,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3584568548575898689
+      hash: 523352009748703952
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3584568548575898689
+      hash: 523352009748703952
 requirements: []
 rubyforge_project: ! '[none]'
 rubygems_version: 1.8.10
@@ -146,6 +158,7 @@ test_files:
 - test/all.rb
 - test/api_test.rb
 - test/missing_test.rb
+- test/sequel_cache_test.rb
 - test/sequel_test.rb
 - test/test_helper.rb
 - test/test_setup.rb