moved callbacks instance_methods tags and top_level_component

Author: catmando

ruby/hyper-component/lib/hyper-component.rb

@@ -14,7 +14,7 @@
   require 'react/component'
   #require 'react/component/dsl_instance_methods'
   require 'react/component/should_component_update'
-  require 'react/component/tags'
+  require 'hyperstack/internal/component/tags'
   require 'react/component/base'
   require 'react/event'
   require 'react/rendering_context'
@@ -25,7 +25,7 @@
   require 'reactive-ruby/isomorphic_helpers'
   require 'react/top_level'
   #require 'react/top_level_render'
-  require 'rails-helpers/top_level_rails_component'
+  require 'hyperstack/internal/component/top_level_rails_component'
   require 'reactive-ruby/version'
 else
   require 'opal'

…y/hyper-component/lib/react/callbacks.rb …perstack/internal/component/callbacks.rbruby/hyper-component/lib/react/callbacks.rb renamed to ruby/hyper-component/lib/hyperstack/internal/component/callbacks.rb ruby/hyper-component/lib/react/callbacks.rb renamed to ruby/hyper-component/lib/hyperstack/internal/component/callbacks.rb

@@ -1,8 +1,8 @@
 require 'hyperstack-config'
 
 module Hyperstack
-  module Component
-    module Internal
+  module Internal
+    module Component
       module Callbacks
         def self.included(base)
           base.extend(ClassMethods)
@@ -22,7 +22,7 @@ module ClassMethods
           def define_callback(callback_name, &after_define_hook)
             wrapper_name = "_#{callback_name}_callbacks"
             define_singleton_method(wrapper_name) do
-              Hyperstack::Context.set_var(self, "@#{wrapper_name}", force: true) { [] }
+              Context.set_var(self, "@#{wrapper_name}", force: true) { [] }
             end
             define_singleton_method(callback_name) do |*args, &block|
               send(wrapper_name).concat(args)

…per-component/lib/react/component/api.rb …k/internal/component/instance_methods.rbruby/hyper-component/lib/react/component/api.rb renamed to ruby/hyper-component/lib/hyperstack/internal/component/instance_methods.rb ruby/hyper-component/lib/react/component/api.rb renamed to ruby/hyper-component/lib/hyperstack/internal/component/instance_methods.rb

@@ -1,11 +1,11 @@
 require "react/children"
 
 module Hyperstack
-  module Component
-    module Internal
+  module Internal
+    module Component
       module InstanceMethods
         def children
-          Children.new(`#{@native}.props.children`)
+          Hyperstack::Component::Children.new(`#{@native}.props.children`)
         end
 
         def params

…er-component/lib/react/component/tags.rb …ib/hyperstack/internal/component/tags.rbruby/hyper-component/lib/react/component/tags.rb renamed to ruby/hyper-component/lib/hyperstack/internal/component/tags.rb ruby/hyper-component/lib/react/component/tags.rb renamed to ruby/hyper-component/lib/hyperstack/internal/component/tags.rb

@@ -1,6 +1,6 @@
 module Hyperstack
