activerecord-mysql-enum 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2084948247375121f6afd7e4c37a3d80b71370d301de92801bbe8c8659a359a1
-  data.tar.gz: 2f9c5a9fafb6ea306ec68fc7fcbfd7d1c0aa160990e2cff428ea6460088c9f44
+  metadata.gz: ffce6e3ac257695994f6047a2fc92014732807c6df5f73e7a50a8c9e43b4dead
+  data.tar.gz: 3cf2a902e47a9d4077c271802aaa1dd2f9dd382be35ff150537f4432312d4453
 SHA512:
-  metadata.gz: 628fae94acef21e4d62a3c603c16924669f3f85118e1cb66c40ea6338c9273abb33aafc63d4e0e0c174143f2e53ae97da1b3e8bac2b55b3fb3721e87a76e6cce
-  data.tar.gz: '04157914bbeda6f17243216409fa612e357f643c6694c824551eaf4624e1b7d07ffd150b5f6d4c43dbb3acf57ebcb574af3b5737ac438692b5f7b813d4216312'
+  metadata.gz: 835337ba0e11f9164608edaca8de311e533eba27ede45944b7a4c323377e1ac96cdb8e3c45f4e9fc227c09568fb6501150e8c5e75bb2042eed33dd7d13f4e873
+  data.tar.gz: 9d451b8452ec9981942b09d66e568ee0312e1fca635ab454b342c495f15d8c6e3bbfa7f8fbb13d06a99b50b7d05bb4468ec5a1b9e16515e17e140dafaa3e0df3

data/.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "22:00"
+    timezone: PST8PDT
+  open-pull-requests-limit: 99
+  versioning-strategy: lockfile-only
+  commit-message:
+    prefix: No-Jira
+    include: scope

data/.github/workflows/test.yml

@@ -24,6 +24,8 @@ jobs:
         - Gemfile
         - gemfiles/rails_5.gemfile
         - gemfiles/rails_6.gemfile
+        - gemfiles/rails_6_1.gemfile
+        - gemfiles/rails_7_0.gemfile
         exclude:
         - ruby: '3.0'
           gemfile: Gemfile
@@ -33,6 +35,10 @@ jobs:
           gemfile: gemfiles/rails_5.gemfile
         - ruby: 3.1
           gemfile: gemfiles/rails_5.gemfile
+        - ruby: 2.5.8
+          gemfile: gemfiles/rails_7_0.gemfile
+        - ruby: 2.6.5
+          gemfile: gemfiles/rails_7_0.gemfile
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
       DATABASE_MYSQL_HOST: 127.0.0.1

data/Appraisals

@@ -8,4 +8,17 @@ end
 appraise 'rails-6' do
   gem 'rails', '~> 6.0.0'
   gem 'mysql2', '~> 0.5'
+  gem "net-smtp", require: false
+end
+
+appraise 'rails-6-1' do
+  gem 'rails', '~> 6.1.0'
+  gem 'mysql2', '~> 0.5'
+  gem "net-smtp", require: false
+end
+
+appraise 'rails-7-0' do
+  gem 'rails', '~> 7.0.0'
+  gem 'mysql2', '~> 0.5'
+  gem "net-smtp", require: false
 end

data/CHANGELOG.md

@@ -4,6 +4,10 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.0] - 2022-07-18
+### Added
+- Added support for Rails 6.1 and 7.0
+
 ## [2.1.0] - 2022-04-11
 ### Added
 - Added ruby 3 support
@@ -56,6 +60,7 @@ Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0
 ### Changed
 - Renamed the gem from `enum_column3` to `activerecord-mysql-enum`
 
+[2.2.0]: https://github.com/Invoca/activerecord-mysql-enum/compare/v2.1.0...v2.2.0
 [2.1.0]: https://github.com/Invoca/activerecord-mysql-enum/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/Invoca/activerecord-mysql-enum/compare/v1.0.0...v2.0.0
 [1.0.0]: https://github.com/Invoca/activerecord-mysql-enum/compare/v0.1.4...v1.0.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    activerecord-mysql-enum (2.1.0)
-      activerecord (>= 5.2, < 7)
+    activerecord-mysql-enum (2.2.0)
+      activerecord (>= 5.2, < 7.1)
       mysql2 (>= 0.4.5, < 0.6)
 
 GEM
@@ -83,7 +83,7 @@ GEM
     mini_mime (1.1.0)
     mini_portile2 (2.6.1)
     minitest (5.14.4)
-    mysql2 (0.5.3)
+    mysql2 (0.5.4)
     nio4r (2.5.8)
     nokogiri (1.12.2)
       mini_portile2 (~> 2.6.1)

data/README.md

