activerecord-time 0.22.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 871778cc70f4d4da9385d3d38e9d8e5b945e459ffe0e78c7e340b8e12f795ef6
-  data.tar.gz: 9d9dfbc6e0256c8b91db7a788ace40cd9ffd583cd5dda8713907545b776ea97f
+  metadata.gz: 419bcae7122a053a5f1e52a9e0709d20128a0591d6ffa8542bf23358e81b31e9
+  data.tar.gz: 7e16d17cb32803d234e6c598f88ff896de9646b534dafa49265bc16f50b49235
 SHA512:
-  metadata.gz: 9965445d6ca087fe9e860b75be161f3ecf22c949d7c44c5c521e5d50938f8d7cb7f9f15af1972766f753c5b1abe748eae4a51a99d57ef12be786cca5c322a347
-  data.tar.gz: 6662a72e566791c18d8439685f1202e12a7ed32ac60917cc1aa64384e1de53ea6ed5b89cb73f5091435ebe5656eaeb16c0466eb01d073eccd2196f9adc5c13f3
+  metadata.gz: d6cb9fd5f4e4347b57dba10479409e8cea8d53f1fae874489260b5c767705aea0ebb47b42d670e9ea82884f9a6ed94d7bef3f8c32568f1b06407dfefc71c75de
+  data.tar.gz: c799ef06ce0d3ad4ff2cc356b0ec368351ae80e7dac1f5805aacef656f9ba81b5bb5603572e9b02be2121f98bcc814943fafa4a9c2858b32ce9a03201c14847b

data/.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.3'
+          ruby-version: '3.4'
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: Rubocop
         run: bundle exec rubocop --auto-correct-all
@@ -36,18 +36,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [ 3.3, 3.2, 3.1, jruby, truffleruby ]
-        gemfile: [ ar71, ar70 ]
+        ruby: [ 3.4, 3.3, jruby, truffleruby ]
+        gemfile: [ ar80, ar72 ]
         adapter: [ postgresql, sqlite3 ]
         exclude:
           - ruby: jruby
+            gemfile: ar72 # Not released, yet.
+          - ruby: jruby
+            gemfile: ar80 # Fails, please investigate.
+          - ruby: truffleruby
+            gemfile: ar71 # Fails, please investigate.
           - ruby: truffleruby
+            gemfile: ar70 # Fails, please investigate.
     env:
       ADAPTER: ${{ matrix.adapter }}
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/gems_${{ matrix.gemfile }}.rb
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.rubocop.yml

@@ -1,5 +1,5 @@
 inherit_from: .rubocop_todo.yml
-require:
+plugins:
   - rubocop-performance
   - rubocop-rails
   - rubocop-rake
@@ -30,7 +30,7 @@ Layout/LineLength:
   Max: 107
   AllowHeredoc: true
   AllowURI: true
-  IgnoreCopDirectives: true
+  AllowCopDirectives: true
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented

data/README.md

@@ -124,3 +124,9 @@ Run tests using
     ./matrix_test.rb
 
 This will run the tests for the same environments as travis-ci.
+
+## Release
+
+* Update the version in [lib/activerecord-time/version.rb](lib/activerecord-time/version.rb)
+* Commit all changes
+* Run `rake release`

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', '~>7.0'
+  gem.add_runtime_dependency 'activerecord', '>=7.2'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rubocop'

data/gemfiles/common.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 platform :ruby do
   gem 'pg'
-  gem 'sqlite3', '<2'
+  gem 'sqlite3'
 end
 
 gem 'minitest-reporters'

data/gemfiles/{gems_ar71.rb → gems_ar72.rb}

@@ -15,4 +15,4 @@ platform :jruby do
   gem 'jdbc-sqlite3', github: 'jruby/activerecord-jdbc-adapter'
 end
 
-gem 'activerecord', '~>7.1.0'
+gem 'activerecord', '~>7.2.0'

data/gemfiles/gems_ar80.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+eval File.read("#{File.dirname __FILE__}/common.gemfile")
+
+platform :jruby do
+  git_source(:github) do |repo_name|
+    repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
+    "https://github.com/#{repo_name}.git"
+  end
+  gem 'activerecord-jdbc-adapter', github: 'jruby/activerecord-jdbc-adapter'
+  # gem 'activerecord-jdbcderby-adapter', github: 'jruby/activerecord-jdbc-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter', github: 'jruby/activerecord-jdbc-adapter'
+  gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter'
+  gem 'jdbc-postgres', github: 'jruby/activerecord-jdbc-adapter'
+  gem 'jdbc-sqlite3', github: 'jruby/activerecord-jdbc-adapter'
+end
+
+gem 'activerecord', '~>8.0.0'

