activerecord-postgres_enum 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cef504021e0ff35024356c599daaed71ce72fe3be8d1c3b24fc038fa2b0b5ff
-  data.tar.gz: 7fbbe81954d2bdaeef201f1cc5abb4cdaefa216c3603ba7a8dd949ec06d8ea8a
+  metadata.gz: 4658a60bc93da30adf1d9cb7d2f6fce18521c2bfb063ff822c51b69d2e1f9d34
+  data.tar.gz: 661cde0de2e935c4d2e67e51282073faafd5991b6391e2a4e09669ba3711a6e4
 SHA512:
-  metadata.gz: 847fc44c04be544a22d468e73dbba779324cfc3a32cbb615dc664090c45a870f963881d875c5b83f72e7808fae878861580ce031a8f105a8f4a34c90e3ea9d36
-  data.tar.gz: a87a1a3250627e1e0112c5fc3e8d4b0ad27a33d5099ca4b7f5bf65bc169e19ee505b43df63176c2f12df45f4eba061bf5b6b10abcb6a7338cd63ed4776032cf0
+  metadata.gz: c880fa8bb243ea447630342c78e272839fbc961b694ec6610b46987ead637d64b5cb29d87550a18c0b654ca17e6afd84511ea7c6a813ab3657e3ab4fb1408f66
+  data.tar.gz: 542a619f5c41b67242aa379524588bb31b1d430d30e9f007244813c6b2ba746d3615a756bd932532a22a2555827f360768e91aadbcff3a814b874ae1c62a4367

data/README.md

@@ -36,7 +36,7 @@ create_table :person do
 end
 ```
 
-Running the above will create a table :person, with a column :person_mood of type :mood. This will also be saved on schema.rb so that `rake schema:load` works as expected.
+Running the above will create a table :person, with a column :person_mood of type :mood. This will also be saved on schema.rb so that `rake db:schema:load` works as expected.
 
 To drop an existing enum:
 

data/lib/active_record/postgres_enum/column.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# frozen_string_literal: true
-
 module ActiveRecord
   module PostgresEnum
     module Column

data/lib/active_record/postgres_enum/command_recorder.rb

@@ -3,7 +3,7 @@
 module ActiveRecord
   module PostgresEnum
     module CommandRecorder
-      def create_enum(name, values)
+      def create_enum(name, values, _opts = nil)
         record(:create_enum, [name, values])
       end
 

data/lib/active_record/postgres_enum/schema_dumper.rb

@@ -4,10 +4,12 @@ module ActiveRecord
   module PostgresEnum
     # provide support for writing out the 'create_enum' calls in schema.rb
     module SchemaDumper
-      def tables(stream)
-        types(stream)
+      unless ActiveRecord::PostgresEnum.rails_7?
+        def tables(stream)
+          types(stream)
 
-        super
+          super
+        end
       end
 
       private
@@ -20,15 +22,21 @@ module ActiveRecord
             statements << "  create_enum #{name.inspect}, [\n#{values}\n  ], force: :cascade"
           end
 
-          stream.puts statements.join("\n\n")
-          stream.puts
+          # Check if there any enum types to dump - otherwise don't output
+          # anything to prevent empty lines in schema.rb
+          if statements.any?
+            stream.puts statements.join("\n\n")
+            stream.puts
+          end
         end
       end
 
-      def prepare_column_options(column)
-        spec = super
-        spec[:enum_type] ||= "\"#{column.sql_type}\"" if column.enum?
-        spec
+      unless ActiveRecord::PostgresEnum.rails_7?
+        def prepare_column_options(column)
+          spec = super
+          spec[:enum_type] ||= "\"#{column.sql_type}\"" if column.enum?
+          spec
+        end
       end
     end
   end

data/lib/active_record/postgres_enum/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module PostgresEnum
-    VERSION = "2.0.0"
+    VERSION = "2.0.2"
   end
 end

data/lib/active_record/postgres_enum.rb

@@ -6,39 +6,39 @@ require "active_record/connection_adapters/postgresql/schema_statements"
 require "active_record/connection_adapters/postgresql_adapter"
 require "active_support/lazy_load_hooks"
 
-require "active_record/postgres_enum/version"
-require "active_record/postgres_enum/postgresql_adapter"
-require "active_record/postgres_enum/schema_dumper"
-require "active_record/postgres_enum/schema_statements"
-require "active_record/postgres_enum/column"
-require "active_record/postgres_enum/column_methods"
-require "active_record/postgres_enum/command_recorder"
-require "active_record/postgres_enum/enum_validator"
-
 module ActiveRecord
   module PostgresEnum
     def self.rails_7?
-      Rails::VERSION::MAJOR == 7
+      ActiveRecord::VERSION::MAJOR == 7
     end
 
     def self.rails_5?
-      Rails::VERSION::MAJOR == 5
+      ActiveRecord::VERSION::MAJOR == 5
     end
   end
 end
 
+require "active_record/postgres_enum/version"
+require "active_record/postgres_enum/postgresql_adapter"
+require "active_record/postgres_enum/schema_dumper"
+require "active_record/postgres_enum/schema_statements"
+require "active_record/postgres_enum/column"
+require "active_record/postgres_enum/column_methods"
+require "active_record/postgres_enum/command_recorder"
+require "active_record/postgres_enum/enum_validator"
+
 ActiveSupport.on_load(:active_record) do
   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend ActiveRecord::PostgresEnum::PostgreSQLAdapter
 
+  ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend(
+    ActiveRecord::PostgresEnum::SchemaDumper
+  )
+
   ActiveRecord::Migration::CommandRecorder.prepend ActiveRecord::PostgresEnum::CommandRecorder
 
   unless ActiveRecord::PostgresEnum.rails_7?
     ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:enum] = {}
 
-    ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend(
-      ActiveRecord::PostgresEnum::SchemaDumper
-    )
-
     if ActiveRecord::PostgresEnum.rails_5?
       ActiveRecord::ConnectionAdapters::PostgreSQLColumn.prepend(
         ActiveRecord::PostgresEnum::Column

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres_enum
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Michael Merkushin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -136,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-description: 
+description:
 email:
 - merkushin.m.s@gmail.com
 executables: []
@@ -160,7 +160,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,15 +168,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Integrate PostgreSQL's enum data type into ActiveRecord's schema and migrations.
 test_files: []