hyper-component 1.0.alpha1.2 → 1.0.alpha1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32f892af1c88068a155f6a7de78fe37ec32f157fe6e3e20d1a06db63501a43af
-  data.tar.gz: 031e39966cb44433d836a82e563236b985b59def309a9bfb39107ac1cc151e08
+  metadata.gz: 42dc80deeb92bd2de37632efacae8b8d4a801c530d65937b7535018a2d3bc91a
+  data.tar.gz: 142a8df3b61e46f55d0d56766cddff7e734fc01b5f7f594ea6a57900bc4e9e4c
 SHA512:
-  metadata.gz: 0ef39af06f446589c0b2ce1137d0403d0125c21657b857e7c3785921c800e9aaa1cb2975cd06e104de4bb45612bc510b0b3fe8ba0233dc68902b2d877bb1d430
-  data.tar.gz: b3a8f74fecb413e0fa82eb7ce97de80123b7e67fd9da9b3a5d9bff2d6a7f287f03aad6a8b62703cb776b14fa0233c602964ca20e56d9225a774be11e59bae9c8
+  metadata.gz: 5306b0fd124bee54d7873b2b6a0f4d6713fd346e2efa3bf9ba9f0467df1348a919daf07aecedb55983e26f95076f8df67981774c3288d6eda3af346036fea791
+  data.tar.gz: ea657f7f9aae7884b5602f3be778452f9088bf9a34ca2afef10ce98e10428412a2e53d5dad6abf55a65f7edc2041460b598b5bd12c6422cb608a29423b8d12ee

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: ../hyper-spec
   specs:
-    hyper-spec (1.0.alpha1.2)
+    hyper-spec (1.0.alpha1.3)
       capybara
       chromedriver-helper (= 1.2.0)
-      libv8 (~> 6.3.0)
+      libv8
       method_source
-      mini_racer (~> 0.1.15)
+      mini_racer (~> 0.2.4)
       opal (>= 0.11.0, < 0.12.0)
       parser (>= 2.3.3.1)
       pry
@@ -14,31 +14,30 @@ PATH
       selenium-webdriver
       timecop (~> 0.8.1)
       uglifier
-      unparser
+      unparser (>= 0.2, < 0.4)
       webdrivers
 
 PATH
   remote: ../hyper-state
   specs:
-    hyper-state (1.0.alpha1.2)
-      hyperstack-config (= 1.0.alpha1.2)
+    hyper-state (1.0.alpha1.3)
+      hyperstack-config (= 1.0.alpha1.3)
       opal (>= 0.11.0, < 0.12.0)
 
 PATH
   remote: ../hyper-store
   specs:
-    hyper-store (1.0.alpha1.2)
-      hyper-state (= 1.0.alpha1.2)
-      hyperstack-config (= 1.0.alpha1.2)
+    hyper-store (1.0.alpha1.3)
+      hyper-state (= 1.0.alpha1.3)
+      hyperstack-config (= 1.0.alpha1.3)
       opal (>= 0.11.0, < 0.12.0)
 
 PATH
   remote: ../hyperstack-config
   specs:
-    hyperstack-config (1.0.alpha1.2)
-      libv8 (~> 6.3.0)
+    hyperstack-config (1.0.alpha1.3)
       listen (~> 3.0)
-      mini_racer (~> 0.1.15)
+      mini_racer (~> 0.2.4)
       opal (>= 0.11.0, < 0.12.0)
       opal-browser (~> 0.2.0)
       uglifier
@@ -47,11 +46,11 @@ PATH
 PATH
   remote: .
   specs:
-    hyper-component (1.0.alpha1.2)
-      hyper-state (= 1.0.alpha1.2)
-      hyperstack-config (= 1.0.alpha1.2)
-      libv8 (~> 6.3.0)
-      mini_racer (~> 0.1.15)
+    hyper-component (1.0.alpha1.3)
+      hyper-state (= 1.0.alpha1.3)
+      hyperstack-config (= 1.0.alpha1.3)
+      libv8 (~> 6.7.0)
+      mini_racer (~> 0.2.4)
       opal (>= 0.11.0, < 0.12.0)
       opal-activesupport (~> 0.3.1)
       react-rails (>= 2.4.0, < 2.5.0)
