hyper-trace working

catmando · catmando · commit 4f49f40d1a68 · 2018-11-09T16:37:55.000-05:00
diff --git a/ruby/examples/misc/stock-tickers/Gemfile b/ruby/examples/misc/stock-tickers/Gemfile
@@ -43,6 +43,7 @@ gem 'hyper-component',   path: '../../../hyper-component'
 gem 'hyper-state',       path: '../../../hyper-state'
 gem 'hyperstack-config', path: '../../../hyperstack-config'
 gem 'hyper-spec',        path: '../../../hyper-spec'
+gem 'hyper-trace',       path: '../../../hyper-trace'
 # gem 'hyperloop'
 #gem 'hyper-operation'
 gem 'opal-rails' #, '~> 0.9.4'
diff --git a/ruby/examples/misc/stock-tickers/Gemfile.lock b/ruby/examples/misc/stock-tickers/Gemfile.lock
@@ -36,6 +36,12 @@ PATH
       hyperstack-config (= 0.1)
       opal (>= 0.11.0, < 0.12.0)
 
+PATH
+  remote: ../../../hyper-trace
+  specs:
+    hyper-trace (0.1.0)
+      hyperstack-config (= 0.1.0)
+
 PATH
   remote: ../../../hyperstack-config
   specs:
@@ -355,6 +361,7 @@ DEPENDENCIES
   hyper-component!
   hyper-spec!
   hyper-state!
+  hyper-trace!
   hyperstack-config!
   jbuilder (~> 2.5)
   listen (>= 3.0.5, < 3.2)
diff --git a/ruby/examples/misc/stock-tickers/app/hyperstack/components/hyper_component.rb b/ruby/examples/misc/stock-tickers/app/hyperstack/components/hyper_component.rb
@@ -1,4 +1,4 @@
 class HyperComponent
   include Hyperstack::Component
   include Hyperstack::State::Observable
-end
+end.hypertrace instrument: :all
diff --git a/ruby/examples/misc/stock-tickers/app/hyperstack/stores/stock_ticker.rb b/ruby/examples/misc/stock-tickers/app/hyperstack/stores/stock_ticker.rb
@@ -18,7 +18,8 @@ def fetch
     HTTP.get("https://api.iextrading.com/1.0/stock/#{@symbol}/delayed-quote")
         .then do |resp|
           mutate @status = :success, @price = resp.json[:delayedPrice],
-                 @time = Time.at(resp.json[:delayedPriceTime] / 1000)
+                 @time = Time.at(resp.json[:delayedPriceTime] / 1000),
+                 @update_time = Time.now
           after(@update_interval) { fetch }
         end
         .fail do |resp|
@@ -35,3 +36,4 @@ def fetch
     puts "cancelling #{@symbol} ticker"
   end
 end
+StockTicker.hypertrace instrument: :all
diff --git a/ruby/hyper-component/lib/hyperstack/internal/component/instance_methods.rb b/ruby/hyper-component/lib/hyperstack/internal/component/instance_methods.rb
@@ -32,7 +32,7 @@ def dom_node
         end
 
         def mounted?
-          `(#{self}.is_mounted === undefined) ? false : #{self}.is_mounted`
+          `(#{self}.__hyperstack_component_is_mounted === undefined) ? false : #{self}.__hyperstack_component_is_mounted`
         end
 
         def force_update!
diff --git a/ruby/hyper-component/lib/hyperstack/internal/component/react_wrapper.rb b/ruby/hyper-component/lib/hyperstack/internal/component/react_wrapper.rb
@@ -103,7 +103,7 @@ class extends React.Component {
                   }
                 }
                 componentDidMount() {
-                  this.__opalInstance.is_mounted = true
+                  this.__opalInstance.__hyperstack_component_is_mounted = true
                   if (#{type.method_defined? :component_did_mount}) {
                     this.__opalInstanceSyncSetState = false;
                     this.__opalInstance.$component_did_mount();
@@ -139,7 +139,7 @@ class extends React.Component {
                     this.__opalInstanceSyncSetState = false;
                     this.__opalInstance.$component_will_unmount();
                   }
-                  this.__opalInstance.is_mounted = false;
+                  this.__opalInstance.__hyperstack_component_is_mounted = false;
                 }
 
                 render() {
@@ -285,7 +285,7 @@ def self.convert_props(args)
                                 }
                               }
                             }