data/lib/active_record/type/time.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module Type
+    class Time < ActiveModel::Type::Time
+      include Internal::Timezone
+
+      class Value < DelegateClass(::TimeOfDay) # :nodoc:
+      end
+
+      def map(value)
+        value
+      end
+
+      def serialize(value)
+        case value = super
+        when ::TimeOfDay
+          Value.new(value)
+        else
+          value
+        end
+      end
+
+      def serialize_cast_value(value)
+        Value.new(value) if value
+      end
+
+      private def cast_value(value)
+        return value.time_of_day if value.is_a?(::DateTime) || value.is_a?(::Time)
+        return value unless value.is_a?(::String)
+        return if value.empty?
+
+        TimeOfDay._parse(value)
+      end
+    end
+  end
+end

data/lib/activerecord-time/extension.rb

@@ -1,38 +1,21 @@
 # frozen_string_literal: true
 
-require 'active_record/connection_adapters/abstract/quoting'
-
 module Activerecord
   module Time
     module Quoting
       def quote(value)
         return "'#{value}'" if value.is_a?(TimeOfDay)
 
-        super(value)
+        super
       end
 
       def type_cast(value)
         return value.to_s if value.is_a?(TimeOfDay)
 
-        super(value)
+        super
       end
     end
   end
 end
 
 ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend Activerecord::Time::Quoting
-
-module Activerecord
-  module Time
-    module Casting
-      private def cast_value(value)
-        return value.time_of_day if value.is_a?(::DateTime) || value.is_a?(::Time)
-        return value unless value.is_a?(::String)
-        return if value.empty?
-
-        TimeOfDay._parse(value)
-      end
-    end
-  end
-end
-ActiveRecord::Type::Time.prepend Activerecord::Time::Casting

data/lib/activerecord-time/version.rb

@@ -2,6 +2,6 @@
 
 module Activerecord
   module Time
-    VERSION = '0.22.0'
+    VERSION = '1.1.0'
   end
 end

data/lib/time_of_day/core_ext.rb

@@ -23,6 +23,8 @@ end
 
 class Date
   def at(time_of_day)
+    return if time_of_day.nil?
+
     time_of_day = TimeOfDay.parse(time_of_day) if time_of_day.is_a?(String)
     zone = Time.zone || Time
     zone.local(year, month, day, time_of_day.hour, time_of_day.minute, time_of_day.second)

data/lib/time_of_day.rb

@@ -42,10 +42,10 @@ class TimeOfDay
         raise "Invalid TimeOfDay. #{hour}:#{minute}:#{second} given, but highest allowed value is 24:00:00"
       end
     else
-      raise "Invalid hour: #{hour}" unless hour >= 0 && hour <= 23
+      raise "Invalid hour: #{hour}" unless hour.between?(0, 23)
     end
-    raise "Invalid minute: #{minute}" unless minute >= 0 && minute <= 59
-    raise "Invalid second: #{second}" unless second >= 0 && second <= 59
+    raise "Invalid minute: #{minute}" unless minute.between?(0, 59)
+    raise "Invalid second: #{second}" unless second.between?(0, 59)
 
     @hour = hour
     @minute = minute

data/matrix_test.rb

@@ -6,6 +6,7 @@ system('rubocop --autocorrect-all') || exit(1)
 update_gemfiles = ARGV.delete('--update')
 
 require 'yaml'
+require 'bundler'
 actions = YAML.safe_load_file('.github/workflows/test.yml')
 
 def run_script(ruby, env, gemfile)
@@ -36,7 +37,7 @@ def use_gemfile(ruby, gemfile, update_gemfiles)
 end
 
 def bad_variant?(bad_variants, ruby, gemfile = nil, adapter = nil)
-  bad_variants.find do |f|
+  bad_variants&.find do |f|
     !(ruby.nil? ^ f['ruby'].nil?) && f['ruby'] == ruby &&
         !(gemfile.nil? ^ f['gemfile'].nil?) && f['gemfile'] == gemfile &&
         !(adapter.nil? ^ f['adapter'].nil?) && f['adapter'] == adapter

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-time
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Uwe Kubosch
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -127,8 +126,9 @@ files:
 - Rakefile
 - activerecord-time.gemspec
 - gemfiles/common.gemfile
-- gemfiles/gems_ar70.rb
-- gemfiles/gems_ar71.rb
+- gemfiles/gems_ar72.rb
+- gemfiles/gems_ar80.rb
+- lib/active_record/type/time.rb
 - lib/activerecord-time.rb
 - lib/activerecord-time/extension.rb
 - lib/activerecord-time/version.rb
@@ -143,7 +143,6 @@ homepage: https://github.com/donv/activerecord-time
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -158,8 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A handler for storing TimeOfDay objects in ActiveRecord objects as sql time
   values.

data/gemfiles/gems_ar70.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-eval File.read("#{File.dirname __FILE__}/common.gemfile")
-
-platform :jruby do
-  # gem 'activerecord-jdbc-adapter'
-  # gem 'activerecord-jdbcderby-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-  gem 'activerecord-jdbcsqlite3-adapter'
-end
-
-gem 'activerecord', '~>7.0.0'