i18n-sequel_bitemporal 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17c191652e457d465a3d7951efdf76a432a82690dd7b3f0bae9324b3bbe7a61d
-  data.tar.gz: 05a1aa9b8d012cced99c152b0700960bbc812e38b753f4f612bdbef635b2b4f0
+  metadata.gz: 74ce18e7919b76481ccbdd441665fc1db28e6906535353fcb9b6947539a734ff
+  data.tar.gz: fbb27c3efd8c27792c71e7a42d02abe54cd8a909c3bb9ead3da396b1e1e0ebd6
 SHA512:
-  metadata.gz: 2c147a89f559776c2977e3aad2a8ee38820d79c0c8246f7b77c801b69667d1272d4d55cdd7ca6cc80a7316aba13fd84516490700a6f9bf1ad2fd6313333e9d19
-  data.tar.gz: e8cfa24c1ea406cd5ae63eba66040c46db6edb63fe30dff280351cff3745c5b5998ade3000f00dac92da59b1a812affc4baba4c52260194bdde893df9ac98c1b
+  metadata.gz: feedc4b5e08a1919cd71c91a34318459e0d1756c2cdadc081bb3f82d4aa77b9b0ce07f66882d76bbfceb5de2c4ec13afb1077a7228ec0c7ed176c067d053eb3d
+  data.tar.gz: b52f213f7b460187f64fefd09f297a2f5178caa99f045da493dca7c0b37945c85c0ccd01c65919b80d963aee95d9adcf3d6d46a2898e3398c20b913a50fff3ff

data/.github/workflows/ci.yml

@@ -0,0 +1,125 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: ['**']
+
+jobs:
+  tests:
+    services:
+      postgres:
+        image: postgres:13
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        ports:
+        - 5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+        - 3306
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        rails:
+          - "5.0"
+          - "5.1"
+          - "5.2"
+          - "6.0"
+          - "6.1"
+          - "7.0"
+          - "7.1"
+        ruby:
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "3.3"
+          # - "jruby"
+        include:
+          - ruby: "2.6"
+            rails: "5.2"
+          - ruby: "2.6"
+            rails: "6.0"
+          - ruby: "2.7"
+            rails: "6.0"
+        exclude:
+          - ruby: "3.1"
+            rails: "6.1"
+          - ruby: "3.2"
+            rails: "6.1"
+          - ruby: "3.3"
+            rails: "6.1"
+          - ruby: "2.6"
+            rails: "7.0"
+          - ruby: "jruby"
+            rails: "7.0"
+          - ruby: "2.6"
+            rails: "7.1"
+          - ruby: "jruby"
+            rails: "7.1"
+    name: Rails ${{ matrix.rails }}, Ruby ${{ matrix.ruby }}
+
+    env:
+      BUNDLE_GEMFILE: "ci/Gemfile.rails-${{ matrix.rails }}"
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install db dependencies and check connections
+        run: |
+          DEBIAN_FRONTEND="noninteractive" sudo apt-get install -yqq mysql-client libmysqlclient-dev postgresql-client libpq-dev
+          mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports[3306] }} -uroot -proot -e "SHOW GRANTS FOR 'root'@'localhost'"
+          env PGPASSWORD=postgres psql -h localhost -p ${{ job.services.postgres.ports[5432] }} -U postgres -l
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Create databases
+        run: |
+          mysql -e 'create database i18n_sequel_bitemporal;' --host 127.0.0.1 --port ${{ job.services.mysql.ports[3306] }} -uroot -proot
+          env PGPASSWORD=postgres psql -c 'create database i18n_sequel_bitemporal;' -U postgres -h localhost -p ${{ job.services.postgres.ports[5432] }}
+      - name: Run PostgreSQL tests
+        run: bundle exec rake test
+        env:
+          TEST_ADAPTER: postgresql
+          TEST_DATABASE: i18n_sequel_bitemporal
+          TEST_DATABASE_HOST: localhost
+          TEST_DATABASE_PORT: ${{ job.services.postgres.ports[5432] }}
+          TEST_OWNER: postgres
+          TEST_USERNAME: postgres
+          TEST_PASSWORD: postgres
+      - name: Run MySQL2 tests
+        run: bundle exec rake test
+        if: matrix.ruby != 'jruby'
+        env:
+          TEST_ADAPTER: mysql2
+          TEST_DATABASE: i18n_sequel_bitemporal
+          TEST_DATABASE_HOST: 127.0.0.1
+          TEST_DATABASE_PORT: ${{ job.services.mysql.ports[3306] }}
+          TEST_USERNAME: root
+          TEST_PASSWORD: root
+          TEST_ENCODING: "utf8"
+      - name: Run SQLite tests
+        run: bundle exec rake test
+        env:
+          TEST_ADAPTER: "sqlite"
+          TEST_DATABASE: "test/database.sqlite3"
+      # - name: Lint
+      #   run: bundle exec rubocop

