activerecord-pg_enum 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41d36c9e4ee304c95191b220c77fce35aefe35302947e35a37a5b7140d2464d1
-  data.tar.gz: f0e1a8b1a8824df5b29e294f9cd35eb395712bf795d5a8b78bea9076a5986420
+  metadata.gz: e90a1c4526f10cabb98bec7d1800ac564c00ade2847cca560ee9ecbb3b471ffb
+  data.tar.gz: a4741cc472ad80350fc69f13ab846b1e5cecaa4484ae353b0d9cbc6af8da041b
 SHA512:
-  metadata.gz: 9b2f8159361a471e78f894348d35e3cd4df4c5794afcbe10be6ceec198a9cc195a3898631699bbbcac630d480ba27bad7aa48481c02615dfd4787d52a985c38b
-  data.tar.gz: afa8c39a24d7ff70b50d7c22b5fc98cca1ac7b3ac05a4f87b61da8ba38c2a60a5bfd43c914d02e415b6813a4bc1640589fa7f0964a4d1000966bf652f46ba07b
+  metadata.gz: 83969dc1fdba6d8f1e0ca382ee34564797ae20d2c941ab98900d0a9574977994fae4b6f465a1e8966ebaf3058680df3c3f66f37a8bae0f86053a2423f7b29524
+  data.tar.gz: 5c21046467a8adcbcba29b90090e8b5472a3c8e337250782ea2b68b0c76e5600ea5bf33bb89a4f4f44b220ea538051ed116228422e33968c1ff60951e2a997bf

data/.circleci/config.yml

