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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2076235a7851fea3270717dc0104f839a004751f65f4bd4ce73ac08682bead6
-  data.tar.gz: 61d62fe953ff92b070fd70d4b5ed3c70b540ff8adb57026428537030e9e31f1d
+  metadata.gz: 0515b59167c89bfa088fb19da74c6006abceadddf1ee2dcbc0b7c38cfd382142
+  data.tar.gz: d753ef19d61e22c45fc39f2dc513e855cce7a80b4d305321b68ad60e00b0ece9
 SHA512:
-  metadata.gz: 97e2efa72feb813e8fa7be7ad4d14f594b3be21d95cbacb6edc0eb45b4e83c9309d909d250a63a17a10d38ffe2f9324f743114e46b9956214de7961ada37c306
-  data.tar.gz: 2c9279c27f330d796d772d2092f0e8db8934704e9efb949cefa6b433c59b6e3b2401d6b7ff498e73373aaeddf30e9428159fdbb840a6cc2e37ceeb4f803ec1a2
+  metadata.gz: e317f71356ac069cd2915eab6877d52fd552e5aa4da8f502e7e45f4d7ca95a761892e1aa0e00e49948e57ee930f9b0910003702d223ef703b8a78cb9fbe7e4e6
+  data.tar.gz: a033f24ad047ef0d66e6b43e2bc9d6b7414605bec760cb1cb9a294131efe588625c9eaf52bcaa91366ee3536b6e27404fab161ff116d050c6a6549b53268d5b4

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

@@ -14,29 +14,6 @@ module Hyperstack
           Hyperstack::Router::Location.new(`#{history.to_n}.location`)
         end
 
-        def render(container = nil, params = {}, &block)
-          if container
-            container = container.type if container.is_a? Hyperstack::Component::Element
-            select_router do
-              Hyperstack::Internal::Component::RenderingContext.render(container, params) do
-                instance_eval(&block) if block
-              end
-            end
-          else
-            select_router { instance_eval(&block) }
-          end
-        end
-
-        def select_router(&block)
-          if Hyperstack::Component::IsomorphicHelpers.on_opal_server?
-            prerender_router(&block)
-          else
-            render_router(&block)
-          end
-        end
-
-        alias route render
-
         private
 
         def browser_history
@@ -50,30 +27,6 @@ module Hyperstack
         def memory_history(*args)
           @__memory_history ||= React::Router::History.current.create_memory_history(*args)
         end
-
-        def render_router(&block)
-          define_method(:__hyperstack_component_render) do
-            self.class.history :browser unless history
-
-            React::Router::Router(history: history.to_n) do
-              instance_eval(&block)
-            end
-          end
-        end
-
-        def prerender_router(&block)
-          define_method(:__hyperstack_component_render) do
-            location = {}.tap do |hash|
-              pathname, search = IsomorphicMethods.request_fullpath.split('?', 2)
-              hash[:pathname] = pathname
-              hash[:search] = search ? "?#{search}" : ''
-            end
-
-            React::Router::StaticRouter(location: location.to_n, context: {}.to_n) do
-              instance_eval(&block)
-            end
-          end
-        end
       end
     end
   end

data/lib/hyperstack/internal/router/helpers.rb

@@ -25,6 +25,9 @@ module Hyperstack
 
         def Redirect(to, opts = {})
           opts[:to] = to.to_n
+          status = opts.delete(:status)
+          status ||= 302
+          `#{IsomorphicMethods.ctx}.status = #{status}`
           React::Router::Redirect(opts)
         end
 
@@ -37,6 +40,8 @@ module Hyperstack
         end
 
         def Route(to, opts = {}, &block)
+          Hyperstack::Internal::State::Mapper.observed! Hyperstack::Router::Location
+
           opts[:path] = to.to_n
 
           if opts[:mounts]
@@ -53,7 +58,7 @@ module Hyperstack
             opts[:render] = lambda do |e|
               route_params = format_params(e)
 
-              yield(route_params.values).to_n
+              yield(*route_params.values).to_n
             end
           end
 

data/lib/hyperstack/internal/router/isomorphic_methods.rb

@@ -4,6 +4,17 @@ module Hyperstack
       class IsomorphicMethods
         include Hyperstack::Component::IsomorphicHelpers
 
+        def self.ctx
+          @ctx ||= `{}`
+        end
+
+        prerender_footer do |_controller|
+          next unless on_opal_server?
+          ctx_as_hash = Hash.new(@ctx)
+          @ctx = `{}`
+          raise "Hyperstack::Internal::Component::Redirect #{ctx_as_hash[:url]} status: #{ctx_as_hash[:status]}" if ctx_as_hash[:url]
+        end
+
         isomorphic_method(:request_fullpath) do |f|
           f.when_on_client { `window.location.pathname` }
           f.send_to_server

data/lib/hyperstack/router.rb

@@ -1,6 +1,50 @@
 module Hyperstack
   module Router
     class NoHistoryError < StandardError; end
+
+    def __hyperstack_router_wrapper(&block)
+      if Hyperstack::Component::IsomorphicHelpers.on_opal_server?
+        ->() { __hyperstack_prerender_router(&block) }
+      else
+        ->() { __hyperstack_render_router(&block) }
+      end
+    end
+
+    def __eval_block(block)
+      result = instance_eval(&block)
+      if result.is_a?(String) ||
+         (result.respond_to?(:acts_as_string?) && result.acts_as_string?)
+        # hyper-mesh DummyValues respond to acts_as_string, and must
+        # be converted to spans INSIDE the parent, otherwise the waiting_on_resources
+        # flag will get set in the wrong context
+        result = Hyperstack::Internal::Component::RenderingContext
+                 .render(:span) { result.to_s }
+      end
+      result
+    end
+
+    def __hyperstack_render_router(&block)
+      instance_eval do
+        self.class.history :browser unless history
+        React::Router::Router(history: history.to_n) do
+          __eval_block(block)
+        end
+      end
+    end
+
+    def __hyperstack_prerender_router(&block)
+      instance_eval do
+        pathname, search = Hyperstack::Internal::Router::IsomorphicMethods.request_fullpath.split('?', 2)
+        location = { pathname: pathname, search: search ? "?#{search}" : '' }.to_n
+        React::Router::StaticRouter(
+          location: location,
+          context: Hyperstack::Internal::Router::IsomorphicMethods.ctx
+        ) do
+          __eval_block(block)
+        end
+      end
+    end
+
     def self.included(base)
       base.extend(Hyperstack::Internal::Router::ClassMethods)
 

data/lib/hyperstack/router/version.rb

@@ -1,3 +1,3 @@
 module HyperRouter
-  VERSION = '1.0.alpha1.2'
+  VERSION = '1.0.alpha1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyper-router
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha1.2
+  version: 1.0.alpha1.3
 platform: ruby
 authors:
 - Adam George
@@ -9,7 +9,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-component
@@ -17,28 +17,28 @@ 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: hyper-state
   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: opal-browser
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -115,28 +121,28 @@ 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: hyper-store
   requirement: !ruby/object:Gem::Requirement
     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: listen
   requirement: !ruby/object:Gem::Requirement
@@ -157,14 +163,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.2.4
   type: :development
   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-rails
   requirement: !ruby/object:Gem::Requirement
@@ -491,8 +497,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: hyper-router for Opal, part of the hyperstack framework