hyper-react 1.0.0.lap22 → 1.0.0.lap23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 314d1859d8e8e051b18b90484662ae2526e3be84
-  data.tar.gz: 29c7e619fc9b697cb3ff46c789263a02885f83aa
+SHA256:
+  metadata.gz: 86768c3348a431a1b97b43fddcced051f69aa697270ddc39baa5ebf249f4d0d6
+  data.tar.gz: 32a0527f8adef0613cf12b8eacbc805e832207fd2bc05cbc92d918aa41c3b97b
 SHA512:
-  metadata.gz: 7990411e5e26fc997a3d1eed87fe34637e2b4b4e26e50b3baf9bba293e838b589d2caa37b24113c0249d8dc4c9b40e22441198fdcb4cc16ea478a713f2975719
-  data.tar.gz: efb54ea4ffa7d33616dcfea439774bfee7bbfdd5a1718340c3c92358677b4e46cdaa4cc803e95180f7903dcf9c7dc8b5384ec7dac14bb48f12c4d16b38075615
+  metadata.gz: bcb9c31c77e0efae816a0a67a91c0fbc02f63ab06ea2e014e31f943aff6c15ccc8500d1eb5f1ccff30158d232a90f87ab089492395f76c93858fdb4127eb2f57
+  data.tar.gz: f53942a3396b92b43ddd7194e171ba759b5005d3fc31266714fa10d72af34fed92276ec1bcf4f69b870fae69c0b3101f080e2b3aab06c02b0190bdacd22e4fdf

data/Appraisals

@@ -26,6 +26,6 @@ appraise "opal-master-react-15" do
   ruby '>= 2.0.0'
   gem 'opal', git: 'https://github.com/opal/opal.git'
   gem "opal-sprockets", git: 'https://github.com/opal/opal-sprockets.git'
-  gem 'opal-rails', '~> 0.9.0'
+  gem 'opal-rails', '~> 0.9.4'
   gem 'react-rails', '~> 2.4.0', require: false
 end

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 gem "opal-jquery", git: "https://github.com/opal/opal-jquery.git", branch: "master"
-gem "opal-rails", git: "https://github.com/opal/opal-rails.git", branch: "master"
 gemspec

data/Rakefile

@@ -1,30 +1,44 @@
-require 'bundler'
-Bundler.require
-Bundler::GemHelper.install_tasks
+# require 'bundler'
+# Bundler.require
+# Bundler::GemHelper.install_tasks
+#
+# # Store the BUNDLE_GEMFILE env, since rake or rspec seems to clean it
+# # while invoking task.
+# ENV['REAL_BUNDLE_GEMFILE'] = ENV['BUNDLE_GEMFILE']
+#
+# require 'rspec/core/rake_task'
+# require 'opal/rspec/rake_task'
+#
+# RSpec::Core::RakeTask.new('ruby:rspec')
+#
+# task :test do
+#   Rake::Task['ruby:rspec'].invoke
+# end
+#
+# require 'generators/reactive_ruby/test_app/test_app_generator'
+# desc "Generates a dummy app for testing"
+# task :test_app do
+#   ReactiveRuby::TestAppGenerator.start
+#   puts "Setting up test app database..."
+#   system("bundle exec rake db:drop db:create db:migrate > #{File::NULL}")
+# end
+#
+# task :test_prepare do
+#   system("./dciy_prepare.sh")
+# end
+#
+# task default: [ :test ]
 
-# Store the BUNDLE_GEMFILE env, since rake or rspec seems to clean it
-# while invoking task.
-ENV['REAL_BUNDLE_GEMFILE'] = ENV['BUNDLE_GEMFILE']
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-require 'rspec/core/rake_task'
-require 'opal/rspec/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-RSpec::Core::RakeTask.new('ruby:rspec')
-
-task :test do
-  Rake::Task['ruby:rspec'].invoke
-end
-
-require 'generators/reactive_ruby/test_app/test_app_generator'
-desc "Generates a dummy app for testing"
-task :test_app do
-  ReactiveRuby::TestAppGenerator.start
-  puts "Setting up test app database..."
-  system("bundle exec rake db:drop db:create db:migrate > #{File::NULL}")
-end
-
-task :test_prepare do
-  system("./dciy_prepare.sh")
+namespace :spec do
+  task :prepare do
+    sh %{bundle update}
+    sh %{cd spec/test_app; bundle update}
+  end
 end
 
