activerecord-pg_enum 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fff1e0a83e5de4507a70ca673c8dbe261715810cda9936430a4c73673b74c623
-  data.tar.gz: 4a02ec6d42efb7fdec11f5cd5ceeee2200b47d6e544202d6eef6fa7947bef69d
+  metadata.gz: 6cc3af8b6c62c5db56b315c318f77f6cabf8ca8b522e6548f20f0cc780a64aa4
+  data.tar.gz: 2bdc0adf214333b6777006dfeb025aca3de673adbb672d7581df53ea0bf3724b
 SHA512:
-  metadata.gz: 61cdf54e236bb77fc2196779ff2c8300ef504a23a5d714a63ab9423d3d02bc3fef7f31c598dda827db950652f9eb680ce01e7c54ab0bb7b2d63b6fcd364a2844
-  data.tar.gz: f546fa5f64257640d9bc4889bea00fd23e52033928a7f7623e571be48f16ce8358904caffac975994404b73115bb0214e124e4f8f36be88b3beef55085d06caa
+  metadata.gz: 7fbbbf6ddf2d7f1eca10bc5fbc7218ffedbb87fd9798e277a0f566b0c6e18b428ed7a96824fd1e5676442a74796c9d7a55977adf2f7c17da36bf8d08a6b8981f
+  data.tar.gz: e6a309965758d93b2c558e8029edcdb51bf4a4e2c5af5283d5fdf645e65729596dc02dfba497b22f3bfa35e913c3dc903c4ebe7ea8e2b8535da29bf88c7ff174

data/.travis.yml

@@ -1,27 +1,25 @@
 sudo: false
 language: ruby
-rvm:
-- 2.2.2
-- 2.5.0
-gemfile:
-- gemfiles/5.0.gemfile
-- gemfiles/5.1.gemfile
-- gemfiles/5.2.gemfile
-- gemfiles/edge.gemfile
 matrix:
-  exclude:
-  - rvm: 2.5.0
+  include:
+  - rvm: 2.2.4
+    gemfile: gemfiles/4.1.gemfile
+  - rvm: 2.2.10
+    gemfile: gemfiles/4.2.gemfile
+  - rvm: 2.3.8
     gemfile: gemfiles/5.0.gemfile
-  - rvm: 2.5.0
+  - rvm: 2.4.4
     gemfile: gemfiles/5.1.gemfile
-  - rvm: 2.5.0
+  - rvm: 2.5.1
     gemfile: gemfiles/5.2.gemfile
-  - rvm: 2.2.2
+  - rvm: 2.6.0
+    gemfile: gemfiles/6.0.gemfile
+  - rvm: ruby-head
     gemfile: gemfiles/edge.gemfile
   allow_failures:
   - gemfile: gemfiles/edge.gemfile
-services:
-- postgresql
+addons:
+  postgresql: "9.3"
 before_install: gem install bundler -v 1.17.3
 script: "bundle exec rake spec"
 env:

data/Appraisals

@@ -1,3 +1,7 @@
+appraise "6.0" do
+  gem "activerecord", "6.0.0.rc1"
+end
+
 appraise "5.2" do
   gem "activerecord", "~> 5.2"
 end
@@ -11,6 +15,18 @@ appraise "5.0" do
   gem "i18n", "1.5.1"
 end
 
+appraise "4.2" do
+  gem "activerecord", ">= 4.2.0", "< 5.0.0"
+  gem "i18n", "~> 0.7"
+  gem "pg", "~> 0.15"
+end
+
+appraise "4.1" do
+  gem "activerecord", ">= 4.1.0", "< 4.2.0"
+  gem "i18n", "~> 0.7"
+  gem "pg", "~> 0.15"
+end
+
 appraise "edge" do
   gem "rails", git: "https://github.com/rails/rails.git", branch: "master"
 end

