sequel_bitemporal 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d522ca4aed441f88c808ee0af6f54aa18bd873fc4742f11fd0e890b2c611b01
-  data.tar.gz: eb3f8873178c6db5b69f6c5a2b2cc42582c21777ae92e94bda268b25873ea254
+  metadata.gz: 33df8e3ea5762139cd17bc15469b6f4c0535e698191eff1db9feb1387be4eb9b
+  data.tar.gz: da3482ad1fa5d018fc50e95c45940beba6013205574f65257be300abbfc119ee
 SHA512:
-  metadata.gz: f16ee4864135847b45f8782b5926329dad9a21d150da5c9bd4d4e1ac4f568046595f768bad38a716b4316113e498fffd7eb91ccb94918dceba3724a073281cfb
-  data.tar.gz: 737bac4d58bca9f678ef95fb0851fc82dc49f33eef19e91beb3c87ff34be2c2f2d5edb0417aac9ac709114e3d3b97bc1dbe32a0017cbf1d9adcc1d6dce81e119
+  metadata.gz: 0b6f966365eaf5c42143b5e050c467aaef0b1e479c68fd792cbedc1cf4d3c420962651254ca9dd1344c95e4401f3ee2ba56f6acb54702248a8d4d5684d351265
+  data.tar.gz: 176b15f045e9b91b29857f0b5e1ffcbb313d44cd623bd10718cbdabd359ba929b55c231882d639e47499c496307c8b5bbf9c160cacc11569d46c624bca9439d3

data/.github/workflows/ci.yml

@@ -0,0 +1,64 @@
+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
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "3.3"
+    name: Ruby ${{ matrix.ruby }}
+
+    env:
+      SEQUEL: "~> 5.0"
+      BUNDLE_GEMFILE: "ci/sequel.gemfile"
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install db dependencies and check connections
+        run: |
+          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: |
+          env PGPASSWORD=postgres psql -c 'create database sequel_bitemporal_test;' -U postgres -h localhost -p ${{ job.services.postgres.ports[5432] }}
+      - name: Run PostgreSQL tests
+        run: bundle exec rake spec
+        env:
+          TEST_ADAPTER: postgresql
+          TEST_DATABASE: sequel_bitemporal_test
+          TEST_DATABASE_HOST: localhost
+          TEST_DATABASE_PORT: ${{ job.services.postgres.ports[5432] }}
+          TEST_USERNAME: postgres
+          TEST_PASSWORD: postgres
+      - name: Run SQLite tests
+        run: bundle exec rake spec
+        env:
+          TEST_ADAPTER: sqlite

data/lib/sequel/plugins/bitemporal.rb

@@ -332,7 +332,7 @@ module Sequel
                 { master_id: id }
               end
 
-            current_version.keys.each do |key|
+            current_version.columns.each do |key|
               next if excluded_columns.include? key
               current_attributes[key] = current_version.public_send key
             end if current_version?
@@ -592,7 +592,7 @@ module Sequel
 
         def save_fossil(expired, attributes={})
           fossil = model.version_class.new
-          expired_attributes = expired.keys.each_with_object({}) do |key, hash|
+          expired_attributes = expired.columns.each_with_object({}) do |key, hash|
             hash[key] = expired.public_send key
           end
           expired_attributes.delete :id
@@ -603,7 +603,7 @@ module Sequel
 
         def save_propagated(version, attributes={})
           propagated = model.version_class.new
-          version_attributes = version.keys.each_with_object({}) do |key, hash|
+          version_attributes = version.columns.each_with_object({}) do |key, hash|
             hash[key] = version.public_send key
           end
           version_attributes.delete :id

data/sequel_bitemporal.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "sequel_bitemporal"
-  s.version     = "0.10.0"
+  s.version     = "0.11.0"
   s.authors     = ["Joseph HALTER", "Jonathan TRON"]
   s.email       = ["joseph.halter@thetalentbox.com", "jonathan.tron@thetalentbox.com"]
   s.homepage    = "https://github.com/TalentBox/sequel_bitemporal"

