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

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

@@ -19,27 +19,41 @@ module Hyperstack
             raise NotQuiet.new("#{component} is waiting on resources")
           end
 
+          def render_string(string)
+            @buffer ||= []
+            @buffer << string
+          end
+
           def render(name, *args, &block)
             was_outer_most = !@not_outer_most
             @not_outer_most = true
             remove_nodes_from_args(args)
-            @buffer ||= [] unless @buffer
+            @buffer ||= [] #unless @buffer
             if block
               element = build do
                 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)
+                run_child_block(&block)
                 if name
                   buffer = @buffer.dup
                   ReactWrapper.create_element(name, *args) { buffer }.tap do |element|
                     element.waiting_on_resources = saved_waiting_on_resources || !!buffer.detect { |e| e.waiting_on_resources if e.respond_to?(:waiting_on_resources) }
                     element.waiting_on_resources ||= waiting_on_resources if buffer.last.is_a?(String)
                   end
-                elsif @buffer.last.is_a? Hyperstack::Component::Element
-                  @buffer.last.tap { |element| element.waiting_on_resources ||= saved_waiting_on_resources }
                 else
-                  buffer_s = @buffer.last.to_s
-                  RenderingContext.render(:span) { buffer_s }.tap { |element| element.waiting_on_resources = saved_waiting_on_resources }
+                  buffer = @buffer.collect do |item|
+                    if item.is_a? Hyperstack::Component::Element
+                      item.waiting_on_resources ||= saved_waiting_on_resources
+                      item
+                    else
+                      RenderingContext.render(:span) { item.to_s }.tap { |element| element.waiting_on_resources = saved_waiting_on_resources }
+                    end
+                  end
+                  if buffer.length > 1
+                    buffer
+                  else
+                    buffer.first
+                  end
                 end
               end
             elsif name.is_a? Hyperstack::Component::Element
@@ -65,6 +79,7 @@ module Hyperstack
 
           def delete(element)
             @buffer.delete(element)
+            @last_deleted = element
             element
           end
           alias as_node delete
@@ -86,55 +101,74 @@ module Hyperstack
             end if args[0] && args[0].is_a?(Hash)
           end
 
-          # run_child_block gathers the element(s) generated by a child block.
+          # run_child_block yields to the child rendering block which will put any
+          # elements to be rendered into the current rendering buffer.
+          #
           # for example when rendering this div: div { "hello".span; "goodby".span }
           # two child Elements will be generated.
           #
-          # the final value of the block should either be
-          #   1 an object that responds to :acts_as_string?
-          #   2 a string,
-          #   3 an element that is NOT yet pushed on the rendering buffer
-          #   4 or the last element pushed on the buffer
+          # However the block itself will return a value, which in some cases should
+          # also added to the buffer:
+          #
+          # If the final value of the block is a
           #
-          # in case 1 we render a span
-          # in case 2 we automatically push the string onto the buffer
-          # in case 3 we also push the Element onto the buffer IF the buffer is empty
-          # case 4 requires no special processing
+          #   a hyper model dummy value that is being loaded, then wrap it in a span and add it to the buffer
+          #   a string (or if the buffer is empty any value), then add it to the buffer
+          #   an Element, then add it on the buffer unless it has been just deleted
+          #          #
+          # Note that the reason we don't always allow Strings to be automatically pushed is
+          # to avoid confusing results in situations like this:
+          #   DIV { collection.each { |item| SPAN { item } } }
+          # If we accepted any object to be rendered this would generate:
+          #   DIV { SPAN { collection[0] } SPAN { collection[n] } collection.to_s }
+          # which is probably not the desired output.  If it was you would just append to_s
+          # to the end of the expression, to force it to be added to the output buffer.
           #
-          # Once we have taken care of these special cases we do a check IF we are in an
-          # outer rendering scope.  In this case react only allows us to generate 1 Element
-          # so we insure that is the case, and also check to make sure that element in the buffer
-          # is the element returned
+          # However if the buffer is empty then it makes sense to automatically apply the `.to_s`
+          # to the value, and push it on the buffer, unless it is a falsy value or an array
 
-          def run_child_block(is_outer_scope)
+          def run_child_block
             result = yield
-            if result.respond_to?(:acts_as_string?) && result.acts_as_string?
-              # hyper-mesh DummyValues respond to acts_as_string, and must
+            check_for_component_return(result)
+            if dummy_value?(result)
+              # hyper-mesh DummyValues must
               # be converted to spans INSIDE the parent, otherwise the waiting_on_resources
               # flag will get set in the wrong context
               RenderingContext.render(:span) { result.to_s }
