hyper-react 0.11.0 → 0.12.0

data/spec/react/param_declaration_spec.rb

@@ -66,7 +66,16 @@ describe 'the param macro', type: :component do
       end
     end
 
+    %x{
+      var log = [];
+      var org_warn_console =  window.console.warn;
+      var org_error_console = window.console.error;
+      window.console.warn = window.console.error = function(str){log.push(str)}
+    }
     expect(Foo).to render_static_html('<div>12-string</div>').with_params(foo1: 12, foo2: "string")
+    `window.console.warn = org_warn_console; window.console.error = org_error_console;`
+
+    expect(`log[0]`).to match(/Warning: Failed prop( type|Type): In component `Foo`\nProvided prop `foo1` could not be converted to String/)
   end
 
   it 'logs error in warning if validation failed' do

data/spec/react/react_spec.rb

@@ -201,13 +201,6 @@ RSpec.describe React, type: :component do
     end
   end
 
-  describe "render_to_string" do
-    it "should render a React.Element to string" do
-      ele = React.create_element('span') { "lorem" }
-      expect(React.render_to_string(ele)).to be_kind_of(String)
-    end
-  end
-
   describe "unmount_component_at_node" do
     async "should unmount component at node" do
       div = `document.createElement("div")`

data/spec/react/refs_callback_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+if opal?
+
+describe 'Refs callback' do
+  before do
+    stub_const 'Foo', Class.new
+    Foo.class_eval do
+      include React::Component
+    end
+  end
+
+  it "is invoked with the actual Ruby instance" do
+    stub_const 'Bar', Class.new
+    Bar.class_eval do
+      include React::Component
+      def render
+        React.create_element('div')
+      end
+    end
+
+    Foo.class_eval do
+      def my_bar=(bar)
+        $bar = bar
+      end
+
+      def render
+        React.create_element(Bar, ref: method(:my_bar=).to_proc)
+      end
+    end
+
+    element = React.create_element(Foo)
+    React::Test::Utils.render_into_document(element)
+    expect($bar).to be_a(Bar)
+    $bar = nil
+  end
+
+  it "is invoked with the actual DOM node" do
+    Foo.class_eval do
+      def my_div=(div)
+        $div = div
+      end
+
+      def render
+        React.create_element('div', ref: method(:my_div=).to_proc)
+      end
+    end
+
+    element = React.create_element(Foo)
+    React::Test::Utils.render_into_document(element)
+    expect(`#{$div}.nodeType`).to eq(1)
+    $div = nil
+  end
+end
+
+end

data/spec/react/server_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+if opal?
+
+RSpec.describe React::Server do
+  after(:each) do
+    React::API.clear_component_class_cache
+  end
+
+  describe "render_to_string" do
+    it "should render a React.Element to string" do
+      ele = React.create_element('span') { "lorem" }
+      expect(React::Server.render_to_string(ele)).to be_kind_of(String)
+    end
+  end
+
+  describe "render_to_static_markup" do
+    it "should render a React.Element to static markup" do
+      ele = React.create_element('span') { "lorem" }
+      expect(React::Server.render_to_static_markup(ele)).to eq("<span>lorem</span>")
+    end
+  end
+end
+
+end

data/spec/react/state_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 if opal?
 describe 'React::State' do
-  it "can created static exported states" do
+  it "can create dynamically initialized exported states" do
     stub_const 'Foo', Class.new
     Foo.class_eval do
       include React::Component
       export_state(:foo) { 'bar' }
     end
-
+    Hyperloop::Application::Boot.run
     expect(Foo.foo).to eq('bar')
   end
 
@@ -45,7 +45,7 @@ describe 'React::State' do
       var org_error_console = window.console.error;
       window.console.warn = window.console.error = function(str){log.push(str)}
     }
-    markup = React.render_to_static_markup(React.create_element(StateTest))
+    markup = React::Server.render_to_static_markup(React.create_element(StateTest))
     `window.console.warn = org_warn_console; window.console.error = org_error_console;`
     expect(markup).to eq('<span>Boom</span>')
     expect(StateTest.boom).to be_falsy