@@ -115,7 +114,7 @@ GEM
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
     builder (3.2.3)
-    capybara (3.11.0)
+    capybara (3.12.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -152,7 +151,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    libv8 (6.3.292.48.1)
+    libv8 (6.7.288.46.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -173,9 +172,10 @@ GEM
     mimemagic (0.3.2)
     mini_mime (1.0.1)
     mini_portile2 (2.3.0)
-    mini_racer (0.1.15)
-      libv8 (~> 6.3)
+    mini_racer (0.2.4)
+      libv8 (>= 6.3)
     minitest (5.11.3)
+    net_http_ssl_fix (0.0.10)
     nio4r (2.3.1)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
@@ -308,7 +308,7 @@ GEM
     timecop (0.8.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.19)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.4.0)
     unparser (0.2.8)
@@ -319,7 +319,8 @@ GEM
       equalizer (~> 0.0.9)
       parser (>= 2.3.1.2, < 2.6)
       procto (~> 0.0.2)
-    webdrivers (3.4.3)
+    webdrivers (3.6.0)
+      net_http_ssl_fix
       nokogiri (~> 1.6)
       rubyzip (~> 1.0)
       selenium-webdriver (~> 3.0)
@@ -334,7 +335,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16.0)
+  bundler (>= 1.17.3, < 2.1)
   chromedriver-helper
   hyper-component!
   hyper-spec!
@@ -360,4 +361,4 @@ DEPENDENCIES
   timecop (~> 0.8.1)
 
 BUNDLED WITH
-   1.16.1
+   2.0.1

data/hyper-component.gemspec

@@ -23,13 +23,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'hyper-state', Hyperstack::Component::VERSION
   spec.add_dependency 'hyperstack-config', Hyperstack::Component::VERSION
-  spec.add_dependency 'libv8', '~> 6.3.0' # see https://github.com/discourse/mini_racer/issues/92
-  spec.add_dependency 'mini_racer', '~> 0.1.15'
+  spec.add_dependency 'libv8', '~> 6.7.0'
+  spec.add_dependency 'mini_racer', '~> 0.2.4'
   spec.add_dependency 'opal', '>= 0.11.0', '< 0.12.0'
   spec.add_dependency 'opal-activesupport', '~> 0.3.1'
   spec.add_dependency 'react-rails', '>= 2.4.0', '< 2.5.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.16.0'
+  spec.add_development_dependency 'bundler', ['>= 1.17.3', '< 2.1']
   spec.add_development_dependency 'chromedriver-helper'
   spec.add_development_dependency 'hyper-spec', Hyperstack::Component::VERSION
   spec.add_development_dependency 'jquery-rails'

data/lib/hyper-component.rb

@@ -27,6 +27,10 @@ if RUBY_ENGINE == 'opal'
   require 'hyperstack/component/isomorphic_helpers'
   require 'hyperstack/component/react_api'
   require 'hyperstack/internal/component/top_level_rails_component'
+  require 'hyperstack/component/while_loading'
+  require 'hyperstack/internal/component/rescue_wrapper'
+  require 'hyperstack/internal/component/while_loading_wrapper'
+
   require 'hyperstack/component/version'
 else
   require 'opal'

data/lib/hyperstack/component.rb

@@ -21,9 +21,11 @@ module Hyperstack
         class_attribute :initial_state
         define_callback :before_mount
         define_callback :after_mount
-        define_callback :before_receive_props
+        define_callback :before_new_params
         define_callback :before_update
         define_callback :after_update
+        define_callback :__hyperstack_component_after_render_hook
+        define_callback :__hyperstack_component_rescue_hook
         #define_callback :before_unmount defined already by Async module
         define_callback(:after_error) { Hyperstack::Internal::Component::ReactWrapper.add_after_error_hook(base) }
       end
@@ -93,13 +95,14 @@ module Hyperstack
     def component_did_mount
       observing(update_objects: true) do
         run_callback(:after_mount)
