hyper-react 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9734c02583fe5d4a7aee42da9c56733be0f9b1e
-  data.tar.gz: a69ec787eaab3f82efcee4dbff6f74e02e941894
+  metadata.gz: 9ce1a3a5b1c6327f4acec7ec587a1bca16c12738
+  data.tar.gz: 9268144dd28594592f79c11a99812876fd24c905
 SHA512:
-  metadata.gz: bc6d96170652d1b2f8d0dba3a8445ed44990ad276bdab89f9fba36c33f1198bb2c04036f8254f29daac210ef4281760e12aa17d45f4fe4e9da550641d4c2b058
-  data.tar.gz: 5cd77c77cd1d87a0d9ea86ad2fa0ad3bbdc1058d7ea7b09cd9502f8ebc4a5806953383f27cc3155937682146692d4ca0279696638f00b8bfa4a8bcb7a9947b44
+  metadata.gz: 76a870924c4762816df9eda0f50edba5e4a65bc5158490f08c11953752cd022dae5da7ff67f4933f9cd0e7c28d10700822872a162245fb247b359fb581589929
+  data.tar.gz: 65fbb0f11b47c7bb1d5182d5a80e5109f5b748b7b87f43125b0937b7a773c09364956ae0a5dd44ba7965ff8e8acdd25ddad3043371e42d4915d2061e66412ae2

data/.travis.yml

@@ -6,9 +6,8 @@ rvm:
   - jruby-19mode
 before_script:
   - phantomjs --version
-script:
-  - bundle exec rake test_app
-  - bundle exec rake
+env:
+  - PHANTOMJS_VERSION=1.9.8
 gemfile:
   - gemfiles/opal_0.8_react_13.gemfile
   - gemfiles/opal_0.8_react_14.gemfile
@@ -16,7 +15,20 @@ gemfile:
   - gemfiles/opal_0.9_react_13.gemfile
   - gemfiles/opal_0.9_react_14.gemfile
   - gemfiles/opal_0.9_react_15.gemfile
-
+cache:
+  directories:
+    - "travis_phantomjs"
+before_install:
+  - "phantomjs --version"
+  - "export PATH=$PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin:$PATH"
+  - "phantomjs --version"
+  - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
+  - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then wget https://github.com/Medium/phantomjs/releases/download/v$PHANTOMJS_VERSION/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2; fi"
+  - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
+  - "phantomjs --version"
+script:
+  - bundle exec rake test_app
+  - bundle exec rake
 # These two setup seems to run indefinitely long
 # further investigation required.
 matrix:
@@ -27,3 +39,13 @@ matrix:
     gemfile: gemfiles/opal_0.9_react_14.gemfile
   - rvm: jruby-19mode
     gemfile: gemfiles/opal_0.9_react_15.gemfile
+  include:
+  - rvm: 2.1
+    env: PHANTOMJS_VERSION=2.1.1
+    gemfile: gemfiles/opal_0.10_react_13.gemfile
+  - rvm: 2.1
+    env: PHANTOMJS_VERSION=2.1.1
+    gemfile: gemfiles/opal_0.10_react_14.gemfile
+  - rvm: 2.1
+    env: PHANTOMJS_VERSION=2.1.1
+    gemfile: gemfiles/opal_0.10_react_15.gemfile

data/Appraisals

@@ -1,12 +1,13 @@
-opal_versions = ['0.8', '0.9']
+opal_versions = ['0.8', '0.9', '0.10']
 react_versions_map = {
   '13' => '~> 1.3.3',
   '14' => '~> 1.6.2',
-  '15' => '~> 1.8.2'
+  '15' => '~> 1.10.0'
 }
 opal_rails_versions_map = {
   '0.8' => '~> 0.8.1',
   '0.9' => '~> 0.9.0',
+  '0.10' => '~> 0.9.0',
 }
 
 opal_versions.each do |opal_v|

data/CHANGELOG.md

@@ -18,6 +18,25 @@ Whitespace conventions:
 - 1 spaces before normal text
  -->
 
