all specs passing with hyper-store embedded and new deprecations

Author: catmando

.rubocop.yml

@@ -716,7 +716,7 @@ Style/LineEndConcatenation:
                  line end.
   Enabled: false
 
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
   Description: 'Do not use parentheses for method calls with no arguments.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-args-no-parens'
   Enabled: false

Gemfile

@@ -1,7 +1,9 @@
 source 'https://rubygems.org'
 gemspec
 
-ruby ">= 1.9.3" 
+gem 'hyper-store', path: '../hyper-store'
+
+ruby ">= 1.9.3"
 
 group :development do
   gem "appraisal"

gemfiles/opal_0.10_react_15.gemfile

@@ -4,6 +4,8 @@ source "https://rubygems.org"
 
 ruby ">= 1.9.3"
 
+gem 'hyper-store', path: '../../hyper-store'
+
 gem "opal", "~> 0.10.0"
 gem "opal-rails", "~> 0.9.0"
 gem "react-rails", "~> 1.10.0", :require => false

hyper-react.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'opal', '>= 0.8.0'
   s.add_dependency 'opal-activesupport', '>= 0.2.0'
   s.add_dependency 'react-rails'
+  s.add_dependency 'hyper-store'
   s.add_development_dependency 'rake', '< 11.0'
   s.add_development_dependency 'rspec-rails', '3.3.3'
   s.add_development_dependency 'timecop'
@@ -33,6 +34,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mime-types', '< 3'
   s.add_development_dependency 'opal-rails'
   s.add_development_dependency 'nokogiri', '< 1.7'
+  s.add_development_dependency 'rubocop'
   if RUBY_PLATFORM == 'java'
     s.add_development_dependency 'jdbc-sqlite3'
     s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'

lib/hyper-react.rb

@@ -1,6 +1,12 @@
 
 
 if RUBY_ENGINE == 'opal'
+
+  module Hyperloop
+    class Component
+    end
+  end
+
   if `Opal.global.React === undefined || Opal.global.React.version === undefined`
     raise [
       "No React.js Available",
@@ -32,7 +38,17 @@
   require 'reactive-ruby/isomorphic_helpers'
   require 'rails-helpers/top_level_rails_component'
   require 'reactive-ruby/version'
-
+  module Hyperloop
+    class Component
+      def self.inherited(child)
+        child.include(Mixin)
+      end
+    end
+  end
+  React::Component.deprecation_warning(
+    'components.rb',
+    "Requiring 'hyper-react' is deprecated.  Use gem 'hyper-component', and require 'hyper-component' instead."
+  ) unless defined? Hyperloop::Component::VERSION
 else
   require 'opal'
   # rubocop:disable Lint/HandleExceptions

lib/rails-helpers/top_level_rails_component.rb

@@ -1,6 +1,6 @@
 module React
   class TopLevelRailsComponent
-    include React::Component
+    include Hyperloop::Component::Mixin
 
     def self.search_path
       @search_path ||= [Module]

lib/react/component.rb

@@ -3,137 +3,166 @@
 require 'active_support/core_ext/class/attribute'
 require 'react/callbacks'
 require 'react/rendering_context'
-require 'react/observable'
-require 'react/state'
+require 'hyper-store'
+require 'react/state_wrapper'
 require 'react/component/api'
 require 'react/component/class_methods'
 require 'react/component/props_wrapper'
 require 'native'
 
-module React
-  module Component
-    def self.included(base)
-      base.include(API)
-      base.include(Callbacks)
-      base.include(Tags)
-      base.include(DslInstanceMethods)
-      base.include(ShouldComponentUpdate)
-      base.class_eval do
-        class_attribute :initial_state
-        define_callback :before_mount
-        define_callback :after_mount
-        define_callback :before_receive_props
-        define_callback :before_update
-        define_callback :after_update
-        define_callback :before_unmount
-      end
-      base.extend(ClassMethods)
-    end
+module Hyperloop
+  class Component
+    module Mixin
+      def self.included(base)
+        base.include(Store::Mixin)
+        base.include(React::Component::API)
+        base.include(React::Component::Callbacks)
+        base.include(React::Component::Tags)
+        base.include(React::Component::DslInstanceMethods)
+        base.include(React::Component::ShouldComponentUpdate)
+        base.class_eval do
+          class_attribute :initial_state
+          define_callback :before_mount
+          define_callback :after_mount
+          define_callback :before_receive_props
+          define_callback :before_update
+          define_callback :after_update
+          define_callback :before_unmount
+        end
+        base.extend(React::Component::ClassMethods)
+      end
 
-    def self.deprecation_warning(message)
-      @deprecation_messages ||= []
-      message = "Warning: Deprecated feature used in #{name}. #{message}"
-      unless @deprecation_messages.include? message
-        @deprecation_messages << message
-        IsomorphicHelpers.log message, :warning
+      def self.deprecation_warning(message)
+        React::Component.deprecation_warning(name, message)
       end
-    end
 
-    def initialize(native_element)
-      @native = native_element
-    end
+      def deprecation_warning(message)
+        React::Component.deprecation_warning(self.class.name, message)
+      end
 
-    def emit(event_name, *args)
-      params["_on#{event_name.to_s.event_camelize}"].call(*args)
-    end
+      def initialize(native_element)
+        @native = native_element
+        init_store
+      end
 
-    def component_will_mount
-      IsomorphicHelpers.load_context(true) if IsomorphicHelpers.on_opal_client?
-      set_state! initial_state if initial_state
-      State.initialize_states(self, initial_state)
-      State.set_state_context_to(self) { run_callback(:before_mount) }
-    rescue Exception => e
-      self.class.process_exception(e, self)
-    end
+      def emit(event_name, *args)
+        params["_on#{event_name.to_s.event_camelize}"].call(*args)
+      end
 
-    def component_did_mount
-      State.set_state_context_to(self) do
-        run_callback(:after_mount)
-        State.update_states_to_observe
+      def component_will_mount
+        React::IsomorphicHelpers.load_context(true) if React::IsomorphicHelpers.on_opal_client?
+        # set_state! initial_state if initial_state
+        # State.initialize_states(self, initial_state)
+        React::State.set_state_context_to(self) { run_callback(:before_mount) }
+      rescue Exception => e
+        self.class.process_exception(e, self)
       end
-    rescue Exception => e
-      self.class.process_exception(e, self)
-    end
 
-    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
-      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
+      def component_did_mount
+        React::State.set_state_context_to(self) do
+          run_callback(:after_mount)
+          React::State.update_states_to_observe
+        end
+      rescue Exception => e
+        self.class.process_exception(e, self)
+      end
 
-    def component_will_update(next_props, next_state)
-      State.set_state_context_to(self) { self.run_callback(:before_update, Hash.new(next_props), Hash.new(next_state)) }
-    rescue Exception => e
-      self.class.process_exception(e, self)
-    end
+      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)) }
+      rescue Exception => e
+        self.class.process_exception(e, self)
+      end
 
