Merge pull request #29 from alpaca-tc/remove-eol-ruby-and-rails

EOL Ruby and Rails no longer supported

.rubocop.yml

@@ -6,12 +6,11 @@ AllCops:
     - '**/Rakefile'
     - '**/config.ru'
     - 'node_modules/**/*'
-  TargetRubyVersion: 2.5
+    - 'gemfiles/**/*'
+  DisabledByDefault: true
+  TargetRubyVersion: 3.0
   DisplayCopNames: true
 
-Performance:
-  Enabled: false
-
 Bundler:
   Enabled: false
 
@@ -24,7 +23,7 @@ Metrics/BlockNesting:
 Metrics/ClassLength:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 
 Metrics/MethodLength:
@@ -39,10 +38,6 @@ Metrics/ModuleLength:
 Style/AsciiComments:
   Enabled: false
 
-Style/BlockDelimiters:
-  Exclude:
-    - 'spec/**/*'
-
 Style/Documentation:
   Enabled: false
 
@@ -67,11 +62,14 @@ Style/NumericPredicate:
 Style/Lambda:
   Enabled: false
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
+
+Lint/MissingSuper:
+  Enabled: false

.travis.yml

@@ -3,27 +3,13 @@ language: ruby
 services:
   - mysql
 rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-  - 3.0.0
+  - 3.0.6
+  - 3.1.4
+  - 3.2.2
 before_install: gem install bundler
 gemfile:
-  - gemfiles/5.0_stable.gemfile
-  - gemfiles/5.1_stable.gemfile
-  - gemfiles/5.2_stable.gemfile
-  - gemfiles/6.0_stable.gemfile
   - gemfiles/6.1_stable.gemfile
-matrix:
-  exclude:
-    - rvm: 3.0.0
-      gemfile: gemfiles/5.0_stable.gemfile
-    - rvm: 3.0.0
-      gemfile: gemfiles/5.1_stable.gemfile
-    - rvm: 3.0.0
-      gemfile: gemfiles/5.2_stable.gemfile
-    - rvm: 3.0.0
-      gemfile: gemfiles/6.0_stable.gemfile
+  - gemfiles/7.0_stable.gemfile
 script:
   - bundle exec rspec
   - bundle exec rubocop

Appraisals

@@ -1,26 +1,9 @@
 # frozen_string_literal: true
 
-appraise '5.0-stable' do
-  gem 'activerecord', '~> 5.0.0'
-  gem 'sqlite3', '~> 1.3.0'
-end
-
-appraise '5.1-stable' do
-  gem 'activerecord', '~> 5.1.0'
-end
-
-appraise '5.2-stable' do
-  gem 'activerecord', '~> 5.2.0'
-end
-
-appraise '6.0-stable' do
-  gem 'activerecord', '~> 6.0.0'
-end
-
 appraise '6.1-stable' do
   gem 'activerecord', '~> 6.1.0'
 end
 
 appraise '7.0-stable' do
-  gem 'activerecord', '7.0.0.alpha2'
+  gem 'activerecord', '~> 7.0.0'
 end

CHANGELOG.md

@@ -1,5 +1,8 @@
-## 0.3.1
+## Unreleased
 
+- EOL Ruby and Rails no longer supported #29
+  - Requires Ruby 3.0.0 or newer.
+  - Requires Rails 6.1.0 or newer.
 - Support rails 7.0.0 #25
 
 ## 0.3.0

README.md

@@ -118,9 +118,8 @@ end
 
 ```bash
 bundle exec appraisal install
-bundle exec appraisal 5.0-stable rspec
-bundle exec appraisal 5.1-stable rspec
-bundle exec appraisal 5.2-stable rspec
+bundle exec appraisal 6.1-stable rspec
+bundle exec appraisal 7.0-stable rspec
 ```
 
 ## Contributing

active_record_encryption.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 3.0.0'
 
   spec.files = %w[
     CHANGELOG.md
@@ -24,7 +25,7 @@ Gem::Specification.new do |spec|
     LICENSE.txt
   ] + Dir['lib/**/*.rb']
 
-  spec.add_dependency 'activerecord', '>= 5.0'
+  spec.add_dependency 'activerecord', '>= 6.1'
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'guard-rspec'

docker-compose.yml

@@ -0,0 +1,13 @@
+version: '3'
+services:
+  db:
+    platform: linux/x86_64
+    image: mysql:5.7
+    volumes:
+      - db:/var/lib/mysql
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+    ports:
+      - 3306:3306
+volumes:
+  db:

gemfiles/7.0_stable.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "7.0.0.alpha2"
+gem "activerecord", "~> 7.0.0"
 
 gemspec path: "../"

lib/active_record_encryption/quoter.rb

@@ -18,12 +18,22 @@ def unquoted_false
       'f'
     end
 
+    if ActiveRecord::VERSION::MAJOR >= 7
+      # Cast value to string
+      def type_cast(value)
+        return value.to_s if value.is_a?(Numeric)
+        super(value)
+      end
+    end
+
     private
 
-    # Cast value to string
-    def _type_cast(value)
-      return value.to_s if value.is_a?(Numeric)
-      super(value)
+    if ActiveRecord::VERSION::MAJOR < 7
+      # Cast value to string
+      def _type_cast(value)
+        return value.to_s if value.is_a?(Numeric)
+        super(value)
+      end
     end
   end
 end

lib/active_record_encryption/type.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
-require 'active_record_encryption/serializer_with_cast'
-
 module ActiveRecordEncryption
   class Type < ActiveRecord::Type::Value
-    using(ActiveRecordEncryption::SerializerWithCast)
-
     delegate :type, :cast, to: :subtype
     delegate :user_input_in_time_zone, to: :subtype # for ActiveRecord::AttributeMethods::TimeZoneConversion::TimeZoneConverter
 

spec/active_record_encryption/encryptor/active_support_spec.rb

@@ -24,7 +24,13 @@ def new_cipher
           let(:cipher) { 'aes-256-gcm' }
 
           it 'builds aes-256-gcm encryptor' do
-            expect(new_cipher.name).to eq('id-aes256-GCM')
+            expected = if RUBY_VERSION >= '3.1.0'
+                         'AES-256-GCM'
+                       else
+                         'id-aes256-GCM'
+                       end
+
+            expect(new_cipher.name).to eq(expected)
           end
         end