activerecord-mysql-enum 0.1.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 578ac3f22e8b3c8918ba90a0275b6cec90bc5b65
-  data.tar.gz: ee0b982c920256d50afeae9b9a2b8b4ec143e10f
+SHA256:
+  metadata.gz: 459885e4a5040ecec66b8e13a82810c5b58a516e7b6d862540861b983ec16671
+  data.tar.gz: 22dc3afd5d45bf3a5b7f6ca49105742ac805b9385e470983eaf38be9d22a58fb
 SHA512:
-  metadata.gz: fe548ee120207058a9e1af2a87bcd95a120be896aa02b0e826ed856de893121d7604b106125d7f093695a0efd704959a3651eacd8940ea33779d474df3eada0f
-  data.tar.gz: 0e240650af84b1e562789fad514c9f1a01d11dedc3c39d67734632b51d0301a0e87b4d99c4814690c7cef107742d9b7f32c404cd9a622284d181a24c76948c02
+  metadata.gz: '0219e9b653b15e4354b8e515ee815a7dd6daa99c7ccc88470017e3802096e739008ce985c67bfee9aa543f918a5a58a2a5d449c3b6f2dc00601c2412143f7df6'
+  data.tar.gz: 2215b573018c5d3971294b2d9a672434497437c5c9f846e1ee945491ab2629f03152da44bf0a55dfa91ea17bff3e44ed964655b39aab3d6eb5e5ca748c01f1c0

data/.github/workflows/test.yml

@@ -0,0 +1,39 @@
+---
+name: ActiveRecord MySQL Enum
+on: [push]
+jobs:
+  test:
+    name: Unit Tests
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_DATABASE: activerecord_mysql_enum_test
+          MYSQL_USER: user
+          MYSQL_PASSWORD: password
+          MYSQL_ROOT_PASSWORD: rootpassword
+        ports:
+        - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5.8, 2.6.5, 2.7.1]
+        gemfile:
+        - gemfiles/rails_5.gemfile
+        - gemfiles/rails_6.gemfile
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      DATABASE_MYSQL_HOST: 127.0.0.1
+      DATABASE_MYSQL_USERNAME: user
+      DATABASE_MYSQL_PASSWORD: password
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler: 1.17.3
+        bundler-cache: true
+    - run: RAILS_ENV=test bundle exec rake db:create
+    - run: bundle exec rspec

data/.gitignore

@@ -6,3 +6,9 @@
 /pkg/
 /spec/reports/
 /tmp/