+        Hyperstack::Internal::Component::RenderingContext.quiet_test(self)
       end
     end
 
     def component_will_receive_props(next_props)
       # need to rethink how this works in opal-react, or if its actually that useful within the react.rb environment
       # for now we are just using it to clear processed_params
-      observing(immediate_update: true) { run_callback(:before_receive_props, next_props) }
+      observing(immediate_update: true) { run_callback(:before_new_params, next_props) }
       @__hyperstack_component_receiving_props = true
     end
 
@@ -112,7 +115,10 @@ module Hyperstack
     end
 
     def component_did_update(prev_props, prev_state)
-      observing(update_objects: true) { run_callback(:after_update, prev_props, prev_state) }
+      observing(update_objects: true) do
+        run_callback(:after_update, prev_props, prev_state)
+        Hyperstack::Internal::Component::RenderingContext.quiet_test(self)
+      end
     end
 
     def component_will_unmount
@@ -124,7 +130,9 @@ module Hyperstack
     end
 
     def component_did_catch(error, info)
-      observing { run_callback(:after_error, error, info) }
+      observing do
+        run_callback(:after_error, error, info)
+      end
     end
 
     def mutations(_objects)
@@ -156,9 +164,15 @@ module Hyperstack
       @__hyperstack_component_waiting_on_resources
     end
 
+    def __hyperstack_component_run_post_render_hooks(element)
+      run_callback(:__hyperstack_component_after_render_hook, element) { |*args| args }.first
+    end
+
     def _render_wrapper
       observing(rendering: true) do
-        element = Hyperstack::Internal::Component::RenderingContext.render(nil) { render || '' }
+        element = Hyperstack::Internal::Component::RenderingContext.render(nil) do
+          render || ''
+        end
         @__hyperstack_component_waiting_on_resources =
           element.waiting_on_resources if element.respond_to? :waiting_on_resources
         element

data/lib/hyperstack/component/element.rb

@@ -45,7 +45,7 @@ module Hyperstack
       # Used for elements that are not yet in DOM, i.e. they are provided as children
       # or they have been explicitly removed from the rendering context using the delete method.
 
-      def render(props = {}, &new_block)
+      def render(*props, &new_block)
         if props.empty?
           Hyperstack::Internal::Component::RenderingContext.render(self)
         else

data/lib/hyperstack/component/version.rb

@@ -1,5 +1,5 @@
 module Hyperstack
   module Component
-    VERSION = '1.0.alpha1.2' # '1.0.alpha1.2'
+    VERSION = '1.0.alpha1.3' # '1.0.alpha1.3'
   end
 end

data/lib/hyperstack/component/while_loading.rb

@@ -0,0 +1,27 @@
+module Hyperstack
+  module Component
+    module WhileLoading
+      def __hyperstack_component_rescue_wrapper(child)
+        Hyperstack::Internal::Component::WhileLoadingWrapper(child: self, children_elements: child)
+      end
+
+      def resources_loading?
+        @__hyperstack_while_loading_waiting_on_resources
+      end
+
+      def resources_loaded?
+        !@__hyperstack_while_loading_waiting_on_resources
+      end
+
+      if Hyperstack::Component::IsomorphicHelpers.on_opal_client?
+        %x{
+          function onError(event) {
+            if (event.message.startsWith('Uncaught NotQuiet: ')) event.preventDefault();
+          }
+
+          window.addEventListener('error', onError);
+         }
+      end
+    end
+  end
+end

data/lib/hyperstack/ext/component/element.rb

@@ -45,4 +45,20 @@ Element.instance_eval do
   Element.expose :mount_components
 end
 
-DOM = Element
+module Hyperstack
+  module Internal
+    module Component
+      module InstanceMethods
+        def set_jq(var)
+          ->(val) { set(var).call(jQ[val]) }
+        end
+      end
+    end
+  end
+end
+
+class Object
+  def jQ
+    Element
+  end
+end

data/lib/hyperstack/ext/component/string.rb

