activerecord-time 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80b52c52ad34414185dbadd7b54be0d7dbfc2b9be326581d7102fe1ce713eff2
-  data.tar.gz: '04965d38dce4fa1a2510725f4626f7796d2e23e0a7a9597535f6b212b8058b46'
+  metadata.gz: 38e31e5791113c1c15833344fc7a243a87bacc1f35cc6fdbeb15cbe7edf7daf4
+  data.tar.gz: 58990d314938ba0786cf4733c1616c50757d5e21cb6e37153b207fff4d5d5b42
 SHA512:
-  metadata.gz: cf3f7975838214c58b8c7970c3951b1be99f14b1dea449f30c1ab63370ab196cc352fff4dde07c99d848f04e49e3f9d9ca1c148545e457a9293100fab97cd7bb
-  data.tar.gz: a64a1dd1ffccccf70699318117503f67841f59b4c54e8c36f8d7fadd01169130a921a027e8800f6173b3387487b54d08c6ca0a91749b0c679d39274b0f6fd921
+  metadata.gz: 0bfd12648f4877017b8296a35dfebca5ae1ac9157bc6d63f35354450b3953a950d6a99fa38d477ffe01bf363b459b3010fe6d0f17589ee744e0b8b4b542c1210
+  data.tar.gz: fa6e24e7993c666265de8e82dee024f66e18878141d31c5862c0602ba4096854601f81af6253875cf7f81505ceac2de1e932d36dde97423db825ba6943517a29

data/.github/workflows/test.yml

@@ -0,0 +1,69 @@
+name: Test
+on: 
+  workflow_dispatch:
+    inputs:
+      logLevel:
+        description: 'Log level'     
+        required: true
+        default: 'warning'
+      tags:
+        description: 'Test scenario tags'
+        required: false
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  LANGUAGE: nb
+  PGUSER: postgres
+  PGPASSWORD: password
+  RAILS_ENV: test
+
+jobs:
+  Rubocop:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Rubocop
+        run: bundle exec rubocop --auto-correct-all
+  Test:
+    runs-on: ubuntu-20.04
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_PASSWORD: password
+        ports:
+          - 5432:5432
+        # needed because the postgres container does not provide a healthcheck
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+    strategy:
+      fail-fast: false
+      matrix:
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: [ 2.6, 2.7, '3.0', jruby, truffleruby ]
+        gemfile: [ ar61, ar60, ar52, ar51 ]
+        adapter: [ postgresql, sqlite3 ]
+        exclude:
+          - ruby: '3.0'
+            gemfile: ar52
+          - ruby: '3.0'
+            gemfile: ar51
+          - ruby: jruby
+            adapter: sqlite3
+    env:
+      ADAPTER: ${{ matrix.adapter }}
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Rake test
+        run: bundle exec rake test

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-11-25 10:12:00 UTC using RuboCop version 1.23.0.
+# on 2021-11-25 11:12:32 UTC using RuboCop version 1.23.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -31,7 +31,7 @@ Metrics/BlockLength:
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 174
+  Max: 184
 
 # Offense count: 1
 # Configuration parameters: IgnoredMethods.

data/lib/activerecord-time/version.rb

@@ -2,6 +2,6 @@
 
 module Activerecord
   module Time
-    VERSION = '0.18.0'
+    VERSION = '0.19.0'
   end
 end

data/lib/time_of_day/core_ext.rb

@@ -8,6 +8,12 @@ class Time
   end
 end
 
+class DateTime
+  def time_of_day
+    TimeOfDay.new(hour, min, sec)
+  end
+end
+
 class ActiveSupport::TimeWithZone
   def time_of_day
     TimeOfDay.new(hour, min, sec)

data/lib/time_of_day.rb

@@ -87,11 +87,12 @@ class TimeOfDay
   end
 
   def -(other)
-    if other.is_a?(TimeOfDay)
+    case other
+    when TimeOfDay
       t1 = Time.local(0, 1, 1, hour, minute, second) # rubocop: disable Rails/TimeZone
       t2 = Time.local(0, 1, 1, other.hour, other.minute, other.second) # rubocop: disable Rails/TimeZone
       (t1 - t2).seconds
