ar-enum 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c54482529b0c9ca4c656af951d450a415701f1f5be9bb03bb1779f28b3e1a61d
-  data.tar.gz: 79feea073eb9ac0669e5a7b1d28218ae6b800f59270ca023c38b0f7dc4705b60
+  metadata.gz: 3e86b5917258828aad1000b878f4cf5f263c2f00d4c9bada348159f75410d864
+  data.tar.gz: 5c97b8d8f4a81c72036ef4d4b627772965ac19cdbe0a4c4217aaf91f8abbaaa1
 SHA512:
-  metadata.gz: b6909bccd2dff996432fa2117b07746f4c5cc12c6905f31b5b1eae16fbbc57bca9a8fde2843fe0de705cbd786e138f5db072131420eea90a0693da87b1dae024
-  data.tar.gz: 7502f7eb5291001f8e51bc52184426002c0d075042380fa2e27d01316b32b64ee399a2c1a93cce40a8d0a9dbbe006e7de389a35ace07df7f311b824664b42134
+  metadata.gz: 584a2323fad2de86e7e30979a037a7ae935f3d12d4590b6484ffc5733b266d458962a513b265af863dcb0f152815169687dd85bfce79df5c7fe7524c234c9658
+  data.tar.gz: 6f713d4790f5f802775062448626e94e61698d4ba98d735ea3cd929a6202acb750f9210bced6a73b371c960225e15fc8072d95123e2bfafc04b9336b442486ca

data/README.md

@@ -40,6 +40,18 @@ create_table :articles do |t|
 end
 ```
 
+You can even use the type shortcut if you want; i.e. you can use `t.article_status` instead of `t.column`.
+
+```ruby
+# The type is created independently from the table.
+create_enum :article_status, %w[draft published]
+
+create_table :articles do |t|
+  # Use the type `article_status` when defining your column.
+  t.article_status :status, null: false, default: "draft"
+end
+```
+
 ### Dropping enums
 
 To remove the enum, use `drop_enum`.

data/lib/ar/enum.rb

@@ -3,6 +3,8 @@
 require "active_support/all"
 require "active_record"
 require "active_record/connection_adapters/postgresql_adapter"
+require "active_record/connection_adapters/postgresql/schema_statements"
+require "active_record/connection_adapters/postgresql/schema_definitions"
 require "active_record/schema_dumper"
 require "active_record/migration/command_recorder"
 require "ar/enum/version"
@@ -15,7 +17,50 @@ module AR
   end
 end
 
-ActiveRecord::Migration::CommandRecorder.include AR::Enum::CommandRecorder
-ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include AR::Enum::Adapter
-ActiveRecord::SchemaDumper.prepend AR::Enum::SchemaDumper
-ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:enum] = {name: "character varying"}
+ActiveSupport.on_load(:active_record) do
+  require "active_record/connection_adapters/postgresql_adapter"
+
+  ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(
+    Module.new do
+      def create_table_definition(*args)
+        ActiveRecord::Base.connection.enum_types.each do |enum|
+          ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[enum["name"].to_sym] = {name: enum["name"]}
+          ActiveRecord::ConnectionAdapters::PostgreSQL::ColumnMethods.class_eval do
+            define_method(enum["name"]) do |*names, **options|
+              names.each {|name| column(name, enum["name"].to_sym, options) }
+            end
+          end
+        end
+
+        super
+      end
+    end
+  )
+
+  ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaStatements.class_eval do
+    original_fetch_type_metadata = instance_method(:fetch_type_metadata)
+
+    define_method(:fetch_type_metadata) do |*args|
+      type_metadata = original_fetch_type_metadata.bind(self).call(*args)
+
+      if type_metadata.type == :enum
+        type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(
+          sql_type: type_metadata.sql_type,
+          type: type_metadata.sql_type.to_sym,
+          limit: type_metadata.limit,
+          precision: type_metadata.precision,
+          scale: type_metadata.scale
+        )
+        type_metadata = ActiveRecord::ConnectionAdapters::PostgreSQLTypeMetadata.new(type_metadata)
+
+        ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[type_metadata.type] = {name: "character varying"}
+      end
+
+      type_metadata
+    end
+  end
+
+  ActiveRecord::Migration::CommandRecorder.include AR::Enum::CommandRecorder
+  ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include AR::Enum::Adapter
+  ActiveRecord::SchemaDumper.prepend AR::Enum::SchemaDumper
+end

data/lib/ar/enum/schema_dumper.rb

@@ -11,7 +11,7 @@ module AR
       def enum_types(stream)
         list = @connection.enum_types.to_a
 
-        stream.puts("  # These are enum types created on this database") if list.any?
+        stream.puts("  # These are enum types available on this database") if list.any?
 
         list.each do |row|
           labels = row["labels"].split(",")

data/lib/ar/enum/version.rb

@@ -2,6 +2,6 @@
 
 module AR
   module Enum
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-enum
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nando Vieira