@@ -5,4 +5,4 @@ class String
       return capitalize ? word.substr(0,1).toUpperCase()+word.substr(1) : word;
     })`
   end
-end
+end

data/lib/hyperstack/internal/component.rb

@@ -1,7 +1,13 @@
 require 'hyperstack-config'
 
 module Hyperstack
-
   define_setting :prerendering, :off if RUBY_ENGINE != 'opal'
 
+  module Internal
+    module Component
+      class << self
+        attr_accessor :after_error_args
+      end
+    end
+  end
 end

data/lib/hyperstack/internal/component/class_methods.rb

@@ -42,18 +42,74 @@ module Hyperstack
           backtrace[1..-1].each { |line| message_array << line }
         end
 
+        def before_receive_props(*args, &block)
+          deprecation_warning "'before_receive_props' is deprecated. Use the 'before_new_params' macro instead."
+          before_new_params(*args, &block)
+        end
+
         def render(container = nil, params = {}, &block)
           Tags.included(self)
           if container
             container = container.type if container.is_a? Hyperstack::Component::Element
-            define_method :__hyperstack_component_render do
-              RenderingContext.render(container, params) { instance_eval(&block) if block }
+            define_method(:__hyperstack_component_render) do
+              __hyperstack_component_select_wrappers do
+                RenderingContext.render(container, params) do
+                  instance_eval(&block) if block
+                end
+              end
             end
           else
-            define_method(:__hyperstack_component_render) { instance_eval(&block) }
+            define_method(:__hyperstack_component_render) do
+              __hyperstack_component_select_wrappers do
+                instance_eval(&block)
+              end
+            end
+          end
+        end
+
+        # def while_loading(*args, &block)
+        #   __hyperstack_component_after_render_hook do |element|
+        #     element.while_loading(*args) { |*aargs| instance_exec(*aargs, &block) }
+        #   end
+        # end
+
+        def on(*args, &block)
+          __hyperstack_component_after_render_hook  do |element|
+            element.on(*args) { |*aargs| instance_exec(*aargs, &block) }
+          end
+        end
+
+        def rescues(*klasses, &block)
+          klasses = [StandardError] if klasses.empty?
+          __hyperstack_component_rescue_hook do |found, *args|
+            next [found, *args] if found || !klasses.detect { |klass| args[0].is_a? klass }
+            instance_exec(*args, &block)
+            [true, *args]
           end
         end
 
+        def before_render(*args, &block)
+          before_mount(*args, &block)
+          before_update(*args, &block)
+        end
+
+        def after_render(*args, &block)
+          after_mount(*args, &block)
+          after_update(*args, &block)
+        end
+
+        # [:while_loading, :on].each do |method|
+        #   define_method(method) do |*args, &block|
+        #     @@alias_id ||= 0
+        #     @@alias_id += 1
+        #     alias_name = "__hyperstack_attach_post_render_hook_#{@@alias_id}"
+        #     alias_method alias_name, :__hyperstack_attach_post_render_hook
+        #     define_method(:__hyperstack_attach_post_render_hook) do |element|
+        #       send(alias_name, element.while_loading(*args) { instance_eval(&block) })
+        #     end
+        #   end
+        # end
+
         # method missing will assume the method is a class name, and will treat this a render of
         # of the component, i.e. Foo::Bar.baz === Foo::Bar().baz
 
@@ -147,8 +203,10 @@ module Hyperstack
 
         alias other_params collect_other_params_as
         alias others collect_other_params_as
+        alias other collect_other_params_as
+        alias opts collect_other_params_as
 
-        def triggers(name, opts = {})
+        def fires(name, opts = {})
           aka = opts[:alias] || "#{name}!"
           name = if name =~ /^<(.+)>$/
                    name.gsub(/^<(.+)>$/, '\1')
@@ -161,6 +219,8 @@ module Hyperstack
           define_method(aka) { |*args| props[name]&.call(*args) }
         end
 
+        alias triggers fires
+
         def define_state(*states, &block)
           deprecation_warning "'define_state' is deprecated. Use the 'state' macro to declare states."
           default_initial_value = (block && block.arity == 0) ? yield : nil

data/lib/hyperstack/internal/component/instance_methods.rb

@@ -9,7 +9,7 @@ module Hyperstack
         end
 
         def params
-          if @__hyperstack_component_params_wrapper.param_accessor_style == :hyperstack
+          if [:hyperstack, :accessors].include? @__hyperstack_component_params_wrapper.param_accessor_style
             raise "params are now directly accessible via instance variables.\n"\
                   '  to access the legacy behavior add `param_accessor_style = :legacy` '\
                     "to your component class\n"\
@@ -27,10 +27,24 @@ module Hyperstack
           `ReactDOM.findDOMNode(#{self}.__hyperstack_component_native)` # react >= v0.15.0
         end
 
+        def jq_node
+          ::Element[dom_node]
+        end
+
         def mounted?
           `(#{self}.__hyperstack_component_is_mounted === undefined) ? false : #{self}.__hyperstack_component_is_mounted`
         end
 
+        def pluralize(count, singular, plural = nil)
+          word = if (count == 1 || count =~ /^1(\.0+)?$/)
+            singular
+          else
+            plural || singular.pluralize
+          end
+
+          "#{count || 0} #{word}"
+        end
+
         def force_update!
           `#{self}.__hyperstack_component_native.forceUpdate()`
           self
@@ -47,6 +61,29 @@ module Hyperstack
 
         private
 
+        # can be overriden by the Router include
+        def __hyperstack_router_wrapper(&block)
+          ->() { instance_eval(&block) }
+        end
+
+        # can be overriden by including WhileLoading include
+        def __hyperstack_component_rescue_wrapper(child)
+          if self.class.callbacks?(:__hyperstack_component_rescue_hook)
+            Hyperstack::Internal::Component::RescueWrapper(child: self, children_elements: child)
+          else
+            child.call
+          end
+        end
+
+        def __hyperstack_component_select_wrappers(&block)
+          RescueWrapper.after_error_args = nil
+          __hyperstack_component_run_post_render_hooks(
+            __hyperstack_component_rescue_wrapper(
+              __hyperstack_router_wrapper(&block)
+            )
+          )
+        end
+
         def set_or_replace_state_or_prop(state_or_prop, method, &block)
           raise "No native ReactComponent associated" unless @__hyperstack_component_native
           `var state_prop_n = #{state_or_prop.shallow_to_n}`

data/lib/hyperstack/internal/component/props_wrapper.rb

@@ -9,7 +9,7 @@ module Hyperstack
           def instance_var_name_for(name)
             case Hyperstack.naming_convention
             when :camelize_params
-              name.camelize
+              fix_suffix(name.camelize)
             when :prefix_params
               "_#{name}"
             else
@@ -17,6 +17,17 @@ module Hyperstack
             end
           end
 
+          def fix_suffix(name)
+            return unless name
+            if name =~ /\?$/
+              name[0..-2] + '_q'
+            elsif name =~ /\!$/
+              name[0..-2] + '_b'
+            else
+              name
+            end
+          end
+
           def param_accessor_style(style = nil)
             @param_accessor_style = style if style
             @param_accessor_style ||=
@@ -38,11 +49,14 @@ module Hyperstack
 
           def define_param(name, param_type, aka = nil)
             meth_name = aka || name
-            var_name = aka || instance_var_name_for(name)
+            var_name = fix_suffix(aka) || instance_var_name_for(name)
             param_definitions[name] = lambda do |props|
-              @component.instance_variable_set :"@#{var_name}", fetch_from_cache(name, param_type, props)
+              @component.instance_variable_set :"@#{var_name}", val = fetch_from_cache(name, param_type, props)
+              next unless param_accessor_style == :accessors
+              `#{@component}[#{"$#{meth_name}"}] = function() { return #{val} }`
+              # @component.define_singleton_method(name) { val } if param_accessor_style == :accessors
             end
-            return if param_accessor_style == :hyperstack
+            return if %i[hyperstack accessors].include? param_accessor_style
             if param_type == Proc
               define_method(meth_name.to_sym) do |*args, &block|
                 props[name].call(*args, &block) if props[name]
@@ -57,7 +71,10 @@ module Hyperstack
           def define_all_others(name)
             var_name = instance_var_name_for(name)
             param_definitions[name] = lambda do |props|
-              @component.instance_variable_set :"@#{var_name}", yield(props)
+              @component.instance_variable_set :"@#{var_name}", val = yield(props)
+              next unless param_accessor_style == :accessors
+              `#{@component}[#{"$#{name}"}] = function() { return #{val} }`
+              # @component.define_singleton_method(name) { val } if param_accessor_style == :accessors
             end
             define_method(name.to_sym) do
               @_all_others_cache ||= yield(props)

data/lib/hyperstack/internal/component/rails/controller_helper.rb

@@ -1,5 +1,19 @@
 require 'action_controller'
 
+module Hyperstack
+  module Internal
+    module Component
+      class Redirect < StandardError
+        attr_reader :url
+        def initialize(url)
+          @url = url
+          super("redirect to #{url}")
+        end
+      end
+    end
+  end
+end
+
 module ActionController
   # adds render_component helper to ActionControllers
   class Base
@@ -7,8 +21,13 @@ module ActionController
       @component_name = (args[0].is_a? Hash) || args.empty? ? params[:action].camelize : args.shift
       @render_params = args.shift || {}
       options = args[0] || {}
+      return if performed?
       render inline: '<%= react_component @component_name, @render_params %>',
              layout: options.key?(:layout) ? options[:layout].to_s : :default
+    rescue Exception => e
+      m = /^RuntimeError: Hyperstack::Internal::Component::Redirect (.+) status: (.+)$/.match(e.message)
+      raise e unless m
+      redirect_to m[1], status: m[2]
     end
   end
 end

data/lib/hyperstack/internal/component/react_wrapper.rb

@@ -153,7 +153,7 @@ module Hyperstack
             # that responds to render to act as a component we have to make sure that
             # we have a callbacks_for method.  This all becomes much easier once issue
             # #270 is resolved.
-            if type.respond_to?(:callbacks_for) && type.callbacks_for(:after_error) != []
+            if type.respond_to?(:callbacks?) && type.callbacks?(:after_error)
               add_after_error_hook_to_native comp
             end
             comp
@@ -261,7 +261,7 @@ module Hyperstack
                               }
                             }
 