@@ -0,0 +1,95 @@
+version: 2.1
+
+jobs:
+  test:
+    parameters:
+      image:
+        type: string
+      gemfile:
+        type: string
+    docker:
+      - image: '<< parameters.image >>'
+        auth:
+          username: alassek
+          password: $DOCKERHUB_TOKEN
+      - image: circleci/postgres:10
+        auth:
+          username: alassek
+          password: $DOCKERHUB_TOKEN
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: ""
+          POSTGRES_HOST_AUTH_METHOD: trust
+    environment:
+      BUNDLER_VERSION: "1.17.3"
+      BUNDLE_GEMFILE: '<< parameters.gemfile >>'
+      BUNDLE_JOBS: "3"
+      BUNDLE_RETRY: "3"
+      PGHOST: 127.0.0.1
+      PGUSER: postgres
+      PGPASSWORD: ""
+      TEST_USER: postgres
+    steps:
+      - checkout
+      - run:
+          name: Generate checksums
+          command: |
+            mkdir -p tmp
+            shasum gemfiles/*.lock > tmp/checksum.txt
+      - restore_cache:
+          key: v1-gem-cache-{{ checksum "tmp/checksum.txt" }}
+      - run:
+          name: Install Dependencies
+          command: |
+            gem install bundler:$BUNDLER_VERSION
+            bundle check --path ./vendor/bundle || bundle install --deployment
+      - run:
+          name: Wait for DB
+          command: dockerize -wait tcp://localhost:5432 -timeout 1m
+      - run:
+          name: Run RSpec Tests
+          command: bundle exec rake spec
+
+workflows:
+  rails_4_1:
+    jobs:
+      - test:
+          name: Rails 4.1
+          image: 'circleci/ruby:2.2.6'
+          gemfile: 'gemfiles/4.1.gemfile'
+  rails_4_2:
+    jobs:
+      - test:
+          name: Rails 4.2
+          image: 'circleci/ruby:2.2.10'
+          gemfile: 'gemfiles/4.2.gemfile'
+  rails_5_0:
+    jobs:
+      - test:
+          name: Rails 5.0
+          image: 'circleci/ruby:2.3.8'
+          gemfile: 'gemfiles/5.0.gemfile'
+  rails_5_1:
+    jobs:
+      - test:
+          name: Rails 5.1
+          image: 'circleci/ruby:2.4.4'
+          gemfile: 'gemfiles/5.1.gemfile'
+  rails_6_0:
+    jobs:
+      - test:
+          name: Rails 6.0
+          image: 'circleci/ruby:2.6.0'
+          gemfile: 'gemfiles/6.0.gemfile'
+  rails_6_1:
+    jobs:
+      - test:
+          name: Rails 6.1
+          image: 'circleci/ruby:3.0.1'
+          gemfile: 'gemfiles/6.1.gemfile'
+  rails_7_0:
+    jobs:
+      - test:
+          name: Rails 7.0
+          image: 'cimg/ruby:2.7.6'
+          gemfile: 'gemfiles/7.0.gemfile'

data/Appraisals

@@ -1,3 +1,7 @@
+appraise "7.0" do
+  gem "activerecord", "~> 7.0"
+end
+
 appraise "6.1" do
   gem "activerecord", "~> 6.1"
 end

data/CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.0.0] - 2022-07-17
+### Added
+- Support for 7.0
+
+### Changed
+- ActiveRecord added `enum_types` interface so monkeypatch has been removed. **Note:** output format has changed.
+- `create_enum` uses framework interface, replacing `:as` kwarg with `:enum_type`
+
 ## [1.2.2] - 2021-01-07
 ### Fixed
 - Don't mutate `Gem::Version#canonical_segments` (@agrobbin)

data/README.md

@@ -1,4 +1,7 @@
-# ActiveRecord::PGEnum [![Build Status](https://travis-ci.com/alassek/activerecord-pg_enum.svg?branch=master)](https://travis-ci.com/alassek/activerecord-pg_enum)
+# ActiveRecord::PGEnum [![Build Status](https://circleci.com/gh/alassek/activerecord-pg_enum.svg?style=shield)](https://app.circleci.com/pipelines/github/alassek/activerecord-pg_enum)
+
+**Note**: This was originally written before Rails added support for native enums. See the comments in [version
+support](#version-support).
 
 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.
 
@@ -61,6 +64,9 @@ The monkeypatches in this library are extremely narrow and contained; the dirty
 
 Monkeypatching Rails internals is **scary**. So this library has a comprehensive test suite that runs against every known minor version.
 
+Rails 7 added support for native enums, but they have so far neglected to support altering or dropping enums in the API,
+so this gem remains to fill in the gaps. I expect to slowly deprecate this over time.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -91,10 +97,12 @@ class AddContactMethodType < ActiveRecord::Migration[5.2]
 end
 ```
 
-Adding a value to an existing ENUM
+Adding a value to an existing ENUM (you must disable the wrapping transaction on PostgreSQL versions older than 12)
 
 ```ruby
 class AddSMSToContactMethodType < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
   def up
     add_enum_value "contact_method_type", "SMS", before: "Phone"
   end

data/gemfiles/7.0.gemfile

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

data/gemfiles/7.0.gemfile.lock

@@ -0,0 +1,68 @@
+PATH
+  remote: ..
+  specs:
+    activerecord-pg_enum (1.2.2)
+      activerecord (>= 4.1.0)
+      activesupport
+      pg
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activerecord (7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activesupport (7.0.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    method_source (1.0.0)
+    minitest (5.16.2)
+    pg (1.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (10.5.0)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    thor (1.2.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 7.0)
+  activerecord-pg_enum!
+  appraisal
+  bundler (~> 1.17)
+  pry
+  rake (~> 10.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.17.3

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

@@ -0,0 +1 @@
+require "active_record/pg_enum/6.1/create_enum"

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

@@ -0,0 +1 @@
+require "active_record/pg_enum/6.1/postgresql_adapter"

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

@@ -0,0 +1 @@
+require "active_record/pg_enum/6.1/create_enum"

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

@@ -0,0 +1 @@
+require "active_record/pg_enum/6.1/postgresql_adapter"

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

@@ -0,0 +1 @@
+require "active_record/pg_enum/6.1/create_enum"

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

@@ -0,0 +1 @@
+require "active_record/pg_enum/6.1/postgresql_adapter"

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

@@ -0,0 +1 @@
+require "active_record/pg_enum/6.1/create_enum"

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

@@ -0,0 +1 @@
+require "active_record/pg_enum/6.1/postgresql_adapter"

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

@@ -0,0 +1 @@
+require "active_record/pg_enum/6.1/create_enum"

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

@@ -0,0 +1 @@
+require "active_record/pg_enum/6.1/postgresql_adapter"

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

@@ -0,0 +1 @@
+require "active_record/pg_enum/6.1/create_enum"

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

@@ -0,0 +1 @@
+require "active_record/pg_enum/6.1/postgresql_adapter"

data/lib/active_record/pg_enum/6.1/create_enum.rb

@@ -0,0 +1,21 @@
+module ActiveRecord
+  module PGEnum
+    register :create_enum do
+      require "active_record/connection_adapters/postgresql_adapter"
+      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include CreateEnum
+    end
+
+    module CreateEnum
+      # Create a new ENUM type, with an arbitrary number of values.
+      #
+      # Example:
+      #
+      #   create_enum("foo_type", "foo", "bar", "baz", "foo bar")
+      def create_enum(name, values)
+        execute("CREATE TYPE #{name} AS ENUM (#{Array(values).map { |v| "'#{v}'" }.join(", ")})").tap {
+          reload_type_map
+        }
+      end
+    end
+  end
+end

data/lib/active_record/pg_enum/{postgresql_adapter.rb → 6.1/postgresql_adapter.rb}

@@ -2,7 +2,7 @@ module ActiveRecord
   module PGEnum
     register :postgresql_adapter do
       require "active_record/connection_adapters/postgresql_adapter"
-      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include PostgreSQLAdapter
+      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include ::ActiveRecord::PGEnum::PostgreSQLAdapter
       ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES.merge!(enum: { name: "enum" })
     end
 

data/lib/active_record/pg_enum/schema_statements.rb

@@ -1,22 +1,11 @@
 module ActiveRecord
   module PGEnum
     register :schema_statements do
-      require "active_record/connection_adapters/postgresql/schema_statements"
+      require "active_record/connection_adapters/postgresql_adapter"
       ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include SchemaStatements
     end
 
     module SchemaStatements
-      # Create a new ENUM type, with an arbitrary number of values.
-      #
-      # Example:
-      #
-      #   create_enum("foo_type", "foo", "bar", "baz", "foo bar")
-      def create_enum(name, values)
-        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}").tap {

data/lib/active_record/pg_enum/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module PGEnum
-    VERSION = "1.2.2"
+    VERSION = "2.0.0"
   end
 end

data/lib/active_record/pg_enum.rb

@@ -3,7 +3,7 @@ require "active_support/lazy_load_hooks"
 
 module ActiveRecord
   module PGEnum
-    KNOWN_VERSIONS = %w[4.1 4.2 5.0 5.1 5.2 6.0 6.1].map { |v| Gem::Version.new(v) }
+    KNOWN_VERSIONS = %w[4.1 4.2 5.0 5.1 5.2 6.0 6.1 7.0].map { |v| Gem::Version.new(v) }
 
     class << self
       attr_reader :enabled_version
@@ -37,7 +37,6 @@ module ActiveRecord
 
       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 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pg_enum
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Adam Lassek
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2022-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -129,10 +129,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -157,37 +157,52 @@ files:
 - gemfiles/6.0.gemfile.lock
 - gemfiles/6.1.gemfile
 - gemfiles/6.1.gemfile.lock
+- gemfiles/7.0.gemfile
+- gemfiles/7.0.gemfile.lock
 - gemfiles/edge.gemfile
 - gemfiles/edge.gemfile.lock
 - lib/active_record/pg_enum.rb
+- lib/active_record/pg_enum/4.1/create_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/postgresql_adapter.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/create_enum.rb
 - lib/active_record/pg_enum/4.2/migration_keys.rb
+- lib/active_record/pg_enum/4.2/postgresql_adapter.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/create_enum.rb
 - lib/active_record/pg_enum/5.0/migration_keys.rb
+- lib/active_record/pg_enum/5.0/postgresql_adapter.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/create_enum.rb
+- lib/active_record/pg_enum/5.1/postgresql_adapter.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/create_enum.rb
+- lib/active_record/pg_enum/5.2/postgresql_adapter.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/5.2/table_definition.rb
+- lib/active_record/pg_enum/6.0/create_enum.rb
+- lib/active_record/pg_enum/6.0/postgresql_adapter.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/6.1/create_enum.rb
+- lib/active_record/pg_enum/6.1/postgresql_adapter.rb
 - lib/active_record/pg_enum/6.1/prepare_column_options.rb
 - lib/active_record/pg_enum/6.1/schema_dumper.rb
 - lib/active_record/pg_enum/6.1/table_definition.rb
 - lib/active_record/pg_enum/command_recorder.rb
-- lib/active_record/pg_enum/postgresql_adapter.rb
 - lib/active_record/pg_enum/schema_statements.rb
 - lib/active_record/pg_enum/version.rb
 - lib/activerecord/pg_enum.rb
@@ -214,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Integrate PostgreSQL's enumerated types with the Rails enum feature

data/.travis.yml

@@ -1,33 +0,0 @@
-sudo: false
-dist: xenial
-language: ruby
-matrix:
-  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.4.4
-    gemfile: gemfiles/5.1.gemfile
-  - rvm: 2.5.1
-    gemfile: gemfiles/5.2.gemfile
-  - rvm: 2.6.0
-    gemfile: gemfiles/6.0.gemfile
-  - rvm: 2.7.0
-    gemfile: gemfiles/6.1.gemfile
-  - rvm: ruby-head
-    gemfile: gemfiles/edge.gemfile
-  allow_failures:
-  - gemfile: gemfiles/edge.gemfile
-services:
-- postgresql
-addons:
-  postgresql: "10"
-before_install: gem install bundler -v 1.17.3
-script: "bundle exec rake spec"
-env:
-  global:
-  - TEST_USER=postgres
-  - PGPORT=5432