moved component config event native_library object server state_wrapper to_key top_level and validator

catmando · catmando · commit 0ee79eadadd4 · 2018-10-19T19:31:51.000-04:00
diff --git a/ruby/hyper-component/lib/hyper-component.rb b/ruby/hyper-component/lib/hyper-component.rb
@@ -1,28 +1,28 @@
-require 'hyperstack-config'
+require 'hyperstack/internal/component'
+
 Hyperstack.import    'hyper-state'
 Hyperstack.js_import 'react/react-source-browser', client_only: true, defines: %w[ReactDOM React]
 Hyperstack.js_import 'react/react-source-server', server_only: true, defines: 'React'
 Hyperstack.import    'browser/delay', client_only: true
 Hyperstack.js_import 'react_ujs', defines: 'ReactRailsUJS'
 Hyperstack.import    'hyper-component'  # TODO: confirm this does not break anything.  Added while converting hyperloop->hyperstack
+
 if RUBY_ENGINE == 'opal'
   require 'native'
   require 'hyperstack/state/observer'
-  require 'react/validator'
+  require 'hyperstack/internal/component/validator'
   require 'react/element'
   require 'hyperstack/internal/component/react_wrapper'
-  require 'react/component'
-  #require 'react/component/dsl_instance_methods'
+  require 'hyperstack/component'
   require 'hyperstack/internal/component/should_component_update'
   require 'hyperstack/internal/component/tags'
-  require 'react/event'
+  require 'hyperstack/component/event'
   require 'react/rendering_context'
-  #require 'react/state'
-  require 'react/object'
-  require 'react/to_key'
+  require 'hyperstack/ext/component/object'
+  require 'hyperstack/ext/component/number'
+  require 'hyperstack/ext/component/boolean'
   require 'reactive-ruby/isomorphic_helpers'
-  require 'react/top_level'
-  #require 'react/top_level_render'
+  require 'hyperstack/component/react_api'
   require 'hyperstack/internal/component/top_level_rails_component'
   require 'reactive-ruby/version'
 else
diff --git a/ruby/hyper-component/lib/hyperstack/component.rb b/ruby/hyper-component/lib/hyperstack/component.rb
@@ -3,12 +3,12 @@
 require 'active_support/core_ext/class/attribute'
 require 'hyperstack/internal/component/callbacks'
 require 'react/rendering_context'
-require 'react/state_wrapper'
 require 'hyperstack/internal/component'
 require 'hyperstack/internal/component/instance_methods'
 require 'hyperstack/internal/component/class_methods'
 require 'hyperstack/internal/component/props_wrapper'
 module Hyperstack
+
   module Component
 
     def self.included(base)
diff --git a/ruby/hyper-component/lib/hyperstack/component/event.rb b/ruby/hyper-component/lib/hyperstack/component/event.rb
diff --git a/ruby/hyper-component/lib/hyperstack/component/native_library.rb b/ruby/hyper-component/lib/hyperstack/component/native_library.rb
diff --git a/ruby/hyper-component/lib/hyperstack/component/react_api.rb b/ruby/hyper-component/lib/hyperstack/component/react_api.rb
diff --git a/ruby/hyper-component/lib/hyperstack/component/server.rb b/ruby/hyper-component/lib/hyperstack/component/server.rb
diff --git a/ruby/hyper-component/lib/hyperstack/ext/component/boolean.rb b/ruby/hyper-component/lib/hyperstack/ext/component/boolean.rb
@@ -0,0 +1,14 @@
+# to_key method returns a suitable unique id that can be used as
+# a react `key`.  Other classes may override to_key as needed
+# for example hyper_mesh returns the object id of the internal
+# backing record.
+#
+# to_key is automatically called on objects passed as keys for
+# example Foo(key: my_object) results in Foo(key: my_object.to_key)
+
+# for Boolean to_key can be true or false
+class Boolean
+  def to_key
+    self
+  end
+end
diff --git a/ruby/hyper-component/lib/hyperstack/ext/component/number.rb b/ruby/hyper-component/lib/hyperstack/ext/component/number.rb
@@ -5,22 +5,10 @@
 #
 # to_key is automatically called on objects passed as keys for
 # example Foo(key: my_object) results in Foo(key: my_object.to_key)
