no need to repeat react module when inside it

Author: ajjahn

lib/react/component.rb

@@ -13,7 +13,7 @@ module React
   module Component
     def self.included(base)
       base.include(API)
-      base.include(React::Callbacks)
+      base.include(Callbacks)
       base.class_eval do
         class_attribute :initial_state
         define_callback :before_mount
@@ -86,7 +86,7 @@ def method_missing(n, *args, &block)
             unless name && name.method_defined?(:render)
               return super
             end
-            React::RenderingContext.build_or_render(node_only, name, *args, &block)
+            RenderingContext.build_or_render(node_only, name, *args, &block)
           end
 
         end
@@ -131,16 +131,16 @@ def component_will_mount
       IsomorphicHelpers.load_context(true) if IsomorphicHelpers.on_opal_client?
       @props_wrapper = self.class.props_wrapper.new(Hash.new(`#{@native}.props`))
       set_state! initial_state if initial_state
-      React::State.initialize_states(self, initial_state)
-      React::State.set_state_context_to(self) { self.run_callback(:before_mount) }
+      State.initialize_states(self, initial_state)
+      State.set_state_context_to(self) { self.run_callback(:before_mount) }
     rescue Exception => e
       self.class.process_exception(e, self)
     end
 
     def component_did_mount
-      React::State.set_state_context_to(self) do
+      State.set_state_context_to(self) do
         self.run_callback(:after_mount)
-        React::State.update_states_to_observe
+        State.update_states_to_observe
       end
     rescue Exception => e
       self.class.process_exception(e, self)
@@ -149,7 +149,7 @@ def component_did_mount
     def component_will_receive_props(next_props)
       # need to rethink how this works in opal-react, or if its actually that useful within the react.rb environment
       # for now we are just using it to clear processed_params
-      React::State.set_state_context_to(self) { self.run_callback(:before_receive_props, Hash.new(next_props)) }
+      State.set_state_context_to(self) { self.run_callback(:before_receive_props, Hash.new(next_props)) }
     rescue Exception => e
       self.class.process_exception(e, self)
     end
@@ -160,7 +160,7 @@ def props_changed?(next_props)
     end
 
     def should_component_update?(next_props, next_state)
-      React::State.set_state_context_to(self) do
+      State.set_state_context_to(self) do
         next_props = Hash.new(next_props)
         if self.respond_to?(:needs_update?)
           !!self.needs_update?(next_props, Hash.new(next_state))
@@ -181,25 +181,25 @@ def should_component_update?(next_props, next_state)
     end
 
     def component_will_update(next_props, next_state)
-      React::State.set_state_context_to(self) { self.run_callback(:before_update, Hash.new(next_props), Hash.new(next_state)) }
+      State.set_state_context_to(self) { self.run_callback(:before_update, Hash.new(next_props), Hash.new(next_state)) }
       @props_wrapper = self.class.props_wrapper.new(Hash.new(next_props))
     rescue Exception => e
       self.class.process_exception(e, self)
     end
 
     def component_did_update(prev_props, prev_state)
-      React::State.set_state_context_to(self) do
+      State.set_state_context_to(self) do
         self.run_callback(:after_update, Hash.new(prev_props), Hash.new(prev_state))
-        React::State.update_states_to_observe
+        State.update_states_to_observe
       end
     rescue Exception => e
       self.class.process_exception(e, self)
     end
 
     def component_will_unmount
-      React::State.set_state_context_to(self) do
+      State.set_state_context_to(self) do
         self.run_callback(:before_unmount)
-        React::State.remove
+        State.remove
       end
     rescue Exception => e
       self.class.process_exception(e, self)
@@ -232,7 +232,7 @@ def method_missing(n, *args, &block)
         node_only = true
         name = name.gsub(/_as_node$/, "")
       end
-      unless (React::HTML_TAGS.include?(name) || name == 'present'  || name == '_p_tag' || (name = component?(name, self)))
+      unless (HTML_TAGS.include?(name) || name == 'present'  || name == '_p_tag' || (name = component?(name, self)))
         return super
       end
 
@@ -244,21 +244,21 @@ def method_missing(n, *args, &block)
         name = "p"
       end
 
-      React::RenderingContext.build_or_render(node_only, name, *args, &block)
+      RenderingContext.build_or_render(node_only, name, *args, &block)
     end
 
     def watch(value, &on_change)
-      React::Observable.new(value, on_change)
+      Observable.new(value, on_change)
     end
 
     def define_state(*args, &block)
-      React::State.initialize_states(self, self.class.define_state(*args, &block))
+      State.initialize_states(self, self.class.define_state(*args, &block))
     end
 
     attr_reader :waiting_on_resources
 
     def _render_wrapper