data/spec/react/top_level_component_spec.rb

@@ -45,7 +45,7 @@ def render_top_level(controller, component_name)
     render_params: {}
   }
   element = React.create_element(React::TopLevelRailsComponent, params)
-  React.render_to_static_markup(element)
+  React::Server.render_to_static_markup(element)
 end
 
 describe React::TopLevelRailsComponent do

data/spec/spec_helper.rb

@@ -15,14 +15,44 @@ end
 
 if RUBY_ENGINE == 'opal'
   require File.expand_path('../vendor/jquery-2.2.4.min', __FILE__)
-  require 'react/react-source'
+  require 'react/react-source-browser'
+  require 'react/react-source-server'
   require 'hyper-react'
   require 'react/test/rspec'
   require 'react/test/utils'
   require 'react/top_level_render'
+  require 'react/ref_callback'
+  require 'react/server'
 
   require File.expand_path('../support/react/spec_helpers', __FILE__)
 
+  # turn off deprecation warnings for old style name spaces during this test
+  module React
+    module Component
+
+      def self.included(base)
+        # deprecation_warning base, "The module name React::Component has been deprecated.  Use Hyperloop::Component::Mixin instead."
+        base.include Hyperloop::Component::Mixin
+      end
+
+      class Base
+        def self.inherited(child)
+          # 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
+  end
+
+  module React
+    class State
+      # this messes with lots of tests, these tests will be retested in the new hyper-component gem tests
+      ALWAYS_UPDATE_STATE_AFTER_RENDER = false
+    end
+  end
+
   module Opal
     module RSpec
       module AsyncHelpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyper-react
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - David Chang
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -54,6 +54,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hyper-store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hyperloop-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +208,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +292,7 @@ files:
 - gemfiles/opal_0.9_react_13.gemfile
 - gemfiles/opal_0.9_react_14.gemfile
 - gemfiles/opal_0.9_react_15.gemfile
+- gemfiles/opal_master_react_15.gemfile
 - hyper-react.gemspec
 - lib/generators/reactive_ruby/test_app/templates/assets/javascripts/components.rb
 - lib/generators/reactive_ruby/test_app/templates/assets/javascripts/test_application.rb
@@ -261,6 +318,9 @@ files:
 - lib/react/component/props_wrapper.rb
 - lib/react/component/should_component_update.rb
 - lib/react/component/tags.rb
+- lib/react/config.rb
+- lib/react/config/client.rb.erb
+- lib/react/config/server.rb
 - lib/react/element.rb
 - lib/react/event.rb
 - lib/react/ext/hash.rb
@@ -269,10 +329,13 @@ files:
 - lib/react/hash.rb
 - lib/react/native_library.rb
 - lib/react/object.rb
-- lib/react/observable.rb
+- lib/react/react-source-browser.rb
+- lib/react/react-source-server.rb
 - lib/react/react-source.rb
+- lib/react/ref_callback.rb
 - lib/react/rendering_context.rb
-- lib/react/state.rb
+- lib/react/server.rb
+- lib/react/state_wrapper.rb
 - lib/react/test.rb
 - lib/react/test/dsl.rb
 - lib/react/test/matchers/render_html_matcher.rb
@@ -294,10 +357,6 @@ files:
 - lib/reactrb/auto-import.rb
 - lib/reactrb/deep-compare.rb
 - lib/reactrb/new-event-name-convention.rb
-- lib/sources/react-latest.js
-- lib/sources/react-v13.js
-- lib/sources/react-v14.js
-- lib/sources/react-v15.js
 - logo1.png
 - logo2.png
 - logo3.png
@@ -316,6 +375,8 @@ files:
 - spec/react/opal_jquery_extensions_spec.rb
 - spec/react/param_declaration_spec.rb
 - spec/react/react_spec.rb
+- spec/react/refs_callback_spec.rb
+- spec/react/server_spec.rb
 - spec/react/state_spec.rb
 - spec/react/test/dsl_spec.rb
 - spec/react/test/matchers/render_html_matcher_spec.rb