+/log/*.log
+/db/*.sqlite3
+.idea
+gemfiles/*.lock
+coverage/
+spec/dummy/log/*.log

data/.rspec

@@ -0,0 +1 @@
+--require rails_helper

data/Appraisals

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+appraise 'rails-5' do
+  gem 'rails', '~> 5.2'
+  gem 'mysql2', '~> 0.4'
+end
+
+appraise 'rails-6' do
+  gem 'rails', '~> 6.0.0'
+  gem 'mysql2', '~> 0.5'
+end

data/CHANGELOG.md

@@ -4,6 +4,27 @@ 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.0.0] - 2021-08-10
+### Removed
+- Dropped support for Rails less than 5
+
+## [1.0.0] - 2020-09-16
+### Added
+- A Rspec test suit
+- Dummy Rails app to be used by tests
+- Test coverage reports via Coveralls/SimpleCov
+- A coverage report badge to the README
+- Unit tests being run on push with TravisCI
+- Appraisal to test Rails 4.2, 5.2, and 6.0
+- A dependency on the mysql2 gem
+
+### Changed
+- Existing tests to be run with Rspec
+
+### Removed
+- Support for the mysql gem
+- Support for Rails < 4.2
+
 ## [0.1.4] - 2020-08-20
 ### Fixed
 - Fixed bug in `mysql_adapter` where optional arguments being passed to `type_to_sql` would cause
@@ -28,6 +49,8 @@ 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.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
 [0.1.4]: https://github.com/Invoca/activerecord-mysql-enum/compare/v0.1.3...v0.1.4
 [0.1.3]: https://github.com/Invoca/activerecord-mysql-enum/compare/v0.1.2...v0.1.3
 [0.1.2]: https://github.com/Invoca/activerecord-mysql-enum/compare/v0.1.1...v0.1.2

data/Gemfile

@@ -5,8 +5,11 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in active_table_set.gemspec
 gemspec
 
-gem 'bundler',     '~> 1.8'
+gem 'appraisal'
+gem 'coveralls', require: false
 gem 'pry'
 gem 'pry-byebug'
 gem 'rake',        '~> 13.0'
-gem 'rails',       '~> 4.2'
+gem 'rails',       '~> 5.2'
+gem 'rspec'
+gem 'rspec-rails', '~> 3.0'

data/Gemfile.lock

@@ -1,124 +1,187 @@
 PATH
   remote: .
   specs:
-    activerecord-mysql-enum (0.1.4)
-      activerecord (>= 4.2, < 7)
+    activerecord-mysql-enum (2.0.0)
+      activerecord (>= 5.2, < 7)
+      mysql2 (>= 0.4.5, < 0.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.11.3)
-      actionpack (= 4.2.11.3)
-      actionview (= 4.2.11.3)
-      activejob (= 4.2.11.3)
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.11.3)
-      actionview (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.11.3)
-      activesupport (= 4.2.11.3)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.11.3)
-      activesupport (= 4.2.11.3)
-      globalid (>= 0.3.0)
-    activemodel (4.2.11.3)
-      activesupport (= 4.2.11.3)
-      builder (~> 3.1)
-    activerecord (4.2.11.3)
-      activemodel (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
-      arel (~> 6.0)
-    activesupport (4.2.11.3)
-      i18n (~> 0.7)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
+      globalid (>= 0.3.6)
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
+      arel (>= 9.0)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
+      marcel (~> 1.0.0)
+    activesupport (5.2.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.4)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
     crass (1.0.6)
-    erubis (2.7.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (0.9.5)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    erubi (1.10.0)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.6.0)
+    json (2.5.1)
+    loofah (2.11.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    marcel (1.0.1)
     method_source (1.0.0)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    pry (0.13.1)
+    mini_mime (1.1.0)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    mysql2 (0.5.3)
+    nio4r (2.5.8)
+    nokogiri (1.12.2)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rack (1.6.13)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.11.3)
-      actionmailer (= 4.2.11.3)
-      actionpack (= 4.2.11.3)
-      actionview (= 4.2.11.3)
-      activejob (= 4.2.11.3)
-      activemodel (= 4.2.11.3)
-      activerecord (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.11.3)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
+      pry (~> 0.10)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.6)
+      actioncable (= 5.2.6)
+      actionmailer (= 5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      activemodel (= 5.2.6)
+      activerecord (= 5.2.6)
+      activestorage (= 5.2.6)
+      activesupport (= 5.2.6)
+      bundler (>= 1.3.0)
+      railties (= 5.2.6)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (4.2.11.3)
-      actionpack (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
+      method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (13.0.1)
-    sprockets (3.7.2)
+      thor (>= 0.19.0, < 2.0)
+    rake (13.0.6)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.4)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (1.0.1)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tins (1.29.1)
+      sync
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord-mysql-enum!
-  bundler (~> 1.8)
+  appraisal
+  coveralls
   pry
   pry-byebug
-  rails (~> 4.2)
+  rails (~> 5.2)
   rake (~> 13.0)
+  rspec
+  rspec-rails (~> 3.0)
 
 BUNDLED WITH
    1.17.3

data/README.md

@@ -1,4 +1,4 @@
-# ActiveRecord::Mysql::Enum
+# ActiveRecord::Mysql::Enum [![Coverage Status](https://coveralls.io/repos/github/Invoca/activerecord-mysql-enum/badge.svg?branch=master)](https://coveralls.io/github/Invoca/activerecord-mysql-enum?branch=master)
 
 This gem is an extension to ActiveRecord which enables native support of
 enumerations in the database schema using the ENUM type in MySQL. Forked
@@ -7,17 +7,15 @@ 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 has been manually tested with Rails version 4 and 5, and works with scaffolding.
+Currently this is tested with Rails version 5.2, and 6.0.
 
 **Supported adapters:**
-- mysql
 - mysql2
-- jdbcmysql (by Nilesh Trivedi)
 
 ## Installation
 In your `Gemfile` add the following snippet
 ```ruby
-gem 'activerecord-mysql-enum', '~> 0.1', require: 'active_record/mysql/enum'
+gem 'activerecord-mysql-enum', '~> 1.0', require: 'active_record/mysql/enum'
 ```
 
 ## Usage
@@ -50,17 +48,3 @@ irb(1)> Enumeration.columns_hash['color'].limit
 irb(2)> @enumeration.column_for_attribute(:color).limit
 => [:red, :blue, :green, :yellow]
 ```
-
-### Form Helpers
-You can use enum_select helper to generate input for enumerated attribute as:
-```ruby
-<%= enum_select(@enumeration, 'severity')%>
-```
-
-Or using `form_for`:
-```ruby
-<%= form_for @enumeration do |f| %>
-  <%= f.label :severity %>
-  <%= f.enum_select :severity %>
-<% end %>
-```

data/Rakefile

@@ -1,4 +1,17 @@
-#!/usr/bin/env rake
-# frozen_string_literal: true
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+require File.expand_path('../spec/dummy/config/application', __FILE__)
+Rails.application.config.root = "spec/dummy"
 
 Bundler::GemHelper.install_tasks
+Rails.application.load_tasks
+
+task default: :rspec
+
+desc "run rspec unit tests"
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:rspec) do |rspec_task|
+    # rspec_task.exclude_pattern = 'spec/e2e/**/*_spec.rb'
+  end
+end

