closes #64

Author: catmando

ruby/hyper-router/lib/hyperstack/internal/router/class_methods.rb

@@ -14,31 +14,6 @@ def location
           Hyperstack::Router::Location.new(`#{history.to_n}.location`)
         end
 
-        # def xrender(container = nil, params = {}, &block)
-        #   if container
-        #     container = container.type if container.is_a? Hyperstack::Component::Element
-        #     select_router do
-        #       __hyperstack_component_run_post_render_hooks(
-        #         Hyperstack::Internal::Component::RenderingContext.render(container, params) do
-        #           instance_eval(&block) if block
-        #         end
-        #       )
-        #     end
-        #   else
-        #     select_router { __hyperstack_component_run_post_render_hooks(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
@@ -52,30 +27,6 @@ def hash_history(*args)
         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: IsomorphicMethods.ctx) do
-        #       instance_eval(&block)
-        #     end
-        #   end
-        # end
       end
     end
   end

ruby/hyper-router/lib/hyperstack/router.rb

@@ -10,11 +10,24 @@ def __hyperstack_router_wrapper(&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
-          instance_eval(&block)
+          __eval_block(block)
         end
       end
     end
@@ -27,7 +40,7 @@ def __hyperstack_prerender_router(&block)
           location: location,
           context: Hyperstack::Internal::Router::IsomorphicMethods.ctx
         ) do
-          instance_eval(&block)
+          __eval_block(block)
         end
       end
     end

ruby/hyper-router/spec/hyper-router/basic_dsl_spec.rb

@@ -19,8 +19,11 @@
     expect(page.current_path).to eq('/topics/components')
   end
 
-  it 'a routers render method can return a string', skip: 'breaking - see issue #64' do
-    mount 'SimpleStringRouter'
-    expect(page).to have_content('a simple string')
+  [:server_only, :client_only].each do |render_on|
+    it "a routers render method can return a string (#{render_on})" do
+      client_option render_on: render_on
+      mount 'SimpleStringRouter'
+      expect(page).to have_content('a simple string')
+    end
   end
 end