@@ -7,7 +7,7 @@ which was itself a fork of a fork of Nick Pohodnya's original gem for
 Rails 3, [enum_column3](https://github.com/electronick/enum_column).
 
 ## Support
-Currently this is tested with Rails version 5.2, and 6.0.
+Currently this is tested with Rails version 5.2, 6.0, 6.1, and 7.0.
 
 **Supported adapters:**
 - mysql2

data/enum_column.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activerecord', '>= 5.2', '< 7'
+  spec.add_dependency 'activerecord', '>= 5.2', '< 7.1'
   spec.add_dependency 'mysql2', '>= 0.4.5', '< 0.6'
 end

data/gemfiles/rails_5.gemfile

@@ -8,8 +8,8 @@ gem "pry"
 gem "pry-byebug"
 gem "rake", "~> 13.0"
 gem "rails", "~> 5.2"
-gem "rspec"
-gem "rspec-rails", "~> 4.0"
+gem "rspec", "~> 3.11"
+gem "rspec-rails", "~> 5.0"
 gem "mysql2", "~> 0.4"
 
 gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -8,8 +8,8 @@ gem "pry"
 gem "pry-byebug"
 gem "rake", "~> 13.0"
 gem "rails", "~> 6.0.0"
-gem "rspec"
-gem "rspec-rails", "~> 4.0"
+gem "rspec", "~> 3.11"
+gem "rspec-rails", "~> 5.0"
 gem "mysql2", "~> 0.5"
 gem "net-smtp", require: false
 

data/gemfiles/rails_6_1.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "coveralls", require: false
+gem "pry"
+gem "pry-byebug"
+gem "rake", "~> 13.0"
+gem "rails", "~> 6.1.0"
+gem "rspec", "~> 3.11"
+gem "rspec-rails", "~> 5.0"
+gem "mysql2", "~> 0.5"
+gem "net-smtp", require: false
+
+gemspec path: "../"

data/gemfiles/rails_7_0.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "coveralls", require: false
+gem "pry"
+gem "pry-byebug"
+gem "rake", "~> 13.0"
+gem "rails", "~> 7.0.0"
+gem "rspec", "~> 3.11"
+gem "rspec-rails", "~> 5.0"
+gem "mysql2", "~> 0.5"
+gem "net-smtp", require: false
+
+gemspec path: "../"

data/lib/active_record/mysql/enum/enum_column_adapter.rb

@@ -22,16 +22,6 @@ module ActiveRecord
       ActiveRecordColumnWithEnums = Enum.mysql_column_adapter
 
       module EnumColumnAdapter
-        def initialize(*args, **kwargs, &block)
-          super
-
-          if type == :enum
-            @default = if @default.present?
-                         @default.to_sym
-                       end
-          end
-        end
-
         # Convert to a symbol.
         def type_cast_from_database(value)
           if type == :enum

data/lib/active_record/mysql/enum/mysql_adapter.rb

@@ -10,6 +10,13 @@ module ActiveRecord
 
           ActiveRecord::ConnectionAdapters::Mysql2Adapter
         end
+
+        def register_enum_with_type_mapping(m)
+          m.register_type(/enum/i) do |sql_type|
+            limit = sql_type.sub(/^enum\('(.+)'\)/i, '\1').split("','").map { |v| v.to_sym }
+            ActiveRecord::Type::Enum.new(limit: limit)
+          end
+        end
       end
 
       ActiveRecordMysqlAdapter = Enum.mysql_adapter
@@ -45,20 +52,24 @@ module ActiveRecord
           end
         end
 
+        if Gem::Version.new(Rails.version) < Gem::Version.new('7.0')
+          private
 
-        private
-
-        def initialize_type_map(m = type_map)
-          super
+          def initialize_type_map(m = type_map)
+            super
 
-          m.register_type(/enum/i) do |sql_type|
-            limit = sql_type.sub(/^enum\('(.+)'\)/i, '\1').split("','").map { |v| v.to_sym }
-            ActiveRecord::Type::Enum.new(limit: limit)
+            Enum.register_enum_with_type_mapping(m)
           end
         end
       end
 
       ActiveRecordMysqlAdapter.prepend ActiveRecord::Mysql::Enum::MysqlAdapter
+
+      unless Gem::Version.new(Rails.version) < Gem::Version.new('7.0')
+        [ActiveRecordMysqlAdapter::TYPE_MAP, ActiveRecordMysqlAdapter::TYPE_MAP_WITH_BOOLEAN].each do |m|
+          Enum.register_enum_with_type_mapping(m)
+        end
+      end
     end
   end
 end

data/lib/active_record/mysql/enum/schema_definitions.rb

@@ -6,7 +6,7 @@ module ActiveRecord
       def enum(*args)
         options = args.extract_options!
         column_names = args
-        column_names.each { |name| column(name, 'enum', **options) }
+        column_names.each { |name| column(name, :enum, **options) }
       end
     end
   end

data/lib/active_record/mysql/enum/version.rb

@@ -3,7 +3,7 @@
 module ActiveRecord
   module Mysql
     module Enum
-      VERSION = "2.1.0"
+      VERSION = "2.2.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-enum
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Nick Pohodnya
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -20,7 +20,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".dependabot/config.yml"
+- ".github/dependabot.yml"
 - ".github/workflows/gem_release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
@@ -76,6 +76,8 @@ files:
 - gemfiles/.bundle/config
 - gemfiles/rails_5.gemfile
 - gemfiles/rails_6.gemfile
+- gemfiles/rails_6_1.gemfile
+- gemfiles/rails_7_0.gemfile
 - init.rb
 - lib/active_record/mysql/enum.rb
 - lib/active_record/mysql/enum/enum_column_adapter.rb
@@ -107,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Enable enum type for the MySQL Adapter in ActiveRecord

data/.dependabot/config.yml

@@ -1,10 +0,0 @@
----
-version: 1
-update_configs:
-- package_manager: "ruby:bundler"
-  directory: "/"
-  update_schedule: "live"
-  version_requirement_updates: "off"
-  commit_message:
-    prefix: "No-Jira"
-    include_scope: true