data/app/assets/config/manifest.js

@@ -0,0 +1 @@
+{}

data/enum_column.gemspec

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

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/rails_5.gemfile

@@ -0,0 +1,15 @@
+# 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", "~> 5.2"
+gem "rspec"
+gem "rspec-rails", "~> 3.0"
+gem "mysql2", "~> 0.4"
+
+gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -0,0 +1,15 @@
+# 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.0.0"
+gem "rspec"
+gem "rspec-rails", "~> 3.0"
+gem "mysql2", "~> 0.5"
+
+gemspec path: "../"

data/lib/active_record/mysql/enum.rb

@@ -9,16 +9,11 @@ if defined?(::Rails::Railtie)
             ActiveSupport.on_load :active_record do
               require 'active_record/mysql/enum/mysql_adapter'
               require 'active_record/mysql/enum/enum_type'
-              require 'active_record/mysql/enum/enum_adapter'
               require 'active_record/mysql/enum/enum_column_adapter'
               require 'active_record/mysql/enum/schema_definitions'
               require 'active_record/mysql/enum/quoting'
               require 'active_record/mysql/enum/validations'
             end
-
-            ActiveSupport.on_load :action_view do
-              require 'active_record/mysql/enum/active_record_helper'
-            end
           end
         end
       end

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

@@ -3,111 +3,58 @@
 # This module provides all the column helper methods to deal with the
 # values and adds the common type management code for the adapters.
 
-
-# try rails 3.1, then rails 3.2+, mysql column adapters
-column_class = if defined? ActiveRecord::ConnectionAdapters::Mysql2Column
-  ActiveRecord::ConnectionAdapters::Mysql2Column
-elsif defined? ActiveRecord::ConnectionAdapters::MysqlColumn
-  ActiveRecord::ConnectionAdapters::MysqlColumn
-elsif defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter::Column
-  ActiveRecord::ConnectionAdapters::Mysql2Adapter::Column
-elsif defined? ActiveRecord::ConnectionAdapters::MysqlAdapter::Column
-  ActiveRecord::ConnectionAdapters::MysqlAdapter::Column
-elsif defined? ActiveRecord::ConnectionAdapters::MySQL::Column
-  ActiveRecord::ConnectionAdapters::MySQL::Column
-end
-
-if column_class
-  column_class.class_eval do
-
-    if instance_methods.include?(:extract_default)
-      alias __extract_default_enum extract_default
-      def extract_default
-        if type == :enum
-          if @default == '' || @default.nil?
-            @default = nil
+module ActiveRecord
+  module Mysql
+    module Enum
+
+      class << self
+        def mysql_column_adapter
+          if defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter::Column
+            ActiveRecord::ConnectionAdapters::Mysql2Adapter::Column
+          elsif defined? ActiveRecord::ConnectionAdapters::MySQL::Column
+            ActiveRecord::ConnectionAdapters::MySQL::Column
           else