-  module Component
-    module Internal    # contains the name of all HTML tags, and the mechanism to register a component
+  module Internal
+    module Component    # contains the name of all HTML tags, and the mechanism to register a component
       # class as a new tag
       module Tags
         HTML_TAGS = %w(a abbr address area article aside audio b base bdi bdo big blockquote body br
@@ -26,7 +26,7 @@ module Tags
         HTML_TAGS.each do |tag|
 
           define_method(tag.upcase) do |*params, &children|
-            RenderingContext.render(tag, *params, &children)
+            Hyperstack::Component::Internal::RenderingContext.render(tag, *params, &children)
           end
 
           const_set tag.upcase, tag
@@ -35,7 +35,7 @@ module Tags
           if tag == 'p'
             define_method(tag) do |*params, &children|
               if children || params.count == 0 || (params.count == 1 && params.first.is_a?(Hash))
-                RenderingContext.render(tag, *params, &children)
+                Hyperstack::Component::Internal::RenderingContext.render(tag, *params, &children)
               else
                 Kernel.p(*params)
               end
@@ -50,7 +50,7 @@ module Tags
         def self.html_tag_class_for(tag)
           downcased_tag = tag.downcase
           if tag =~ /[A-Z]+/ && HTML_TAGS.include?(downcased_tag)
-            Object.const_set tag, ReactWrapper.create_element(downcased_tag)
+            Object.const_set tag, Hyperstack::Component::Internal::ReactWrapper.create_element(downcased_tag)
           end
         end
 
@@ -59,7 +59,7 @@ def self.html_tag_class_for(tag)
 
         def method_missing(name, *params, &children)
           component = find_component(name)
-          return RenderingContext.render(component, *params, &children) if component
+          return Hyperstack::Component::Internal::RenderingContext.render(component, *params, &children) if component
           super
         end
 
@@ -71,11 +71,11 @@ def included(component)
             name, parent = find_name_and_parent(component)
             tag_names_module = Module.new do
               define_method name do |*params, &children|
-                RenderingContext.render(component, *params, &children)
+                Hyperstack::Component::Internal::RenderingContext.render(component, *params, &children)
               end
               # handle deprecated _as_node style
               define_method "#{name}_as_node" do |*params, &children|
-                RenderingContext.build_only(component, *params, &children)
+                Hyperstack::Component::Internal::RenderingContext.build_only(component, *params, &children)
               end
             end
             parent.extend(tag_names_module)
@@ -103,8 +103,6 @@ def find_component(name)
 
         def lookup_const(name)
           return nil unless name =~ /^[A-Z]/
-          #html_tag = React::Component::Tags.html_tag_class(name)
-          #return html_tag if html_tag
           scopes = self.class.name.to_s.split('::').inject([Module]) do |nesting, next_const|
             nesting + [nesting.last.const_get(next_const)]
           end.reverse

…ils-helpers/top_level_rails_component.rb …l/component/top_level_rails_component.rbruby/hyper-component/lib/rails-helpers/top_level_rails_component.rb renamed to ruby/hyper-component/lib/hyperstack/internal/component/top_level_rails_component.rb ruby/hyper-component/lib/rails-helpers/top_level_rails_component.rb renamed to ruby/hyper-component/lib/hyperstack/internal/component/top_level_rails_component.rb

@@ -167,7 +167,7 @@ def self.create_element(type, *args, &block)
             params << ncc
           elsif type.is_a?(Class)
             params << create_native_react_class(type)
-          elsif block_given? || Tags::HTML_TAGS.include?(type)
+          elsif block_given? || Hyperstack::Internal::Component::Tags::HTML_TAGS.include?(type)
             params << type
           elsif type.is_a?(String)
             return Element.new(type)

ruby/hyper-component/lib/react/api.rb

@@ -1,10 +1,10 @@
 require 'react/ext/string'
 require 'react/ext/hash'
 require 'active_support/core_ext/class/attribute'
-require 'react/callbacks'
+require 'hyperstack/internal/component/callbacks'
 require 'react/rendering_context'
 require 'react/state_wrapper'
-require 'react/component/api'
+require 'hyperstack/internal/component/instance_methods'
 require 'react/component/class_methods'
 require 'react/component/props_wrapper'
 module Hyperstack
@@ -30,9 +30,9 @@ def self.force_update!
     def self.included(base)
       #base.include(Hyperstack::State::Observable)
       base.include(Hyperstack::State::Observer)
-      base.include(Internal::InstanceMethods)
-      base.include(Internal::Callbacks)
-      base.include(Internal::Tags)
+      base.include(Hyperstack::Internal::Component::InstanceMethods)
+      base.include(Hyperstack::Internal::Component::Callbacks)
+      base.include(Hyperstack::Internal::Component::Tags)
       #base.include(React::Component::DslInstanceMethods)
       base.include(Internal::ShouldComponentUpdate)
       base.class_eval do

ruby/hyper-component/lib/react/component.rb

@@ -9,7 +9,7 @@ def const_missing(const_name)
       # so we always call the original, and respond to the exception
       _reactrb_tag_original_const_missing(const_name)
     rescue StandardError => e
-      Hyperstack::Component::Internal::Tags.html_tag_class_for(const_name) || raise(e)
+      Hyperstack::Internal::Component::Tags.html_tag_class_for(const_name) || raise(e)
     end
   end
 end

ruby/hyper-component/lib/react/object.rb

@@ -1,6 +1,6 @@
 require "native"
 require 'active_support/core_ext/object/try'
-require 'react/component/tags'
+require 'hyperstack/internal/component/tags'
 require 'react/component/base'
 
 module Hyperstack
@@ -28,7 +28,7 @@ module ReactAPI
                     viewBox x1 x2 x xlinkActuate xlinkArcrole xlinkHref xlinkRole
                     xlinkShow xlinkTitle xlinkType xmlBase xmlLang xmlSpace y1 y2 y)
       HASH_ATTRIBUTES = %w(data aria)
-      HTML_TAGS = Internal::Tags::HTML_TAGS
+      HTML_TAGS = Hyperstack::Internal::Component::Tags::HTML_TAGS
 
       def self.html_tag?(name)
         tags = HTML_TAGS

ruby/hyper-component/lib/react/top_level.rb

@@ -3,10 +3,10 @@
 describe 'redefining builtin tags', js: true do
   it "built in tags can be redefined" do
     mount 'Foo' do
-      Hyperstack::Component::Internal::Tags.remove_method :DIV
-      Hyperstack::Component::Internal::Tags.send(:remove_const, :DIV)
+      Hyperstack::Internal::Component::Tags.remove_method :DIV
+      Hyperstack::Internal::Component::Tags.send(:remove_const, :DIV)
 
-      class Hyperstack::Component::Internal::Tags::DIV #< HyperComponent
+      class Hyperstack::Internal::Component::Tags::DIV #< HyperComponent
         include Hyperstack::Component
         others :opts
         render do