diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d5009c..55965c3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -69,11 +69,11 @@ jobs: - ruby: 2.7.3 gemfile: Gemfile.6.1.pg - ruby: 2.7.3 - gemfile: Gemfile.7.0.pg - - ruby: 3.2.0 + gemfile: Gemfile.7.1.pg + - ruby: 3.3.0 gemfile: Gemfile.6.1.pg - - ruby: 3.2.0 - gemfile: Gemfile.7.0.pg + - ruby: 3.3.0 + gemfile: Gemfile.7.1.pg env: BUNDLE_GEMFILE: "${{ matrix.gemfile }}" steps: diff --git a/.ruby-version b/.ruby-version index 944880f..15a2799 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.0 +3.3.0 diff --git a/Gemfile b/Gemfile index 69d34e2..806dbda 120000 --- a/Gemfile +++ b/Gemfile @@ -1 +1 @@ -Gemfile.7.0.pg \ No newline at end of file +Gemfile.7.1.pg \ No newline at end of file diff --git a/Gemfile.7.0.pg b/Gemfile.7.1.pg similarity index 89% rename from Gemfile.7.0.pg rename to Gemfile.7.1.pg index 0f39692..eabfb33 100644 --- a/Gemfile.7.0.pg +++ b/Gemfile.7.1.pg @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Runtime dependencies -gem 'activerecord', '~>7.0.1' +gem 'activerecord', '~>7.1.3' gem 'i18n' gem 'pg', '~> 1.3.5' diff --git a/Gemfile.7.0.pg.lock b/Gemfile.7.1.pg.lock similarity index 56% rename from Gemfile.7.0.pg.lock rename to Gemfile.7.1.pg.lock index aa50146..a991c2e 100644 --- a/Gemfile.7.0.pg.lock +++ b/Gemfile.7.1.pg.lock @@ -7,23 +7,40 @@ PATH GEM remote: https://rubygems.org/ specs: - activemodel (7.0.4.1) - activesupport (= 7.0.4.1) - activerecord (7.0.4.1) - activemodel (= 7.0.4.1) - activesupport (= 7.0.4.1) - activesupport (7.0.4.1) + activemodel (7.1.3) + activesupport (= 7.1.3) + activerecord (7.1.3) + activemodel (= 7.1.3) + activesupport (= 7.1.3) + timeout (>= 0.4.0) + activesupport (7.1.3) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - concurrent-ruby (1.2.0) - database_cleaner (1.7.0) + base64 (0.2.0) + bigdecimal (3.1.6) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + database_cleaner (2.0.2) + database_cleaner-active_record (>= 2, < 3) + database_cleaner-active_record (2.1.0) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) diff-lcs (1.3) + drb (2.2.0) + ruby2_keywords gemika (0.8.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - minitest (5.17.0) + minitest (5.22.2) + mutex_m (0.2.0) pg (1.3.5) rake (12.3.2) rspec (3.8.0) @@ -42,16 +59,18 @@ GEM rspec_candy (0.5.1) rspec sneaky-save + ruby2_keywords (0.0.5) sneaky-save (0.1.3) activerecord (>= 3.2.0) - tzinfo (2.0.5) + timeout (0.4.1) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) PLATFORMS ruby DEPENDENCIES - activerecord (~> 7.0.1) + activerecord (~> 7.1.3) assignable_values! database_cleaner gemika (~> 0.8.0) diff --git a/Gemfile.lock b/Gemfile.lock index d413978..ebe8f1e 120000 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1 +1 @@ -Gemfile.7.0.pg.lock \ No newline at end of file +Gemfile.7.1.pg.lock \ No newline at end of file diff --git a/README.md b/README.md index f973b3b..c3618db 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ assignable_values - Enums on vitamins [![Tests](https://github.com/makandra/assi We carefully enhanced the core enum functionality with small tweaks that are useful for web forms, internationalized applications and common authorization patterns. -`assignable_values` is tested with Rails 5.1, 6.1 and 7.0 on Ruby 2.5, 2.7 and 3.2. +`assignable_values` is tested with Rails 5.1, 6.1 and 7.1 on Ruby 2.5, 2.7 and 3.3. Restricting scalar attributes diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index dafad21..ff2e291 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -10,7 +10,11 @@ I18n.load_path = [File.join(File.dirname(__FILE__), 'support/i18n.yml')] I18n.default_locale = :en -ActiveRecord::Base.default_timezone = :local +if ActiveRecord.respond_to?(:default_timezone) + ActiveRecord.default_timezone = :local +else + ActiveRecord::Base.default_timezone = :local +end Dir["#{File.dirname(__FILE__)}/support/*.rb"].sort.each {|f| require f}