-            elsif key == 'dom'
+            elsif key == 'jq_ref'
               unless value.respond_to?(:call)
                 raise "The ref and dom params must be given a Proc.\n"\
                       "If you want to capture the dom node in an instance variable use the `set` method.\n"\

data/lib/hyperstack/internal/component/rendering_context.rb

@@ -2,9 +2,23 @@ module Hyperstack
   module Internal
     module Component
       class RenderingContext
+        class NotQuiet < Exception; end
         class << self
           attr_accessor :waiting_on_resources
 
+          def raise_if_not_quiet?
+            @raise_if_not_quiet
+          end
+
+          def raise_if_not_quiet=(x)
+            @raise_if_not_quiet = x
+          end
+
+          def quiet_test(component)
+            return unless component.waiting_on_resources && raise_if_not_quiet? #&& component.class != RescueMetaWrapper <- WHY  can't create a spec that this fails without this, but several fail with it.
+            raise NotQuiet.new("#{component} is waiting on resources")
+          end
+
           def render(name, *args, &block)
             was_outer_most = !@not_outer_most
             @not_outer_most = true
@@ -12,7 +26,7 @@ module Hyperstack
             @buffer ||= [] unless @buffer
             if block
               element = build do
-                saved_waiting_on_resources = waiting_on_resources
+                saved_waiting_on_resources = nil #waiting_on_resources  what was the purpose of this its used below to or in with the current elements waiting_for_resources
                 self.waiting_on_resources = nil
                 run_child_block(name.nil?, &block)
                 if name