-            @default = @default.intern
+            raise "could not find MySQL::Column or equivalent connection adapter"
           end
         end
-        __extract_default_enum
       end
-    end
 
-    def __enum_type_cast(value)
-      if type == :enum
-        self.class.value_to_symbol(value)
-      else
-        __type_cast_enum(value)
-      end
-    end
+      ActiveRecordColumnWithEnums = Enum.mysql_column_adapter
 
-    if instance_methods.include?(:type_cast_from_database)
-      alias __type_cast_enum type_cast_from_database
-      # Convert to a symbol.
-      def type_cast_from_database(value)
-        __enum_type_cast(value)
-      end
-    elsif instance_methods.include?(:type_cast)
-      alias __type_cast_enum type_cast
-      def type_cast(value)
-        __enum_type_cast(value)
-      end
-    end
+      module EnumColumnAdapter
+        def initialize(*)
+          super
 
-    # Deprecated in Rails 4.1
-    if instance_methods.include?(:type_cast_code)
-      alias __type_cast_code_enum type_cast_code
-      # Code to convert to a symbol.
-      def type_cast_code(var_name)
-        if type == :enum
-          "#{self.class.name}.value_to_symbol(#{var_name})"
-        else
-          __type_cast_code_enum(var_name)
+          if type == :enum
+            @default = if @default.present?
+                         @default.to_sym
+                       end
+          end
         end
-      end
-    end
 
-    class << self
-      # Safely convert the value to a symbol.
-      def value_to_symbol(value)
-        case value
-        when Symbol
-          value
-        when String
-          value.empty? ? nil : value.intern
-        else
-          nil
+        # Convert to a symbol.
+        def type_cast_from_database(value)
+          if type == :enum
+            EnumColumnAdapter.value_to_symbol(value)
+          else
+            super
+          end
         end
-      end
-    end
-
-  private
 
-    # Deprecated in Rails 4.2
-    if private_instance_methods.include?(:simplified_type)
-      alias __simplified_type_enum simplified_type
-      # The enum simple type.
-      def simplified_type(field_type)
-        if field_type =~ /enum/i
-          :enum
-        else
-          __simplified_type_enum(field_type)
+        class << self
+          # Safely convert the value to a symbol.
+          def value_to_symbol(value)
+            case value
+            when Symbol
+              value
+            when String
+              value.to_sym if value.present?
+            end
+          end
         end
       end
-    end
 
-    # Deprecated in Rails 4.2
-    if private_instance_methods.include?(:extract_limit)
-      alias __extract_limit_enum extract_limit
-      def extract_limit(sql_type)
-        if sql_type =~ /^enum/i
-          sql_type.sub(/^enum\('(.+)'\)/i, '\1').split("','").map { |v| v.intern }
-        else
-          __extract_limit_enum(sql_type)
-        end
-      end
+      ActiveRecordColumnWithEnums.prepend EnumColumnAdapter
     end
-
   end
 end

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

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
-adapter_class = if defined? ActiveRecord::ConnectionAdapters::MySQLJdbcConnection
-  ActiveRecord::ConnectionAdapters::MySQLJdbcConnection
-# elsif defined? ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
-#   ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
-elsif defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter
-  ActiveRecord::ConnectionAdapters::Mysql2Adapter
-elsif defined? ActiveRecord::ConnectionAdapters::MysqlAdapter
-  ActiveRecord::ConnectionAdapters::MysqlAdapter
-end
-
 module ActiveRecord
   module Mysql
     module Enum