-      React::State.set_state_context_to(self) do
+      State.set_state_context_to(self) do
         RenderingContext.render(nil) {render || ""}.tap { |element| @waiting_on_resources = element.waiting_on_resources if element.respond_to? :waiting_on_resources }
       end
     rescue Exception => e

lib/react/component/base.rb

@@ -1,10 +1,8 @@
-require 'react/component'
-
 module React
   module Component
     class Base
       def self.inherited(child)
-        child.send(:include, React::Component)
+        child.include(Component)
       end
     end
   end

lib/react/component/class_methods.rb

@@ -114,7 +114,7 @@ def export_state(*states, &block)
         default_initial_value = (block && block.arity == 0) ? yield : nil
         states_hash = (states.last.is_a?(Hash)) ? states.pop : {}
         states.each { |name| states_hash[name] = default_initial_value }
-        React::State.initialize_states(self, states_hash)
+        State.initialize_states(self, states_hash)
         states_hash.each do |name, initial_value|
           define_state_methods(self, name, self, &block)
           define_state_methods(singleton_class, name, self, &block)
@@ -124,27 +124,27 @@ def export_state(*states, &block)
       def define_state_methods(this, name, from = nil, &block)
         this.define_method("#{name}") do
           self.class.deprecation_warning "Direct access to state `#{name}`.  Use `state.#{name}` instead." if from.nil? || from == this
-          React::State.get_state(from || self, name)
+          State.get_state(from || self, name)
         end
         this.define_method("#{name}=") do |new_state|
           self.class.deprecation_warning "Direct assignment to state `#{name}`.  Use `#{(from && from != this) ? from : 'state'}.#{name}!` instead."
-          yield name, React::State.get_state(from || self, name), new_state if block && block.arity > 0
-          React::State.set_state(from || self, name, new_state)
+          yield name, State.get_state(from || self, name), new_state if block && block.arity > 0
+          State.set_state(from || self, name, new_state)
         end
         this.define_method("#{name}!") do |*args|
           self.class.deprecation_warning "Direct access to state `#{name}`.  Use `state.#{name}` instead."  if from.nil? or from == this
           if args.count > 0
-            yield name, React::State.get_state(from || self, name), args[0] if block && block.arity > 0
-            current_value = React::State.get_state(from || self, name)
-            React::State.set_state(from || self, name, args[0])
+            yield name, State.get_state(from || self, name), args[0] if block && block.arity > 0
+            current_value = State.get_state(from || self, name)
+            State.set_state(from || self, name, args[0])
             current_value
           else
-            current_state = React::State.get_state(from || self, name)
-            yield name, React::State.get_state(from || self, name), current_state if block && block.arity > 0
-            React::State.set_state(from || self, name, current_state)
-            React::Observable.new(current_state) do |update|
-              yield name, React::State.get_state(from || self, name), update if block && block.arity > 0
-              React::State.set_state(from || self, name, update)
+            current_state = State.get_state(from || self, name)
+            yield name, State.get_state(from || self, name), current_state if block && block.arity > 0
+            State.set_state(from || self, name, current_state)
+            Observable.new(current_state) do |update|
+              yield name, State.get_state(from || self, name), update if block && block.arity > 0
+              State.set_state(from || self, name, update)
             end
           end
         end

lib/react/component/props_wrapper.rb

@@ -7,7 +7,7 @@ def self.define_param(name, param_type, owner)
         owner.define_method("#{name}") do
           deprecated_params_method("#{name}", *args, &block)
         end
-        if param_type == React::Observable
+        if param_type == Observable
           owner.define_method("#{name}!") do |*args|
             deprecated_params_method("#{name}!", *args)
           end

lib/react/state.rb

@@ -1,7 +1,5 @@
 module React
-
   class StateWrapper < BasicObject
-
     def initialize(native, from)
       @state_hash = Hash.new(`#{native}.state`)
       @from = from
@@ -18,23 +16,22 @@ def []=(state, new_value)
     def method_missing(method, *args)
       if match = method.match(/^(.+)\!$/)
         if args.count > 0
-          current_value = React::State.get_state(@from, match[1])
-          React::State.set_state(@from, $1, args[0])
+          current_value = State.get_state(@from, match[1])
+          State.set_state(@from, $1, args[0])
           current_value
         else
-          current_state = React::State.get_state(@from, match[1])
-          React::State.set_state(@from, $1, current_state)
-          React::Observable.new(current_state) do |update|
-            React::State.set_state(@from, $1, update)
+          current_state = State.get_state(@from, match[1])
+          State.set_state(@from, $1, current_state)
+          Observable.new(current_state) do |update|
+            State.set_state(@from, $1, update)
           end
         end
       else
-        React::State.get_state(@from, method)
+        State.get_state(@from, method)
       end
     end
   end
 
-
   class State
     class << self
       attr_reader :current_observer