enum_kit 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f5949293c0b433b8a014dd718bdb0db6f65b13293bc3c781d51296e13a3023d
-  data.tar.gz: 5d8e7e994ec2f47c932fb120e1bb9373d6b9d64ab9380cbba98de58483377004
+  metadata.gz: a34de5e74d0221b789a2b6f032fbb9925ac5514d9543107346afdcaedb040c69
+  data.tar.gz: 0cce23fa1f546f4f23cdd7e7b124e7eb081a66ab599cbf2a16fe14295fe9cb49
 SHA512:
-  metadata.gz: 281be07f6004fc567ceb889b1bf63574e08ba8a0e3f250a098b37ba19d9e035718e75993248cc9e4a9d80d1640a5453b71ee4c89848a9f125bae84db16ea046b
-  data.tar.gz: 6ecf20f2cf802b611c6a5604dd5940962448b70bb3816668f596f81d6c0b46e5292ebf032eeb562c74cd6ea0a78d17623d39280e6e6b73bf25e4c42f38f90b99
+  metadata.gz: de6d95058b1386969164de088d9f12d5ec69798d87696bc1ef20e8c88289856e1a25a9266b9489dd6618d3c95296870ffc971feea44f0c0ed27f403f199dded3
+  data.tar.gz: 5d47f9663a4249c66e7624753c14d7ae46c77f7da38cb068809a74ac7f6c0bb6b36be6b6b604e3367a56b2cd732cbdf2f7fec4ed4462d0e61351ceefdcc433b1

data/lib/enum_kit/active_record_extensions/connection_adapters/postgresql_adapter.rb

@@ -27,10 +27,16 @@ module EnumKit
           ORDER BY pg_type.typname
         SQL
 
+        # Clear the cached enums to force a refresh the next time they are accessed.
+        #
+        def clear_enum_cache!
+          @enums = nil
+        end
+
         # @return [Hash] The enum types available in the database.
         #
         def enums
-          select_all(ENUM_QUERY.tr("\n", ' ').strip).each_with_object({}) do |row, enums|
+          @enums ||= select_all(ENUM_QUERY.tr("\n", ' ').strip).each_with_object({}) do |row, enums|
             enums[row['typname'].to_sym] = row['values'].split("\t\t")
           end
         end
@@ -44,7 +50,7 @@ module EnumKit
           name   = EnumKit.sanitize_name!(name)
           values = EnumKit.sanitize_values!(values)
 
-          execute "CREATE TYPE #{name} AS ENUM #{EnumKit.sqlize(values)}"
+          enum_execute "CREATE TYPE #{name} AS ENUM #{EnumKit.sqlize(values)}"
         end
 
         # Rename an existing enum type.
@@ -56,7 +62,7 @@ module EnumKit
           current_name = EnumKit.sanitize_name!(current_name)
           new_name     = EnumKit.sanitize_name!(new_name)
 
-          execute "ALTER TYPE #{current_name} RENAME TO #{new_name}"
+          enum_execute "ALTER TYPE #{current_name} RENAME TO #{new_name}"
         end
 
         # Drop an existing enum type from the database.
@@ -66,7 +72,7 @@ module EnumKit
         def drop_enum(name)
           name = EnumKit.sanitize_name!(name)
 
-          execute "DROP TYPE #{name}"
+          enum_execute "DROP TYPE #{name}"
         end
 
         # Add a new value to an enum type in the database.
@@ -89,7 +95,7 @@ module EnumKit
           statement += " AFTER #{EnumKit.sqlize(EnumKit.sanitize_value!(after))}"   if after
           statement += " BEFORE #{EnumKit.sqlize(EnumKit.sanitize_value!(before))}" if before
 
-          execute(statement)
+          enum_execute(statement)
         end
 
         # Rename a value within an enum type in the database.
@@ -105,7 +111,7 @@ module EnumKit
           current_name = EnumKit.sanitize_value!(current_name)
           new_name     = EnumKit.sanitize_value!(new_name)
 
-          execute "ALTER TYPE #{name} RENAME VALUE #{EnumKit.sqlize(current_name)} TO #{EnumKit.sqlize(new_name)}"
+          enum_execute "ALTER TYPE #{name} RENAME VALUE #{EnumKit.sqlize(current_name)} TO #{EnumKit.sqlize(new_name)}"
         end
 
         # :nodoc:
@@ -129,6 +135,14 @@ module EnumKit
 
           raise NotImplementedError, 'PostgreSQL 10.0+ is required to enable renaming of enum values.'
         end
+
+        # Execute a SQL statement, then clear the enum cache.
+        #
+        def enum_execute(*args, &block)
+          result = execute(*args, &block)
+          clear_enum_cache!
+          result
+        end
       end
     end
   end

data/lib/enum_kit/constants.rb

@@ -3,5 +3,5 @@
 module EnumKit
   # @return [String] The gem's semantic version number.
   #
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/active_record/connection_adapters/postgresql_adapter_spec.rb

@@ -6,6 +6,9 @@ RSpec.describe ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, :unit do
   before do
     # Sanity check to ensure ActiveRecord is configured to use a PostgreSQL database.
     expect(connection).to be_a(described_class)
+
+    # Clear the cached enums before each test to ensure clean tests.
+    connection.clear_enum_cache!
   end
 
   %i[create_enum rename_enum drop_enum add_enum_value rename_enum_value].each do |method|
@@ -14,6 +17,44 @@ RSpec.describe ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, :unit do
     end
   end
 
+  # TODO: Investigate possible alternatives as this test is a bit odd.
+  describe '#clear_enum_cache!' do
+    it 'sets @enums to nil' do
+      connection.instance_eval do
+        @enums = { sizes: ['small', 'medium', 'large', 'extra large'] }
+      end
+
+      connection.clear_enum_cache!
+
+      expect(connection.instance_eval { @enums }).to be nil
+    end
+  end
+
+  describe '#enums' do
+    before { connection.execute "CREATE TYPE sizes AS ENUM ('small', 'medium', 'large', 'extra large')" }
+    after  { connection.execute 'DROP TYPE IF EXISTS sizes' }
+
+    subject { connection.enums }
+
+    it 'retrieves the enums' do
+      expect(subject).to include(sizes: ['small', 'medium', 'large', 'extra large'])
+    end
+  end
+
+  describe '#enum_execute' do
+    subject { connection.enum_execute('SELECT 1=1') }
+
+    it 'invokes #execute with the specified arguments' do
+      expect(connection).to receive(:execute).with('SELECT 1=1').once
+      subject
+    end
+
+    it 'invokes #clear_enum_cache!' do
+      expect(connection).to receive(:clear_enum_cache!).once
+      subject
+    end
+  end
+
   describe '#create_enum' do
     after { connection.execute 'DROP TYPE IF EXISTS sizes' }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enum_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nialto Services