+
+      class << self
+        def mysql_adapter
+          defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter or raise "Could not find MySQL connection adapter"
+
+          ActiveRecord::ConnectionAdapters::Mysql2Adapter
+        end
+      end
+
+      ActiveRecordMysqlAdapter = Enum.mysql_adapter
+
       module MysqlAdapter
         def native_database_types #:nodoc
           types = super
@@ -27,39 +28,20 @@ module ActiveRecord
         # be done on a per adapter basis, but is generalized here.
         #
         # will generate enum('a', 'b', 'c') for :limit => [:a, :b, :c]
-        if Rails::VERSION::MAJOR < 5
-          def type_to_sql(type, limit = nil, *args)
-            if type.to_s == 'enum'
-              column_type_sql =
-                if (native_database_type = native_database_types[type])
-                  native_database_type[:name]
-                else
-                  'enum'
-                end
-
-              quoted_values = limit.map { |v| quote(v) }.join(',')
-
-              "#{column_type_sql}(#{quoted_values})"
-            else
-              super
-            end
-          end
-        else
-          def type_to_sql(type, limit: nil, **_options) # :nodoc:
-            if type.to_s == 'enum'
-              column_type_sql =
-                if (native_database_type = native_database_types[type])
-                  native_database_type[:name]
-                else
-                  'enum'
-                end
+        def type_to_sql(type, limit: nil, **_options) # :nodoc:
+          if type.to_s == 'enum'
+            column_type_sql =
+              if (native_database_type = native_database_types[type])
+                native_database_type[:name]
+              else
+                'enum'
+              end
 
-              quoted_values = limit.map { |v| quote(v) }.join(',')
+            quoted_values = limit.map { |v| quote(v) }.join(',')
 
-              "#{column_type_sql}(#{quoted_values})"
-            else
-              super
-            end
+            "#{column_type_sql}(#{quoted_values})"
+          else
+            super
           end
         end
 
@@ -75,10 +57,8 @@ module ActiveRecord
           end
         end
       end
+
+      ActiveRecordMysqlAdapter.prepend ActiveRecord::Mysql::Enum::MysqlAdapter
     end
   end
 end
-
-if adapter_class
-  adapter_class.prepend(ActiveRecord::Mysql::Enum::MysqlAdapter)
-end

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

@@ -7,21 +7,11 @@ module ActiveRecord
 
       # Quote a symbol as a normal string. This will support quoting of
       # enumerated values.
-      if Rails::VERSION::MAJOR < 5
-        def quote(value, column = nil)
-          if !value.is_a? Symbol
-            __quote_enum(value, column)
-          else
-            ActiveRecord::Base.send(:quote_bound_value, value.to_s)
-          end
-        end
-      else
-        def quote(value)
-          if !value.is_a? Symbol
-            __quote_enum(value)
-          else
-            ActiveRecord::Base.send(:quote_bound_value, value.to_s)
-          end
+      def quote(value)
+        if !value.is_a? Symbol
+          __quote_enum(value)
+        else
+          ActiveRecord::Base.send(:quote_bound_value, value.to_s)
         end
       end
     end

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

@@ -3,7 +3,7 @@
 module ActiveRecord
   module Mysql
     module Enum
-      VERSION = "0.1.4"
+      VERSION = "2.0.0"
     end
   end
 end

data/lib/activerecord-mysql-enum.rb

@@ -0,0 +1 @@
+require 'active_record/mysql/enum'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-enum
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Nick Pohodnya
 - Invoca Development
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -27,10 +27,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: Enable enum type for the MySQL Adapter in ActiveRecord
 email:
 - development@invoca.com
@@ -40,18 +60,23 @@ extra_rdoc_files: []
 files:
 - ".dependabot/config.yml"
 - ".github/workflows/gem_release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
+- ".rspec"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/config/manifest.js
 - enum_column.gemspec