-                            
+
             elsif Hyperstack::Component::ReactAPI::HASH_ATTRIBUTES.include?(key) && value.is_a?(Hash)
               value.each { |k, v| props["#{key}-#{k.gsub(/__|_/, '__' => '_', '_' => '-')}"] = v.to_n }
             else
diff --git a/ruby/hyper-trace/DOCS.md b/ruby/hyper-trace/DOCS.md
@@ -1,6 +1,6 @@
 # HyperTrace
 
-Method tracing and conditional break points for [Opal](http://opalrb.org/) and [Hyperloop](http://ruby-hyperloop.io) debug.
+Method tracing and conditional break points for [Opal](http://opalrb.org/) and [Hyperstack](http://hyperstack.org) debug.
 
 Typically you are going to use this in Capybara or Opal-RSpec examples that you are debugging.
 
diff --git a/ruby/hyper-trace/Gemfile b/ruby/hyper-trace/Gemfile
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
-gem 'hyperloop-config', path: '../hyperloop-config'
+gem 'hyperstack-config', path: '../hyperloop-config'
 # Specify your gem's dependencies in hyper-trace.gemspec
 gemspec
diff --git a/ruby/hyper-trace/bin/console b/ruby/hyper-trace/bin/console
diff --git a/ruby/hyper-trace/bin/setup b/ruby/hyper-trace/bin/setup
diff --git a/ruby/hyper-trace/hyper-trace.gemspec b/ruby/hyper-trace/hyper-trace.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'hyperloop-config', HyperTrace::VERSION
+  spec.add_dependency 'hyperstack-config', HyperTrace::VERSION
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency 'chromedriver-helper'
   spec.add_development_dependency "rake", "~> 10.0"
diff --git a/ruby/hyper-trace/lib/hyper-trace.rb b/ruby/hyper-trace/lib/hyper-trace.rb
@@ -1,4 +1,4 @@
-Hyperloop.import 'hyper-trace'
+Hyperstack.import 'hyper-trace'
 if RUBY_ENGINE=='opal'
   require 'hyper_trace/hyper_trace.rb'
   require 'hyper_trace/react_trace.rb'
diff --git a/ruby/hyper-trace/lib/hyper_trace/hyper_trace.rb b/ruby/hyper-trace/lib/hyper_trace/hyper_trace.rb
@@ -1,6 +1,6 @@
 class Class
   def hyper_trace(*args, &block)
-    return unless React::IsomorphicHelpers.on_opal_client?
+    return self unless Hyperstack::Component::IsomorphicHelpers.on_opal_client?
     HyperTrace.hyper_trace(self, *args, &block)
   end
   alias hypertrace hyper_trace
@@ -106,6 +106,7 @@ def hyper_trace(klass, *args, &block)
         end
         selected_methods.each { |method| instrument_method(method, config) }
       end
+      klass
     end
 
     def exclusions
@@ -254,7 +255,7 @@ def format_instance(instance, filter = nil, &block)
       filtered_instance_variables = if filter
           filter
         else
-          instance.instance_variables
+          instance.instance_variables.reject { |var| var =~ /@__hyperstack_/ }
         end
       return if filtered_instance_variables.empty? && block.nil?
       group "self:#{instance_tag(instance,' ')}", collapsed: true do
diff --git a/ruby/hyper-trace/lib/hyper_trace/react_trace.rb b/ruby/hyper-trace/lib/hyper_trace/react_trace.rb
@@ -1,44 +1,32 @@
 
-module React
-  module Component
-    module ClassMethods
-      def hypertrace_exclusions
-        @@hypertrace_exclusions ||=
-          Tags::HTML_TAGS +
-          Tags::HTML_TAGS.collect { |t| t.upcase } +
-          [
-            :_render_wrapper, :params, :find_component, :lookup_const,
-            :update_react_js_state, :props_changed?,
-            :update_react_js_state2, :set_state, :original_component_did_mount,
-            :props, :reactive_record_link_to_enclosing_while_loading_container,
-            :reactive_record_link_set_while_loading_container_class,
-            :dom_node, :state, :run_callback, :initial_state, :set_state!,
-            :set_or_replace_state_or_prop, :original_component_did_update
-          ]
+module Hyperstack
+  module Internal
+    module Component
+      module ClassMethods
+        def hypertrace_exclusions
+          @@hypertrace_exclusions ||=
+            Tags::HTML_TAGS +
+            Tags::HTML_TAGS.collect { |t| t.upcase } +
+            [
+              :_render_wrapper, :params, :find_component, :lookup_const,
+              :update_react_js_state, :props_changed?,
+              :update_react_js_state2, :set_state, :original_component_did_mount,
+              :props, :reactive_record_link_to_enclosing_while_loading_container,
+              :reactive_record_link_set_while_loading_container_class,
+              :dom_node, :state, :run_callback, :initial_state, :set_state!,
+              :set_or_replace_state_or_prop, :original_component_did_update, :observing,
+              :update_objects_to_observe, :remove, :set, :mutations
+            ]
+        end
       end
-    end
-    module DslInstanceMethods
-      def hypertrace_format_instance(h)
-        filtered_vars =
-          instance_variables -
-          ['@native', '@props_wrapper', '@state_wrapper', '@waiting_on_resources']
-        h.format_instance(self, filtered_vars) do
-          @props_wrapper.props.each do |param, value|
-            val = h.safe_i value
-            h.group("params.#{param}: #{val[0..10]}", collapsed: true) do
-              puts val
-              h.log value
-            end
-          end if @props_wrapper
-          hash = Hash.new(`#{@native}.state`)
-          updated_at = hash.delete('***_state_updated_at-***')
-          h.group("state last updated at: #{Time.at(updated_at)}") if updated_at
-          hash.each do |state, value|
-            val = h.safe_i(value)
-            h.group("state.#{state}: #{val[0..10]}", collapsed: true) do
-              puts val
-              h.log value
-            end
+      module InstanceMethods
+        def hypertrace_format_instance(h)
+          filtered_vars = instance_variables.reject { |var| var =~ /@__hyperstack_/ }
+          filtered_vars = filtered_vars.select { |var| var =~ /@[A-Z]/ } +
+                          filtered_vars.reject { |var| var =~ /@[A-Z]/ }
+          h.format_instance(self, filtered_vars) do
+            updated_at = `#{@__hyperstack_component_native}.state['***_state_updated_at-***']`
+            h.group("state last updated at: #{Time.at(updated_at)}") if updated_at
           end
         end
       end
diff --git a/ruby/hyper-trace/lib/hyper_trace/version.rb b/ruby/hyper-trace/lib/hyper_trace/version.rb
@@ -1,3 +1,3 @@
 module HyperTrace
-  VERSION = '0.99.3'
+  VERSION = '0.1.0'
 end

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ class extends React.Component {`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`componentDidMount() {`
`106`		`- this.__opalInstance.is_mounted = true`
	`106`	`+ this.__opalInstance.__hyperstack_component_is_mounted = true`
`107`	`107`	`if (#{type.method_defined? :component_did_mount}) {`
`108`	`108`	`this.__opalInstanceSyncSetState = false;`
`109`	`109`	`this.__opalInstance.$component_did_mount();`
`@@ -139,7 +139,7 @@ class extends React.Component {`
`139`	`139`	`this.__opalInstanceSyncSetState = false;`
`140`	`140`	`this.__opalInstance.$component_will_unmount();`
`141`	`141`	`}`
`142`		`- this.__opalInstance.is_mounted = false;`
	`142`	`+ this.__opalInstance.__hyperstack_component_is_mounted = false;`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`render() {`
`@@ -285,7 +285,7 @@ def self.convert_props(args)`
`285`	`285`	`}`
`286`	`286`	`}`
`287`	`287`	`}`
`288`		`-`
	`288`	`+`
`289`	`289`	`elsif Hyperstack::Component::ReactAPI::HASH_ATTRIBUTES.include?(key) && value.is_a?(Hash)`
`290`	`290`	`value.each { \|k, v\| props["#{key}-#{k.gsub(/__\|_/, '__' => '_', '_' => '-')}"] = v.to_n }`
`291`	`291`	`else`