enum_type 2.1.2 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9a3e4e56b190e7bafd870a8d85d36f2d510db511
-  data.tar.gz: 7b6ed07e741a01450e0546ed39dbcf9ec76295e9
+SHA256:
+  metadata.gz: 89bc30e3e226b181141db43882f5fab69b0535a3440fe11e2abd2a2682a68fd5
+  data.tar.gz: e0ee22403862c1f77000691cd0e0a01f1c0757690f8154332f019d1632dfc442
 SHA512:
-  metadata.gz: 98cd180bedacbf7233eb4bc7e87eb1211dc00407cc0e6614602e1b3c9094e49eb2b684a24c17ab38ac8483c003f6fbcae140046fd4857bf9d9c17b2f1452a20d
-  data.tar.gz: 1c8d026cbd98ef6d02406c2c868cfb06b8da813fbd41d4448353a8c5194acac59d0af4ffe0285d1339b8f5784944064fdb3aa8b79d2bd8368fa87d656727ea5e
+  metadata.gz: cc1b7a7596e279ce9d59f32e9eededb064bb756023a6a4331dd9dde97f2147c7362752ada6ef3bd8431cc875f3a6a0a9c3d0927128a838e0bc7950b1db9f0b3b
+  data.tar.gz: cf62c7272e2aa16ea21bb7f9c8d23b6280cbe0f463085161c9234fcdfbab0c630d4837543114a3022a76a407bc7acd58c06fefd287b0098f25c2cc6179717c37

data/.rspec

@@ -1 +1,2 @@
--cfs
+--color
+--format documentation

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.4.2

data/Gemfile

@@ -1,18 +1,17 @@
 source 'https://rubygems.org'
 
 # DEPENDENCIES
-gem 'activerecord', '>= 4.0', require: 'active_record'
-gem 'activesupport', '>= 4.0', require: 'active_support/core_ext/object/try'
+gem 'rails', '~> 4'
 
 group :development do
   # DEVELOPMENT
   gem 'jeweler'
   gem 'yard'
-  gem 'RedCloth', require: 'redcloth'
+  gem 'redcarpet', require: nil
 
   # TEST
   gem 'rspec'
-  gem 'factory_girl'
-  platform(:mri) { gem 'pg' }
-  platform(:jruby) { gem 'activerecord-jdbcpostgresql-adapter' }
+  gem 'factory_bot'
+  gem 'pg', platform: :mri
+  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
 end

data/Gemfile.lock

@@ -1,108 +1,183 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    RedCloth (4.2.9-java)
-    activemodel (4.0.1)
-      activesupport (= 4.0.1)
-      builder (~> 3.1.0)
-    activerecord (4.0.1)
-      activemodel (= 4.0.1)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.1)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activerecord-jdbc-adapter (1.3.2)
+    actionmailer (4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.10)
+      actionview (= 4.2.10)
+      activesupport (= 4.2.10)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.10)
+      activesupport (= 4.2.10)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.10)
+      activesupport (= 4.2.10)
+      globalid (>= 0.3.0)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
+      builder (~> 3.1)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
+      arel (~> 6.0)
+    activerecord-jdbc-adapter (50.0)
       activerecord (>= 2.2)