-class Object
-  def to_key
-    object_id
-  end
-end
 
 # for Number to_key can just be the number itself
 class Number
   def to_key
     self
   end
 end
-
-# for Boolean to_key can be true or false
-class Boolean
-  def to_key
-    self
-  end
-end
diff --git a/ruby/hyper-component/lib/hyperstack/ext/component/object.rb b/ruby/hyper-component/lib/hyperstack/ext/component/object.rb
@@ -12,4 +12,14 @@ def const_missing(const_name)
       Hyperstack::Internal::Component::Tags.html_tag_class_for(const_name) || raise(e)
     end
   end
+  # to_key method returns a suitable unique id that can be used as
+  # a react `key`.  Other classes may override to_key as needed
+  # for example hyper_mesh returns the object id of the internal
+  # backing record.
+  #
+  # to_key is automatically called on objects passed as keys for
+  # example Foo(key: my_object) results in Foo(key: my_object.to_key)
+  def to_key
+    object_id
+  end
 end
diff --git a/ruby/hyper-component/lib/hyperstack/internal/component.rb b/ruby/hyper-component/lib/hyperstack/internal/component.rb
@@ -1,4 +1,9 @@
+require 'hyperstack-config'
+
 module Hyperstack
+
+  define_setting :prerendering, :off if RUBY_ENGINE != 'opal'
+
   module Internal
     module Component
       class << self
diff --git a/ruby/hyper-component/lib/hyperstack/internal/component/class_methods.rb b/ruby/hyper-component/lib/hyperstack/internal/component/class_methods.rb
@@ -52,7 +52,7 @@ def method_missing(name, *args, &children)
         end
 
         def validator
-          @validator ||= Hyperstack::Component::Internal::Validator.new(props_wrapper)
+          @validator ||= Validator.new(props_wrapper)
         end
 
         def prop_types
diff --git a/ruby/hyper-component/lib/hyperstack/internal/component/react_wrapper.rb b/ruby/hyper-component/lib/hyperstack/internal/component/react_wrapper.rb
@@ -1,4 +1,4 @@
-require 'react/native_library'
+require 'hyperstack/component/native_library'
 
 module Hyperstack
   module Internal
diff --git a/ruby/hyper-component/lib/hyperstack/internal/component/validator.rb b/ruby/hyper-component/lib/hyperstack/internal/component/validator.rb
@@ -1,12 +1,12 @@
 module Hyperstack
-  module Component
-    module Internal
+  module Internal
+    module Component
       class Validator
         attr_accessor :errors
         attr_reader :props_wrapper
         private :errors, :props_wrapper
 
-        def initialize(props_wrapper = Class.new(Hyperstack::Internal::Component::PropsWrapper))
+        def initialize(props_wrapper = Class.new(PropsWrapper))
           @props_wrapper = props_wrapper
         end
 
diff --git a/ruby/hyper-component/lib/react/config.rb b/ruby/hyper-component/lib/react/config.rb
diff --git a/ruby/hyper-component/lib/react/react-source.rb b/ruby/hyper-component/lib/react/react-source.rb
@@ -9,7 +9,7 @@
   require 'react.js'
   require "react-server.js"
 else
-  require "react/config"
+  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
diff --git a/ruby/hyper-component/lib/react/state_wrapper.rb b/ruby/hyper-component/lib/react/state_wrapper.rb
diff --git a/ruby/hyper-component/lib/reactive-ruby/isomorphic_helpers.rb b/ruby/hyper-component/lib/reactive-ruby/isomorphic_helpers.rb
@@ -1,4 +1,4 @@
-require "react/config"
+require "hyperstack/internal/component"
 
 module Hyperstack
   module Component
diff --git a/ruby/hyper-component/spec/react/misc_fixes_spec.rb b/ruby/hyper-component/spec/react/misc_fixes_spec.rb
@@ -115,7 +115,7 @@ class TestComp < HyperComponent
   #   )
   # end
 
-  it 'defines component spec methods' do
+  it 'defines component introspection methods (used by Hypertrace and Hyperconsole)' do
     mount "Foo" do
       class Foo
         include Hyperstack::Component
diff --git a/ruby/hyper-component/spec/react/validator_spec.rb b/ruby/hyper-component/spec/react/validator_spec.rb
@@ -1,11 +1,11 @@
 require "spec_helper"
 
