hyper-component 1.0.alpha1.4 → 1.0.alpha1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 407fc5c699f76a1d030f4f8c3c221806ce010cd473adb062fbba7f08d41f2a74
-  data.tar.gz: 9d139310c4721502f09b74477efdd4f4f6fe388bc4a410abf6abe87e7cee0f52
+  metadata.gz: 5eb3f7c53a31ed9f6708f9fd1251f3ed52f7d54e5894145abaaf4ac4e5ac7fce
+  data.tar.gz: b95ea7df69882114a1a55f772911ba2b609221bde04df9e629e1278c0e71ea73
 SHA512:
-  metadata.gz: aa213634e017097aa2562f00f29083017a12e345ba1abfe51bac88e7941b7e0f08f787f32f64871698b922e8518ec0e11bd34faa52a83c3c453f931a8ce97811
-  data.tar.gz: bf453d84ab0e93c94831a42cba2b3a3c364d18612071e7564b4d3f751d282c5fa04240f3c938e591e9f755f2dee619e69b885b90c4718f2da5199446ce380587
+  metadata.gz: b7022103f15e46d7251addacac7ca755bb2cc2e7d52ae9ec8ebcd9fbb24ada6db90e77d3d689ad20a058a60e84192f00ea88f5d99065c2b86420187f2a0a2057
+  data.tar.gz: 44d0acecd8dc27123a35d0db8fa32f9cbdbe6715c523661a618114ad157891dfec8ebc226b6eff70e3a2a562271e3144d477e16f9110a8a274058edd1fb188cf

data/lib/hyper-component.rb

@@ -22,12 +22,16 @@ if RUBY_ENGINE == 'opal'
   require 'hyperstack/component/event'
   require 'hyperstack/internal/component/rendering_context'
   require 'hyperstack/ext/component/object'
+  require 'hyperstack/ext/component/kernel'
   require 'hyperstack/ext/component/number'
   require 'hyperstack/ext/component/boolean'
+  require 'hyperstack/ext/component/array'
+  require 'hyperstack/ext/component/enumerable'
   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/component/free_render'
   require 'hyperstack/internal/component/rescue_wrapper'
   require 'hyperstack/internal/component/while_loading_wrapper'
 

data/lib/hyperstack/component/element.rb

@@ -39,18 +39,25 @@ module Hyperstack
       end
 
       def ref
-        @ref || raise("#{self} has not been mounted yet")
+        return @ref if @ref
+        raise("The instance of #{self.type} has not been mounted yet") if properties[:ref]
+        raise("Attempt to get a ref on #{self.type} which is a static component.")
       end
 
       def dom_node
-        @type.is_a?(String) ? ref : ref.dom_node
+        `typeof #{ref}.$dom_node == 'function'` ? ref.dom_node : ref
       end
 
-      # Attach event handlers.
+      # Attach event handlers. skip false, nil and blank event names
 
       def on(*event_names, &block)
-        event_names.each { |event_name| merge_event_prop!(event_name, &block) }
-        @native = `React.cloneElement(#{@native}, #{@properties.shallow_to_n})`
+        any_found = false
+        event_names.each do |event_name|
+          next unless event_name && event_name.strip != ''
+          merge_event_prop!(event_name, &block)
+          any_found = true
+        end
+        @native = `React.cloneElement(#{@native}, #{@properties.shallow_to_n})` if any_found
         self
       end
 
