pg-enum 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66e50be4876e131e93d1399ef75a2e1249f57d9f
-  data.tar.gz: 7136105c3614899d6a3f2d69856fee9bb657d975
+  metadata.gz: 7cdafa9079223a850e747a9f0001f57455671ee9
+  data.tar.gz: 27529331b76515a61879c0c87bc22a73bd4fa6f1
 SHA512:
-  metadata.gz: 3bb5ddef3034ab90cfb5ec8544b81a3f640e351b8907082f3820ee2a941230a3cc8a0f776fb07295d47219a5651be72e2c9ed701403ec80c7905b359ff4c6132
-  data.tar.gz: f686631000ac8459dfe907825950604d09be9d3cdd756b5c108f1b5e32730399106a693070b58cc39ec5c1509014770cf4b5fdbde76d49aaf889ff35cbcaf875
+  metadata.gz: 5558aa1310676410177a9ccd2765ed1f9de85da412b7e9fdc9e8a7b742e623a95130708d2153b0e0d72c7836e6ec6d9f0f529cbcfd2699eb968a5f482e2bf29f
+  data.tar.gz: 758dbcf652c14658fe9c1ec709ed542445a452762459c274b7400c3e84bd088d4b3f1a1dc4c1f27d6a69bfda1775005f9c6500693bf925b308cc104fa958a1a3

data/lib/pg_enum.rb

@@ -1,18 +1,39 @@
 # frozen_string_literal: true
 
 require "active_support/concern"
+require "active_support/lazy_load_hooks"
+require "rails/railtie"
 
 module PgEnum
   extend ActiveSupport::Concern
 
   ENUM_SQL = <<~SQL.squish
-    SELECT e.enumlabel
+    SELECT t.typname AS name, e.enumlabel AS value
       FROM pg_enum e
       JOIN pg_type t
         ON e.enumtypid = t.oid
-     WHERE t.typname = ?
   SQL
 
+  mattr_accessor :enums_hash
+
+  def self.load_enums_hash(connection)
+    self.enums_hash = enum_rows(connection).each_with_object({}) do |row, hash|
+      hash.deep_merge!(row["name"] => { row["value"].to_sym => row["value"] })
+    end
+  end
+
+  def self.enum_rows(connection)
+    connection.select_all(ENUM_SQL)
+  end
+
+  class Railtie < Rails::Railtie
+    initializer "pg-enum.enums", after: "active_record.initialize_database" do
+      ActiveSupport.on_load(:active_record) do
+        PgEnum.load_enums_hash(connection)
+      end
+    end
+  end
+
   class_methods do
     def pg_enum(attr, options = {})
       column = columns_hash[attr.to_s]
@@ -21,16 +42,7 @@ module PgEnum
         raise "PgEnum: #{ model.table_name }.#{ attr } is not an enum"
       end
 
-      enum(options.merge(column.name.to_sym => enum_values(column)))
-    end
-
-    private
-
-    def enum_values(column)
-      connection
-        .select_all(sanitize_sql_array([ENUM_SQL, column.sql_type]))
-        .map { |v| v["enumlabel"] }
-        .each_with_object({}) { |v, h| h[v.to_sym] = v }
+      enum(options.merge(column.name.to_sym => PgEnum.enums_hash[column.sql_type]))
     end
   end
 

data/test/pg_enum_test.rb

@@ -2,6 +2,7 @@
 
 require "bundler/setup"
 require "active_record"
+require "rails"
 require "pg"
 require "minitest/autorun"
 require_relative "../lib/pg_enum"
@@ -32,6 +33,13 @@ ActiveRecord::Schema.define do
   end
 end
 
+class Application < Rails::Application
+  config.eager_load = false
+  config.root = File.dirname(__FILE__)
+end
+
+Application.initialize!
+
 class Conversation < ActiveRecord::Base
   include PgEnum
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg-enum
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Francesco Rodríguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord