activerecord-mysql-enum 0.1.1 → 1.0.0.pre.1

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 current_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.current_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,21 @@
 # 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 current_mysql_adapter
+          if defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter
+            ActiveRecord::ConnectionAdapters::Mysql2Adapter
+          else
+            raise "Could not find MySQL connection adapter"
+          end
+        end
+      end
+
+      ActiveRecordMysqlAdapter = Enum.current_mysql_adapter
+
       module MysqlAdapter
         def native_database_types #:nodoc
           types = super
@@ -28,29 +31,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 +78,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.1"
+      VERSION = "1.0.0.pre.1"
     end
   end
 end

data/lib/activerecord-mysql-enum.rb

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

data/public/404.html

@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The page you were looking for doesn't exist (404)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/404.html -->
+  <div class="dialog">
+    <div>
+      <h1>The page you were looking for doesn't exist.</h1>
+      <p>You may have mistyped the address or the page may have moved.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>

data/public/422.html

@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The change you wanted was rejected (422)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <div>
+      <h1>The change you wanted was rejected.</h1>
+      <p>Maybe you tried to change something you didn't have access to.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>

data/public/500.html

@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <div>
+      <h1>We're sorry, but something went wrong.</h1>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>