activerecord-pg_enum 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b054a50be2905bc27d33ea19f01be2dca1c435ee12097cf887442b181fc7d2a4
-  data.tar.gz: a06db65579894edded448f85e16bd436de2d51a09d8a5f647389cb193d28ecbe
+SHA1:
+  metadata.gz: 375facb22f785682bbc48ddd221c8fd2ccd7c1d5
+  data.tar.gz: 61d7656a02c14feb0e6d591dbb3ecd15839a6154
 SHA512:
-  metadata.gz: 2dbc6fee1995ef05d75acb20c0cf03639bca2b753788ba91df098268d914f286c3b04b34639bae6984bbe0ebb9948d9196b84ae07defcc953a485b70a08370b6
-  data.tar.gz: f04459faaae97d771aa60e44cb0ca2d13e983f3bff36f7eef3f71401997746d54516eb216e25666e1618755b46aef9248636a4b263e6a6af09b505ebb75c767e
+  metadata.gz: dcd88c40ee6625cdf4120e06def40dcdbe5573ccebb77f710e62bfa037222d896a64762798a6ba8736bbbf7e89702633771f20671f92cd63c7a603a5c7cc6293
+  data.tar.gz: be1393454674cd111816dc113902d4240cbd0ff0a10e5cd4441dbe87fa1daaf98920eaf20ece41e5a494802a2e0c33c6b79e766261320f4920334eb33be2d61e

data/.travis.yml

@@ -1,22 +1,28 @@
 sudo: false
 language: ruby
 rvm:
-- 2.1
-- 2.2
-- 2.5
+- 2.2.2
+- 2.5.0
 gemfile:
-- gemfiles/5.2.gemfile
+- gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
+- gemfiles/5.2.gemfile
 - gemfiles/edge.gemfile
 matrix:
   exclude:
-  - rvm: 2.1
+  - rvm: 2.5.0
+    gemfile: gemfiles/5.0.gemfile
+  - rvm: 2.5.0
+    gemfile: gemfiles/5.1.gemfile
+  - rvm: 2.5.0
     gemfile: gemfiles/5.2.gemfile
+  - rvm: 2.2.2
+    gemfile: gemfiles/edge.gemfile
   allow_failures:
   - gemfile: gemfiles/edge.gemfile
 services:
 - postgresql
-before_install: gem install bundler -v 1.15.4
+before_install: gem install bundler -v 1.17.3
 script: "bundle exec rake spec"
 env:
   global:

data/Appraisals

@@ -6,6 +6,11 @@ appraise "5.1" do
   gem "activerecord", ">= 5.1.0", "< 5.2.0"
 end
 
+appraise "5.0" do
+  gem "activerecord", ">= 5.0.0", "< 5.1.0"
+  gem "i18n", "1.5.1"
+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]
 
+## [0.3.0] - 2019-03-03
+- Support for 5.0 and 5.1
+- Change travis config to test against oldest supported version of ruby
+
+## [0.2.1] - 2019-02-22
+- Fixed a bug in the `SchemaDumper` output
+
 ## [0.2.0] - 2018-08-18
 ### Changed
 - Change API of `create_enum` to take two arguments instead, the name and an array of values

data/README.md

