reactrb 0.8.8 → 0.9.0

data/lib/react/top_level.rb

@@ -1,22 +1,54 @@
 require "native"
 require 'active_support'
+require 'react/component/tags'
 require 'react/component/base'
 
 module React
 
   ATTRIBUTES = %w(accept acceptCharset accessKey action allowFullScreen allowTransparency alt
-                  async autoComplete autoPlay cellPadding cellSpacing charSet checked classID
-                  className cols colSpan content contentEditable contextMenu controls coords
-                  crossOrigin data dateTime defer dir disabled download draggable encType form
-                  formAction formEncType formMethod formNoValidate formTarget frameBorder height
-                  hidden href hrefLang htmlFor httpEquiv icon id label lang list loop manifest
-                  marginHeight marginWidth max maxLength media mediaGroup method min multiple
-                  muted name noValidate open pattern placeholder poster preload radioGroup
-                  readOnly rel required role rows rowSpan sandbox scope scrolling seamless
-                  selected shape size sizes span spellCheck src srcDoc srcSet start step style
-                  tabIndex target title type useMap value width wmode dangerouslySetInnerHTML)
-
+                async autoComplete autoPlay cellPadding cellSpacing charSet checked classID
+                className cols colSpan content contentEditable contextMenu controls coords
+                crossOrigin data dateTime defer dir disabled download draggable encType form
+                formAction formEncType formMethod formNoValidate formTarget frameBorder height
+                hidden href hrefLang htmlFor httpEquiv icon id label lang list loop manifest
+                marginHeight marginWidth max maxLength media mediaGroup method min multiple
+                muted name noValidate open pattern placeholder poster preload radioGroup
+                readOnly rel required role rows rowSpan sandbox scope scrolling seamless
+                selected shape size sizes span spellCheck src srcDoc srcSet start step style
+                tabIndex target title type useMap value width wmode dangerouslySetInnerHTML) +
+                #SVG ATTRIBUTES
+                %w(clipPath cx cy d dx dy fill fillOpacity fontFamily
+                fontSize fx fy gradientTransform gradientUnits markerEnd
+                markerMid markerStart offset opacity patternContentUnits
+                patternUnits points preserveAspectRatio r rx ry spreadMethod
+                stopColor stopOpacity stroke  strokeDasharray strokeLinecap
+                strokeOpacity strokeWidth textAnchor transform version
+                viewBox x1 x2 x xlinkActuate xlinkArcrole xlinkHref xlinkRole
+                xlinkShow xlinkTitle xlinkType xmlBase xmlLang xmlSpace y1 y2 y)
   HASH_ATTRIBUTES = %w(data aria)
+  HTML_TAGS = React::Component::Tags::HTML_TAGS
+
+  def self.html_tag?(name)
+    tags = HTML_TAGS
+    %x{
+      for(var i = 0; i < tags.length; i++) {
+        if(tags[i] === name)
+          return true;
+      }
+      return false;
+    }
+  end
+
+  def self.html_attr?(name)
+    attrs = ATTRIBUTES
+    %x{
+      for(var i = 0; i < attrs.length; i++) {
+        if(attrs[i] === name)
+          return true;
+      }
+      return false;
+    }
+  end
 
   def self.create_element(type, properties = {}, &block)
     React::API.create_element(type, properties, &block)
@@ -78,7 +110,7 @@ Element.instance_eval do
       selector.dom_node
     rescue
       selector
-    end if selector.respond_to? :dom_node
+    end if `#{selector}.$dom_node !== undefined`
     `$(#{selector})`
   end
 
@@ -87,10 +119,14 @@ Element.instance_eval do
   end
 
   define_method :render do |container = nil, params = {}, &block|
-    klass = Class.new(React::Component::Base)
+    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(klass), self)
+
+    React.render(React.create_element(`#{self.to_n}._reactrb_component_class`), self)
   end
 end if Object.const_defined?('Element')

data/lib/react/validator.rb