@@ -354,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Opal Ruby wrapper of React.js library.
@@ -373,6 +434,8 @@ test_files:
 - spec/react/opal_jquery_extensions_spec.rb
 - spec/react/param_declaration_spec.rb
 - spec/react/react_spec.rb
+- spec/react/refs_callback_spec.rb
+- spec/react/server_spec.rb
 - spec/react/state_spec.rb
 - spec/react/test/dsl_spec.rb
 - spec/react/test/matchers/render_html_matcher_spec.rb

data/lib/react/observable.rb

@@ -1,29 +0,0 @@
-module React
-  class Observable
-    def initialize(value, on_change = nil, &block)
-      @value = value
-      @on_change = on_change || block
-    end
-
-    def method_missing(method_sym, *args, &block)
-      @value.send(method_sym, *args, &block).tap { |result| @on_change.call @value }
-    end
-
-    def respond_to?(method, *args)
-      if [:call, :to_proc].include? method
-        true
-      else
-        @value.respond_to? method, *args
-      end
-    end
-
-    def call(new_value)
-      @on_change.call new_value
-      @value = new_value
-    end
-
-    def to_proc
-      lambda { |arg = @value| @on_change.call arg }
-    end
-  end
-end

data/lib/react/state.rb

@@ -1,191 +0,0 @@
-module React
-  class StateWrapper < BasicObject
-    def initialize(native, from)
-      @state_hash = Hash.new(`#{native}.state`)
-      @from = from
-    end
-
-    def [](state)
-      @state_hash[state]
-    end
-
-    def []=(state, new_value)
-      @state_hash[state] = new_value
-    end
-
-    def method_missing(method, *args)
-      if match = method.match(/^(.+)\!$/)
-        key_name = $1
-        if args.count > 0
-          current_value = State.get_state(@from, match[1])
-          State.set_state(@from, key_name, args[0])
-          current_value
-        else
-          current_state = State.get_state(@from, match[1])
-          State.set_state(@from, key_name, current_state)
-          Observable.new(current_state) do |update|
-            State.set_state(@from, key_name, update)
-          end
-        end
-      else
-        State.get_state(@from, method)
-      end
-    end
-  end
-
-  class State
-
-    @rendering_level = 0
-
-    class << self
-      attr_reader :current_observer
-
-      def has_observers?(object, name)
-        !observers_by_name[object][name].empty?
-      end
-
-      def bulk_update
-        saved_bulk_update_flag = @bulk_update_flag
-        @bulk_update_flag = true
-        yield
-      ensure
-        @bulk_update_flag = saved_bulk_update_flag
-      end
-
-      def set_state2(object, name, value, updates, exclusions = nil)
-        # set object's name state to value, tell all observers it has changed.
-        # Observers must implement update_react_js_state
-        object_needs_notification = object.respond_to? :update_react_js_state
-        observers_by_name[object][name].dup.each do |observer|
-          next if exclusions && exclusions.include?(observer)
-          updates[observer] += [object, name, value]
-          object_needs_notification = false if object == observer
-        end
-        updates[object] += [nil, name, value] if object_needs_notification
-      end
-
-      def initialize_states(object, initial_values) # initialize objects' name/value pairs
-        states[object].merge!(initial_values || {})
-      end
-
-      def get_state(object, name, current_observer = @current_observer)
-        # get current value of name for object, remember that the current object depends on this state,
-        # current observer can be overriden with last param
-        if current_observer && !new_observers[current_observer][object].include?(name)
-          new_observers[current_observer][object] << name
-        end
-        if @delayed_updates && @delayed_updates[object][name]
-          @delayed_updates[object][name][1] << current_observer
-        end
-        states[object][name]
-      end
-
-      def set_state(object, name, value, delay=nil)
-        states[object][name] = value
-        if delay || @bulk_update_flag
-          @delayed_updates ||= Hash.new { |h, k| h[k] = {} }
-          @delayed_updates[object][name] = [value, Set.new]
-          @delayed_updater ||= after(0.001) do
-            delayed_updates = @delayed_updates
-            @delayed_updates = Hash.new { |h, k| h[k] = {} } # could this be nil???
-            @delayed_updater = nil
-            updates = Hash.new { |hash, key| hash[key] = Array.new }
-            delayed_updates.each do |object, name_hash|
-              name_hash.each do |name, value_and_set|
-                set_state2(object, name, value_and_set[0], updates, value_and_set[1])
-              end
-            end
-            updates.each { |observer, args| observer.update_react_js_state(*args) }
-          end
-        elsif @rendering_level == 0
-          updates = Hash.new { |hash, key| hash[key] = Array.new }
-          set_state2(object, name, value, updates)
-          updates.each { |observer, args| observer.update_react_js_state(*args) }
-        end
-        value
-      end
-
-      def notify_observers(object, name, value)
-        object_needs_notification = object.respond_to? :update_react_js_state
-        observers_by_name[object][name].dup.each do |observer|
-          observer.update_react_js_state(object, name, value)
-          object_needs_notification = false if object == observer
-        end
-        object.update_react_js_state(nil, name, value) if object_needs_notification
-      end
-
-      def notify_observers_after_thread_completes(object, name, value)
-        (@delayed_updates ||= []) << [object, name, value]
-        @delayed_updater ||= after(0) do
-          delayed_updates = @delayed_updates
-          @delayed_updates = []
-          @delayed_updater = nil
-          delayed_updates.each { |args| notify_observers(*args) }
-        end
-      end
-
-      def will_be_observing?(object, name, current_observer)
-        current_observer && new_observers[current_observer][object].include?(name)
-      end
-
-      def is_observing?(object, name, current_observer)
-        current_observer && observers_by_name[object][name].include?(current_observer)
-      end
-
-      def update_states_to_observe(current_observer = @current_observer)  # should be called after the last after_render callback, currently called after components render method
-        raise "update_states_to_observer called outside of watch block" unless current_observer
-        current_observers[current_observer].each do |object, names|
-          names.each do |name|
-            observers_by_name[object][name].delete(current_observer)
-          end
-        end
-        observers = current_observers[current_observer] = new_observers[current_observer]
-        new_observers.delete(current_observer)
-        observers.each do |object, names|
-          names.each do |name|
-            observers_by_name[object][name] << current_observer
-          end
-        end
-      end
-
-      def remove # call after component is unmounted
-        raise "remove called outside of watch block" unless @current_observer
-        current_observers[@current_observer].each do |object, names|
-          names.each do |name|
-            observers_by_name[object][name].delete(@current_observer)
-          end
-        end
-        current_observers.delete(@current_observer)
-      end
-
-      def set_state_context_to(observer, rendering = nil) # wrap all execution that may set or get states in a block so we know which observer is executing
-        if `typeof Opal.global.reactive_ruby_timing !== 'undefined'`
-          @nesting_level = (@nesting_level || 0) + 1
-          start_time = Time.now.to_f
-          observer_name = (observer.class.respond_to?(:name) ? observer.class.name : observer.to_s) rescue "object:#{observer.object_id}"
-        end
-        saved_current_observer = @current_observer
-        @current_observer = observer
-        @rendering_level += 1 if rendering
-        return_value = yield
-        return_value
-      ensure
-        @current_observer = saved_current_observer
-        @rendering_level -= 1 if rendering
-        @nesting_level = [0, @nesting_level - 1].max if `typeof Opal.global.reactive_ruby_timing !== 'undefined'`
-        return_value
-      end
-
-      def states
-        @states ||= Hash.new { |h, k| h[k] = {} }
-      end
-
-      [:new_observers, :current_observers, :observers_by_name].each do |method_name|
-        define_method(method_name) do
-          instance_variable_get("@#{method_name}") ||
-          instance_variable_set("@#{method_name}", Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = [] } })
-        end
-      end
-    end
-  end
-end