@@ -129,7 +143,7 @@ module Hyperstack
 end
 
 class Object
-  [:span, :td, :th, :while_loading].each do |tag|
+  [:span, :td, :th].each do |tag|
     define_method(tag) do |*args, &block|
       args.unshift(tag)
       # legacy hyperloop allowed tags to be lower case as well so if self is a component

data/lib/hyperstack/internal/component/rescue_wrapper.rb

@@ -0,0 +1,40 @@
+module Hyperstack
+  module Internal
+    module Component
+      class RescueMetaWrapper
+        include Hyperstack::Component
+
+        param :children_elements
+
+        render do
+          @ChildrenElements.call
+        end
+      end
+
+      class RescueWrapper
+        class << self
+          attr_accessor :after_error_args
+        end
+
+        include Hyperstack::Component
+
+        param :child
+        param :children_elements
+
+        render do
+          RescueMetaWrapper(children_elements: @ChildrenElements)
+        end
+
+        after_error do |error, info|
+          args = RescueWrapper.after_error_args || [error, info]
+          found, * = @Child.run_callback(:__hyperstack_component_rescue_hook, found, *args) { |a| a }
+          unless found
+            RescueWrapper.after_error_args = args
+            raise error
+          end
+          @Child.force_update!
+        end
+      end
+    end
+  end
+end