@@ -114,6 +121,9 @@ module Hyperstack
           prop_name => %x{
             function(){
               var react_event = arguments[0];
+              if (arguments.length == 0 || !react_event.nativeEvent) {
+                return #{yield(*Array(`arguments`))}
+              }
               var all_args;
               var other_args;
               if (arguments.length > 1) {

data/lib/hyperstack/component/free_render.rb

@@ -0,0 +1,21 @@
+module Hyperstack
+  module Component
+    module FreeRender
+      def self.included(base)
+        base.instance_eval do
+          alias :hyperstack_component_original_meth_missing method_missing
+          def method_missing(name, *args, &block)
+            if const_defined?(name) &&
+               (klass = const_get(name)) &&
+               ((klass.is_a?(Class) && klass.method_defined?(:render)) ||
+                 Hyperstack::Internal::Component::Tags::HTML_TAGS.include?(klass))
+              render(klass, *args, &block)
+            else
+              hyperstack_component_original_meth_missing(name, *args, &block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hyperstack/component/version.rb

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

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

@@ -0,0 +1,20 @@
+# from Rails 6.0 activesupport.  Remove once defined by Opal activesupport
+class Array
+  # Removes and returns the elements for which the block returns a true value.
+  # If no block is given, an Enumerator is returned instead.
+  #
+  #   numbers = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  #   odd_numbers = numbers.extract! { |number| number.odd? } # => [1, 3, 5, 7, 9]
+  #   numbers # => [0, 2, 4, 6, 8]
+  def extract!
+    return to_enum(:extract!) { size } unless block_given?
+
+    extracted_elements = []
+
+    reject! do |element|
+      extracted_elements << element if yield(element)
+    end
+
+    extracted_elements
+  end
+end

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

@@ -1,11 +1,9 @@
 Element.instance_eval do
   def self.find(selector)
-    selector = begin
-      selector.dom_node
-    rescue
-      selector
-    end if `#{selector}.$dom_node !== undefined`
-    `$(#{selector})`
+    if `typeof #{selector}['$respond_to?'] == 'function'` && selector.respond_to?(:dom_node)
+      selector = selector.dom_node
+    end
+    `jQuery(#{selector})`
   end
 
   def self.[](selector)
@@ -37,7 +35,7 @@ Element.instance_eval do
   # see react-rails documentation for more details
 
   %x{
-    $.fn.mount_components = function() {
+    jQuery.fn.mount_components = function() {
       this.each(function(e) { ReactRailsUJS.mountComponents(e[0]) })
       return this;
     }

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

@@ -0,0 +1,18 @@
+# from Rails 6.0 activesupport.  Remove once defined by Opal activesupport
+module Enumerable
+  INDEX_WITH_DEFAULT = Object.new
+  private_constant :INDEX_WITH_DEFAULT
+  def index_with(default = INDEX_WITH_DEFAULT)
+    if block_given?
+      result = {}
+      each { |elem| result[elem] = yield(elem) }
+      result
+    elsif default != INDEX_WITH_DEFAULT
+      result = {}
+      each { |elem| result[elem] = default }
+      result
+    else
+      to_enum(:index_with) { size if respond_to?(:size) }
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Kernel
+  def pause(s, &block)
+    Promise.new.tap { |p| after(s) { p.resolve(*(block && [block.call])) }}
+  end
+  alias busy_sleep sleep
+  alias sleep pause
+end

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

@@ -271,7 +271,8 @@ module Hyperstack
           ReactWrapper.import_native_component(
             self, ReactWrapper.eval_native_react_component(component_name)
           )
-          define_method(:render) {} # define a dummy render method - will never be called...
+          render {}
+          #define_method(:render) {} # define a dummy render method - will never be called...
         rescue Exception => e # rubocop:disable Lint/RescueException : we need to catch everything!
           raise "#{self} cannot import '#{component_name}': #{e.message}."
           # rubocop:enable Lint/RescueException
@@ -291,7 +292,7 @@ module Hyperstack
         end
 
         def to_n
-          ReactWrapper.class_eval('@@component_classes')[self]
+          Hyperstack::Internal::Component::ReactWrapper.create_native_react_class(self)
         end
       end
     end

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

@@ -48,21 +48,23 @@ module Hyperstack
           end
 
           def define_param(name, param_type, aka = nil)
-            meth_name = aka || name
-            var_name = fix_suffix(aka) || instance_var_name_for(name)
-            param_definitions[name] = lambda do |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
+            if param_accessor_style != :legacy || aka
+              meth_name = aka || name
+              var_name = fix_suffix(aka) || instance_var_name_for(name)
+              param_definitions[name] = lambda do |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 %i[hyperstack accessors].include? param_accessor_style
             end
-            return if %i[hyperstack accessors].include? param_accessor_style
             if param_type == Proc
-              define_method(meth_name.to_sym) do |*args, &block|
+              define_method(name.to_sym) do |*args, &block|
                 props[name].call(*args, &block) if props[name]
               end
             else
-              define_method(meth_name.to_sym) do
+              define_method(name.to_sym) do
                 fetch_from_cache(name, param_type, props)
               end
             end
@@ -88,7 +90,7 @@ module Hyperstack
 
         def initialize(component, incoming = nil)
           @component = component
-          return if param_accessor_style == :legacy
+          #return if param_accessor_style == :legacy
           self.class.param_definitions.each_value do |initializer|
             instance_exec(incoming || props, &initializer)
           end

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

@@ -50,3 +50,12 @@ module Hyperstack
     end
   end
 end
+
+
+module React
+  module Rails
+    module ViewHelper
+      alias mount_component react_component
+    end
+  end
+end

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

@@ -22,7 +22,7 @@ module ActionController
       @render_params = args.shift || {}
       options = args[0] || {}
       return if performed?
-      render inline: '<%= react_component @component_name, @render_params %>',
+      render inline: '<%= mount_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)

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

@@ -12,8 +12,9 @@ module Hyperstack
           end
           config.after_initialize do
             class ::HyperstackController < ::ApplicationController
-              def action_missing(_name)
-                render_component
+              def action_missing(*)
+                parts = params[:action].split('__')
+                render_component (parts[0..-2]+[parts.last.camelize]).join('::')
               end
             end
           end

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

@@ -30,6 +30,7 @@ module Hyperstack
         def self.eval_native_react_component(name)
           component = `eval(name)`
           raise "#{name} is not defined" if `#{component} === undefined`
+          component = `component.default` if `component.__esModule`
           is_component_class = `#{component}.prototype !== undefined` &&
                                 (`!!#{component}.prototype.isReactComponent` ||
                                  `!!#{component}.prototype.render`)

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

@@ -85,11 +85,11 @@ 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|
+          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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyper-component
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha1.4
+  version: 1.0.alpha1.5
 platform: ruby
 authors:
 - David Chang
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyper-state
@@ -20,28 +20,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.4
+        version: 1.0.alpha1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.4
+        version: 1.0.alpha1.5
 - !ruby/object:Gem::Dependency
   name: hyperstack-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.4
+        version: 1.0.alpha1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.4
+        version: 1.0.alpha1.5
 - !ruby/object:Gem::Dependency
   name: libv8
   requirement: !ruby/object:Gem::Requirement
@@ -164,14 +164,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.4
+        version: 1.0.alpha1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.4
+        version: 1.0.alpha1.5
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -431,6 +431,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
@@ -439,9 +440,12 @@ 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
@@ -489,7 +493,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.4
 signing_key: 
 specification_version: 4
 summary: Opal Ruby wrapper of React.js library.