@@ -1,11 +1,11 @@
 module React
-
   class Validator
     attr_accessor :errors
-    private :errors
+    attr_reader :props_wrapper
+    private :errors, :props_wrapper
 
-    def initialize(component_class)
-      @component_class = component_class
+    def initialize(props_wrapper = Class.new(Component::PropsWrapper))
+      @props_wrapper = props_wrapper
     end
 
     def self.build(&block)
@@ -70,7 +70,7 @@ module React
 
     def define_rule(name, options = {})
       rules[name] = coerce_native_hash_values(options)
-      @component_class.define_param(name, options[:type]) unless name == :params
+      props_wrapper.define_param(name, options[:type])
     end
 
     def errors

data/lib/reactive-ruby/isomorphic_helpers.rb

@@ -6,19 +6,12 @@ module React
 
     if RUBY_ENGINE != 'opal'
       def self.load_context(ctx, controller, name = nil)
-        puts "************************** React Server Context Initialized #{name} *********************************************"
         @context = Context.new("#{controller.object_id}-#{Time.now.to_i}", ctx, controller, name)
       end
     else
       def self.load_context(unique_id = nil, name = nil)
         # can be called on the client to force re-initialization for testing purposes
         if !unique_id || !@context || @context.unique_id != unique_id
-          if on_opal_server?
-            message = "************************ React Prerendering Context Initialized #{name} ***********************"
-          else
-            message = "************************ React Browser Context Initialized ****************************"
-          end
-          log(message)
           @context = Context.new(unique_id)
         end
         @context

data/lib/reactive-ruby/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '0.8.8'
+  VERSION = "0.9.0"
 end

data/lib/reactrb.rb

@@ -2,39 +2,38 @@
 
 if RUBY_ENGINE == 'opal'
   if `window.React === undefined || window.React.version === undefined`
-    raise "No React.js Available\n\n"\
-          "React.js must be defined before requiring 'reactrb'\n"\
-          "'reactrb' has been tested with react v13, v14, and v15.\n\n"\
-          "IF USING 'react-rails':\n"\
-          "   add 'require \"react\"' immediately before the 'require \"reactive-ruby\" "\
-              "directive in 'views/components.rb'.\n"\
-          "IF USING WEBPACK:\n"\
-          "   add 'react' to your webpack manifest.\n"\
-          "OTHERWISE TO GET THE LATEST TESTED VERSION\n"\
-          "   add 'require \"react-latest\"' immediately before the require of 'reactrb',\n"\
-          "OR TO USE A SPECIFIC VERSION\n"\
-          "   add 'require \"react-v1x\"' immediately before the require of 'reactrb'."
+    raise [
+      "No React.js Available",
+      "",
+      "A global `React` must be defined before requiring 'reactrb'",
+      "",
+      "To USE THE BUILT-IN SOURCE: ",
+      "   add 'require \"react/react-source\"' immediately before the 'require \"reactrb\" directive.",
+      "IF USING WEBPACK:",
+      "   add 'react' to your webpack manifest."
+    ].join("\n")
   end
   require 'react/hash'
   require 'react/top_level'
   require 'react/observable'
+  require 'react/validator'
   require 'react/component'
   require 'react/component/dsl_instance_methods'
+  require 'react/component/should_component_update'
   require 'react/component/tags'
   require 'react/component/base'
   require 'react/element'
   require 'react/event'
   require 'react/api'
-  require 'react/validator'
   require 'react/rendering_context'
   require 'react/state'
+  require 'react/object'
   require 'reactive-ruby/isomorphic_helpers'
   require 'rails-helpers/top_level_rails_component'
   require 'reactive-ruby/version'
 
 else
   require 'opal'
-  require 'opal-browser'
   # rubocop:disable Lint/HandleExceptions
   begin
     require 'opal-jquery'
@@ -49,4 +48,5 @@ else
 
   Opal.append_path File.expand_path('../', __FILE__).untaint
   Opal.append_path File.expand_path('../sources/', __FILE__).untaint