data/spec/bitemporal_serialization_spec.rb

@@ -91,10 +91,10 @@ RSpec.describe "Sequel::Plugins::Bitemporal", :skip_jdbc_sqlite do
       expect(
         master.update_attributes valid_from: Date.parse("2016-01-01"), price: 10
       ).to be_truthy
-      result = master.versions_dataset.order(:expired_at, :valid_from).all.map do |version|
+      result = master.versions_dataset.all.map do |version|
         [!!version.expired_at, version.valid_from.year, version.valid_to.year, version.price, version.length, version.width, version[:name]]
       end
-      expect(result).to eql [
+      expect(result).to match_array [
         [false, 2016, 2017, 10, nil, nil, nil],
         [false, 2017, 2018, 0, 10, nil, "{}"],
         [false, 2018, 2019, 0, 20, nil, nil],

data/spec/spec_helper.rb

@@ -12,11 +12,7 @@ rspec_exclusions = {}
 DB = if DbHelpers.pg?
   `createdb sequel_bitemporal_test`
   Sequel.extension :pg_range, :pg_range_ops
-  if ::Sequel::Plugins::Bitemporal.jruby?
-    Sequel.connect "jdbc:postgresql://localhost/sequel_bitemporal_test"
-  else
-    Sequel.postgres "sequel_bitemporal_test"
-  end
+  Sequel.connect DbHelpers.pg_ruby_connect_uri
 else
   if Sequel::Plugins::Bitemporal.jruby?
     rspec_exclusions[:skip_jdbc_sqlite] = true

data/spec/support/db.rb

@@ -1,13 +1,26 @@
 module DbHelpers
 
   def self.pg?
-    ENV.has_key? "PG"
+    !ENV.has_key?("TEST_ADAPTER") || ENV["TEST_ADAPTER"]=="postgresql"
   end
 
   def self.jruby?
     (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby') || defined?(JRUBY_VERSION)
   end
 
+  def self.pg_ruby_connect_uri
+    username = ENV.fetch("TEST_USERNAME", nil)
+    password = ENV.fetch("TEST_PASSWORD", nil)
+    auth = [username, password].compact.join(":")
+
+    uri = "postgresql://#{"#{auth}@" unless auth.empty?}#{ENV.fetch("TEST_DATABASE_HOST", "127.0.0.1")}:#{ENV.fetch("TEST_DATABASE_PORT", "5432")}/#{ENV.fetch("TEST_DATABASE", "sequel_bitemporal_test")}"
+    if jruby?
+      "jdbc:#{uri}"
+    else
+      uri
+    end
+  end
+
   def db_setup(opts={})
     use_time = opts[:use_time]
     DB.drop_table(:room_versions) if DB.table_exists?(:room_versions)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Joseph HALTER
 - Jonathan TRON
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2024-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -81,10 +81,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -106,7 +106,7 @@ homepage: https://github.com/TalentBox/sequel_bitemporal
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,9 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Bitemporal versioning for sequel.
 test_files:

data/.travis.yml

@@ -1,31 +0,0 @@
-language: ruby
-
-cache:
-  bundler: true
-
-rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.0
-  - jruby-9.1.17.0
-  - jruby-9.2.5.0
-before_script:
-  - psql  -c 'create database sequel_bitemporal_test;' -U postgres
-env:
-  - SQLITE=1 SEQUEL='~> 4.0'
-  - SQLITE=1 SEQUEL='~> 5.0'
-  - PG=1 SEQUEL='~> 4.0'
-  - PG=1 SEQUEL='~> 5.0'
-gemfile:
-  - ci/sequel.gemfile
-matrix:
-  allow_failures:
-    - rvm: jruby-9.1.17.0
-      env: PG=1 SEQUEL='~> 4.0'
-    - rvm: jruby-9.1.17.0
-      env: PG=1 SEQUEL='~> 5.0'
-    - rvm: jruby-9.2.5.0
-      env: PG=1 SEQUEL='~> 4.0'
-    - rvm: jruby-9.2.5.0
-      env: PG=1 SEQUEL='~> 5.0'