+## [0.11.0] - 2016-12-13
+
+### Changed
+
+- The whole opal-activesuppport is not loaded by default now. This gave us about 18% size reduction on the built file. If your code rely on any of the module which is not required by hyper-react, you need to require it yourself. (#135)
+
+### Deprecated
+
+- Current `React.render` behavior is deprecated. Require `"react/top_level_render"` to get the updated behavior. (#187)
+- `React.is_valid_element` is deprecated in favor of `React.is_valid_element?`.
+- `expect(component).to render('<div />')` is now deprecated in favor of `expect(component).to render_static_html('<div />')`, which is much clearer.
+
+### Fixed
+
+- `ReferenceError: window is not defined` error in prerender context with react-rails v1.10.0. (#196)
+- State might not be updated using `React::Observable` from a param. (#175)
+- Arity checking failed for `_react_param_conversion` & `React::Element#initialize` (#167)
+
+
 ## [0.10.0] - 2016-10-30
 
 ### Changed

data/README.md

@@ -1,9 +1,9 @@
 # hyper-react
 
 [![Join the chat at https://gitter.im/reactrb/chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/reactrb/chat?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/ruby-hyperloop/reactrb.svg?branch=master)](https://travis-ci.org/reactrb/reactrb)
+[![Build Status](https://travis-ci.org/ruby-hyperloop/hyper-react.svg?branch=master)](https://travis-ci.org/ruby-hyperloop/hyper-react)
 [![Code Climate](https://codeclimate.com/github/reactrb/reactrb/badges/gpa.svg)](https://codeclimate.com/github/reactrb/reactrb)
-[![Gem Version](https://badge.fury.io/rb/reactrb.svg)](https://badge.fury.io/rb/reactrb)
+[![Gem Version](https://badge.fury.io/rb/hyper-react.svg)](https://badge.fury.io/rb/hyper-react)
 
 **hyper-react is an [Opal Ruby](http://opalrb.org) wrapper of
 [React.js library](https://facebook.github.io/react)**.
@@ -107,7 +107,7 @@ Note that these are very simple examples, for the purpose of showing how to conf
 
 1. Run `bundle exec rake test_app` to generate a dummy test app.
 2. `bundle exec appraisal install` to generate separate gemfiles for different environments.
-2. `bundle exec appraisal opal-0.9-react-15 rake` to run test for opal-0.9 & react-v0.15.
+2. `bundle exec appraisal opal-0.10-react-15 rake` to run test for opal-0.10 & react-v0.15.
 
 ## Contributions
 

data/config.ru

@@ -2,7 +2,8 @@ require 'bundler'
 Bundler.require
 
 require "opal/rspec"
-require "opal-jquery"
+
+Opal::Config.arity_check_enabled = true
 
 if Opal::RSpec.const_defined?("SprocketsEnvironment")
   sprockets_env = Opal::RSpec::SprocketsEnvironment.new

data/gemfiles/opal_0.10_react_13.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "opal", "~> 0.10.0"
+gem "opal-rails", "~> 0.9.0"
+gem "react-rails", "~> 1.3.3", :require => false
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec :path => "../"

data/gemfiles/opal_0.10_react_14.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "opal", "~> 0.10.0"
+gem "opal-rails", "~> 0.9.0"
+gem "react-rails", "~> 1.6.2", :require => false
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec :path => "../"

data/gemfiles/opal_0.10_react_15.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "opal", "~> 0.10.0"
+gem "opal-rails", "~> 0.9.0"
+gem "react-rails", "~> 1.10.0", :require => false
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec :path => "../"

data/gemfiles/opal_0.8_react_15.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "opal", "~> 0.8.0"
 gem "opal-rails", "~> 0.8.1"
-gem "react-rails", "~> 1.8.2", :require => false
+gem "react-rails", "~> 1.10.0", :require => false
 
 group :development do
   gem "appraisal"

data/gemfiles/opal_0.9_react_15.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "opal", "~> 0.9.0"
 gem "opal-rails", "~> 0.9.0"
-gem "react-rails", "~> 1.8.2", :require => false
+gem "react-rails", "~> 1.10.0", :require => false
 
 group :development do
   gem "appraisal"

data/hyper-react.gemspec

@@ -21,7 +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_development_dependency 'rake'
+  s.add_development_dependency 'rake', '< 11.0'
   s.add_development_dependency 'rspec-rails', '3.3.3'
   s.add_development_dependency 'timecop'
   s.add_development_dependency 'opal-rspec'

data/lib/generators/reactive_ruby/test_app/templates/assets/javascripts/components.rb

@@ -1,4 +1,3 @@
 require 'opal'
-require 'react/react-source'
 require 'hyper-react'
 require_tree './components'

data/lib/hyper-react.rb

@@ -1,7 +1,7 @@
 
 
 if RUBY_ENGINE == 'opal'
-  if `window.React === undefined || window.React.version === undefined`
+  if `Opal.global.React === undefined || Opal.global.React.version === undefined`
     raise [
       "No React.js Available",
       "",
@@ -28,6 +28,7 @@ if RUBY_ENGINE == 'opal'
   require 'react/rendering_context'
   require 'react/state'
   require 'react/object'
+  require "react/ext/opal-jquery/element"
   require 'reactive-ruby/isomorphic_helpers'
   require 'rails-helpers/top_level_rails_component'
   require 'reactive-ruby/version'

data/lib/react/api.rb

@@ -27,14 +27,15 @@ module React
                             (`!!#{component}.prototype.isReactComponent` ||
                              `!!#{component}.prototype.render`)
       is_functional_component = `typeof #{component} === "function"`
-      is_not_using_react_v13 = `!window.React.version.match(/0\.13/)`
+      is_not_using_react_v13 = `!Opal.global.React.version.match(/0\.13/)`
       unless is_component_class || (is_not_using_react_v13 && is_functional_component)
         raise 'does not appear to be a native react component'
       end
       component
     end
 
-    def self.native_react_component?(name)
+    def self.native_react_component?(name = nil)
+      return false unless name
       eval_native_react_component(name)
     rescue
       nil

data/lib/react/component/class_methods.rb

@@ -181,8 +181,8 @@ module React
       def export_component(opts = {})
         export_name = (opts[:as] || name).split('::')
         first_name = export_name.first
-        Native(`window`)[first_name] = add_item_to_tree(
-          Native(`window`)[first_name],
+        Native(`Opal.global`)[first_name] = add_item_to_tree(
+          Native(`Opal.global`)[first_name],
           [React::API.create_native_react_class(self)] + export_name[1..-1].reverse
         ).to_n
       end

data/lib/react/component/props_wrapper.rb

@@ -35,11 +35,11 @@ module React
           define_method("#{name}") do
             fetch_from_cache(name) do
               if param_type.respond_to? :_react_param_conversion
-                param_type._react_param_conversion props[name]
+                param_type._react_param_conversion props[name], nil
               elsif param_type.is_a?(Array) &&
                 param_type[0].respond_to?(:_react_param_conversion)
                 props[name].collect do |param|
-                  param_type[0]._react_param_conversion param
+                  param_type[0]._react_param_conversion param, nil
                 end
               else
                 props[name]

data/lib/react/element.rb

@@ -25,7 +25,7 @@ module React
 
     attr_accessor :waiting_on_resources
 
-    def initialize(native_element, type, properties, block)
+    def initialize(native_element, type = nil, properties = {}, block = nil)
       @type = type
       @properties = (`typeof #{properties} === 'undefined'` ? nil : properties) || {}
       @block = block

data/lib/react/ext/opal-jquery/element.rb

@@ -0,0 +1,26 @@
+Element.instance_eval do
+  def self.find(selector)
+    selector = begin
+      selector.dom_node
+    rescue
+      selector
+    end if `#{selector}.$dom_node !== undefined`
+    `$(#{selector})`
+  end
+
+  def self.[](selector)
+    find(selector)
+  end
+
+  define_method :render do |container = nil, params = {}, &block|
+    if `#{self.to_n}._reactrb_component_class === undefined`
+      `#{self.to_n}._reactrb_component_class = #{Class.new(React::Component::Base)}`
+    end
+    klass = `#{self.to_n}._reactrb_component_class`
+    klass.class_eval do
+      render(container, params, &block)
+    end
+
+    React.render(React.create_element(`#{self.to_n}._reactrb_component_class`), self)
+  end
+end if Object.const_defined?('Element')

data/lib/react/state.rb

@@ -15,15 +15,16 @@ module React
 
     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, $1, args[0])
+          State.set_state(@from, key_name, args[0])
           current_value
         else
           current_state = State.get_state(@from, match[1])
-          State.set_state(@from, $1, current_state)
+          State.set_state(@from, key_name, current_state)
           Observable.new(current_state) do |update|
-            State.set_state(@from, $1, update)
+            State.set_state(@from, key_name, update)
           end
         end
       else
@@ -158,7 +159,7 @@ module React
       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 window.reactive_ruby_timing !== 'undefined'`
+        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}"
@@ -171,7 +172,7 @@ module React
       ensure
         @current_observer = saved_current_observer
         @rendering_level -= 1 if rendering
-        @nesting_level = [0, @nesting_level - 1].max if `typeof window.reactive_ruby_timing !== 'undefined'`
+        @nesting_level = [0, @nesting_level - 1].max if `typeof Opal.global.reactive_ruby_timing !== 'undefined'`
         return_value
       end
 

data/lib/react/test/matchers/render_html_matcher.rb

@@ -41,7 +41,12 @@ module React
         end
       end
 
+      def render_static_html(*args)
+        RenderHTMLMatcher.new(*args)
+      end
+
       def render(*args)
+        %x{ console.error("Warning: `render` matcher is deprecated in favor of `render_static_html`."); }
         RenderHTMLMatcher.new(*args)
       end
     end

data/lib/react/test/session.rb

@@ -1,8 +1,7 @@
 module React
   module Test
     class Session
-      DSL_METHODS = %i[mount instance native element update_params
-        force_update! html].freeze
+      DSL_METHODS = %i[mount instance update_params html].freeze
 
       def mount(component_klass, params = {})
         @element = React.create_element(component_klass, params)
@@ -11,35 +10,27 @@ module React
 
       def instance
         unless @instance
-          @native = Native(`React.addons.TestUtils.renderIntoDocument(#{element.to_n})`)
-          @instance = `#{@native.to_n}._getOpalInstance()`
+          @container = `document.createElement('div')`
+          @instance = React.render(@element, @container)
         end
         @instance
       end
 
-      def native
-        @native
-      end
-
-      def element
-        @element
-      end
-
-      def update_params(params)
-        cloned_element = React::Element.new(`React.cloneElement(#{self.element.to_n}, #{params.to_n})`)
-        prev_container = `#{self.instance.dom_node}.parentNode`
-        React.render(cloned_element, prev_container)
+      def update_params(params, &block)
+        cloned_element = React::Element.new(`React.cloneElement(#{@element.to_n}, #{params.to_n})`)
+        React.render(cloned_element, @container, &block)
         nil
       end
 
-      def force_update!
-        native.force_update!
-      end
-
       def html
-        # How can we get the current ReactElement w/o violating private APIs?
-        elem = Native(native[:_reactInternalInstance][:_currentElement])
-        React.render_to_static_markup(elem)
+        html = `#@container.innerHTML`
+        %x{
+            var REGEX_REMOVE_ROOT_IDS = /\s?data-reactroot="[^"]*"/g;
+            var REGEX_REMOVE_IDS = /\s?data-reactid="[^"]+"/g;
+            html = html.replace(REGEX_REMOVE_ROOT_IDS, '');
+            html = html.replace(REGEX_REMOVE_IDS, '');
+        }
+        return html
       end
     end
   end

data/lib/react/test/utils.rb

@@ -0,0 +1,25 @@
+module React
+  module Test
+    class Utils
+      `var ReactTestUtils = React.addons.TestUtils`
+
+      def self.render_into_document(element, options = {})
+        raise "You should pass a valid React::Element" unless React.is_valid_element?(element)
+        native_instance = `ReactTestUtils.renderIntoDocument(#{element.to_n})`
+
+        if `#{native_instance}._getOpalInstance !== undefined`
+          `#{native_instance}._getOpalInstance()`
+        elsif `ReactTestUtils.isDOMComponent(#{native_instance}) && React.findDOMNode !== undefined`
+          `React.findDOMNode(#{native_instance})`
+        else
+          native_instance
+        end
+      end
+
+      def self.simulate(event, element, params = {})
+        simulator = Native(`ReactTestUtils.Simulate`)
+        simulator[event.to_s].call(`element.$dom_node === undefined` ? element : element.dom_node, params)
+      end
+    end
+  end
+end