bootsnap 1.1.3-java → 1.1.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e5ced86d8f4b8e5cd77fd68bc776e0023d9486d
-  data.tar.gz: 8e75434679474db2f1c3883495679ba11ad87a1f
+  metadata.gz: 11e26b3ba0d58a77f3c0cdef644a1cb909fcee2c
+  data.tar.gz: 72aece9a04a051b94c72fe259bd28e7b1b5890f8
 SHA512:
-  metadata.gz: edc9608549f1e313b4c3bdc6fc788eb055918628116caa1ec3c397de5a3a7ed0cc97aa59b83a493553acce302dae5c44b23582138ec369584ad04288b60c332a
-  data.tar.gz: b4b93d00b10ef0471fe056b068e97c8bb4295b0ce6c8091a5a8cf5d25c988cd2e23f9bc900fbcb12a4d639c8cd48cb34c3ea5c1e7284862dd5c7eec547bab811
+  metadata.gz: 70ab2d95fdf8783cee2923bdebc1c1ad50bcced6c7dee3d407c7b8fe7599783abcfc635f1ea3a51b889829c885a70ca7eab0007c2f148d083f03bcb44b1879fd
+  data.tar.gz: b3db3cfefb5de516143892bf2293c0d27ff9f7815fe559b88860eb8c12ce5c784684c8f15dcdbb0fdb70beb0352353aa96c68a7a8317e0e12c34a1ab2ebfb8ee

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.1.4
+
+* Avoid loading a constant twice by checking if it is already defined
+
 # 1.1.3
 
 * Properly resolve symlinked path entries

data/lib/bootsnap/load_path_cache/core_ext/active_support.rb

@@ -2,15 +2,6 @@ module Bootsnap
   module LoadPathCache
     module CoreExt
       module ActiveSupport
-        def self.with_bootsnap_fallback(error)
-          yield
-        rescue error => e
-          # NoMethodError is a NameError, but we only want to handle actual
-          # NameError instances.
-          raise unless e.class == error
-          without_bootsnap_cache { yield }
-        end
-
         def self.without_bootsnap_cache
           prev = Thread.current[:without_bootsnap_cache] || false
           Thread.current[:without_bootsnap_cache] = true
@@ -50,13 +41,21 @@ module Bootsnap
           # behaviour.  The gymnastics here are a bit awkward, but it prevents
           # 200+ lines of monkeypatches.
           def load_missing_constant(from_mod, const_name)
-            CoreExt::ActiveSupport.with_bootsnap_fallback(NameError) { super }
+            super
+          rescue NameError => e
+            # NoMethodError is a NameError, but we only want to handle actual
+            # NameError instances.
+            raise unless e.class == NameError
+            raise if from_mod.const_defined?(const_name)
+            without_bootsnap_cache { super }
           end
 
           # Signature has changed a few times over the years; easiest to not
           # reiterate it with version polymorphism here...
           def depend_on(*)
-            CoreExt::ActiveSupport.with_bootsnap_fallback(LoadError) { super }
+            super
+          rescue LoadError
+            without_bootsnap_cache { super }
           end
         end
       end

data/lib/bootsnap/version.rb

@@ -1,3 +1,3 @@
 module Bootsnap
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsnap
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: java
 authors:
 - Burke Libbey
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement