Merge pull request #182 from ruby-hyperloop/opal-0.10-support

Opal 0.10 support

Author: zetachang

.travis.yml

@@ -6,17 +6,29 @@ 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
   - gemfiles/opal_0.8_react_15.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

Appraisals

@@ -1,4 +1,4 @@
-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',
@@ -7,6 +7,7 @@ react_versions_map = {
 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|

config.ru

@@ -4,6 +4,8 @@ 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
   sprockets_env.cache = Sprockets::Cache::FileStore.new("tmp")

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 => "../"

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 => "../"

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.8.2", :require => false
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec :path => "../"

lib/react/api.rb

@@ -34,7 +34,8 @@ def self.eval_native_react_component(name)
       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

lib/react/component/props_wrapper.rb

@@ -35,11 +35,11 @@ def self.define_param(name, param_type)
           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]

lib/react/element.rb

@@ -25,7 +25,7 @@ class Element
 
     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

lib/react/top_level.rb

@@ -1,5 +1,5 @@
 require "native"
-require 'active_support'
+require 'active_support/core_ext/object/try'
 require 'react/component/tags'
 require 'react/component/base'