+- gemfiles/.bundle/config
+- gemfiles/rails_5.gemfile
+- gemfiles/rails_6.gemfile
 - init.rb
 - lib/active_record/mysql/enum.rb
-- lib/active_record/mysql/enum/active_record_helper.rb
-- lib/active_record/mysql/enum/enum_adapter.rb
 - lib/active_record/mysql/enum/enum_column_adapter.rb
 - lib/active_record/mysql/enum/enum_type.rb
 - lib/active_record/mysql/enum/mysql_adapter.rb
@@ -59,13 +84,14 @@ files:
 - lib/active_record/mysql/enum/schema_definitions.rb
 - lib/active_record/mysql/enum/validations.rb
 - lib/active_record/mysql/enum/version.rb
+- lib/activerecord-mysql-enum.rb
 - rails/init.rb
 homepage: http://github.com/Invoca/activerecord-mysql-enum
 licenses: []
 metadata:
   source_code_uri: https://github.com/Invoca/activerecord-mysql-enum
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -80,9 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.1
+signing_key:
 specification_version: 4
 summary: Enable enum type for the MySQL Adapter in ActiveRecord
 test_files: []

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

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-if defined?(Rails::Generator)
-  module Rails
-    module Generator
-      class GeneratedAttribute
-        def field_type_with_enumerated_attribute
-          return (@field_type = :enum_select) if type == :enum
-          field_type_without_enumerated_attribute
-        end
-        alias_method_chain :field_type, :enumerated_attribute
-      end
-    end
-  end
-end
-
-if defined?(ActionView::Base)
-	module ActionView
-		module Helpers
-
-			#form_options_helper.rb
-			module FormOptionsHelper
-				#def select
-				def enum_select(object, method, options={}, html_options={})
-					InstanceTag.new(object, method, self, options.delete(:object)).to_enum_select_tag(options, html_options)
-				end
-			end
-
-			class InstanceTag
-				def to_enum_select_tag(options, html_options={})
-					if self.object.respond_to?(method_name.to_sym)
-            column = self.object.column_for_attribute(method_name)
-						if (value = self.object.__send__(method_name.to_sym))
-							options[:selected] ||= value.to_s
-						else
-              options[:include_blank] = column.null if options[:include_blank].nil?
-						end
-					end
-					to_select_tag(column.limit, options, html_options)
-				end
-
-				#initialize record_name, method, self
-				if respond_to?(:to_tag)
-  				def to_tag_with_enumerated_attribute(options={})
-  					#look for an enum
-  					if (column_type == :enum && self.object.class.respond_to?(method_name.to_sym))
-  						to_enum_select_tag(options)
-  					else
-  						to_tag_without_enumerated_attribute(options)
-  					end
-  				end
-  				alias_method_chain :to_tag, :enumerated_attribute
-				end
-
-			end
-
-			class FormBuilder
-				def enum_select(method, options={}, html_options={})
-					@template.enum_select(@object_name, method, objectify_options(options), @default_options.merge(html_options))
-				end
-			end
-
-		end
-	end
-end

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

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-# This module provides all the column helper methods to deal with the
-# values and adds the common type management code for the adapters.
-
-adapter_class = if defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter
-  ActiveRecord::ConnectionAdapters::Mysql2Adapter
-elsif defined? ActiveRecord::ConnectionAdapters::MysqlAdapter
-  ActiveRecord::ConnectionAdapters::MysqlAdapter
-end
-
-if adapter_class
-  adapter_class.class_eval do
-
-    protected
-      if instance_methods.include?(:initialize_type_map)
-        def initialize_type_map_with_enum_types(m)
-          initialize_type_map_without_enum_types(m)
-          m.register_type(%r(enum)i) do |sql_type|
-            limit = sql_type.sub(/^enum\('(.+)'\)/i, '\1').split("','").map { |v| v.intern }
-            ActiveRecord::Type::Enum.new(limit: limit)
-          end
-        end
-        alias_method_chain :initialize_type_map, :enum_types
-      end
-  end
-end