activerecord-time 0.17.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a78f054f0473a1a0adb90af5ae3395b847bdd06cfb9d564a67f595a8e90d0c6f
-  data.tar.gz: feca115e76f76ab8d2b5734ac2c5e89a8d3fca0eb12930b1c12a9a512f24df1c
+  metadata.gz: b4fd61f3d4336ca6066bf7c370cc9b6ef79197a8a223c90c5988df700f4766f7
+  data.tar.gz: 0c718820286900bcb68d4ca0a7fbcf138d9f2333335ef8a136e81421fb67f894
 SHA512:
-  metadata.gz: 3936ced2f21a9d38cb4578789a952917a90f20365caccbb58e1bfd9a280a6b551a4dd8cc672208a04466311971158a480d20cdf88a60939eb2538f85360f0d97
-  data.tar.gz: 1fc524b519c6a4ca3bec14f8c73976df8ff111856d1834d1da31ad81f9b2ffe967fa0829a81b01c1dbd05b42144ebf33694c76570e4b88529ebf088f1370b02b
+  metadata.gz: 0b6cdf1f3d47679076e9e20ff5504ddd1b0322508e76431d7e27050f0d6b9e0cdddaef424cc3eb70cebbd4dda78fde8240864737ae011b1b402f42446a377bf4
+  data.tar.gz: 0a3a67c6781ca27f19ca9814835f44389756625d13c69be4ca291c09e69fb602b33a05927af0b860a5c21814a1856473b3a7f5cc79e26b915c2fcbc89d3ca151

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.yml

@@ -5,7 +5,6 @@ require:
   - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 2.4
   DisplayCopNames: true
   DisplayStyleGuide: true
   NewCops: enable

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-02-02 13:29:03 UTC using RuboCop version 1.9.1.
+# 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
@@ -26,12 +26,12 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 # IgnoredMethods: refine
 Metrics/BlockLength:
-  Max: 26
+  Max: 28
 
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 176
+  Max: 184
 
 # Offense count: 1
 # Configuration parameters: IgnoredMethods.
@@ -41,7 +41,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 3
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 15
+  Max: 13
 
 # Offense count: 1
 # Configuration parameters: IgnoredMethods.
@@ -49,7 +49,7 @@ Metrics/PerceivedComplexity:
   Max: 11
 
 # Offense count: 2
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, AllowToTime.
 # SupportedStyles: strict, flexible
 Rails/Date:
   Exclude:
@@ -105,6 +105,7 @@ Style/OptionalBooleanParameter:
 
 # Offense count: 5
 # Cop supports --auto-correct.
+# Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
     - 'test/test_helper.rb'

data/.travis.yml

@@ -4,13 +4,15 @@ cache: bundler
 services:
   - postgresql
 jdk:
-  - openjdk
+  - openjdk11
 rvm:
+  - ruby-3.0
   - ruby-2.7
   - ruby-2.6
   - ruby-2.5
   - jruby
 gemfile:
+  - gemfiles/ar61.gemfile
   - gemfiles/ar60.gemfile
   - gemfiles/ar52.gemfile
   - gemfiles/ar51.gemfile

data/activerecord-time.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = %w[lib]
 
-  gem.add_runtime_dependency 'activerecord', '>=5.1', '<7'
+  gem.add_runtime_dependency 'activerecord', '~>7.0'
 
   if defined? JRUBY_VERSION
     gem.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
@@ -32,7 +32,6 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency 'pg'
     gem.add_development_dependency 'sqlite3'
   end
-  gem.add_development_dependency 'minitest-reporters'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rubocop'
   gem.add_development_dependency 'rubocop-performance'

data/lib/activerecord-time/extension.rb

@@ -5,13 +5,13 @@ require 'active_record/connection_adapters/abstract/quoting'
 module Activerecord
   module Time
     module Quoting
-      def _quote(value)
+      def quote(value)
         return "'#{value}'" if value.is_a?(TimeOfDay)
 
         super(value)
       end
 
-      def _type_cast(value)
+      def type_cast(value)
         return value.to_s if value.is_a?(TimeOfDay)
 
         super(value)
@@ -20,8 +20,7 @@ module Activerecord
   end
 end
 
-# ActiveRecord::ConnectionAdapters::Quoting.prepend Activerecord::Time::Quoting
-ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend Activerecord::Time::Quoting
+ActiveRecord::ConnectionAdapters::Quoting.prepend Activerecord::Time::Quoting
 
 module ActiveRecord
   module Type

data/lib/activerecord-time/version.rb

@@ -2,6 +2,6 @@
 
 module Activerecord
   module Time
-    VERSION = '0.17.0'
+    VERSION = '0.20.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,9 +87,16 @@ class TimeOfDay
   end
 
   def -(other)
-    raise "Illegal argument: #{other.inspect}" unless other.is_a? Numeric
-
-    self.+(-other)
+    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
+    when Numeric
+      self.+(-other)
+    else
+      raise "Illegal argument: #{other.inspect}"
+    end
   end
 
   def <=>(other)
@@ -142,4 +149,8 @@ class TimeOfDay
   def to_json(*)
     %("#{self}")
   end
+
+  def utc?
+    true
+  end
 end

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

@@ -6,8 +6,6 @@ RAILS_ROOT = File.dirname(__FILE__)
 require 'rubygems'
 require 'bundler/setup'
 require 'minitest/autorun'
-require 'minitest/reporters'
-MiniTest::Reporters.use!
 
 require 'active_record'
 require 'activerecord-time'
@@ -21,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,6 +142,18 @@ class TimeOfDayTest < Minitest::Test
     assert_equal 59, tod.second
   end
 
+  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
     tod1 = TimeOfDay.new(12, 0, 5)
     tod2 = TimeOfDay.new(12, 0, 5)

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-time
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +144,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -175,11 +156,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
@@ -211,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 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