+  require "react/react-source"
 end

data/lib/reactrb/deep-compare.rb

@@ -0,0 +1,24 @@
+# rubocop:disable Style/FileName
+# require 'reactrb/deep-compare' to get 0.9 deep compare behavior
+module React
+  module Component
+    module ShouldComponentUpdate
+
+      def props_changed?(next_params)
+        next_params != props
+      end
+
+      def call_needs_update(next_params, native_next_state)
+        component = self
+        next_params.define_singleton_method(:changed?) do
+          next_params != props
+        end
+        next_state = Hash.new(native_next_state)
+        next_state.define_singleton_method(:changed?) do
+          component.native_state_changed?(native_next_state)
+        end
+        needs_update?(next_params, next_state)
+      end
+    end
+  end
+end

data/lib/sources/react-latest.js

@@ -1,3 +1,5 @@
+console.error("Warning: loading `react-latest` directly is deprecated. Replace the requires with `react/react-source`.");
+
 /**
  * React (with addons) v15.0.1
  */

data/lib/sources/react-v13.js

@@ -1,3 +1,6 @@
+console.error("Warning: loading `react-v13` directly is deprecated. ")
+console.error("Replace the requires with `react/react-source` and add `gem 'react-rails', '~> 1.3.3'` to your Gemfile.");
+
 /**
  * React (with addons) v0.13.3
  */
@@ -21639,4 +21642,4 @@ if ("production" !== "development") {
 module.exports = warning;
 
 },{"129":129}]},{},[1])(1)
-});
+});

data/lib/sources/react-v14.js

@@ -1,3 +1,6 @@
+console.error("Warning: loading `react-v14` directly is deprecated. ")
+console.error("Replace the requires with `react/react-source` and add `gem 'react-rails', '~> 1.6.2'` to your Gemfile.");
+
 /**
  * React (with addons) v0.14.8
  */
@@ -20816,87 +20819,3 @@ module.exports = warning;
 })(function(React) {
   return React.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 });
-/**
- * ReactDOM v0.14.8
- *
- * Copyright 2013-2015, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- */
-// Based off https://github.com/ForbesLindesay/umd/blob/master/template.js
-;(function(f) {
-  // CommonJS
-  if (typeof exports === "object" && typeof module !== "undefined") {
-    module.exports = f(require('react'));
-
-  // RequireJS
-  } else if (typeof define === "function" && define.amd) {
-    define(['react'], f);
-
-  // <script>
-  } else {
-    var g;
-    if (typeof window !== "undefined") {
-      g = window;
-    } else if (typeof global !== "undefined") {
-      g = global;
-    } else if (typeof self !== "undefined") {
-      g = self;
-    } else {
-      // works providing we're not in "use strict";
-      // needed for Java 8 Nashorn
-      // see https://github.com/facebook/react/issues/3037
-      g = this;
-    }
-    g.ReactDOM = f(g.React);
-  }
-
-})(function(React) {
-  return React.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-});
-/**
- * ReactDOMServer v0.14.8
- *
- * Copyright 2013-2015, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- */
-// Based off https://github.com/ForbesLindesay/umd/blob/master/template.js
-;(function(f) {
-  // CommonJS
-  if (typeof exports === "object" && typeof module !== "undefined") {
-    module.exports = f(require('react'));
-
-  // RequireJS
-  } else if (typeof define === "function" && define.amd) {
-    define(['react'], f);
-
-  // <script>
-  } else {
-    var g;
-    if (typeof window !== "undefined") {
-      g = window;
-    } else if (typeof global !== "undefined") {
-      g = global;
-    } else if (typeof self !== "undefined") {
-      g = self;
-    } else {
-      // works providing we're not in "use strict";
-      // needed for Java 8 Nashorn
-      // see https://github.com/facebook/react/issues/3037
-      g = this;
-    }
-    g.ReactDOMServer = f(g.React);
-  }
-
-})(function(React) {
-  return React.__SECRET_DOM_SERVER_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-});