-describe 'Hyperstack::Component::Internal::Validator', js: true do
+describe 'Hyperstack::Internal::Component::Validator', js: true do
   describe '#validate' do
     describe "Presence validation" do
       it "should check if required props provided" do
         evaluate_ruby do
-          VALIDATOR = Hyperstack::Component::Internal::Validator.new.build do
+          VALIDATOR = Hyperstack::Internal::Component::Validator.new.build do
             requires :foo
             requires :bar
           end
@@ -16,7 +16,7 @@
 
       it "should check if passed non specified prop" do
         evaluate_ruby do
-          VALIDATOR = Hyperstack::Component::Internal::Validator.new.build do
+          VALIDATOR = Hyperstack::Internal::Component::Validator.new.build do
             optional :foo
           end
         end
@@ -28,7 +28,7 @@
     describe "Type validation" do
       it "should check if passed value with wrong type" do
         evaluate_ruby do
-          VALIDATOR = Hyperstack::Component::Internal::Validator.new.build do
+          VALIDATOR = Hyperstack::Internal::Component::Validator.new.build do
             requires :foo, type: String
           end
         end
@@ -39,7 +39,7 @@
       it "should check if passed value with wrong custom type" do
         evaluate_ruby do
           class Bar; end
-          VALIDATOR = Hyperstack::Component::Internal::Validator.new.build do
+          VALIDATOR = Hyperstack::Internal::Component::Validator.new.build do
             requires :foo, type: Bar
           end
         end
@@ -49,7 +49,7 @@ class Bar; end
 
       it 'coerces native JS prop types to opal objects' do
         evaluate_ruby do
-          VALIDATOR = Hyperstack::Component::Internal::Validator.new.build do
+          VALIDATOR = Hyperstack::Internal::Component::Validator.new.build do
             requires :foo, type: JS.call(:eval, "(function () { return { x: 1 }; })();")
           end
         end
@@ -58,7 +58,7 @@ class Bar; end
 
       it 'coerces native JS values to opal objects' do
         evaluate_ruby do
-          VALIDATOR = Hyperstack::Component::Internal::Validator.new.build do
+          VALIDATOR = Hyperstack::Internal::Component::Validator.new.build do
             requires :foo, type: Array[Integer]
           end
         end
@@ -67,7 +67,7 @@ class Bar; end
 
       it "should support Array[Class] validation" do
         evaluate_ruby do
-          VALIDATOR = Hyperstack::Component::Internal::Validator.new.build do
+          VALIDATOR = Hyperstack::Internal::Component::Validator.new.build do
             requires :foo, type: Array[Hash]
           end
         end
@@ -85,7 +85,7 @@ class Bar; end
     describe "Limited values" do
       it "should check if passed value is not one of the specified values" do
         evaluate_ruby do
-          VALIDATOR = Hyperstack::Component::Internal::Validator.new.build do
+          VALIDATOR = Hyperstack::Internal::Component::Validator.new.build do
             requires :foo, values: [4,5,6]
           end
         end
@@ -98,7 +98,7 @@ class Bar; end
   it 'collects other params into a hash' do
     evaluate_ruby do
       PROPS = { foo: 'foo', bar: 'bar', biz: 'biz', baz: 'baz' }
-      VALIDATOR = Hyperstack::Component::Internal::Validator.new.build do
+      VALIDATOR = Hyperstack::Internal::Component::Validator.new.build do
         requires :foo
         optional :bar
         all_other_params :baz
@@ -116,7 +116,7 @@ def props
   describe "default_props" do
     it "should return specified default values" do
       evaluate_ruby do
-        VALIDATOR = Hyperstack::Component::Internal::Validator.new.build do
+        VALIDATOR = Hyperstack::Internal::Component::Validator.new.build do
           requires :foo, default: 10
           requires :bar
           optional :lorem, default: 20
diff --git a/ruby/hyper-component/spec/test_app/app/views/components.rb b/ruby/hyper-component/spec/test_app/app/views/components.rb
@@ -5,7 +5,7 @@
   #require 'react/ext/opal-jquery/element'
   require 'hyperstack/component/jquery'
 end
-require 'react/server'
+require 'hyperstack/component/server'
 require 'react/test/utils'
 require 'reactrb/auto-import'
 require 'js'
