activerecord-pg_enum 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '068a2c10c5375f5842445a5bff077ec28e14cd633d99dd7b8ef98690b28b2d2b'
-  data.tar.gz: aca6f592f676a8f6cd866a3bb1b3ca0eb0081976e8c1bbb99c71b25f5fc5192b
+  metadata.gz: 552cd4fa6b85fd2002965150aca5e1f92f9752bfce9ab6628241dce0ef40406f
+  data.tar.gz: b7915cd86940a3f2c5b2e9053712369f639073e22123b7a3a173f5403539aca1
 SHA512:
-  metadata.gz: 8c10ce8c87fada1997551cc9257cfd1cf7a8af5182f048c0b4f8fc56738e8bfe6fdda0bd88bd4e5126dba8102d9f1107cd1c1c40a5693fc8e860b190935c673d
-  data.tar.gz: ef59bbe1f7ea8dba8191c40c74aa703e1a00de17b26457ee26b4b73bf95fe24ceb2f85f105d480f6e49877d2bf466dfed39dfd323c8643e7cb35ddeb79737eb3
+  metadata.gz: 5b48750e4060fb131d1099ddf2198362e750901873e590ca488cb376e99ef30ab09c11857d9aa91ae9e0caea2903367a97bb34073f31f1ee1a9c4377cf9a27a5
+  data.tar.gz: 66fc8ee9467a8dc96445e5e5f8fdab62b77ad4740086b17fa1d3a673415c657f3fdccf5cc09898f8153534951ccfa88b644359b7ebb2ccb81fd187e5465b4655

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.0.3] - 2019-10-13
+### Fixed
+- Allow enum labels to contain spaces (@AndrewSpeed)
+
 ## [1.0.2] - 2019-08-29
 - Move the active_record load hook to a different place to ensure things run in the correct order
 

data/activerecord-pg_enum.gemspec

@@ -14,6 +14,13 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/alassek/activerecord-pg_enum"
   spec.license  = "MIT"
 
+  spec.metadata = {
+    "bug_tracker_uri" => "https://github.com/alassek/activerecord-pg_enum/issues",
+    "changelog_uri"   => "https://github.com/alassek/activerecord-pg_enum/blob/master/CHANGELOG.md",
+    "pgp_keys_uri"    => "https://keybase.io/alassek/pgp_keys.asc",
+    "signatures_uri"  => "https://keybase.pub/alassek/gems/"
+  }
+
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end

data/gemfiles/4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.1)
+    activerecord-pg_enum (1.0.3)
       activerecord (>= 4.1.0)
       activesupport
       pg

data/gemfiles/4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.1)
+    activerecord-pg_enum (1.0.3)
       activerecord (>= 4.1.0)
       activesupport
       pg

data/gemfiles/5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.1)
+    activerecord-pg_enum (1.0.3)
       activerecord (>= 4.1.0)
       activesupport
       pg

data/gemfiles/5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.1)
+    activerecord-pg_enum (1.0.3)
       activerecord (>= 4.1.0)
       activesupport
       pg

data/gemfiles/5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.1)
+    activerecord-pg_enum (1.0.3)
       activerecord (>= 4.1.0)
       activesupport
       pg

data/gemfiles/6.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.1)
+    activerecord-pg_enum (1.0.3)
       activerecord (>= 4.1.0)
       activesupport
       pg

data/gemfiles/edge.gemfile.lock

@@ -66,7 +66,7 @@ GIT
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.1)
+    activerecord-pg_enum (1.0.3)
       activerecord (>= 4.1.0)
       activesupport
       pg

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

@@ -19,7 +19,7 @@ module ActiveRecord
         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(" ")}]}
+          stream.puts %Q{  create_enum "#{name}", #{definition}}
         end
 
         stream.puts

data/lib/active_record/pg_enum/postgresql_adapter.rb

@@ -14,7 +14,7 @@ module ActiveRecord
       #   { "foo_type" => ["foo", "bar", "baz"] }
       def enum_types
         res = exec_query(<<-SQL.strip_heredoc, "SCHEMA")
-          SELECT t.typname AS enum_name, string_agg(e.enumlabel, ' ' ORDER BY e.enumsortorder) AS enum_value
+          SELECT t.typname AS enum_name, array_agg(e.enumlabel ORDER BY e.enumsortorder) AS enum_value
           FROM pg_type t
           JOIN pg_enum e ON t.oid = e.enumtypid
           JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace
@@ -22,14 +22,17 @@ module ActiveRecord
           GROUP BY enum_name
         SQL
 
-        if res.respond_to?(:cast_values)
-          res = res.cast_values
+        coltype = res.column_types["enum_value"]
+        deserialize = if coltype.respond_to?(:deserialize)
+          proc { |values| coltype.deserialize(values) }
+        elsif coltype.respond_to?(:type_cast_from_database)
+          proc { |values| coltype.type_cast_from_database(values) }
         else
-          res = res.rows
+          proc { |values| coltype.type_cast(values) }
         end
 
-        res.inject({}) do |memo, (name, values)|
-          memo[name] = values.split(" ")
+        res.rows.inject({}) do |memo, (name, values)|
+          memo[name] = deserialize.call(values)
           memo
         end
       end

data/lib/active_record/pg_enum/schema_statements.rb

@@ -10,7 +10,7 @@ module ActiveRecord
       #
       # Example:
       #
-      #   create_enum("foo_type", "foo", "bar", "baz")
+      #   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

data/lib/active_record/pg_enum/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module PGEnum
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pg_enum
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Adam Lassek
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2019-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -189,7 +189,11 @@ files:
 homepage: https://github.com/alassek/activerecord-pg_enum
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/alassek/activerecord-pg_enum/issues
+  changelog_uri: https://github.com/alassek/activerecord-pg_enum/blob/master/CHANGELOG.md
+  pgp_keys_uri: https://keybase.io/alassek/pgp_keys.asc
+  signatures_uri: https://keybase.pub/alassek/gems/
 post_install_message: 
 rdoc_options: []
 require_paths: