activerecord-mysql-enum 0.1.2 → 1.0.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 990d55ec62633ed4bc3da5770f0b37fe020b24681b689d2528defa237d3d3411
-  data.tar.gz: 4500ece77eae411c0d4c51f1f7732258cb2c8e41ce8dc0bc7a0db56de0f491f6
+  metadata.gz: 654ebffea2d493ba5392b1aab3f69048c2c38462cf1782d109ee417e46605a89
+  data.tar.gz: 28009a9d255721863644711c217633a26b7de8275764508f80bca2ac1a086d7f
 SHA512:
-  metadata.gz: e993d90711a95befe09afff1f556e7f3a533cd2668a13164e69bb078601735f621bef907e373415280e6fb3a343b561a4ed479c70bdf3d95ce937ca86029654d
-  data.tar.gz: a1599a97a54c13f69f12f2c02be06b004d9b613ebe8913e3044eaa7b62a3b2b133c27231d4918508bd9af34388d31a0df8d49c01228444eeda68506302a400f3
+  metadata.gz: d68c31a06bb274bfc8599f4c120976e3b5534df6bdb299fee0ba9495e08ef8a4fece362d2da6e0fb0b793a3d0275a393a27dbcf87302804ffbe4e3197e14bd88
+  data.tar.gz: d6e78050ab6bdce2a23e8f3479a82eef0dd669cbb357bafd843a550de1781b96d35fc14888f2f4f28ff2a7104a0175b75a88a46130776c0477c29e2cd6dc986f

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/.travis.yml

@@ -0,0 +1,29 @@
+---
+dist: trusty
+language: ruby
+sudo: false
+cache: bundler
+rvm:
+  - 2.4.5
+  - 2.5.8
+  - 2.6.5
+  - 2.7.1
+  - ruby-head
+gemfile:
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_5.gemfile
+  - gemfiles/rails_6.gemfile
+matrix:
+  fast_finish: false
+  exclude:
+    - gemfile: gemfiles/rails_4.gemfile
+      rvm: 2.7.1
+    - gemfile: gemfiles/rails_5.gemfile
+      rvm: 2.4.5
+    - gemfile: gemfiles/rails_6.gemfile
+      rvm: 2.4.5
+  allow_failures:
+    - rvm: ruby-head
+script:
+  - RAILS_ENV=test bundle exec rake db:create
+  - bundle exec rspec

data/Appraisals

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+appraise 'rails-4' do
+  gem 'rails', '~> 4.2'
+end
+
+appraise 'rails-5' do
+  gem 'rails', '~> 5.2'
+end
+
+appraise 'rails-6' do
+  gem 'rails', '~> 6.0'
+end

data/CHANGELOG.md

@@ -4,6 +4,32 @@ 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).
 
+## [1.0.0] - Unreleased
+### 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] - Unreleased
+### Fixed
+- Fixed bug in `mysql_adapter` where optional arguments being passed to `type_to_sql` would cause
+  an unexpected error
+
+## [0.1.3] - 2020-08-19
+### Changed
+- refactor mysql adapter
+
 ## [0.1.2] - 2020-08-18
 ### Changed
 - fixed frozen string to reassign value instead of append
@@ -19,4 +45,9 @@ Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0
 ### Changed
 - Renamed the gem from `enum_column3` to `activerecord-mysql-enum`
 
-[0.1.0]: https://github.com/Invoca/activerecord-mysql-enum/tree/0.1.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
+[0.1.1]: https://github.com/Invoca/activerecord-mysql-enum/compare/v0.1.0...v0.1.1
+[0.1.0]: https://github.com/Invoca/activerecord-mysql-enum/tree/v0.1.0

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 'rspec'
+gem 'rspec-rails', '~> 3.0'

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    activerecord-mysql-enum (0.1.2)
+    activerecord-mysql-enum (1.0.0.pre.2)
       activerecord (>= 4.2, < 7)
+      mysql2 (= 0.4.5)
 
 GEM
   remote: https://rubygems.org/