data/lib/hyperstack/internal/component/should_component_update.rb

@@ -30,7 +30,7 @@ module Hyperstack
             if respond_to?(:needs_update?)
               !!call_needs_update(next_props, next_state)
             else
-              (props_changed?(next_props) || native_state_changed?(next_state))
+              props_changed?(next_props) || native_state_changed?(next_state)
             end
             # rubocop:enable Style/DoubleNegation
           end

data/lib/hyperstack/internal/component/while_loading_wrapper.rb

@@ -0,0 +1,29 @@
+module Hyperstack
+  module Internal
+    module Component
+      class WhileLoadingWrapper < RescueWrapper
+        render do
+          if @waiting_on_resources && !quiet?
+            RenderingContext.raise_if_not_quiet = false
+          else
+            @waiting_on_resources = false
+            @Child.instance_eval do
+              mutate if @__hyperstack_while_loading_waiting_on_resources
+              @__hyperstack_while_loading_waiting_on_resources = false
+            end
+            RenderingContext.raise_if_not_quiet = true
+          end
+          RescueMetaWrapper(children_elements: @ChildrenElements)
+        end
+
+        before_mount do
+          wrapper = self
+          @Child.class.rescues RenderingContext::NotQuiet do
+            wrapper.instance_variable_set(:@waiting_on_resources, true)
+            @__hyperstack_while_loading_waiting_on_resources = true
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyper-component
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha1.2
+  version: 1.0.alpha1.3
 platform: ruby
 authors:
 - David Chang
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyper-state
@@ -20,56 +20,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.2
+        version: 1.0.alpha1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.2
+        version: 1.0.alpha1.3
 - !ruby/object:Gem::Dependency
   name: hyperstack-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.2
+        version: 1.0.alpha1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.2
+        version: 1.0.alpha1.3
 - !ruby/object:Gem::Dependency
   name: libv8
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.3.0
+        version: 6.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.3.0
+        version: 6.7.0
 - !ruby/object:Gem::Dependency
   name: mini_racer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -128,16 +128,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.17.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.17.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
@@ -158,14 +164,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.2
+        version: 1.0.alpha1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.2
+        version: 1.0.alpha1.3
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -433,6 +439,7 @@ files:
 - lib/hyperstack/component/react_api.rb
 - lib/hyperstack/component/server.rb
 - lib/hyperstack/component/version.rb
+- lib/hyperstack/component/while_loading.rb
 - lib/hyperstack/ext/component/boolean.rb
 - lib/hyperstack/ext/component/element.rb
 - lib/hyperstack/ext/component/hash.rb
@@ -454,10 +461,12 @@ files:
 - lib/hyperstack/internal/component/rails/server_rendering/hyper_asset_container.rb
 - lib/hyperstack/internal/component/react_wrapper.rb
 - lib/hyperstack/internal/component/rendering_context.rb
+- lib/hyperstack/internal/component/rescue_wrapper.rb
 - lib/hyperstack/internal/component/should_component_update.rb
 - lib/hyperstack/internal/component/tags.rb
 - lib/hyperstack/internal/component/top_level_rails_component.rb
 - lib/hyperstack/internal/component/validator.rb
+- lib/hyperstack/internal/component/while_loading_wrapper.rb
 - lib/react/react-source-browser.rb
 - lib/react/react-source-server.rb
 - lib/react/react-source.rb
@@ -481,8 +490,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Opal Ruby wrapper of React.js library.