-    activerecord-jdbcpostgresql-adapter (1.3.2)
-      activerecord-jdbc-adapter (~> 1.3.2)
-      jdbc-postgres (>= 9.1)
-    activesupport (4.0.1)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    addressable (2.3.5)
-    arel (4.0.1)
-    atomic (1.1.14)
-    atomic (1.1.14-java)
-    builder (3.1.4)
-    diff-lcs (1.2.5)
-    factory_girl (4.3.0)
+    activerecord-jdbcpostgresql-adapter (50.0)
+      activerecord-jdbc-adapter (~> 50.0)
+      jdbc-postgres (>= 9.4, < 43)
+    activesupport (4.2.10)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    arel (6.0.4)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.0.5-java)
+    crass (1.0.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    erubis (2.7.0)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    httpauth (0.2.0)
-    i18n (0.6.5)
-    jdbc-postgres (9.2.1004)
-    jeweler (1.8.8)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    hashie (3.5.6)
+    highline (1.7.10)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    jar-dependencies (0.3.11)
+    jdbc-postgres (42.1.4)
+    jeweler (2.3.7)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-    json (1.8.1)
-    json (1.8.1-java)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    minitest (4.7.5)
-    multi_json (1.8.2)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    nokogiri (1.5.10-java)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+      semver2
+    jwt (1.5.6)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    mime-types (2.99.3)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    multi_json (1.12.2)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    nokogiri (1.8.1-java)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    pg (0.17.0)
-    rack (1.5.2)
-    rake (10.1.0)
-    rdoc (4.0.1)
-      json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    thread_safe (0.1.3)
-      atomic
-    thread_safe (0.1.3-java)
-      atomic
-    tzinfo (0.3.38)
-    yard (0.8.7.3)
+      rack (>= 1.2, < 3)
+    pg (0.21.0)
+    psych (2.2.4)
+    psych (2.2.4-java)
+      jar-dependencies (>= 0.1.7)
+    rack (1.6.8)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.10)
+      actionmailer (= 4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      activemodel (= 4.2.10)
+      activerecord (= 4.2.10)
+      activesupport (= 4.2.10)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.10)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.8)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.3.0)
+    rdoc (6.0.0)
+    redcarpet (3.4.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    semver2 (3.4.2)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    thread_safe (0.3.6-java)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+    yard (0.9.12)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  RedCloth
-  activerecord (>= 4.0)
   activerecord-jdbcpostgresql-adapter
-  activesupport (>= 4.0)
-  factory_girl
+  factory_bot
   jeweler
   pg
+  rails (~> 4)
+  redcarpet
   rspec
   yard
+
+BUNDLED WITH
+   1.16.0

data/README.md

@@ -0,0 +1,58 @@
+> ⚠️ **DEPRECATED:** `enum_type` is no longer maintained. Modern Rails has
+> native ActiveRecord enum support (`enum`) that covers most use cases; for
+> PostgreSQL native ENUM types, consider alternatives like the
+> `activerecord-postgres_enum` gem family. The final release is v2.2.1.
+
+enum_type
+=========
+
+**Enumerated Types in ActiveRecord**
+
+|             |                                 |
+|:------------|:--------------------------------|
+| **Author**  | Tim Morgan                      |
+| **Version** | 2.1.2 (Nov 10, 2013)            |
+| **License** | Released under the MIT license. |
+
+About
+-----
+
+`enum_type` allows you to effectively use the PostgreSQL `ENUM` data type in
+your ActiveRecord models. It's a really simple gem that just adds a convenience
+method to take care of the usual "witch chant" that accompanies building an
+enumerated type in Rails.
+
+Installation
+------------
+
+**Important Note:** This gem requires Ruby 1.9+. Ruby 1.8 is not supported, and
+will never be.
+
+First, add the `enum_type` gem to your `Gemfile`:
+
+```` ruby
+gem 'enum_type'
+````
+
+Then, extend your model with the `EnumType` module:
+
+```` ruby
+class MyModel < ActiveRecord::Base
+  extend EnumType
+end
+````
+
+Usage
+-----
+
+In your model, call the `enum_type` method, providing one or more enumerated
+fields, and any additional options:
+
+```` ruby
+class MyModel < ActiveRecord::Base
+  extend EnumType
+  enum_type :status, %w( active pending admin superadmin banned )
+end
+````
+
+See the {EnumType#enum_type} method documentation for more information.

data/Rakefile

@@ -11,12 +11,12 @@ require 'rake'
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
-  gem.name = "enum_type"
-  gem.summary = %Q{PostgreSQL enumerated types in ActiveRecord}
-  gem.description = %Q{Allows ActiveRecord to better use PostgreSQL's ENUM types.}
-  gem.email = "git@timothymorgan.info"
-  gem.homepage = "http://github.com/riscfuture/enum_type"
-  gem.authors = [ "Tim Morgan" ]
+  gem.name                  = "enum_type"
+  gem.summary               = %Q{PostgreSQL enumerated types in ActiveRecord}
+  gem.description           = %Q{Allows ActiveRecord to better use PostgreSQL's ENUM types.}
+  gem.email                 = 'git@timothymorgan.info'
+  gem.homepage              = 'http://github.com/riscfuture/enum_type'
+  gem.authors               = ["Tim Morgan"]
   gem.required_ruby_version = '>= 1.9'
   gem.add_dependency "activerecord", ">= 0"
 end
@@ -26,14 +26,23 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
 
 require 'yard'
+
+# bring sexy back (sexy == tables)
+module YARD::Templates::Helpers::HtmlHelper
+  def html_markup_markdown(text)
+    markup_class(:markdown).new(text, :gh_blockcode, :fenced_code, :autolink, :tables, :no_intraemphasis).to_html
+  end
+end
+
 YARD::Rake::YardocTask.new('doc') do |doc|
-  doc.options << "-m" << "textile"
-  doc.options << "--protected"
-  doc.options << "-r" << "README.textile"
-  doc.options << "-o" << "doc"
-  doc.options << "--title" << "enum_type Documentation"
-  
-  doc.files = [ 'lib/**/*', 'README.textile' ]
+  doc.options << '-m' << 'markdown'
+  doc.options << '-M' << 'redcarpet'
+  doc.options << '--protected' << '--no-private'
+  doc.options << '-r' << 'README.md'
+  doc.options << '-o' << 'doc'
+  doc.options << '--title' << 'enum_type Documentation'
+
+  doc.files = %w(lib/**/* README.md)
 end
 
 task(default: :spec)

data/VERSION

@@ -1 +1 @@
-2.1.2
+2.2.1

data/enum_type.gemspec

@@ -2,20 +2,21 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: enum_type 2.1.2 ruby lib
+# stub: enum_type 2.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "enum_type"
-  s.version = "2.1.2"
+  s.version = "2.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Tim Morgan"]
-  s.date = "2013-11-11"
+  s.date = "2013-12-26"
   s.description = "Allows ActiveRecord to better use PostgreSQL's ENUM types."
   s.email = "git@timothymorgan.info"
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.textile"
+    "README.md"
   ]
   s.files = [
     ".document",
@@ -25,7 +26,7 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
-    "README.textile",
+    "README.md",
     "Rakefile",
     "VERSION",
     "enum_type.gemspec",
@@ -36,10 +37,18 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/riscfuture/enum_type"
-  s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "2.1.10"
-  s.summary = "PostgreSQL enumerated types in ActiveRecord"
+  s.rubygems_version = "2.2.0"
+  s.summary = "[DEPRECATED] PostgreSQL enumerated types in ActiveRecord"
+  s.post_install_message = <<~MSG
+
+    ⚠️  DEPRECATED: enum_type is no longer maintained.
+
+    No longer maintained. Modern Rails has native ActiveRecord enum support (`enum`) that covers most use cases; for PostgreSQL native ENUM types, consider alternatives like the `activerecord-postgres_enum` gem family.
+
+    This is the final release. No further updates are planned.
+
+  MSG
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
@@ -47,37 +56,34 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 4.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 4.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<RedCloth>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<factory_girl>, [">= 0"])
-      s.add_development_dependency(%q<pg>, [">= 0"])
-      s.add_development_dependency(%q<activerecord-jdbcpostgresql-adapter>, [">= 0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>)
+      s.add_development_dependency(%q<yard>)
+      s.add_development_dependency(%q<redcarpet>)
+      s.add_development_dependency(%q<rspec>)
+      s.add_development_dependency(%q<factory_girl>)
+      s.add_development_dependency(%q<pg>)
+      s.add_development_dependency(%q<activerecord-jdbcpostgresql-adapter>)
     else
       s.add_dependency(%q<activerecord>, [">= 4.0"])
       s.add_dependency(%q<activesupport>, [">= 4.0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<RedCloth>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<factory_girl>, [">= 0"])
-      s.add_dependency(%q<pg>, [">= 0"])
-      s.add_dependency(%q<activerecord-jdbcpostgresql-adapter>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<jeweler>)
+      s.add_dependency(%q<yard>)
+      s.add_dependency(%q<redcarpet>)
+      s.add_dependency(%q<rspec>)
+      s.add_dependency(%q<factory_girl>)
+      s.add_dependency(%q<pg>)
+      s.add_dependency(%q<activerecord-jdbcpostgresql-adapter>)
     end
   else
     s.add_dependency(%q<activerecord>, [">= 4.0"])
     s.add_dependency(%q<activesupport>, [">= 4.0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<RedCloth>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<factory_girl>, [">= 0"])
-    s.add_dependency(%q<pg>, [">= 0"])
-    s.add_dependency(%q<activerecord-jdbcpostgresql-adapter>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<jeweler>)
+    s.add_dependency(%q<yard>)
+    s.add_dependency(%q<redcarpet>)
+    s.add_dependency(%q<rspec>)
+    s.add_dependency(%q<factory_girl>)
+    s.add_dependency(%q<pg>)
+    s.add_dependency(%q<activerecord-jdbcpostgresql-adapter>)
   end
 end
 

data/lib/enum_type/extensions.rb

@@ -1,8 +1,9 @@
 require 'active_support/core_ext/module/aliasing'
 require 'active_record/connection_adapters/postgresql_adapter'
 
-# Patch the PostgreSQL adapter to recognize defaults on ENUM columns.
+# Patch the PostgreSQL adapter to recognize defaults on `ENUM` columns.
 
+# @private
 class ActiveRecord::ConnectionAdapters::PostgreSQLColumn
 
   def initialize(name, default, oid_type, sql_type = nil, null = true)
@@ -36,6 +37,7 @@ class ActiveRecord::ConnectionAdapters::PostgreSQLColumn
   end
 end if ActiveRecord::ConnectionAdapters::PostgreSQLColumn.methods.include?(:extract_value_from_default)
 
+# @private
 class ActiveRecord::ConnectionAdapters::JdbcColumn
   def initialize(config, name, default, *args)
     call_discovered_column_callbacks(config)

data/lib/enum_type.rb

@@ -1,6 +1,6 @@
 require 'enum_type/extensions'
 
-# Adds the @enum_type@ method to a model.
+# Adds the `enum_type` method to a model.
 #
 # @example Basic usage
 #   class MyModel < ActiveRecord::Base
@@ -17,16 +17,19 @@ module EnumType
   # @overload enum_type(field, ..., options={})
   #   @param [Symbol] field An enumerated field.
   #   @param [Hash] options A hash of options.
-  #   @option options [true, false] :allow_nil (false) If @true@, a nil value
-  #   is allowed.
+  #   @option options [true, false] :allow_nil (false) If `true`, a `nil` value
+  #     is allowed.
   #   @option options [Array<String>] :values If given, restricts valid values
-  #   to those in the given array.
+  #     to those in the given array.
+  #   @option options [String] :register_type If `true`, registers the column's
+  #     type with the PostgreSQL adapter, to suppress "unknown OID" warnings.
   #
   # @example Enumerated field with restricted types
   #   enum_type :color, values: %w( red orange yellow green blue purple )
 
   def enum_type(*fields)
     options = fields.extract_options!
+
     fields.each do |field|
       define_method field do
         value = read_attribute(field)
@@ -39,6 +42,19 @@ module EnumType
 
       validates_presence_of(field) unless options[:allow_nil]
       validates_inclusion_of(field, in: options[:values].map(&:to_sym), allow_nil: options[:allow_nil]) if options[:values]
+
+      if options[:register_type]
+        #ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID.register_type field.to_s,
+        #                                                                       ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::Identity.new
+        begin
+          result   = connection.select_one("SELECT atttypid FROM pg_catalog.pg_attribute WHERE attrelid = #{connection.quote table_name}::regclass AND attname = #{connection.quote field.to_s}")
+          type_oid = Integer(result['atttypid'])
+          ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::TYPE_MAP[type_oid] =
+            ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::Identity.new
+        rescue => err
+          Rails.logger.warn "Couldn't register type #{field}: #{err}"
+        end
+      end
     end
   end
 end

data/spec/enum_type_spec.rb

@@ -4,7 +4,7 @@ module SpecSupport
   class EnumTypeTester
     include ActiveModel::Validations
     extend EnumType
-    
+
     def self.set_field(field)
       @field = field
       reset_callbacks :validate
@@ -12,7 +12,9 @@ module SpecSupport
       enum_type @field
     end
 
-    def self.field() @field end
+    def self.field()
+      @field
+    end
 
     def read_attribute(_)
       instance_variable_get :"@#{self.class.field}"
@@ -37,72 +39,88 @@ describe EnumType do
     context "[getter]" do
       it "should return a symbol" do
         Model.connection.execute "INSERT INTO models (state) VALUES ('completed')"
-        Model.last.state.should eql(:completed)
+        expect(Model.last.state).to eql(:completed)
       end
-      
+
       it "should return nil if the value is nil" do
         Model.connection.execute "INSERT INTO models (state) VALUES (NULL)"
-        Model.last.state.should be_nil
+        expect(Model.last.state).to be_nil
       end
     end
 
     context "[setter]" do
       it "should typecast the value to a string" do
-        m = Model.new
+        m       = Model.new
         m.state = :failed
-        m.state.should eql(:failed)
+        expect(m.state).to eql(:failed)
         m.save!
-        m.reload.state.should eql(:failed)
-        m.state_before_type_cast.should eql('failed')
+        expect(m.reload.state).to eql(:failed)
+        expect(m.state_before_type_cast).to eql('failed')
       end
-      
+
       it "should leave nil as nil" do
-        m = Model.new
+        m       = Model.new
         m.state = nil
-        m.state.should eql(nil)
+        expect(m.state).to eql(nil)
         m.save!
-        m.reload.state.should be_nil
+        expect(m.reload.state).to be_nil
       end
     end
 
     context "[validations]" do
       before :each do
-        @field = FactoryGirl.generate(:enum_field)
+        @field = FactoryBot.generate(:enum_field)
         SpecSupport::EnumTypeTester.set_field(@field)
         @model = SpecSupport::EnumTypeTester.new
       end
-      
+
       it "should validate inclusion if :values option is given" do
-        SpecSupport::EnumTypeTester.enum_type @field, values: [ :a, :b ]
+        SpecSupport::EnumTypeTester.enum_type @field, values: [:a, :b]
         @model.send :"#{@field}=", :a
-        @model.get.should eql('a')
-        @model.should be_valid
+        expect(@model.get).to eql('a')
+        expect(@model).to be_valid
         @model.send :"#{@field}=", :c
-        @model.should_not be_valid
+        expect(@model).not_to be_valid
       end
 
       it "should not validate presence if :allow_nil is true" do
         pending "Doesn't work"
         SpecSupport::EnumTypeTester.enum_type @field, allow_nil: true
         @model.send :"#{@field}=", nil
-        @model.should be_valid
+        expect(@model).to be_valid
       end
-      
+
       it "should validate presence if :allow_nil is not given" do
         SpecSupport::EnumTypeTester.enum_type @field
         @model.send :"#{@field}=", nil
-        @model.should_not be_valid
+        expect(@model).not_to be_valid
       end
-      
+
       it "should validate presence if :allow_nil is false" do
         SpecSupport::EnumTypeTester.enum_type @field, allow_nil: false
         @model.send :"#{@field}=", nil
-        @model.should_not be_valid
+        expect(@model).not_to be_valid
+      end
+    end
+
+    context '[:register_type option]' do
+      before(:each) { @field = FactoryBot.generate(:enum_field) }
+
+      it "should register each new PostgreSQL type with ActiveRecord when set" do
+        expect(Model.connection).
+            to receive(:select_one).once.
+                with(/SELECT atttypid FROM pg_catalog.pg_attribute WHERE attrelid = 'models'::regclass AND attname = '#{@field}'/).
+                and_return('atttypid' => '12345')
+        Model.enum_type @field, register_type: true
+        if ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID.const_defined?(:TYPE_MAP)
+          expect(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::TYPE_MAP[12345]).
+              to be_kind_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::Identity)
+        end
       end
     end
-    
+
     it "should determine the correct column default" do
-      Model.columns.detect { |c| c.name == 'state' }.default.should eql('pending')
+      expect(Model.columns.detect { |c| c.name == 'state' }.default).to eql('pending')
     end
   end
 end

data/spec/factories.rb

@@ -1,4 +1,4 @@
 require 'factory_girl'
-FactoryGirl.define do
+FactoryBot.define do
   sequence(:enum_field) { |i| :"field#{i}" }
 end

data/spec/spec_helper.rb

@@ -1,4 +1,8 @@
-Bundler.require :default, :test
+require 'bundler'
+Bundler.require :default, :development
+
+require 'rails/all'
+Rails.logger = ActiveSupport::Logger.new(STDOUT)
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

metadata

@@ -1,153 +1,138 @@
 --- !ruby/object:Gem::Specification
 name: enum_type
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.1
 platform: ruby
 authors:
 - Tim Morgan
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: RedCloth
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbcpostgresql-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Allows ActiveRecord to better use PostgreSQL's ENUM types.
@@ -156,16 +141,16 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE
-- README.textile
+- README.md
 files:
-- .document
-- .rspec
-- .ruby-gemset
-- .ruby-version
+- ".document"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.textile
+- README.md
 - Rakefile
 - VERSION
 - enum_type.gemspec
@@ -177,24 +162,30 @@ files:
 homepage: http://github.com/riscfuture/enum_type
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+  ⚠️  DEPRECATED: enum_type is no longer maintained.
+
+  No longer maintained. Modern Rails has native ActiveRecord enum support (`enum`) that covers most use cases; for PostgreSQL native ENUM types, consider alternatives like the `activerecord-postgres_enum` gem family.
+
+  This is the final release. No further updates are planned.
+
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.1.10
-signing_key: 
+rubygems_version: 4.0.11
 specification_version: 4
-summary: PostgreSQL enumerated types in ActiveRecord
+summary: "[DEPRECATED] PostgreSQL enumerated types in ActiveRecord"
 test_files: []
+...

data/README.textile

@@ -1,45 +0,0 @@
-h1. enum_type -- Enumerated Types in ActiveRecord
-
-| *Author* | Tim Morgan |
-| *Version* | 2.1.2 (Nov 10, 2013) |
-| *License* | Released under the MIT license. |
-
-h2. About
-
-@enum_type@ allows you to effectively use the PostgreSQL @ENUM@ data type in
-your ActiveRecord models. It's a really simple gem that just adds a convenience
-method to take care of the usual "witch chant" that accompanies building an
-enumerated type in Rails.
-
-h2. Installation
-
-*Important Note:* This gem requires Ruby 1.9. Ruby 1.8 is not supported, and
-will never be.
-
-First, add the @enum_type@ gem to your @Gemfile@:
-
-<pre><code>
-gem 'enum_type'
-</code></pre>
-
-Then, extend your model with the @EnumType@ module:
-
-<pre><code>
-class MyModel < ActiveRecord::Base
-  extend EnumType
-end
-</code></pre>
-
-h2. Usage
-
-In your model, call the @enum_type@ method, providing one or more enumerated
-fields, and any additional options:
-
-<pre><code>
-class MyModel < ActiveRecord::Base
-  extend EnumType
-  enum_type :status, %w( active pending admin superadmin banned )
-end
-</code></pre>
-
-See the {EnumType#enum_type} method documentation for more information.