@@ -41,17 +42,30 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    appraisal (2.3.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
     arel (6.0.4)
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.1.7)
+    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)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
     erubis (2.7.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
+    json (2.3.1)
     loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -61,6 +75,7 @@ GEM
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.1)
+    mysql2 (0.4.5)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     pry (0.13.1)
@@ -97,6 +112,32 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      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.3)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -104,8 +145,13 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
     thor (1.0.1)
     thread_safe (0.3.6)
+    tins (1.25.0)
+      sync
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
 
@@ -114,11 +160,14 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-mysql-enum!
-  bundler (~> 1.8)
+  appraisal
+  coveralls
   pry
   pry-byebug
   rails (~> 4.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 4.2, 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

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

data/gemfiles/.bundle/config

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

data/gemfiles/rails_4.gemfile

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

data/gemfiles/rails_5.gemfile

@@ -0,0 +1,14 @@
+# 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"
+
+gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -0,0 +1,14 @@
+# 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"
+gem "rspec"
+gem "rspec-rails", "~> 3.0"
+
+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
@@ -28,29 +29,37 @@ module ActiveRecord
         #
         # will generate enum('a', 'b', 'c') for :limit => [:a, :b, :c]
         if Rails::VERSION::MAJOR < 5
-          def type_to_sql(type, limit = nil, precision = nil, scale = nil, unsigned = nil, **_options) # :nodoc:
+          def type_to_sql(type, limit = nil, *args)
             if type.to_s == 'enum'
-              native = native_database_types[type]
-              column_type_sql = (native || {})[:name] || 'enum'
+              column_type_sql =
+                if (native_database_type = native_database_types[type])
+                  native_database_type[:name]
+                else
+                  'enum'
+                end
 
-              column_type_sql += "(#{limit.map { |v| quote(v) }.join(',')})"
+              quoted_values = limit.map { |v| quote(v) }.join(',')
 
-              column_type_sql
+              "#{column_type_sql}(#{quoted_values})"
             else
-              super(type, limit, precision, scale, unsigned)
+              super
             end
           end
         else
-          def type_to_sql(type, limit: nil, precision: nil, scale: nil, unsigned: nil, **_options) # :nodoc:
+          def type_to_sql(type, limit: nil, **_options) # :nodoc:
             if type.to_s == 'enum'
-              native = native_database_types[type]
-              column_type_sql = (native || {})[:name] || 'enum'
+              column_type_sql =
+                if (native_database_type = native_database_types[type])
+                  native_database_type[:name]
+                else
+                  'enum'
+                end
 
-              column_type_sql += "(#{limit.map { |v| quote(v) }.join(',')})"
+              quoted_values = limit.map { |v| quote(v) }.join(',')
 
-              column_type_sql
+              "#{column_type_sql}(#{quoted_values})"
             else
-              super(type, limit: limit, precision: precision, scale: scale, unsigned: unsigned)
+              super
             end
           end
         end
@@ -67,10 +76,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/version.rb

@@ -3,7 +3,7 @@
 module ActiveRecord
   module Mysql
     module Enum
-      VERSION = "0.1.2"
+      VERSION = "1.0.0.pre.2"
     end
   end
 end

data/lib/activerecord-mysql-enum.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-enum
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0.pre.2
 platform: ruby
 authors:
 - Nick Pohodnya
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -31,6 +31,20 @@ dependencies:
     - - "<"
       - !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
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.5
 description: Enable enum type for the MySQL Adapter in ActiveRecord
 email:
 - development@invoca.com
@@ -41,17 +55,23 @@ files:
 - ".dependabot/config.yml"
 - ".github/workflows/gem_release.yml"
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/config/manifest.js
 - enum_column.gemspec
+- gemfiles/.bundle/config
+- gemfiles/rails_4.gemfile
+- 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,6 +79,7 @@ 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: []
@@ -76,9 +97,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.1
 signing_key:

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