added Hyperloop::Context.reset handling

Author: catmando

hyper-react.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'opal', '>= 0.8.0'
   s.add_dependency 'opal-activesupport', '>= 0.2.0'
   s.add_dependency 'hyper-store', '>= 0.2.1'
-  s.add_dependency 'hyperloop-config', '>= 0.9.2'
+  s.add_dependency 'hyperloop-config', '>= 0.9.7'
   s.add_development_dependency 'rake', '< 11.0'
   s.add_development_dependency 'rspec-rails', '3.3.3'
   s.add_development_dependency 'timecop'

lib/react/callbacks.rb

@@ -1,5 +1,5 @@
-require 'active_support/core_ext/class/attribute'
-
+require 'hyperloop-config'
+Hyperloop::Context
 module React
   module Callbacks
     def self.included(base)
@@ -18,24 +18,23 @@ def run_callback(name, *args)
 
     module ClassMethods
       def define_callback(callback_name)
-        attribute_name = "_#{callback_name}_callbacks"
-        class_attribute(attribute_name)
-        self.send("#{attribute_name}=", [])
+        wrapper_name = "_#{callback_name}_callbacks"
+        define_singleton_method(wrapper_name) do
+          Hyperloop::Context.set_var(self, "@#{wrapper_name}", force: true) { [] }
+        end
         define_singleton_method(callback_name) do |*args, &block|
-          callbacks = self.send(attribute_name)
-          callbacks.concat(args)
-          callbacks.push(block) if block_given?
-          self.send("#{attribute_name}=", callbacks)
+          send(wrapper_name).concat(args)
+          send(wrapper_name).push(block) if block_given?
         end
       end
 
       def callbacks_for(callback_name)
-        attribute_name = "_#{callback_name}_callbacks"
+        wrapper_name = "_#{callback_name}_callbacks"
         if superclass.respond_to? :callbacks_for
           superclass.callbacks_for(callback_name)
         else
           []
-        end + self.send(attribute_name)
+        end + send(wrapper_name)
       end
     end
   end

spec/react/callbacks_spec.rb

@@ -24,19 +24,50 @@ def wash_hand
       include React::Callbacks
       define_callback :before_dinner
 
-      before_dinner :wash_hand, :turn_of_laptop
+      before_dinner :wash_hand, :turn_off_laptop
 
       def wash_hand;end
 
-      def turn_of_laptop;end
+      def turn_off_laptop;end
     end
 
     instance = Foo.new
     expect(instance).to receive(:wash_hand)
-    expect(instance).to receive(:turn_of_laptop)
+    expect(instance).to receive(:turn_off_laptop)
     instance.run_callback(:before_dinner)
   end
 
+  context 'using Hyperloop::Context.reset!' do
+    after(:all) do
+      Hyperloop::Context.instance_variable_set(:@context, nil)
+    end
+    it 'clears callbacks on Hyperloop::Context.reset!' do
+      Hyperloop::Context.reset!
+      stub_const 'Foo', Class.new
+      Foo.class_eval do
+        include React::Callbacks
+        define_callback :before_dinner
+
+        before_dinner :wash_hand, :turn_off_laptop
+
+        def wash_hands;end
+
+        def turn_off_laptop;end
+      end
+      instance = Foo.new
+      expect(instance).to receive(:wash_hand).once
+      expect(instance).not_to receive(:turn_off_laptop)
+
+      Hyperloop::Context.reset!
+
+      instance.run_callback(:before_dinner)
+      Foo.class_eval do
+        before_dinner :wash_hand
+      end
+      instance.run_callback(:before_dinner)
+    end
+  end # moved elswhere cause its just hard to get anything to work in this environment
+
   it 'defines block callback' do
     stub_const 'Foo', Class.new
     Foo.class_eval do

spec/spec_helper.rb

@@ -15,6 +15,8 @@ def ruby?
 
 if RUBY_ENGINE == 'opal'
   require File.expand_path('../vendor/jquery-2.2.4.min', __FILE__)
+  require 'hyperloop-config'
+  Hyperloop::Context
   require 'react/react-source-browser'
   require 'react/react-source-server'
   require 'hyper-react'