-    elsif other.is_a?(Numeric)
+    when Numeric
       self.+(-other)
     else
       raise "Illegal argument: #{other.inspect}"

data/test/database.yml

@@ -6,6 +6,6 @@ postgresql:
   :adapter: postgresql
   :host: localhost
   :username: postgres
-  :password:
+  :password: password
   :database: activerecord-time_test
   :min_messages: ERROR

data/test/test_helper.rb

@@ -19,7 +19,7 @@ if defined?(Rake) && (RUBY_ENGINE != 'jruby' || org.jruby.RubyInstanceConfig.FUL
 end
 
 FileUtils.rm_rf File.expand_path(':memory:', File.dirname(__FILE__))
-config = YAML.load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+config = YAML.load(File.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/test.log')
 adapter = ENV['ADAPTER'] || 'sqlite3'
 if adapter != 'sqlite3'

data/test/time_of_day_test.rb

@@ -142,14 +142,16 @@ class TimeOfDayTest < Minitest::Test
     assert_equal 59, tod.second
   end
 
-  def test_minus_tod
-    tod1 = TimeOfDay.new(12, 0, 29)
-    tod2 = TimeOfDay.new(13, 30, 59)
-    duration = tod2 - tod1
-
-    assert_equal 1, duration.in_hours.to_i
-    assert_equal 30, duration.in_minutes.to_i % 60
-    assert_equal 30, duration.in_seconds % 60
+  if ActiveRecord.gem_version >= Gem::Version.new('6.1')
+    def test_minus_tod
+      tod1 = TimeOfDay.new(12, 0, 29)
+      tod2 = TimeOfDay.new(13, 30, 59)
+      duration = tod2 - tod1
+
+      assert_equal 1, duration.in_hours.to_i
+      assert_equal 30, duration.in_minutes.to_i % 60
+      assert_equal 30, duration.in_seconds % 60
+    end
   end
 
   def test_equality

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-time
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -150,6 +150,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -161,11 +162,8 @@ files:
 - Rakefile
 - activerecord-time.gemspec
 - gemfiles/ar51.gemfile
-- gemfiles/ar51.gemfile.lock
 - gemfiles/ar52.gemfile
-- gemfiles/ar52.gemfile.lock
 - gemfiles/ar60.gemfile
-- gemfiles/ar60.gemfile.lock
 - gemfiles/ar61.gemfile
 - gemfiles/common.gemfile
 - lib/activerecord-time.rb
@@ -197,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: A handler for storing TimeOfDay objects in ActiveRecord objects as sql time

data/gemfiles/ar51.gemfile.lock

@@ -1,75 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.1.7)
-      activesupport (= 5.1.7)
-    activerecord (5.1.7)
-      activemodel (= 5.1.7)
-      activesupport (= 5.1.7)
-      arel (~> 8.0)
-    activerecord-jdbc-adapter (51.4-java)
-      activerecord (~> 5.1.0)
-    activerecord-jdbcderby-adapter (0.8.2)
-      activerecord-jdbc-adapter (>= 0.8.2)
-      jdbc-derby (>= 10.3.2.1)
-    activerecord-jdbcpostgresql-adapter (51.4-java)
-      activerecord-jdbc-adapter (= 51.4)
-      jdbc-postgres (>= 9.4, < 43)
-    activerecord-jdbcsqlite3-adapter (51.4-java)
-      activerecord-jdbc-adapter (= 51.4)
-      jdbc-sqlite3 (~> 3.8, < 3.30)
-    activesupport (5.1.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    ansi (1.5.0)
-    arel (8.0.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
-    docile (1.3.2)
-    i18n (1.7.0)
-      concurrent-ruby (~> 1.0)
-    jdbc-derby (10.12.1.1)
-    jdbc-postgres (42.2.6)
-    jdbc-sqlite3 (3.28.0)
-    json (2.2.0)
-    json (2.2.0-java)
-    minitest (5.12.2)
-    minitest-reporters (1.4.1)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    pg (0.21.0)
-    rake (13.0.0)
-    ruby-progressbar (1.10.1)
-    simplecov (0.17.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sqlite3 (1.4.1)
-    thread_safe (0.3.6)
-    thread_safe (0.3.6-java)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 5.1.1)
-  activerecord-jdbc-adapter
-  activerecord-jdbcderby-adapter
-  activerecord-jdbcpostgresql-adapter
-  activerecord-jdbcsqlite3-adapter
-  minitest-reporters
-  pg (< 1)
-  rake
-  simplecov
-  sqlite3
-
-BUNDLED WITH
-   1.17.2

data/gemfiles/ar52.gemfile.lock

@@ -1,75 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activerecord-jdbc-adapter (52.3-java)
-      activerecord (~> 5.2.0)
-    activerecord-jdbcderby-adapter (0.8.2)
-      activerecord-jdbc-adapter (>= 0.8.2)
-      jdbc-derby (>= 10.3.2.1)
-    activerecord-jdbcpostgresql-adapter (52.3-java)
-      activerecord-jdbc-adapter (= 52.3)
-      jdbc-postgres (>= 9.4, < 43)
-    activerecord-jdbcsqlite3-adapter (52.3-java)
-      activerecord-jdbc-adapter (= 52.3)
-      jdbc-sqlite3 (~> 3.8, < 3.30)
-    activesupport (5.2.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    ansi (1.5.0)
-    arel (9.0.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
-    docile (1.3.2)
-    i18n (1.7.0)
-      concurrent-ruby (~> 1.0)
-    jdbc-derby (10.12.1.1)
-    jdbc-postgres (42.2.6)
-    jdbc-sqlite3 (3.28.0)
-    json (2.2.0)
-    json (2.2.0-java)
-    minitest (5.12.2)
-    minitest-reporters (1.4.1)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    pg (0.21.0)
-    rake (13.0.0)
-    ruby-progressbar (1.10.1)
-    simplecov (0.17.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sqlite3 (1.4.1)
-    thread_safe (0.3.6)
-    thread_safe (0.3.6-java)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 5.2.0)
-  activerecord-jdbc-adapter
-  activerecord-jdbcderby-adapter
-  activerecord-jdbcpostgresql-adapter
-  activerecord-jdbcsqlite3-adapter
-  minitest-reporters
-  pg (< 1)
-  rake
-  simplecov
-  sqlite3
-
-BUNDLED WITH
-   1.17.2

data/gemfiles/ar60.gemfile.lock

@@ -1,75 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activerecord (6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activerecord-jdbc-adapter (60.1-java)
-      activerecord (~> 6.0.0)
-    activerecord-jdbcderby-adapter (0.8.2)
-      activerecord-jdbc-adapter (>= 0.8.2)
-      jdbc-derby (>= 10.3.2.1)
-    activerecord-jdbcpostgresql-adapter (60.1-java)
-      activerecord-jdbc-adapter (= 60.1)
-      jdbc-postgres (>= 9.4, < 43)
-    activerecord-jdbcsqlite3-adapter (60.1-java)
-      activerecord-jdbc-adapter (= 60.1)
-      jdbc-sqlite3 (~> 3.8, < 3.30)
-    activesupport (6.0.2.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    ansi (1.5.0)
-    builder (3.2.4)
-    concurrent-ruby (1.1.5)
-    docile (1.3.2)
-    i18n (1.7.0)
-      concurrent-ruby (~> 1.0)
-    jdbc-derby (10.12.1.1)
-    jdbc-postgres (42.2.6)
-    jdbc-sqlite3 (3.28.0)
-    json (2.3.0)
-    json (2.3.0-java)
-    minitest (5.13.0)
-    minitest-reporters (1.4.2)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    pg (0.21.0)
-    rake (13.0.1)
-    ruby-progressbar (1.10.1)
-    simplecov (0.17.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    thread_safe (0.3.6-java)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    zeitwerk (2.2.2)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 6.0.0)
-  activerecord-jdbc-adapter
-  activerecord-jdbcderby-adapter
-  activerecord-jdbcpostgresql-adapter
-  activerecord-jdbcsqlite3-adapter
-  minitest-reporters
-  pg (< 1)
-  rake
-  simplecov
-  sqlite3
-
-BUNDLED WITH
-   1.17.2