@@ -6,7 +6,9 @@ This will allow you to use enum columns in your database without replacing `sche
 
 ## Version support
 
-Currently only Rails 5.2 is supported. Support for previous versions going back to 4.1 are planned.
+I intend to support every version of Rails that supports `enum`, which was introduced in 4.1.
+
+Currently Rails 5.0 through 6.0 are supported.
 
 ## Installation
 

data/activerecord-pg_enum.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "pg"
-  spec.add_dependency "activerecord", ">= 5.1.0"
+  spec.add_dependency "activerecord", ">= 5.0.0"
   spec.add_dependency "activesupport"
 
   spec.add_development_dependency "appraisal"

data/gemfiles/5.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", ">= 5.0.0", "< 5.1.0"
+gem "i18n", "1.5.1"
+
+gemspec path: "../"

data/gemfiles/5.0.gemfile.lock

@@ -0,0 +1,72 @@
+PATH
+  remote: ..
+  specs:
+    activerecord-pg_enum (0.3.0)
+      activerecord (>= 5.0.0)
+      activesupport
+      pg
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.7.1)
+      activesupport (= 5.0.7.1)
+    activerecord (5.0.7.1)
+      activemodel (= 5.0.7.1)
+      activesupport (= 5.0.7.1)
+      arel (~> 7.0)
+    activesupport (5.0.7.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.1.4)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.4)
+    diff-lcs (1.3)
+    i18n (1.5.1)
+      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.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (>= 5.0.0, < 5.1.0)
+  activerecord-pg_enum!
+  appraisal
+  bundler (~> 1.15)
+  i18n (= 1.5.1)
+  pry
+  rake (~> 10.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.17.3

data/gemfiles/5.1.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (0.2.0)
-      activerecord (>= 5.1.0)
+    activerecord-pg_enum (0.3.0)
+      activerecord (>= 5.0.0)
       activesupport
       pg
 
@@ -32,7 +32,7 @@ GEM
       concurrent-ruby (~> 1.0)
     method_source (0.9.0)
     minitest (5.11.3)
-    pg (1.0.0)
+    pg (1.1.4)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)

data/gemfiles/5.2.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (0.2.0)
-      activerecord (>= 5.1.0)
+    activerecord-pg_enum (0.3.0)
+      activerecord (>= 5.0.0)
       activesupport
       pg
 
@@ -32,7 +32,7 @@ GEM
       concurrent-ruby (~> 1.0)
     method_source (0.9.0)
     minitest (5.11.3)
-    pg (1.0.0)
+    pg (1.1.4)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)

data/gemfiles/edge.gemfile.lock

@@ -66,8 +66,8 @@ GIT
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (0.2.0)
-      activerecord (>= 5.1.0)
+    activerecord-pg_enum (0.3.0)
+      activerecord (>= 5.0.0)
       activesupport
       pg
 
@@ -103,7 +103,7 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
-    pg (1.0.0)
+    pg (1.1.4)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)

data/lib/active_record/pg_enum.rb

@@ -7,7 +7,6 @@ require "active_support/lazy_load_hooks"
 ActiveSupport.on_load(:active_record) do
   require "active_record/pg_enum/command_recorder"
   require "active_record/pg_enum/postgresql_adapter"
-  require "active_record/pg_enum/schema_dumper"
   require "active_record/pg_enum/schema_statements"
   require "active_record/pg_enum/helper"
 
@@ -16,7 +15,13 @@ ActiveSupport.on_load(:active_record) do
   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES.merge!(enum: { name: "enum" })
 
   if ar_version >= Gem::Version.new("5.2.0")
+    require "active_record/pg_enum/schema_dumper"
     ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend ActiveRecord::PGEnum::SchemaDumper
+  else
+    require "active_record/pg_enum/4.2/column_dumper"
+    require "active_record/pg_enum/4.2/schema_dumper"
+    ActiveRecord::ConnectionAdapters::PostgreSQL::ColumnDumper.prepend ActiveRecord::PGEnum::ColumnDumper
+    ActiveRecord::SchemaDumper.prepend ActiveRecord::PGEnum::SchemaDumper
   end
 
   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include ActiveRecord::PGEnum::PostgreSQLAdapter

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

@@ -0,0 +1,13 @@
+module ActiveRecord
+  module PGEnum
+    module ColumnDumper
+      def column_spec(column)
+        if column.type == :enum
+          return ["column", [column.sql_type.inspect, prepare_column_options(column)]]
+        end
+
+        super
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module ActiveRecord
+  module PGEnum
+    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
+
+      # Takes a column specification in Object form and serializes it into a String.
+      def format_colspec(colspec)
+        case colspec
+        when String
+          colspec
+        when Array
+          colspec.map { |value| format_colspec(value) }.select(&:present?).join(", ")
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/active_record/pg_enum/schema_dumper.rb

@@ -23,10 +23,10 @@ module ActiveRecord
       # Gathers the arguments needed for the column line inside the create_table block.
       def column_spec(column)
         if column.type == :enum
-          ["column", [column.sql_type.inspect, prepare_column_options(column)]]
-        else
-          super
+          return ["column", [column.sql_type.inspect, prepare_column_options(column)]]
         end
+
+        super
       end
 
       # Takes a column specification in Object form and serializes it into a String.

data/lib/active_record/pg_enum/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module PGEnum
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pg_enum
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Adam Lassek
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +143,8 @@ files:
 - bin/console
 - bin/setup
 - gemfiles/.bundle/config
+- gemfiles/5.0.gemfile
+- gemfiles/5.0.gemfile.lock
 - gemfiles/5.1.gemfile
 - gemfiles/5.1.gemfile.lock
 - gemfiles/5.2.gemfile
@@ -150,6 +152,8 @@ files:
 - gemfiles/edge.gemfile
 - gemfiles/edge.gemfile.lock
 - lib/active_record/pg_enum.rb
+- lib/active_record/pg_enum/4.2/column_dumper.rb
+- lib/active_record/pg_enum/4.2/schema_dumper.rb
 - lib/active_record/pg_enum/command_recorder.rb
 - lib/active_record/pg_enum/helper.rb
 - lib/active_record/pg_enum/postgresql_adapter.rb
@@ -177,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Integrate PostgreSQL's enumerated types with the Rails enum feature