data/lib/sources/react-v15.js

@@ -1,3 +1,6 @@
+console.error("Warning: loading `react-v15` directly is deprecated. ")
+console.error("Replace the requires with `react/react-source` and add `gem 'react-rails', '~> 1.9.0'` to your Gemfile.");
+
 /**
  * React (with addons) v15.0.1
  */

data/path_release_steps.md

@@ -4,6 +4,6 @@ For example assuming you are releasing fix to 0.8.18
 1. Checkout 0-8-stable
 2. Update tests, fix the bug and commit the changes.
 3. Build & Release to RubyGems (Remember the version in version.rb should already be 0.8.19)
-4. Create a tag 'v0.8.19' pointing to that commit. (`tag v0.8.19`)
+4. Create a tag 'v0.8.19' pointing to that commit.
 5. Bump the version in 0-8-stable to 0.8.20 so it will be ready for the next patch level release.
 6. Commit the version bump, and do a `git push --tags` so the new tag goes up

data/reactrb.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'opal', '>= 0.8.0'
   s.add_dependency 'opal-activesupport', '>= 0.2.0'
-  s.add_dependency 'opal-browser', '0.2.0'
+  s.add_dependency 'react-rails'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec-rails', '3.3.3'
   s.add_development_dependency 'timecop'
@@ -30,9 +30,8 @@ Gem::Specification.new do |s|
 
   # For Test Rails App
   s.add_development_dependency 'rails', '4.2.4'
-  s.add_development_dependency 'react-rails'
+  s.add_development_dependency 'mime-types', '< 3'
   s.add_development_dependency 'opal-rails'
-  s.add_development_dependency 'pry'
   if RUBY_PLATFORM == 'java'
     s.add_development_dependency 'jdbc-sqlite3'
     s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'

data/spec/react/children_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+if opal?
+describe React::Children do
+  let(:component) {
+    Class.new do
+      include React::Component
+      def render
+        div { 'lorem' }
+      end
+    end
+  }
+  let(:childs) { [React.create_element('a'), React.create_element('li')] }
+  let(:element) { React.create_element(component) { childs } }
+  let(:children) { described_class.new(`#{element.to_n}.props.children`) }
+
+  before(:each) do
+    renderElementToDocument(element)
+  end
+
+  it 'is enumerable' do
+    nodes = children.map { |elem| elem.element_type }
+    expect(nodes).to eq(['a', 'li'])
+  end
+
+  it 'returns an Enumerator when not providing a block' do
+    nodes = children.each
+    expect(nodes).to be_a(Enumerator)
+    expect(nodes.size).to eq(2)
+  end
+
+  describe '#each' do
+    it 'returns an array of elements' do
+      nodes = children.each { |elem| elem.element_type }
+      expect(nodes).to be_a(Array)
+      expect(nodes.map(&:class)).to eq(childs.map(&:class))
+    end
+  end
+
+  describe '#length' do
+    it 'returns the number of child elements' do
+      expect(children.length).to eq(2)
+    end
+  end
+
+  describe 'with single child element' do
+    let(:childs) { [React.create_element('a')] }
+
+    it 'is enumerable containing single element' do
+      nodes = children.map { |elem| elem.element_type }
+      expect(nodes).to eq(['a'])
+    end
+
+    describe '#length' do
+      it 'returns the number of child elements' do
+        expect(children.length).to eq(1)
+      end
+    end
+  end
+
+  describe 'with no child element' do
+    let(:element) { React.create_element(component) }
+
+    it 'is enumerable containing no elements' do
+      nodes = children.map { |elem| elem.element_type }
+      expect(nodes).to eq([])
+    end
+
+    describe '#length' do
+      it 'returns the number of child elements' do
+        expect(children.length).to eq(0)
+      end
+    end
+  end
+end
+end