data/CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.0.0] - 2019-06-23
+### Added
+- Support for 4.1 and 4.2
+
+### Changed
+- Moved module builder to top-level `PGEnum()` method
+
 ## [0.4.0] - 2019-06-19
 ### Added
 - `enum` method on `TableDefinition`

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Flywheel
+Copyright (c) 2019 Adam Lassek
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,14 +1,46 @@
-# ActiveRecord::PGEnum [![Build Status](https://travis-ci.com/getflywheel/activerecord-pg_enum.svg?branch=master)](https://travis-ci.com/getflywheel/activerecord-pg_enum)
+# ActiveRecord::PGEnum [![Build Status](https://travis-ci.com/alassek/activerecord-pg_enum.svg?branch=master)](https://travis-ci.com/alassek/activerecord-pg_enum)
 
-This gem is a small monkeypatch to ActiveRecord so that your `schema.rb` file can support PostgreSQL's native enumerated types.
+The `enum` feature in Rails has bad developer ergonomics. It uses integer types at the DB layer, which means trying to understand SQL output is a pain.
 
-This will allow you to use enum columns in your database without replacing `schema.rb` with `structure.sql`.
+Using the easy form of the helper syntax is a minor footgun:
+
+```ruby
+enum status: %w[new active archived]
+```
+
+It's not obvious that the above code is order-dependent, but if you decide to add a new enum anywhere but the end, you're in trouble.
+
+If you choose the use `varchar` fields instead, now you have to write annoying check constraints and lose the efficient storage.
+
+```ruby
+enum status: { new: "new", active: "active", archived: "archived" }
+```
+
+Nobody has time to write that nonsense.
+
+## Enumerated Types: The Best of Both Worlds
+
+Did you know you can define your own types in PostgreSQL? You can, and this type system also supports enumeration.
+
+```SQL
+CREATE TYPE status_type AS ENUM ('new', 'active', 'archived');
+```
+
+Not only does this give you full type safety at the DB layer, the implementation is highly efficient. An enum value only takes up [four bytes](https://www.postgresql.org/docs/11/datatype-enum.html).
+
+The best part is that PostgreSQL supports inserting new values at any point of the list without having to migrate your data.
+
+```SQL
+ALTER TYPE status_type ADD VALUE 'pending' BEFORE 'active';
+```
 
 ## Version support
 
-I intend to support every version of Rails that supports `enum`, which was introduced in 4.1.
+Every version of Rails with an `enum` macro is supported. This means 4.1 through master. Yes, this was annoying and difficult.
+
+The monkeypatches in this library are extremely narrow and contained; the dirty hacks I had to do to make 4.1 work, for instance, have no impact on 6.0.
 
-Currently Rails 5.0 through 6.0 are supported.
+Monkeypatching Rails internals is **scary**. So this library has a comprehensive test suite that runs against every known minor version.
 
 ## Installation
 
@@ -22,10 +54,6 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
-
-    $ gem install activerecord-pg_enum
-
 ## Usage
 
 ### Migrations
@@ -64,7 +92,7 @@ Adding an enum column to a table
 class AddStatusToOrder < ActiveRecord::Migration[5.2]
   def change
     change_table :orders do |t|
-      t.enum :status, as: "status_type"
+      t.enum :status, as: "status_type", default: "new"
     end
   end
 end
@@ -74,7 +102,7 @@ end
 
 ```ruby
 class ContactInfo < ActiveRecord::Base
-  include ActiveRecord::PGEnum(contact_method: %w[Email SMS Phone])
+  include PGEnum(contact_method: %w[Email SMS Phone])
 end
 ```
 
@@ -90,13 +118,15 @@ There's no technical reason why you couldn't detect enum columns at startup time
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `appraise rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+Test a specific version with `appraise 6.0 rake spec`. This is usually necessary because different versions have different Ruby version support.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/getflywheel/activerecord-pg_enum.
+Bug reports and pull requests are welcome on GitHub at https://github.com/alassek/activerecord-pg_enum.
 
 ## License
 

data/activerecord-pg_enum.gemspec

@@ -5,16 +5,16 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "active_record/pg_enum/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "activerecord-pg_enum"
-  spec.version       = ActiveRecord::PGEnum::VERSION
-  spec.authors       = ["Adam Lassek"]
-  spec.email         = ["adam@doubleprime.net"]
+  spec.name    = "activerecord-pg_enum"
+  spec.version = ActiveRecord::PGEnum::VERSION
+  spec.authors = ["Adam Lassek"]
+  spec.email   = ["adam@doubleprime.net"]
 
-  spec.summary       = %q{Integrate PostgreSQL's enumerated types with the Rails enum feature}
-  spec.homepage      = "https://github.com/getflywheel/activerecord-pg_enum"
-  spec.license       = "MIT"
+  spec.summary  = %q{Integrate PostgreSQL's enumerated types with the Rails enum feature}
+  spec.homepage = "https://github.com/alassek/activerecord-pg_enum"
+  spec.license  = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
 
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "pg"
-  spec.add_dependency "activerecord", ">= 5.0.0"
+  spec.add_dependency "activerecord", ">= 4.1.0"
   spec.add_dependency "activesupport"
 
   spec.add_development_dependency "appraisal"

data/bin/console

@@ -3,12 +3,7 @@
 require "bundler/setup"
 require "activerecord/pg_enum"
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Base)
 
 require "pry"
 Pry.start

data/bin/setup

@@ -3,6 +3,7 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
-bundle install
+gem install appraisal
+appraise bundle install
 
 # Do any other automated setup that you need to do here

data/gemfiles/4.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", ">= 4.1.0", "< 4.2.0"
+gem "i18n", "~> 0.7"
+gem "pg", "~> 0.15"
+
+gemspec path: "../"

data/gemfiles/4.1.gemfile.lock

@@ -0,0 +1,77 @@
+PATH
+  remote: ..
+  specs:
+    activerecord-pg_enum (0.4.0)
+      activerecord (>= 4.1.0)
+      activesupport
+      pg
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.1.16)
+      activesupport (= 4.1.16)
+      builder (~> 3.1)
+    activerecord (4.1.16)
+      activemodel (= 4.1.16)
+      activesupport (= 4.1.16)
+      arel (~> 5.0.0)
+    activesupport (4.1.16)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (5.0.1.20140414130214)
+    builder (3.2.3)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    diff-lcs (1.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (1.8.6)
+    method_source (0.9.2)
+    minitest (5.11.3)
+    pg (0.21.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rake (10.5.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.1)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (>= 4.1.0, < 4.2.0)
+  activerecord-pg_enum!
+  appraisal
+  bundler (~> 1.15)
+  i18n (~> 0.7)
+  pg (~> 0.15)
+  pry
+  rake (~> 10.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.16.3

data/gemfiles/4.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", ">= 4.2.0", "< 5.0.0"
+gem "i18n", "~> 0.7"
+gem "pg", "~> 0.15"
+
+gemspec path: "../"

data/gemfiles/4.2.gemfile.lock

@@ -0,0 +1,75 @@
+PATH
+  remote: ..
+  specs:
+    activerecord-pg_enum (0.4.0)
+      activerecord (>= 4.1.0)
+      activesupport
+      pg
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      builder (~> 3.1)
+    activerecord (4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      arel (~> 6.0)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (6.0.4)
+    builder (3.2.3)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    diff-lcs (1.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    method_source (0.9.2)
+    minitest (5.11.3)
+    pg (0.21.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rake (10.5.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.1)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (>= 4.2.0, < 5.0.0)
+  activerecord-pg_enum!
+  appraisal
+  bundler (~> 1.15)
+  i18n (~> 0.7)
+  pg (~> 0.15)
+  pry
+  rake (~> 10.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.17.3

data/gemfiles/5.0.gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     activerecord-pg_enum (0.4.0)
-      activerecord (>= 5.0.0)
+      activerecord (>= 4.1.0)
       activesupport
       pg
 

data/gemfiles/5.1.gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     activerecord-pg_enum (0.4.0)
-      activerecord (>= 5.0.0)
+      activerecord (>= 4.1.0)
       activesupport
       pg
 

data/gemfiles/5.2.gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     activerecord-pg_enum (0.4.0)
-      activerecord (>= 5.0.0)
+      activerecord (>= 4.1.0)
       activesupport
       pg
 

data/gemfiles/6.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "6.0.0.rc1"
+
+gemspec path: "../"

data/gemfiles/6.0.gemfile.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: ..
+  specs:
+    activerecord-pg_enum (0.4.0)
+      activerecord (>= 4.1.0)
+      activesupport
+      pg
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+    activerecord (6.0.0.rc1)
+      activemodel (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+    activesupport (6.0.0.rc1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.4)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    diff-lcs (1.3)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    method_source (0.9.2)
+    minitest (5.11.3)
+    pg (1.1.4)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rake (10.5.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.1)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    zeitwerk (2.1.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 6.0.0.rc1)
+  activerecord-pg_enum!
+  appraisal
+  bundler (~> 1.15)
+  pry
+  rake (~> 10.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.17.3

data/gemfiles/edge.gemfile.lock

@@ -67,7 +67,7 @@ PATH
   remote: ..
   specs:
     activerecord-pg_enum (0.4.0)
-      activerecord (>= 5.0.0)
+      activerecord (>= 4.1.0)
       activesupport
       pg
 

data/lib/active_record/pg_enum.rb

@@ -2,38 +2,87 @@ require "active_support/lazy_load_hooks"
 require "active_record"
 
 ActiveSupport.on_load(:active_record) do
-  require "active_record/pg_enum/helper"
   ActiveRecord::PGEnum.install Gem.loaded_specs["activerecord"].version
 end
 
 module ActiveRecord
   module PGEnum
-    KNOWN_VERSIONS = %w[5.0 5.1 5.2 6.alpha].map { |v| Gem::Version.new(v) }
+    KNOWN_VERSIONS = %w[4.1 4.2 5.0 5.1 5.2 6.0].map { |v| Gem::Version.new(v) }
 
-    def self.install(version)
-      major_minor = version.canonical_segments[0..1].join(".")
-      major_minor = Gem::Version.new(major_minor)
+    class << self
+      attr_reader :enabled_version
 
-      # Don't immediately fail if we don't yet support the current version.
-      # There's at least a chance it could work.
-      if !KNOWN_VERSIONS.include?(major_minor) && major_minor > KNOWN_VERSIONS.last
-        major_minor = KNOWN_VERSIONS.last
-        warn "[PGEnum] Current ActiveRecord version unsupported! Falling back to: #{major_minor}"
+      def install(version)
+        @enabled_version = approximate_version(version)
+
+        # Don't immediately fail if we don't yet support the current version.
+        # There's at least a chance it could work.
+        if !KNOWN_VERSIONS.include?(enabled_version) && enabled_version > KNOWN_VERSIONS.last
+          @enabled_version = KNOWN_VERSIONS.last
+          warn "[PGEnum] Current ActiveRecord version unsupported! Falling back to: #{enabled_version}"
+        end
+
+        initialize!
+      end
+
+      def register(patch, &block)
+        monkeypatches[patch] = block
+      end
+
+      private
+
+      def monkeypatches
+        @patches ||= {}
+      end
+
+      def initialize!
+        require "active_record/pg_enum/command_recorder"
+        require "active_record/pg_enum/postgresql_adapter"
+        require "active_record/pg_enum/schema_statements"
+
+        Dir[File.join(__dir__, "pg_enum", enabled_version.to_s, "*.rb")].each { |file| require file }
+        monkeypatches.keys.each { |patch| monkeypatches.delete(patch).call }
+      end
+
+      def approximate_version(version)
+        segments = version.respond_to?(:canonical_segments) ? version.canonical_segments : version.segments
+
+        segments.pop     while segments.any? { |s| String === s }
+        segments.pop     while segments.size > 2
+        segments.push(0) while segments.size < 2
+
+        Gem::Version.new segments.join(".")
       end
+    end
+  end
+end
+
+# Declare an enum attribute where the values map to strings enforced by PostgreSQL's
+# enumerated types.
+#
+#   class Conversation < ActiveRecord::Base
+#     include PGEnum(status: %i[active archived])
+#   end
+#
+# This is merely a wrapper over traditional enum syntax so that you can define
+# string-based enums with an array of values.
+def PGEnum(**definitions)
+  values = definitions.values.map do |value|
+    if value.is_a? Array
+      keys   = value.map(&:to_sym)
+      values = value.map(&:to_s)
+
+      Hash[keys.zip(values)]
+    else
+      value
+    end
+  end
+
+  Module.new do
+    define_singleton_method(:inspect) { %{ActiveRecord::PGEnum(#{definitions.keys.join(" ")})} }
 
-      require "active_record/pg_enum/#{major_minor}/prepare_column_options"
-      require "active_record/pg_enum/#{major_minor}/schema_dumper"
-      require "active_record/pg_enum/postgresql_adapter"
-      require "active_record/pg_enum/schema_statements"
-      require "active_record/pg_enum/command_recorder"
-      require "active_record/pg_enum/table_definition"
-
-      install_column_options
-      install_schema_dumper
-      install_postgresql_adapter
-      install_schema_statements
-      install_command_recorder
-      install_table_definition
+    define_singleton_method :included do |klass|
+      klass.enum Hash[definitions.keys.zip(values)]
     end
   end
 end

data/lib/active_record/pg_enum/4.1/initialize_type_map.rb

@@ -0,0 +1,41 @@
+require "active_record/connection_adapters/postgresql_adapter"
+
+module ActiveRecord
+  module PGEnum
+    register :type_map do
+      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend InitializeTypeMap
+    end
+
+    module InitializeTypeMap
+      private
+
+      def initialize_type_map(type_map)
+        super
+
+        adapter = ConnectionAdapters::PostgreSQLAdapter
+
+        adapter::OID.register_type "enum", adapter::OID::Enum.new
+
+        execute("SELECT t.oid, t.typname, t.typtype FROM pg_type as t WHERE t.typtype = 'e'", "SCHEMA").each do |row|
+          adapter::OID.alias_type row["typname"], "enum"
+        end
+      end
+    end
+  end
+
+  module ConnectionAdapters
+    class PostgreSQLAdapter
+      module OID
+        class Enum < Type
+          def type
+            :enum
+          end
+
+          def type_cast(value)
+            value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/pg_enum/4.1/migration_keys.rb

@@ -0,0 +1,14 @@
+module ActiveRecord
+  module PGEnum
+    register :migration_keys do
+      require "active_record/connection_adapters/postgresql_adapter"
+      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend MigrationKeys
+    end
+
+    module MigrationKeys
+      def migration_keys
+        super + [:as]
+      end
+    end
+  end
+end

data/lib/active_record/pg_enum/4.1/prepare_column_options.rb

@@ -0,0 +1,16 @@
+module ActiveRecord
+  module PGEnum
+    register :column_options do
+      require "active_record/connection_adapters/postgresql_adapter"
+      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend PrepareColumnOptions
+    end
+
+    module PrepareColumnOptions
+      def prepare_column_options(column, types)
+        spec = super
+        spec[:as] = column.sql_type.inspect if column.type == :enum
+        spec
+      end
+    end
+  end
+end

data/lib/active_record/pg_enum/4.1/schema_dumper.rb

@@ -0,0 +1,30 @@
+module ActiveRecord
+  module PGEnum
+    register :schema_dumper do
+      require "active_record/schema_dumper"
+      ActiveRecord::SchemaDumper.prepend SchemaDumper
+    end
+
+    module SchemaDumper
+      private
+
+      def extensions(stream)
+        super
+        enums(stream)
+      end
+
+      def enums(stream)
+        return unless (enum_types = @connection.enum_types).any?
+
+        stream.puts "  # These are custom enum types that must be created before they can be used in the schema definition"
+
+        enum_types.each do |name, definition|
+          stream.puts %Q{  create_enum "#{name}", %w[#{definition.join(" ")}]}
+        end
+
+        stream.puts
+      end
+    end
+  end
+end
+

data/lib/active_record/pg_enum/4.1/simplified_type.rb

@@ -0,0 +1,21 @@
+require "active_record/connection_adapters/postgresql_adapter"
+
+module ActiveRecord
+  module PGEnum
+    register :simplified_type do
+      ConnectionAdapters::PostgreSQLColumn.prepend SimplifiedType
+    end
+
+    module SimplifiedType
+      private
+
+      def simplified_type(sql_type)
+        if ConnectionAdapters::PostgreSQLAdapter::OID::NAMES[sql_type].type == :enum
+          :enum
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/active_record/pg_enum/{table_definition.rb → 4.1/table_definition.rb}

@@ -1,8 +1,8 @@
 module ActiveRecord
   module PGEnum
-    def self.install_table_definition
+    register :table_definition do
       require "active_record/connection_adapters/postgresql_adapter"
-      ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.include TableDefinition
+      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::TableDefinition.include TableDefinition
     end
 
     module TableDefinition

data/lib/active_record/pg_enum/4.2/migration_keys.rb

@@ -0,0 +1 @@
+require "active_record/pg_enum/4.1/migration_keys"

data/lib/active_record/pg_enum/4.2/prepare_column_options.rb

@@ -0,0 +1 @@
+require "active_record/pg_enum/4.1/prepare_column_options"

data/lib/active_record/pg_enum/4.2/schema_dumper.rb

@@ -0,0 +1 @@
+require "active_record/pg_enum/4.1/schema_dumper"

data/lib/active_record/pg_enum/4.2/table_definition.rb

@@ -0,0 +1,10 @@
+require "active_record/pg_enum/4.1/table_definition"
+
+module ActiveRecord
+  module PGEnum
+    register :table_definition do
+      require "active_record/connection_adapters/postgresql_adapter"
+      ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.include TableDefinition
+    end
+  end
+end

data/lib/active_record/pg_enum/5.0/migration_keys.rb

@@ -0,0 +1,2 @@
+require "active_record/pg_enum/4.1/migration_keys"
+

data/lib/active_record/pg_enum/5.0/prepare_column_options.rb

@@ -1,17 +1,15 @@
 module ActiveRecord
   module PGEnum
-    def self.install_column_options
+    register :column_options do
       require "active_record/connection_adapters/postgresql/schema_dumper"
-      ActiveRecord::ConnectionAdapters::PostgreSQL::ColumnDumper.prepend PrepareColumnOptions
+      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend PrepareColumnOptions
     end
 
     module PrepareColumnOptions
       def prepare_column_options(column)
-        super.tap do |spec|
-          if column.type == :enum
-            spec[:as] = column.sql_type
-          end
-        end
+        spec = super
+        spec[:as] = column.sql_type.inspect if column.type == :enum
+        spec
       end
     end
   end

data/lib/active_record/pg_enum/5.0/schema_dumper.rb

@@ -1,29 +1 @@
-module ActiveRecord
-  module PGEnum
-    def self.install_schema_dumper
-      require "active_record/schema_dumper"
-      ActiveRecord::SchemaDumper.prepend SchemaDumper
-    end
-
-    module SchemaDumper
-      private
-
-      def extensions(stream)
-        super
-        enums(stream)
-      end
-
-      def enums(stream)
-        return unless (enum_types = @connection.enum_types).any?
-
-        stream.puts "  # These are custom enum types that must be created before they can be used in the schema definition"
-
-        enum_types.each do |name, definition|
-          stream.puts %Q{  create_enum "#{name}", %w[#{definition.join(" ")}]}
-        end
-
-        stream.puts
-      end
-    end
-  end
-end
+require "active_record/pg_enum/4.2/schema_dumper"

data/lib/active_record/pg_enum/5.0/table_definition.rb

@@ -0,0 +1 @@
+require "active_record/pg_enum/4.2/table_definition"

data/lib/active_record/pg_enum/5.1/schema_dumper.rb

@@ -1 +1 @@
-require "active_record/pg_enum/5.0/schema_dumper"
+require "active_record/pg_enum/4.2/schema_dumper"

data/lib/active_record/pg_enum/5.1/table_definition.rb

@@ -0,0 +1,2 @@
+require "active_record/pg_enum/4.2/table_definition"
+

data/lib/active_record/pg_enum/5.2/prepare_column_options.rb

@@ -2,7 +2,7 @@ require "active_record/pg_enum/5.0/prepare_column_options"
 
 module ActiveRecord
   module PGEnum
-    def self.install_column_options
+    register :column_options do
       require "active_record/connection_adapters/postgresql/schema_dumper"
       ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend PrepareColumnOptions
     end

data/lib/active_record/pg_enum/5.2/schema_dumper.rb

@@ -1,8 +1,8 @@
-require "active_record/pg_enum/5.0/schema_dumper"
+require "active_record/pg_enum/4.2/schema_dumper"
 
 module ActiveRecord
   module PGEnum
-    def self.install_schema_dumper
+    register :schema_dumper do
       require "active_record/connection_adapters/postgresql/schema_dumper"
       ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend SchemaDumper
     end

data/lib/active_record/pg_enum/5.2/table_definition.rb

@@ -0,0 +1,2 @@
+require "active_record/pg_enum/4.2/table_definition"
+

data/lib/active_record/pg_enum/6.0/table_definition.rb

@@ -0,0 +1,2 @@
+require "active_record/pg_enum/4.2/table_definition"
+

data/lib/active_record/pg_enum/command_recorder.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module PGEnum
-    def self.install_command_recorder
+    register :command_recorder do
       require "active_record/migration/command_recorder"
       ActiveRecord::Migration::CommandRecorder.include CommandRecorder
     end

data/lib/active_record/pg_enum/postgresql_adapter.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module PGEnum
-    def self.install_postgresql_adapter
+    register :postgresql_adapter do
       require "active_record/connection_adapters/postgresql_adapter"
       ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include PostgreSQLAdapter
       ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES.merge!(enum: { name: "enum" })
@@ -13,7 +13,7 @@ module ActiveRecord
       #
       #   { "foo_type" => ["foo", "bar", "baz"] }
       def enum_types
-        res = exec_query(<<-SQL.strip_heredoc, "SCHEMA").cast_values
+        res = exec_query(<<-SQL.strip_heredoc, "SCHEMA")
           SELECT t.typname AS enum_name, string_agg(e.enumlabel, ' ' ORDER BY e.enumsortorder) AS enum_value
           FROM pg_type t
           JOIN pg_enum e ON t.oid = e.enumtypid
@@ -22,6 +22,12 @@ module ActiveRecord
           GROUP BY enum_name
         SQL
 
+        if res.respond_to?(:cast_values)
+          res = res.cast_values
+        else
+          res = res.rows
+        end
+
         res.inject({}) do |memo, (name, values)|
           memo[name] = values.split(" ")
           memo

data/lib/active_record/pg_enum/schema_statements.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module PGEnum
-    def self.install_schema_statements
+    register :schema_statements do
       require "active_record/connection_adapters/postgresql/schema_statements"
       ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include SchemaStatements
     end
@@ -12,12 +12,16 @@ module ActiveRecord
       #
       #   create_enum("foo_type", "foo", "bar", "baz")
       def create_enum(name, values)
-        execute "CREATE TYPE #{name} AS ENUM (#{Array(values).map { |v| "'#{v}'" }.join(", ")})"
+        execute("CREATE TYPE #{name} AS ENUM (#{Array(values).map { |v| "'#{v}'" }.join(", ")})").tap {
+          reload_type_map
+        }
       end
 
       # Drop an ENUM type from the database.
       def drop_enum(name, values_for_revert = nil)
-        execute "DROP TYPE #{name}"
+        execute("DROP TYPE #{name}").tap {
+          reload_type_map
+        }
       end
 
       # Add a new value to an existing ENUM type.
@@ -41,7 +45,7 @@ module ActiveRecord
           cmd << " AFTER '#{after}'"
         end
 
-        execute cmd
+        execute(cmd).tap { reload_type_map }
       end
     end
   end

data/lib/active_record/pg_enum/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module PGEnum
-    VERSION = "0.4.0"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pg_enum
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Adam Lassek
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +135,6 @@ files:
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -143,31 +142,50 @@ files:
 - bin/console
 - bin/setup
 - gemfiles/.bundle/config
+- gemfiles/4.1.gemfile
+- gemfiles/4.1.gemfile.lock
+- gemfiles/4.2.gemfile
+- gemfiles/4.2.gemfile.lock
 - gemfiles/5.0.gemfile
 - gemfiles/5.0.gemfile.lock
 - gemfiles/5.1.gemfile
 - gemfiles/5.1.gemfile.lock
 - gemfiles/5.2.gemfile
 - gemfiles/5.2.gemfile.lock
+- gemfiles/6.0.gemfile
+- gemfiles/6.0.gemfile.lock
 - gemfiles/edge.gemfile
 - gemfiles/edge.gemfile.lock
 - lib/active_record/pg_enum.rb
+- lib/active_record/pg_enum/4.1/initialize_type_map.rb
+- lib/active_record/pg_enum/4.1/migration_keys.rb
+- lib/active_record/pg_enum/4.1/prepare_column_options.rb
+- lib/active_record/pg_enum/4.1/schema_dumper.rb
+- lib/active_record/pg_enum/4.1/simplified_type.rb
+- lib/active_record/pg_enum/4.1/table_definition.rb
+- lib/active_record/pg_enum/4.2/migration_keys.rb
+- lib/active_record/pg_enum/4.2/prepare_column_options.rb
+- lib/active_record/pg_enum/4.2/schema_dumper.rb
+- lib/active_record/pg_enum/4.2/table_definition.rb
+- lib/active_record/pg_enum/5.0/migration_keys.rb
 - lib/active_record/pg_enum/5.0/prepare_column_options.rb
 - lib/active_record/pg_enum/5.0/schema_dumper.rb
+- lib/active_record/pg_enum/5.0/table_definition.rb
 - lib/active_record/pg_enum/5.1/prepare_column_options.rb
 - lib/active_record/pg_enum/5.1/schema_dumper.rb
+- lib/active_record/pg_enum/5.1/table_definition.rb
 - lib/active_record/pg_enum/5.2/prepare_column_options.rb
 - lib/active_record/pg_enum/5.2/schema_dumper.rb
-- lib/active_record/pg_enum/6.alpha/prepare_column_options.rb
-- lib/active_record/pg_enum/6.alpha/schema_dumper.rb
+- lib/active_record/pg_enum/5.2/table_definition.rb
+- lib/active_record/pg_enum/6.0/prepare_column_options.rb
+- lib/active_record/pg_enum/6.0/schema_dumper.rb
+- lib/active_record/pg_enum/6.0/table_definition.rb
 - lib/active_record/pg_enum/command_recorder.rb
-- lib/active_record/pg_enum/helper.rb
 - lib/active_record/pg_enum/postgresql_adapter.rb
 - lib/active_record/pg_enum/schema_statements.rb
-- lib/active_record/pg_enum/table_definition.rb
 - lib/active_record/pg_enum/version.rb
 - lib/activerecord/pg_enum.rb
-homepage: https://github.com/getflywheel/activerecord-pg_enum
+homepage: https://github.com/alassek/activerecord-pg_enum
 licenses:
 - MIT
 metadata: {}

data/Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in activerecord-pg_enum.gemspec
-gemspec

data/lib/active_record/pg_enum/helper.rb

@@ -1,31 +0,0 @@
-module ActiveRecord
-  # Declare an enum attribute where the values map to strings enforced by PostgreSQL's
-  # enumerated types.
-  #
-  #   class Conversation < ActiveRecord::Base
-  #     include ActiveRecord::PGEnum(status: %i[active archived])
-  #   end
-  #
-  # This is merely a wrapper over traditional enum syntax so that you can define
-  # string-based enums with an array of values.
-  def self.PGEnum(**definitions)
-    values = definitions.values.map do |value|
-      if value.is_a? Array
-        keys   = value.map(&:to_sym)
-        values = value.map(&:to_s)
-
-        Hash[keys.zip(values)]
-      else
-        value
-      end
-    end
-
-    Module.new do
-      define_singleton_method(:inspect) { %{ActiveRecord::PGEnum(#{definitions.keys.join(" ")})} }
-
-      define_singleton_method :included do |klass|
-        klass.enum Hash[definitions.keys.zip(values)]
-      end
-    end
-  end
-end