Merge pull request #623 from DNNX/bypass-for-real

Improve performance of bypassing
toptal · Jan 11, 2018 · 25db17c · 25db17c
2 parents e2a62dd + b0dcf08
commit 25db17c
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/lib/chewy/type/observe.rb b/lib/chewy/type/observe.rb
@@ -9,14 +9,6 @@ def update_proc(type_name, *args, &block)
           method = args.first
 
           proc do
-            backreference = if method && method.to_s == 'self'
-              self
-            elsif method
-              send(method)
-            else
-              instance_eval(&block)
-            end
-
             reference = if type_name.is_a?(Proc)
               if type_name.arity.zero?
                 instance_exec(&type_name)
@@ -27,7 +19,19 @@ def update_proc(type_name, *args, &block)
               type_name
             end
 
-            Chewy.derive_type(reference).update_index(backreference, options)
+            type = Chewy.derive_type(reference)
+
+            next if Chewy.strategy.current.name == :bypass
+
+            backreference = if method && method.to_s == 'self'
+              self
+            elsif method
+              send(method)
+            else
+              instance_eval(&block)
+            end
+
+            type.update_index(backreference, options)
           end
         end