-task default: [ :test ]
+task :default => :spec

data/dciy.toml

@@ -1,3 +1,3 @@
 [dciy.commands]
-prepare = ["./dciy_prepare.sh"]
-cibuild = ["./dciy_run.sh"]
+prepare = ["rake spec:prepare"]
+cibuild = ["bundle exec rake"]

data/hyper-react.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mime-types'
   spec.add_development_dependency 'nokogiri'
   spec.add_development_dependency 'opal-jquery'
-  spec.add_development_dependency 'opal-rails', '~> 0.9.3'
+  spec.add_development_dependency 'opal-rails', '~> 0.9.4'
   spec.add_development_dependency 'opal-rspec'
   spec.add_development_dependency 'rails', '>= 4.0.0'
   spec.add_development_dependency 'rails-controller-testing'

data/lib/react/api.rb

@@ -174,9 +174,9 @@ module React
         elsif key == 'ref' && value.is_a?(Proc)
           props[key] = %x{
                           function(dom_node){
-                            if (dom_node.__opalInstance !== undefined && dom_node.__opalInstance !== null) {
+                            if (dom_node !== null && dom_node.__opalInstance !== undefined && dom_node.__opalInstance !== null) {
                               #{ value.call(`dom_node.__opalInstance`) };
-                            } else if(ReactDOM.findDOMNode !== undefined && dom_node.nodeType === undefined) {
+                            } else if(dom_node !== null && ReactDOM.findDOMNode !== undefined && dom_node.nodeType === undefined) {
                               #{ value.call(`ReactDOM.findDOMNode(dom_node)`) };
                             } else {
                               #{ value.call(`dom_node`) };

data/lib/react/event.rb

@@ -31,27 +31,27 @@ module React
     # Focus
     alias_native :related_target, :relatedTarget
     # Mouse
-    alias_native :alt_key, :altKey
+    # aliased above: alias_native :alt_key, :altKey
     alias_native :button, :button
     alias_native :buttons, :buttons
     alias_native :client_x, :clientX
     alias_native :client_y, :clientY
-    alias_native :ctrl_key, :ctrlKey
+    # aliased above: alias_native :ctrl_key, :ctrlKey
     alias_native :get_modifier_state, :getModifierState
-    alias_native :meta_key, :metaKey
+    # aliased above: alias_native :meta_key, :metaKey
     alias_native :page_x, :pageX
     alias_native :page_y, :pageY
-    alias_native :related_target, :relatedTarget
+    # aliased above: alias_native :related_target, :relatedTarget
     alias_native :screen_x, :screen_x
     alias_native :screen_y, :screen_y
-    alias_native :shift_key, :shift_key
+    # aliased above: alias_native :shift_key, :shift_key
     # Touch
-    alias_native :alt_key, :altKey
+    # aliased above: alias_native :alt_key, :altKey
     alias_native :changed_touches, :changedTouches
-    alias_native :ctrl_key, :ctrlKey
-    alias_native :get_modifier_state, :getModifierState
-    alias_native :meta_key, :metaKey
-    alias_native :shift_key, :shiftKey
+    # aliased above: alias_native :ctrl_key, :ctrlKey
+    # aliased above: alias_native :get_modifier_state, :getModifierState
+    # aliased above: alias_native :meta_key, :metaKey
+    # aliased above: alias_native :shift_key, :shiftKey
     alias_native :target_touches, :targetTouches
     alias_native :touches, :touches
     # UI
@@ -64,10 +64,10 @@ module React
     alias_native :delta_z, :deltaZ
 
     BUILT_IN_EVENTS = %w{onCopy onCut onPaste onKeyDown onKeyPress onKeyUp
-      onFocus onBlur onChange onInput onSubmit onClick onDoubleClick onDrag
+      onFocus onBlur onChange onInput onSubmit onClick onContextMenu onDoubleClick onDrag
       onDragEnd onDragEnter onDragExit onDragLeave onDragOver onDragStart onDrop
       onMouseDown onMouseEnter onMouseLeave onMouseMove onMouseOut onMouseOver
-      onMouseUp onTouchCancel onTouchEnd onTouchMove onTouchStart onScroll}
+      onMouseUp onSelect onTouchCancel onTouchEnd onTouchMove onTouchStart onScroll onWheel}
 
     def initialize(native_element)
       @native = native_element

data/lib/react/ref_callback.rb

@@ -14,9 +14,9 @@ module React
       props.map do |key, value|
         if key == "ref" && value.is_a?(Proc)
           new_proc = Proc.new do |native_inst|
-            if `#{native_inst}.__opalInstance !== undefined && #{native_inst}.__opalInstance !== null`
+            if `#{native_inst} !== null && #{native_inst}.__opalInstance !== undefined && #{native_inst}.__opalInstance !== null`
               value.call(`#{native_inst}.__opalInstance`)
-            elsif `ReactDOM.findDOMNode !== undefined && #{native_inst}.nodeType === undefined`
+            elsif `#{native_inst} !== null &&  ReactDOM.findDOMNode !== undefined && #{native_inst}.nodeType === undefined`
               value.call(`ReactDOM.findDOMNode(#{native_inst})`) # react >= v0.15.`)
             else
               value.call(native_inst)

data/lib/reactive-ruby/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '1.0.0.lap22'
+  VERSION = '1.0.0.lap23'
 end

data/spec/react/refs_callback_spec.rb

@@ -59,7 +59,36 @@ describe 'Refs callback', js: true do
 
       element = React.create_element(Foo)
       React::Test::Utils.render_into_document(element)
-      "#{Foo.bar.JS['nodeType']}" # aboids json serialisation errors by using "#{}"
+      "#{Foo.bar.JS['nodeType']}" # avoids json serialisation errors by using "#{}"
     end.to eq("1")
   end
+
+  it "works, even when the component is unmounted" do
+    # was a bug, on unmount react calls the ref method with null instead of a dom node
+    # callback failed then
+    # ref is called two times, once on mount with dom_node, once on unmount with null
+    mount "Foo" do
+      class Unmountable < Hyperloop::Component
+        render do
+          DIV { "This is a Component" }
+        end
+      end
+      Foo.class_eval do
+        def ref_rec(dom_node)
+          @@rec_cnt ||= 0
+          @@rec_cnt += 1
+        end
+        def self.rec_cnt
+          @@rec_cnt
+        end
+
+        after_mount { mutate.unmount true }
+
+        render do
+          Unmountable(ref: method(:ref_rec).to_proc) unless state.unmount 
+        end
+      end
+    end
+    expect_evaluate_ruby('Foo.rec_cnt').to eq(2)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyper-react
 version: !ruby/object:Gem::Version
-  version: 1.0.0.lap22
+  version: 1.0.0.lap23
 platform: ruby
 authors:
 - David Chang
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyper-store
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.lap22
+        version: 1.0.0.lap23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.lap22
+        version: 1.0.0.lap23
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -81,14 +81,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.lap22
+        version: 1.0.0.lap23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.lap22
+        version: 1.0.0.lap23
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -165,14 +165,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: opal-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -341,8 +341,6 @@ files:
 - UPGRADING.md
 - component-name-lookup.md
 - dciy.toml
-- dciy_prepare.sh
-- dciy_run.sh
 - hyper-react.gemspec
 - lib/generators/reactive_ruby/test_app/templates/assets/javascripts/components.rb
 - lib/generators/reactive_ruby/test_app/templates/assets/javascripts/server_rendering.js
@@ -530,7 +528,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Opal Ruby wrapper of React.js library.

data/dciy_prepare.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-export HYPER_DEV_GEM_SOURCE='https://gems.ruby-hyperloop.org'
-export RAILS_ENV="test"
-bundle update
-cd spec/test_app
-bundle update
-bundle exec rails db:setup
-cd ../..

data/dciy_run.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-export HYPER_DEV_GEM_SOURCE="https://gems.ruby-hyperloop.org"
-export RAILS_ENV="test"
-pwd
-echo
-echo "Running with Chrome headless"
-DRIVER=headless bundle exec rspec
-# echo
-# echo "Running with Firefox headless"
-# DRIVER=beheaded bundle exec rspec