sqreen 1.10.2 → 1.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3129e4afc077e7ca7afbe1704c49e3584fc8677de552575307f28d1a11e2a71e
-  data.tar.gz: 6a84e5d01b162c304195e50e13b32d301d9faa5190fcfe7d2ebc657e66f7ed25
+  metadata.gz: 294bf474df4e1beb0533d87876a9b27e984d47ab332482aab2485fee862de414
+  data.tar.gz: 6a4b0f5c640371ad280c0412c5b3c58f73d921df69f767522659e5c90d4ee663
 SHA512:
-  metadata.gz: e5b855e58472a20f7f190b37e6c7dce6dd36ca3117dd80b9ff8b406fb5c24c7e99713ad11d14833f0887c2af8497971ca0d0a5c3d93069987175f95b414a2956
-  data.tar.gz: 305d5048bbbe5df8d6c9b21c26fae636a6aa6738a77adf8dcc87ff08575b893e7dacb546d4d695ca36b838e9b69cfa0a54410e4ae90ddc5daa0e3da515726e43
+  metadata.gz: bb633499e38e67c6768ac77bbdedccd83710708abe7b2422bfb0f3e4f4a2797b532b35203c97fbdf445ea205fe5e63cb5a1613e4ea8237b74330111410065ddb
+  data.tar.gz: 8bf22330ac83b3c9133a96127f358e34f27fe3dd504985832fb8825a19cfcfbafa82a9a3db25284e4c460c76587a92923c331cac7a584c7e8e396e4145ff2070

data/lib/sqreen/rules_callbacks/execjs.rb

@@ -147,23 +147,35 @@ module Sqreen
         end
       end
 
+      def push_runtime(runtime)
+        @runtimes.delete_if do |th, _runt|
+          th.nil? || !th.weakref_alive? || !th.alive?
+        end
+        @runtimes.push [WeakRef.new(Thread.current), runtime, Thread.current.object_id]
+      end
+
+      def dispose_runtime(runtime)
+        @runtimes.delete_if { |_th, _runt, thid| thid == Thread.current.object_id }
+        runtime.dispose
+      end
+
       def call_callback(name, inst, args, rv = nil)
         if SQREEN_MINI_RACER
-          mini_racer_context = Thread.current["SQREEN_MINI_RACER_CONTEXT_#{self.object_id}"]
+          mini_racer_context = Thread.current["SQREEN_MINI_RACER_CONTEXT_#{object_id}"]
           if mini_racer_context.nil? || mini_racer_context[:r].nil? || !mini_racer_context[:r].weakref_alive?
-            runtime = MiniRacer::Context.new(snapshot: @snapshot)
-            @runtimes.push runtime
-            Thread.current["SQREEN_MINI_RACER_CONTEXT_#{self.object_id}"] = {:c => 0, :r => WeakRef.new(runtime)}
+            new_runtime = MiniRacer::Context.new(:snapshot => @snapshot)
+            push_runtime new_runtime
+            Thread.current["SQREEN_MINI_RACER_CONTEXT_#{object_id}"] = {
+              :c => 0,
+              :r => WeakRef.new(new_runtime),
+            }
           elsif mini_racer_context[:c] >= GC_MINI_RACER
-            @runtimes.delete(mini_racer_context[:r])
-            mini_racer_context[:r].dispose
-
-            new_runtime = MiniRacer::Context.new(snapshot: @snapshot)
-            @runtimes.push new_runtime
-
-            Thread.current["SQREEN_MINI_RACER_CONTEXT_#{self.object_id}"] = {
+            dispose_runtime(mini_racer_context[:r])
+            new_runtime = MiniRacer::Context.new(:snapshot => @snapshot)
+            push_runtime new_runtime
+            Thread.current["SQREEN_MINI_RACER_CONTEXT_#{object_id}"] = {
               :c => 0,
-              :r => WeakRef.new(new_runtime)
+              :r => WeakRef.new(new_runtime),
             }
           end
         end
@@ -177,7 +189,7 @@ module Sqreen
           arguments = restrict(name, arguments) if @conditions.key?(name)
           Sqreen.log.debug { [name, arguments].inspect }
           if SQREEN_MINI_RACER
-            mini_racer_context = Thread.current["SQREEN_MINI_RACER_CONTEXT_#{self.object_id}"]
+            mini_racer_context = Thread.current["SQREEN_MINI_RACER_CONTEXT_#{object_id}"]
             mini_racer_context[:c] += 1
             ret = mini_racer_context[:r].eval("#{name}.apply(this, #{::JSON.generate(arguments)})")
           else

data/lib/sqreen/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 module Sqreen
-  VERSION = '1.10.2'.freeze
+  VERSION = '1.10.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
 platform: ruby
 authors:
 - Sqreen