-    def component_did_update(prev_props, prev_state)
-      State.set_state_context_to(self) do
-        self.run_callback(:after_update, Hash.new(prev_props), Hash.new(prev_state))
-        State.update_states_to_observe
+      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)) }
+      rescue Exception => e
+        self.class.process_exception(e, self)
       end
-    rescue Exception => e
-      self.class.process_exception(e, self)
-    end
 
-    def component_will_unmount
-      State.set_state_context_to(self) do
-        self.run_callback(:before_unmount)
-        State.remove
+      def component_did_update(prev_props, prev_state)
+        React::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
+        end
+      rescue Exception => e
+        self.class.process_exception(e, self)
       end
-    rescue Exception => e
-      self.class.process_exception(e, self)
-    end
 
-    attr_reader :waiting_on_resources
+      def component_will_unmount
+        React::State.set_state_context_to(self) do
+          self.run_callback(:before_unmount)
+          React::State.remove
+        end
+      rescue Exception => e
+        self.class.process_exception(e, self)
+      end
 
-    def update_react_js_state(object, name, value)
-      if object
-        name = "#{object.class}.#{name}" unless object == self
-        set_state(
-          '***_state_updated_at-***' => Time.now.to_f,
-          name => value
-        )
-      else
-        set_state name => value
+      attr_reader :waiting_on_resources
+
+      def update_react_js_state(object, name, value)
+        if object
+          name = "#{object.class}.#{name}" unless object == self
+          set_state(
+            '***_state_updated_at-***' => Time.now.to_f,
+            name => value
+          )
+        else
+          set_state name => value
+        end
       end
-    end
 
-    def render
-      raise 'no render defined'
-    end unless method_defined?(:render)
-
-    def _render_wrapper
-      State.set_state_context_to(self, true) do
-        element = React::RenderingContext.render(nil) { render || '' }
-        @waiting_on_resources =
-          element.waiting_on_resources if element.respond_to? :waiting_on_resources
-        element
-      end
-    # rubocop:disable Lint/RescueException # we want to catch all exceptions regardless
-    rescue Exception => e
-      # rubocop:enable Lint/RescueException
-      self.class.process_exception(e, self)
-    end
+      def render
+        raise 'no render defined'
+      end unless method_defined?(:render)
+
+      def _render_wrapper
+        React::State.set_state_context_to(self, true) do
+          element = React::RenderingContext.render(nil) { render || '' }
+          @waiting_on_resources =
+            element.waiting_on_resources if element.respond_to? :waiting_on_resources
+          element
+        end
+      # rubocop:disable Lint/RescueException # we want to catch all exceptions regardless
+      rescue Exception => e
+        # rubocop:enable Lint/RescueException
+        self.class.process_exception(e, self)
+      end
 
-    def watch(value, &on_change)
-      Observable.new(value, on_change)
+      def watch(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))
+      end
     end
+  end
+end
 
-    def define_state(*args, &block)
-      State.initialize_states(self, self.class.define_state(*args, &block))
+module React
+  module Component
+    def self.included(base)
+      # note this is turned off during old style testing:  See the spec_helper
+      deprecation_warning base, "The module name React::Component has been deprecated.  Use Hyperloop::Component::Mixin instead."
+      base.include Hyperloop::Component::Mixin
+    end
+    def self.deprecation_warning(name, message)
+      @deprecation_messages ||= []
+      message = "Warning: Deprecated feature used in #{name}. #{message}"
+      unless @deprecation_messages.include? message
+        @deprecation_messages << message
+        React::IsomorphicHelpers.log message, :warning
+      end
     end
   end
+  module ComponentNoNotice
+    def self.included(base)
+      base.include Hyperloop::Component::Mixin
+    end
+  end
+end
+
+module React
 end

lib/react/component/base.rb

@@ -2,7 +2,11 @@ module React
   module Component
     class Base
       def self.inherited(child)
-        child.include(Component)
+        # note this is turned off during old style testing:  See the spec_helper
+        unless child.to_s == "React::Component::HyperTestDummy"
+          React::Component.deprecation_warning child, "The class name React::Component::Base has been deprecated.  Use Hyperloop::Component instead."
+        end
+        child.include(ComponentNoNotice)
       end
     end
   end