-            elsif result.is_a?(String) || (result.is_a?(Hyperstack::Component::Element) && @buffer.empty?)
-              @buffer << result
+            elsif result.is_a?(Hyperstack::Component::Element)
+              @buffer << result if @buffer.empty? unless @last_deleted == result
+            elsif pushable_string?(result)
+              @buffer << result.to_s
             end
-            raise_render_error(result) if is_outer_scope && @buffer != [result]
+            @last_deleted = nil
           end
 
-          # heurestically raise a meaningful error based on the situation
-
-          def raise_render_error(result)
-            improper_render 'A different element was returned than was generated within the DSL.',
-                            'Possibly improper use of Element#delete.' if @buffer.count == 1
-            improper_render "Instead #{@buffer.count} elements were generated.",
-                            'Do you want to wrap your elements in a div?' if @buffer.count > 1
-            improper_render "Instead the component #{result} was returned.",
-                            "Did you mean #{result}()?" if result.try :hyper_component?
-            improper_render "Instead the #{result.class} #{result} was returned.",
-                            'You may need to convert this to a string.'
+          def check_for_component_return(result)
+            # check for a common error of saying (for example) DIV (without parens)
+            # which returns the DIV component class instead of a rendered DIV
+            return unless result.try :hyper_component?
+
+            Hyperstack::Component::IsomorphicHelpers.log(
+              "a component's render method returned the component class #{result}, did you mean to say #{result}()",
+              :warning
+            )
+          end
+
+          def dummy_value?(result)
+            result.respond_to?(:loading?) && result.loading?
+          end
+
+          def pushable_string?(result)
+            # if the buffer is not empty we will only push on strings, and ignore anything else
+            return result.is_a?(String) unless @buffer.empty?
+
+            # if the buffer IS empty then we can push on anything except we avoid nil, false and arrays
+            # as these are almost never what you want to render, and if you do there are mechanisms
+            # to render them explicitly
+            result && result.respond_to?(:to_n) && !result.is_a?(Array)
           end
 
           def improper_render(message, solution)
-            raise "a component's render method must generate and return exactly 1 element or a string.\n"\
-                  "    #{message}  #{solution}"
           end
         end
       end
@@ -143,7 +177,7 @@ module Hyperstack
 end
 
 class Object
