grape-entity-preloader 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1706cb12b11070d46f62c3b3a4e9aacb797e1aff8659ca4c41d2ee68306b5f1
-  data.tar.gz: 6a060769e40134c573d14b235def6800b931c1fa8b87e84e5d370ce735384e2b
+  metadata.gz: 4435d853f0ac2438cbd9def7d195a78e4ce66dcfc0db4015b29f20c5102846b6
+  data.tar.gz: 2bde5dbb73a91201040bc0e21da30507638c1b61e164e494a6187dacc1ab328d
 SHA512:
-  metadata.gz: f17b3f692873737c4e9a55e9a971324b77d8263ff08e62cb3d71bee414487e949fe8e76a6d9b088bf2442c4ce266f11041ae7bd3d0394fb236a635f6a8bbb951
-  data.tar.gz: 0e7ba460164dcfad7736f3beb8947c4636d54f954227de6968db5836111171eb8b6b4126fa8348d303f29e15b840e9309c096da04c204a692a434bb419c88cec
+  metadata.gz: 36b9c7316b3cb852024039a2db9ffe0c55215f49c60614b49c95a23a1bf307432b8e564c8c09cd3b56b71a4ed5f212e5fbd756e87675901407acb8acd5a8b642
+  data.tar.gz: 8f9c9b1ed336765001069d34ab27e7b80e5a94d6a829ffd276ff501785ed15d4a8f43d9cdf762c6a79603487e16ddff00669e0a2222833c091e8ff8ebd7a6532

data/lib/grape/entity/preloader/version.rb

@@ -3,7 +3,7 @@
 module Grape
   class Entity
     class Preloader
-      VERSION = '0.2.0'
+      VERSION = '0.3.0'
     end
   end
 end

data/lib/grape/entity/preloader.rb

@@ -26,18 +26,20 @@ module Grape
         end
       end
 
-      def self.with_enable
+      def self.with_enable # rubocop:disable Metrics/MethodLength
         return yield if enabled?
 
-        old_value = ActiveSupport::IsolatedExecutionState[:grape_entity_preloader]
-        ActiveSupport::IsolatedExecutionState[:grape_entity_preloader] = true
+        begin
+          old_value = ActiveSupport::IsolatedExecutionState[:grape_entity_preloader]
+          ActiveSupport::IsolatedExecutionState[:grape_entity_preloader] = true
 
-        yield
-
-        if old_value.nil?
-          ActiveSupport::IsolatedExecutionState.delete(:grape_entity_preloader)
-        else
-          ActiveSupport::IsolatedExecutionState[:grape_entity_preloader] = old_value
+          yield
+        ensure
+          if old_value.nil?
+            ActiveSupport::IsolatedExecutionState.delete(:grape_entity_preloader)
+          else
+            ActiveSupport::IsolatedExecutionState[:grape_entity_preloader] = old_value
+          end
         end
       end
 
@@ -49,18 +51,20 @@ module Grape
         !enabled?
       end
 
-      def self.with_disable
+      def self.with_disable # rubocop:disable Metrics/MethodLength
         return yield if disabled?
 
-        old_value = ActiveSupport::IsolatedExecutionState[:grape_entity_preloader]
-        ActiveSupport::IsolatedExecutionState[:grape_entity_preloader] = false
+        begin
+          old_value = ActiveSupport::IsolatedExecutionState[:grape_entity_preloader]
+          ActiveSupport::IsolatedExecutionState[:grape_entity_preloader] = false
 
-        yield
-
-        if old_value.nil?
-          ActiveSupport::IsolatedExecutionState.delete(:grape_entity_preloader)
-        else
-          ActiveSupport::IsolatedExecutionState[:grape_entity_preloader] = old_value
+          yield
+        ensure
+          if old_value.nil?
+            ActiveSupport::IsolatedExecutionState.delete(:grape_entity_preloader)
+          else
+            ActiveSupport::IsolatedExecutionState[:grape_entity_preloader] = old_value
+          end
         end
       end
 

data/spec/grape/entity/preloader_spec.rb

@@ -4,4 +4,32 @@ RSpec.describe Grape::Entity::Preloader do
   it 'has a version number' do
     expect(Grape::Entity::Preloader::VERSION).not_to be_nil
   end
+
+  describe '.with_enable' do
+    it 'returns the value of the block' do
+      result = described_class.with_enable { 42 }
+      expect(result).to eq(42)
+    end
+
+    it 'returns the value of the block when already enabled' do
+      described_class.enabled!
+      result = described_class.with_enable { 'hello' }
+      expect(result).to eq('hello')
+    ensure
+      described_class.disabled!
+    end
+  end
+
+  describe '.with_disable' do
+    it 'returns the value of the block' do
+      result = described_class.with_disable { 42 }
+      expect(result).to eq(42)
+    end
+
+    it 'returns the value of the block when already disabled' do
+      described_class.disabled!
+      result = described_class.with_disable { 'hello' }
+      expect(result).to eq('hello')
+    end
+  end
 end

data/spec/n_plus_one_op_spec.rb

@@ -105,7 +105,7 @@ RSpec.describe 'N+1 operation' do # rubocop:disable RSpec/DescribeClass
           User::Entity.represent(
             users,
             serializable: true,
-            only: [books_by_association: %i[tags_by_association tags_by_callback]]
+            only: [{ books_by_association: %i[tags_by_association tags_by_callback] }]
           )
         end.to make_database_queries(count: 3)
           .and make_database_queries(count: 1, matching: /user_books_by_association/)
@@ -149,7 +149,7 @@ RSpec.describe 'N+1 operation' do # rubocop:disable RSpec/DescribeClass
           User::Entity.represent(
             users,
             serializable: true,
-            only: [books_by_callback: %i[tags_by_association tags_by_callback]]
+            only: [{ books_by_callback: %i[tags_by_association tags_by_callback] }]
           )
         end.to make_database_queries(count: 3)
           .and make_database_queries(count: 1, matching: /books_by_callback/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-entity-preloader
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - OuYangJinTing