data/.gitignore

@@ -1,5 +1,5 @@
 *.gem
 .bundle
 Gemfile.lock
-ci/Gemfile.lock
+ci/Gemfile*.lock
 pkg/*

data/Gemfile

@@ -11,10 +11,12 @@ gem "timecop"
 
 platforms :ruby do
   gem "pg"
+  gem "mysql2"
   gem "sqlite3"
 end
 
 platforms :jruby do
   gem "jdbc-postgres"
+  gem "jdbc-mysql"
   gem "jdbc-sqlite3"
 end

data/ci/Gemfile.rails-5.0

@@ -12,10 +12,12 @@ gem "timecop"
 
 platforms :ruby do
   gem "pg"
+  gem "mysql2"
   gem "sqlite3"
 end
 
 platforms :jruby do
   gem "jdbc-postgres"
+  gem "jdbc-mysql"
   gem "jdbc-sqlite3"
 end

data/ci/Gemfile.rails-5.1

@@ -12,10 +12,12 @@ gem "timecop"
 
 platforms :ruby do
   gem "pg"
+  gem "mysql2"
   gem "sqlite3"
 end
 
 platforms :jruby do
   gem "jdbc-postgres"
+  gem "jdbc-mysql"
   gem "jdbc-sqlite3"
 end

data/ci/Gemfile.rails-5.2

@@ -12,10 +12,12 @@ gem "timecop"
 
 platforms :ruby do
   gem "pg"
+  gem "mysql2"
   gem "sqlite3"
 end
 
 platforms :jruby do
   gem "jdbc-postgres"
+  gem "jdbc-mysql"
   gem "jdbc-sqlite3"
 end

data/ci/Gemfile.rails-6.0

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

data/ci/Gemfile.rails-6.1

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

data/ci/Gemfile.rails-7.0

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

data/ci/Gemfile.rails-7.1

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

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

@@ -102,6 +102,7 @@ module I18n
 
       class Translation < ::Sequel::Model(::I18n::Backend::SequelBitemporal.master_table_name)
         extend Forwardable
+        plugin :def_dataset_method
         plugin :bitemporal, version_class: TranslationVersion
 
         delegate [:value, :interpolations, :interpolates?] => :pending_or_current_version
@@ -143,7 +144,12 @@ module I18n
           end
 
           def all_for_locale(locale)
-            self.locale(locale).with_current_version.all
+            self.locale(locale).with_current_version.select(
+              :locale,
+              :key,
+              :value,
+              :is_proc
+            ).all
           end
         end
       end

data/lib/i18n/backend/sequel_bitemporal.rb

@@ -44,6 +44,7 @@ module I18n
 
         def store_translations(locale, data, options = {})
           escape = options.fetch(:escape, true)
+          point_in_time_for_new = options[:point_in_time_for_new]
           valid_from_for_new = options[:valid_from_for_new]
           flatten_translations(locale, data, escape, false).each do |key, value|
             # Invalidate all keys matching current one:
@@ -56,7 +57,13 @@ module I18n
                             Translation.new(:locale => locale.to_s, :key => key.to_s)
               translation.attributes = {:value => value}
               translation.attributes[:valid_from] = valid_from_for_new if translation.new?
-              translation.save
+              if point_in_time_for_new && translation.new?
+                ::Sequel::Plugins::Bitemporal.as_we_knew_it point_in_time_for_new do
+                  translation.save
+                end
+              else
+                translation.save
+              end
             end
           end
         end

data/lib/i18n/sequel_bitemporal/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module SequelBitemporal
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

data/test/sequel_test.rb

@@ -67,6 +67,24 @@ class I18nBackendSequelBitemporalTest < I18nBitemporalTest
     assert_equal valid_from_for_new, translation.current_version.valid_from
   end
 
+  test "can specify point in time for the new translation" do
+    point_in_time_for_new = Time.parse("2001-01-01T12:00:00Z")
+    I18n.backend.store_translations(:es, {:"Pagina's" => "Pagina's"}, point_in_time_for_new: point_in_time_for_new )
+    translation = I18n::Backend::SequelBitemporal::Translation.locale(:es).lookup("Pagina's").limit(1).all.first
+    assert_equal "Pagina's", translation.value
+    assert_equal point_in_time_for_new, translation.current_version.created_at
+  end
+
+  test "can specify both point in time and valid_from for the new translation" do
+    point_in_time_for_new = Time.parse("2001-01-01T12:00:00Z")
+    valid_from_for_new = Date.parse("2001-01-01")
+    I18n.backend.store_translations(:es, {:"Pagina's" => "Pagina's"}, point_in_time_for_new: point_in_time_for_new, valid_from_for_new: valid_from_for_new )
+    translation = I18n::Backend::SequelBitemporal::Translation.locale(:es).lookup("Pagina's").limit(1).all.first
+    assert_equal "Pagina's", translation.value
+    assert_equal point_in_time_for_new, translation.current_version.created_at
+    assert_equal valid_from_for_new, translation.current_version.valid_from
+  end
+
   with_mocha do
     test "missing translations table does not cause an error in #available_locales" do
       I18n::Backend::SequelBitemporal::Translation.expects(:available_locales).raises(::Sequel::Error)
@@ -79,7 +97,7 @@ class I18nBackendSequelBitemporalTest < I18nBitemporalTest
   end
 
   test "allows to override the table names" do
-    ::Sequel::Model.db.transaction :rollback => :always do
+    ::Sequel::Model.db.transaction :rollback => :always, savepoint: :only do
       begin
         ::Sequel.migration do
           change do
@@ -125,8 +143,12 @@ class I18nBackendSequelBitemporalTest < I18nBitemporalTest
   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
+    if ::I18n::Backend::SequelBitemporal.const_defined?(:Translation)
+      ::I18n::Backend::SequelBitemporal.send :remove_const, :Translation
+    end
+    if ::I18n::Backend::SequelBitemporal.const_defined?(:TranslationVersion)
+      ::I18n::Backend::SequelBitemporal.send :remove_const, :TranslationVersion
+    end
     load File.expand_path(
       "../../lib/i18n/backend/sequel_bitemporal/translation.rb",
       __FILE__

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+ENV["TZ"] = "UTC"
 $:.unshift File.expand_path(".", File.dirname(__FILE__))
 
 require 'test_setup'

data/test/test_setup.rb

@@ -5,18 +5,14 @@ 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[:adapter] = ENV["ADAPTER"] || "postgres"
+        options[:adapter] = ENV.fetch "TEST_ADAPTER", "sqlite"
+        options[:database] = ENV.fetch "TEST_DATABASE", ":memory:"
+        options[:host] = ENV.fetch "TEST_DATABASE_HOST", nil
+        options[:port] = ENV.fetch "TEST_DATABASE_PORT", nil
+        options[:user] = ENV.fetch "TEST_USERNAME", nil
+        options[:password] = ENV.fetch "TEST_PASSWORD", nil
+        options[:encoding] = ENV.fetch "TEST_ENCODING", nil
       end
 
       def setup_sequel
@@ -38,9 +34,11 @@ module I18n
         connect_adapter
         ::Sequel.extension :migration
         opts = {}
-        opts[:cascade] = true if options[:adapter].to_sym==:postgres
-        ::Sequel::Model.db.drop_table? :i18n_translations, opts
+        opts[:cascade] = true if postgresql?
+        ::Sequel::Model.db.drop_table? :another_i18n_translation_versions, opts
+        ::Sequel::Model.db.drop_table? :another_i18n_translations, opts
         ::Sequel::Model.db.drop_table? :i18n_translation_versions, opts
+        ::Sequel::Model.db.drop_table? :i18n_translations, opts
         ::Sequel.migration do
           change do
             create_table :i18n_translations do
@@ -66,33 +64,44 @@ module I18n
       end
 
       def connect_adapter
-        logger = nil
+        connect_options = options.dup
         if ENV["DEBUG"]
           require "logger"
-          logger =  Logger.new STDOUT
+          connect_options = options.merge! :logger => Logger.new(STDOUT)
         end
-        case options[:adapter].to_sym
-        when :sqlite3
-          if (defined?(RUBY_ENGINE) && RUBY_ENGINE=="jruby") || defined?(JRUBY_VERSION)
-            ::Sequel.connect("jdbc:sqlite::memory:", :logger => logger)
-          else
-            ::Sequel.sqlite(":memory:", :logger => logger)
-          end
-        when :postgres
-          if (defined?(RUBY_ENGINE) && RUBY_ENGINE=="jruby") || defined?(JRUBY_VERSION)
-            ::Sequel.connect("jdbc:postgresql://localhost/i18n_sequel_bitemporal", :logger => logger)
-          else
-            ::Sequel.postgres("i18n_sequel_bitemporal", :logger => logger)
-          end
-        when :mysql
-          # CREATE DATABASE i18n_unittest;
-          # CREATE USER "i18n"@"localhost" IDENTIFIED BY "";
-          # GRANT ALL PRIVILEGES ON i18n_unittest.* to "i18n"@"localhost";
-          if (defined?(RUBY_ENGINE) && RUBY_ENGINE=="jruby") || defined?(JRUBY_VERSION)
-            ::Sequel.connect("jdbc:mysql://localhost/i18n_sequel_bitemporal", :logger => logger)
-          else
-            ::Sequel.mysql(:database => "i18n_unittest", :user => "i18n", :password => "", :host => "localhost", :logger => logger)
-          end
+        ::Sequel.connect(connect_options.merge(:adapter => adapter))
+      end
+
+      private
+
+      def options
+        @options ||= {}
+      end
+
+      def jruby?
+        (defined?(RUBY_ENGINE) && RUBY_ENGINE=="jruby") || defined?(JRUBY_VERSION)
+      end
+
+      def postgresql?
+        options[:adapter] == "postgresql"
+      end
+
+      def sqlite?
+        options[:adapter] == "sqlite"
+      end
+
+      def mysql?
+        options[:adapter] == "mysql2"
+      end
+
+      def adapter
+        case options[:adapter]
+        when "sqlite", "sqlite3"
+          jruby? ? "jdbc:sqlite:" : "sqlite"
+        when "postgresql", "postgres"
+          jruby? ? "jdbc:postgresql" : "postgresql"
+        when "mysql", "mysql2"
+          jruby? ? "jdbc:mysql" : "mysql2"
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Jonathan Tron
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-14 00:00:00.000000000 Z
+date: 2024-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -61,9 +61,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -71,6 +70,10 @@ files:
 - ci/Gemfile.rails-5.0
 - ci/Gemfile.rails-5.1
 - ci/Gemfile.rails-5.2
+- ci/Gemfile.rails-6.0
+- ci/Gemfile.rails-6.1
+- ci/Gemfile.rails-7.0
+- ci/Gemfile.rails-7.1
 - i18n-sequel_bitemporal.gemspec
 - lib/i18n/backend/sequel_bitemporal.rb
 - lib/i18n/backend/sequel_bitemporal/missing.rb
@@ -80,6 +83,7 @@ files:
 - lib/i18n/sequel_bitemporal/version.rb
 - test/all.rb
 - test/api_test.rb
+- test/database.sqlite3
 - test/missing_test.rb
 - test/sequel_cache_test.rb
 - test/sequel_test.rb
@@ -103,13 +107,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: I18n Bitemporal Sequel backend
 test_files:
 - test/all.rb
 - test/api_test.rb
+- test/database.sqlite3
 - test/missing_test.rb
 - test/sequel_cache_test.rb
 - test/sequel_test.rb

data/.ruby-version

@@ -1 +0,0 @@
-2.6.3

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-before_script:
-  - psql -c 'create database i18n_sequel_bitemporal;' -U postgres
-rvm:
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
-env:
-  - ADAPTER=sqlite3
-  - ADAPTER=postgres
-gemfile:
-  - ci/Gemfile.rails-5.0
-  - ci/Gemfile.rails-5.1
-  - ci/Gemfile.rails-5.2