-  [:span, :td, :th].each do |tag|
+  %i[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
@@ -155,24 +189,26 @@ class Object
       # in the component.
       # If we fully deprecate lowercase tags, then this next line can go...
       return send(*args, &block) if respond_to?(:hyper_component?) && hyper_component?
+
       Hyperstack::Internal::Component::RenderingContext.render(*args) { to_s }
     end
   end
 
-
   def para(*args, &block)
     args.unshift(:p)
     # see above comment
     return send(*args, &block) if respond_to?(:hyper_component?) && hyper_component?
+
     Hyperstack::Internal::Component::RenderingContext.render(*args) { to_s }
   end
 
   def br
     # see above comment
     return send(:br) if respond_to?(:hyper_component?) && hyper_component?
-    Hyperstack::Internal::Component::RenderingContext.render(:span) do
-      Hyperstack::Internal::Component::RenderingContext.render(to_s)
-      Hyperstack::Internal::Component::RenderingContext.render(:br)
+    
+    Hyperstack::Internal::Component::RenderingContext.render(Hyperstack::Internal::Component::Tags::FRAGMENT) do
+      Hyperstack::Internal::Component::RenderingContext.render(Hyperstack::Internal::Component::Tags::FRAGMENT) { to_s }
+      Hyperstack::Internal::Component::RenderingContext.render(Hyperstack::Internal::Component::Tags::BR)
     end
   end
 

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

@@ -27,7 +27,7 @@ module Hyperstack
 
         after_error do |error, info|
           args = RescueWrapper.after_error_args || [error, info]
-          found, * = @Child.run_callback(:__hyperstack_component_rescue_hook, found, *args) { |a| a }
+          found, * = @Child.run_callback(:__hyperstack_component_rescue_hook, found, *args)
           unless found
             RescueWrapper.after_error_args = args
             raise error

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

@@ -32,6 +32,14 @@ module Hyperstack
           const_set tag.upcase, tag
         end
 
+        const_set "FRAGMENT", (
+          Class.new do
+            include Hyperstack::Component
+            render {}
+            Hyperstack::Internal::Component::ReactWrapper.import_native_component(self, `React.Fragment`)
+          end
+        )
+
         # this is used for haml style (i.e. DIV.foo.bar) class tags which is deprecated
         def self.html_tag_class_for(tag)
           downcased_tag = tag.downcase
@@ -85,11 +93,12 @@ module Hyperstack
 
         def lookup_const(name)
           return nil unless name =~ /^[A-Z]/
-          scopes = self.class.name.to_s.split('::').inject([Module]) do |nesting, next_const|
+          return Hyperstack::Internal::Component::Tags::FRAGMENT if name == "FRAGMENT"
+          scopes = self.class.name.to_s.split('::').inject([Object]) do |nesting, next_const|
             nesting + [nesting.last.const_get(next_const)]
           end.reverse
-          scope = scopes.detect { |s| s.const_defined?(name) }
-          scope.const_get(name) if scope
+          scope = scopes.detect { |s| s.const_defined?(name, false) }
+          scope.const_get(name, false) if scope
         end
       end
     end

data/lib/react/react-source.rb

@@ -11,7 +11,7 @@ if RUBY_ENGINE == 'opal'
 else
   require "hyperstack/internal/component"
   require "react/rails/asset_variant"
-  variant = Hyperstack.env.production? ? 'production' : 'development'
-  react_directory = React::Rails::AssetVariant.new({environment: variant}).react_directory
+  variant = Hyperstack.env.production? ? :production : :development
+  react_directory = React::Rails::AssetVariant.new({ variant: variant }).react_directory
   Opal.append_path react_directory.untaint
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyper-component
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha1.3
+  version: 1.0.alpha1.8
 platform: ruby
 authors:
 - David Chang
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyper-state
@@ -20,76 +20,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.3
+        version: 1.0.alpha1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.3
+        version: 1.0.alpha1.8
 - !ruby/object:Gem::Dependency
   name: hyperstack-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.3
+        version: 1.0.alpha1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.3
-- !ruby/object:Gem::Dependency
-  name: libv8
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.7.0
-- !ruby/object:Gem::Dependency
-  name: mini_racer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-- !ruby/object:Gem::Dependency
-  name: opal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.0.alpha1.8
 - !ruby/object:Gem::Dependency
   name: opal-activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -130,20 +82,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
@@ -164,14 +110,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.3
+        version: 1.0.alpha1.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.3
+        version: 1.0.alpha1.8
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +161,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: mini_racer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -229,7 +175,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: opal-jquery
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -243,35 +189,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: opal-rails
+  name: opal-jquery
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: opal-rspec
+  name: opal-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-rescue
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -285,7 +237,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-rescue
+  name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -318,14 +270,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
@@ -372,30 +330,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -422,7 +380,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - Rakefile
 - how-component-name-lookup-works.md
 - hyper-component.gemspec
@@ -432,6 +389,7 @@ files:
 - lib/hyperstack/component/children.rb
 - lib/hyperstack/component/element.rb
 - lib/hyperstack/component/event.rb
+- lib/hyperstack/component/free_render.rb
 - lib/hyperstack/component/haml.rb
 - lib/hyperstack/component/isomorphic_helpers.rb
 - lib/hyperstack/component/jquery.rb
@@ -440,13 +398,17 @@ files:
 - lib/hyperstack/component/server.rb
 - lib/hyperstack/component/version.rb
 - lib/hyperstack/component/while_loading.rb
+- lib/hyperstack/ext/component/array.rb
 - lib/hyperstack/ext/component/boolean.rb
 - lib/hyperstack/ext/component/element.rb
+- lib/hyperstack/ext/component/enumerable.rb
 - lib/hyperstack/ext/component/hash.rb
+- lib/hyperstack/ext/component/kernel.rb
 - lib/hyperstack/ext/component/number.rb
 - lib/hyperstack/ext/component/object.rb
 - lib/hyperstack/ext/component/serializers.rb
 - lib/hyperstack/ext/component/string.rb
+- lib/hyperstack/ext/component/time.rb
 - lib/hyperstack/internal/component.rb
 - lib/hyperstack/internal/component/class_methods.rb
 - lib/hyperstack/internal/component/haml.rb
@@ -471,7 +433,7 @@ files:
 - lib/react/react-source-server.rb
 - lib/react/react-source.rb
 - unmounting-objects.md
-homepage: http://ruby-hyperloop.org
+homepage: http://hyperstack.org
 licenses:
 - MIT
 metadata: {}
@@ -490,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Opal Ruby wrapper of React.js library.