hyper-react 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ce1a3a5b1c6327f4acec7ec587a1bca16c12738
-  data.tar.gz: 9268144dd28594592f79c11a99812876fd24c905
+  metadata.gz: 513e80e952999575e80a5b1456a712a2aa895247
+  data.tar.gz: 75ac40ec7d8036255310753b9b47ff923db5b4fc
 SHA512:
-  metadata.gz: 76a870924c4762816df9eda0f50edba5e4a65bc5158490f08c11953752cd022dae5da7ff67f4933f9cd0e7c28d10700822872a162245fb247b359fb581589929
-  data.tar.gz: 65fbb0f11b47c7bb1d5182d5a80e5109f5b748b7b87f43125b0937b7a773c09364956ae0a5dd44ba7965ff8e8acdd25ddad3043371e42d4915d2061e66412ae2
+  metadata.gz: 70cb674bdd87a7cd74ad25e731cb2ac468735f8e9a7dc5344b44bb94bec22a812f21c3c38c0acd5a4ae03502480551aa6465c73d0bd2ab3cf567d0202696d7c4
+  data.tar.gz: baac4f594a9ba1ff729f8b1f519cd50a66d1eeb47683a4b19b70f4769999bad0df71bde08849d35c34139b16db3effc924718c6e148c17c854b95131c1829418

data/.rubocop.yml

@@ -716,7 +716,7 @@ Style/LineEndConcatenation:
                  line end.
   Enabled: false
 
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
   Description: 'Do not use parentheses for method calls with no arguments.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-args-no-parens'
   Enabled: false

data/.travis.yml

@@ -18,6 +18,9 @@ gemfile:
 cache:
   directories:
     - "travis_phantomjs"
+branches:
+  only:
+    - master
 before_install:
   - "phantomjs --version"
   - "export PATH=$PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin:$PATH"
@@ -26,6 +29,7 @@ before_install:
   - "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"
+  - gem install bundler -v 1.13.7
 script:
   - bundle exec rake test_app
   - bundle exec rake
@@ -49,3 +53,10 @@ matrix:
   - rvm: 2.1
     env: PHANTOMJS_VERSION=2.1.1
     gemfile: gemfiles/opal_0.10_react_15.gemfile
+  - rvm: 2.1
+    env: PHANTOMJS_VERSION=2.1.1
+    gemfile: gemfiles/opal_master_react_15.gemfile
+  allow_failures:
+  - rvm: 2.1
+    env: PHANTOMJS_VERSION=2.1.1
+    gemfile: gemfiles/opal_master_react_15.gemfile

data/Appraisals

@@ -13,9 +13,19 @@ opal_rails_versions_map = {
 opal_versions.each do |opal_v|
   react_versions_map.each do |react_v, react_rails_v|
     appraise "opal-#{opal_v}-react-#{react_v}" do
+      ruby ">= 1.9.3"
       gem 'opal', "~> #{opal_v}.0"
       gem 'opal-rails', opal_rails_versions_map[opal_v]
       gem 'react-rails', react_rails_v, require: false
     end
   end
 end
+
+
+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 'react-rails', '~> 1.10.0', require: false
+end

data/CHANGELOG.md

@@ -18,6 +18,37 @@ Whitespace conventions:
 - 1 spaces before normal text
  -->
 
+## [0.12.0] - Unreleased
+
+### Added
+
+- `React::Server` is provided as a module wrapping the original `ReactDOMServer` API, require `react/server` to use it. (#186)
+- `React::Config` is introduced, `environment` is the only config option provided for now. See [#204](https://github.com/ruby-hyperloop/hyper-react/issues/204) for usage details.
+
+### Changed
+
+- State syntax is now consistent with Hyperloop::Store, old syntax is deprecated. (#209, #97)
+
+### Deprecated
+
+- Current ref callback behavior is deprecated. Require `"react/ref_callback"` to get the updated behavior. (#188)
+- `React.render_to_string` & `React.render_to_static_markup` is deprecated, use `React::Server.render_to_string` & `React::Server.render_to_static_markup` instead. (#186)
+- `react/react-source` is deprecated, use `react/react-source-browser` or `react/react-source-server` instead. For most usecase, `react/react-source-browser` is sufficient. If you are using the built-in server side rendering feature, the actual `ReactDOMServer` is already provided by the `react-rails` gem. Therefore, unless you are building a custom server side rendering mechanism, it's not suggested to use `react/react-source-server` in browser code. (#186)
+
+### Removed
+
+- `react-latest` & `react-v1x` is removed. Use `react/react-source-browser` or `react/react-source-server` instead.
+- Support for Ruby < 2.0 is removed. (#201)
+
+### Fixed
+
+- [NativeLibrary] Passing native JS object as props will raise exception. (#195)
+- Returns better error message if result of rendering block is not suitable (#207)
+- Batch all state changes and execute *after* rendering cycle (#206, #178)  (Code is now moved to Hyper::Store)  
+  You can revert to the old behavior by defining the `React::State::ALWAYS_UPDATE_STATE_AFTER_RENDER = false`
+- Memory Leak in render context fixed (#192)
+
+
 ## [0.11.0] - 2016-12-13
 
 ### Changed

data/Gemfile

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 gemspec
 
+ruby ">= 1.9.3"
+
 group :development do
   gem "appraisal"
 end

data/README.md

@@ -48,6 +48,13 @@ You can simply include `React::Component` to get the power of a complete DSL to
 As events occur, components update their state, which causes them to rerender, and perhaps pass new parameters to lower level components, thus causing them to rerender.
 
 ```ruby
+require 'opal'
+require 'browser/interval'
+require 'opal-jquery'
+require 'react/react-source'
+require 'hyper-react'
+require 'react/top_level_render'
+
 class HelloWorld < React::Component::Base
   param :time, type: Time
   render do

data/gemfiles/opal_0.10_react_13.gemfile

@@ -2,6 +2,10 @@
 
 source "https://rubygems.org"
 
+ruby ">= 1.9.3"
+
+gem "hyper-store", :path => "../../hyper-store"
+gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.10.0"
 gem "opal-rails", "~> 0.9.0"
 gem "react-rails", "~> 1.3.3", :require => false

data/gemfiles/opal_0.10_react_14.gemfile

@@ -2,6 +2,10 @@
 
 source "https://rubygems.org"
 
+ruby ">= 1.9.3"
+
+gem "hyper-store", :path => "../../hyper-store"
+gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.10.0"
 gem "opal-rails", "~> 0.9.0"
 gem "react-rails", "~> 1.6.2", :require => false

data/gemfiles/opal_0.10_react_15.gemfile

@@ -2,6 +2,10 @@
 
 source "https://rubygems.org"
 
+ruby ">= 1.9.3"
+
+gem "hyper-store", :path => "../../hyper-store"
+gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.10.0"
 gem "opal-rails", "~> 0.9.0"
 gem "react-rails", "~> 1.10.0", :require => false

data/gemfiles/opal_0.8_react_13.gemfile

@@ -2,6 +2,10 @@
 
 source "https://rubygems.org"
 
+ruby ">= 1.9.3"
+
+gem "hyper-store", :path => "../../hyper-store"
+gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.8.0"
 gem "opal-rails", "~> 0.8.1"
 gem "react-rails", "~> 1.3.3", :require => false

data/gemfiles/opal_0.8_react_14.gemfile

@@ -2,6 +2,10 @@
 
 source "https://rubygems.org"
 
+ruby ">= 1.9.3"
+
+gem "hyper-store", :path => "../../hyper-store"
+gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.8.0"
 gem "opal-rails", "~> 0.8.1"
 gem "react-rails", "~> 1.6.2", :require => false

data/gemfiles/opal_0.8_react_15.gemfile

@@ -2,6 +2,10 @@
 
 source "https://rubygems.org"
 
+ruby ">= 1.9.3"
+
+gem "hyper-store", :path => "../../hyper-store"
+gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.8.0"
 gem "opal-rails", "~> 0.8.1"
 gem "react-rails", "~> 1.10.0", :require => false

data/gemfiles/opal_0.9_react_13.gemfile

@@ -2,6 +2,10 @@
 
 source "https://rubygems.org"
 
+ruby ">= 1.9.3"
+
+gem "hyper-store", :path => "../../hyper-store"
+gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.9.0"
 gem "opal-rails", "~> 0.9.0"
 gem "react-rails", "~> 1.3.3", :require => false

data/gemfiles/opal_0.9_react_14.gemfile

@@ -2,6 +2,10 @@
 
 source "https://rubygems.org"
 
+ruby ">= 1.9.3"
+
+gem "hyper-store", :path => "../../hyper-store"
+gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.9.0"
 gem "opal-rails", "~> 0.9.0"
 gem "react-rails", "~> 1.6.2", :require => false

data/gemfiles/opal_0.9_react_15.gemfile

@@ -2,6 +2,10 @@
 
 source "https://rubygems.org"
 
+ruby ">= 1.9.3"
+
+gem "hyper-store", :path => "../../hyper-store"
+gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.9.0"
 gem "opal-rails", "~> 0.9.0"
 gem "react-rails", "~> 1.10.0", :require => false

data/gemfiles/opal_master_react_15.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+ruby ">= 2.0.0"
+
+gem "hyper-store", :path => "../../hyper-store"
+gem "hyperloop-config", :path => "../../hyperloop-config"
+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 "react-rails", "~> 1.10.0", :require => false
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec :path => "../"

data/hyper-react.gemspec

@@ -21,6 +21,8 @@ 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_dependency 'hyper-store'
+  s.add_dependency 'hyperloop-config'
   s.add_development_dependency 'rake', '< 11.0'
   s.add_development_dependency 'rspec-rails', '3.3.3'
   s.add_development_dependency 'timecop'
@@ -32,6 +34,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rails', '4.2.4'
   s.add_development_dependency 'mime-types', '< 3'
   s.add_development_dependency 'opal-rails'
+  s.add_development_dependency 'nokogiri', '< 1.7'
+  s.add_development_dependency 'rubocop'
   if RUBY_PLATFORM == 'java'
     s.add_development_dependency 'jdbc-sqlite3'
     s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'

data/lib/hyper-react.rb

@@ -1,6 +1,17 @@
-
+require 'hyperloop-config'
+Hyperloop.require_gem 'react/react-source-browser'
+Hyperloop.require_gem 'react/react-source-server', server_only: true
+Hyperloop.require_gem 'opal-jquery', client_only: true
+Hyperloop.require_gem 'browser/delay', client_only: true
+Hyperloop.require_gem 'react_ujs', client_only: true
 
 if RUBY_ENGINE == 'opal'
+
+  module Hyperloop
+    class Component
+    end
+  end
+
   if `Opal.global.React === undefined || Opal.global.React.version === undefined`
     raise [
       "No React.js Available",
@@ -8,7 +19,7 @@ if RUBY_ENGINE == 'opal'
       "A global `React` must be defined before requiring 'hyper-react'",
       "",
       "To USE THE BUILT-IN SOURCE: ",
-      "   add 'require \"react/react-source\"' immediately before the 'require \"hyper-react\" directive.",
+      "   add 'require \"react/react-source-browser\"' immediately before the 'require \"hyper-react\" directive.",
       "IF USING WEBPACK:",
       "   add 'react' to your webpack manifest."
     ].join("\n")
@@ -32,7 +43,17 @@ if RUBY_ENGINE == 'opal'
   require 'reactive-ruby/isomorphic_helpers'
   require 'rails-helpers/top_level_rails_component'
   require 'reactive-ruby/version'
-
+  module Hyperloop
+    class Component
+      def self.inherited(child)
+        child.include(Mixin)
+      end
+    end
+  end
+  React::Component.deprecation_warning(
+    'components.rb',
+    "Requiring 'hyper-react' is deprecated.  Use gem 'hyper-component', and require 'hyper-component' instead."
+  ) unless defined? Hyperloop::Component::VERSION
 else
   require 'opal'
   # rubocop:disable Lint/HandleExceptions
@@ -48,6 +69,5 @@ else
   require 'reactive-ruby/serializers'
 
   Opal.append_path File.expand_path('../', __FILE__).untaint
-  Opal.append_path File.expand_path('../sources/', __FILE__).untaint
   require "react/react-source"
 end

data/lib/rails-helpers/top_level_rails_component.rb

@@ -1,6 +1,6 @@
 module React
   class TopLevelRailsComponent
-    include React::Component
+    include Hyperloop::Component::Mixin
 
     def self.search_path
       @search_path ||= [Module]

data/lib/react/api.rb

@@ -142,6 +142,16 @@ module React
           props["className"] = value
         elsif ["style", "dangerously_set_inner_HTML"].include? key
           props[lower_camelize(key)] = value.to_n
+        elsif key == 'ref' && value.is_a?(Proc)
+          unless React.const_defined?(:RefsCallbackExtension)
+            %x{
+                console.error(
+                  "Warning: Using deprecated behavior of ref callback,",
+                  "require \"react/ref_callback\" to get the correct behavior."
+                );
+            }
+          end
+          props[key] = value
         elsif React::HASH_ATTRIBUTES.include?(key) && value.is_a?(Hash)
           value.each { |k, v| props["#{key}-#{k.tr('_', '-')}"] = v.to_n }
         else

data/lib/react/component.rb

@@ -3,137 +3,166 @@ require 'react/ext/hash'
 require 'active_support/core_ext/class/attribute'
 require 'react/callbacks'
 require 'react/rendering_context'
-require 'react/observable'
-require 'react/state'
+require 'hyper-store'
+require 'react/state_wrapper'
 require 'react/component/api'
 require 'react/component/class_methods'
 require 'react/component/props_wrapper'
 require 'native'
 
-module React
-  module Component
-    def self.included(base)
-      base.include(API)
-      base.include(Callbacks)
-      base.include(Tags)
-      base.include(DslInstanceMethods)
-      base.include(ShouldComponentUpdate)
-      base.class_eval do
-        class_attribute :initial_state
-        define_callback :before_mount
-        define_callback :after_mount
-        define_callback :before_receive_props
-        define_callback :before_update
-        define_callback :after_update
-        define_callback :before_unmount
-      end
-      base.extend(ClassMethods)
-    end
+module Hyperloop
+  class Component
+    module Mixin
+      def self.included(base)
+        base.include(Store::Mixin)
+        base.include(React::Component::API)
+        base.include(React::Component::Callbacks)
+        base.include(React::Component::Tags)
+        base.include(React::Component::DslInstanceMethods)
+        base.include(React::Component::ShouldComponentUpdate)
+        base.class_eval do
+          class_attribute :initial_state
+          define_callback :before_mount
+          define_callback :after_mount
+          define_callback :before_receive_props
+          define_callback :before_update
+          define_callback :after_update
+          define_callback :before_unmount
+        end
+        base.extend(React::Component::ClassMethods)
+      end
 
-    def self.deprecation_warning(message)
-      @deprecation_messages ||= []
-      message = "Warning: Deprecated feature used in #{name}. #{message}"
-      unless @deprecation_messages.include? message
-        @deprecation_messages << message
-        IsomorphicHelpers.log message, :warning
+      def self.deprecation_warning(message)
+        React::Component.deprecation_warning(name, message)
       end
-    end
 
-    def initialize(native_element)
-      @native = native_element
-    end
+      def deprecation_warning(message)
+        React::Component.deprecation_warning(self.class.name, message)
+      end
 
-    def emit(event_name, *args)
-      params["_on#{event_name.to_s.event_camelize}"].call(*args)
-    end
+      def initialize(native_element)
+        @native = native_element
+        init_store
+      end
 
-    def component_will_mount
-      IsomorphicHelpers.load_context(true) if IsomorphicHelpers.on_opal_client?
-      set_state! initial_state if initial_state
-      State.initialize_states(self, initial_state)
-      State.set_state_context_to(self) { run_callback(:before_mount) }
-    rescue Exception => e
-      self.class.process_exception(e, self)
-    end
+      def emit(event_name, *args)
+        params["_on#{event_name.to_s.event_camelize}"].call(*args)
+      end
 
-    def component_did_mount
-      State.set_state_context_to(self) do
-        run_callback(:after_mount)
-        State.update_states_to_observe
+      def component_will_mount
+        React::IsomorphicHelpers.load_context(true) if React::IsomorphicHelpers.on_opal_client?
+        # set_state! initial_state if initial_state
+        # State.initialize_states(self, initial_state)
+        React::State.set_state_context_to(self) { run_callback(:before_mount) }
+      rescue Exception => e
+        self.class.process_exception(e, self)
       end
-    rescue Exception => e
-      self.class.process_exception(e, self)
-    end
 
-    def component_will_receive_props(next_props)
-      # need to rethink how this works in opal-react, or if its actually that useful within the react.rb environment
-      # for now we are just using it to clear processed_params
-      State.set_state_context_to(self) { self.run_callback(:before_receive_props, Hash.new(next_props)) }
-    rescue Exception => e
-      self.class.process_exception(e, self)
-    end
+      def component_did_mount
+        React::State.set_state_context_to(self) do
+          run_callback(:after_mount)
+          React::State.update_states_to_observe
+        end
+      rescue Exception => e
+        self.class.process_exception(e, self)
+      end
 
-    def component_will_update(next_props, next_state)
-      State.set_state_context_to(self) { self.run_callback(:before_update, Hash.new(next_props), Hash.new(next_state)) }
-    rescue Exception => e
-      self.class.process_exception(e, self)
-    end
+      def component_will_receive_props(next_props)
+        # need to rethink how this works in opal-react, or if its actually that useful within the react.rb environment
+        # for now we are just using it to clear processed_params
+        React::State.set_state_context_to(self) { self.run_callback(:before_receive_props, Hash.new(next_props)) }
+      rescue Exception => e
+        self.class.process_exception(e, self)
+      end
 
-    def component_did_update(prev_props, prev_state)
-      State.set_state_context_to(self) do
-        self.run_callback(:after_update, Hash.new(prev_props), Hash.new(prev_state))
-        State.update_states_to_observe
+      def component_will_update(next_props, next_state)
+        React::State.set_state_context_to(self) { self.run_callback(:before_update, Hash.new(next_props), Hash.new(next_state)) }
+      rescue Exception => e
+        self.class.process_exception(e, self)
       end
-    rescue Exception => e
-      self.class.process_exception(e, self)
-    end
 
-    def component_will_unmount
-      State.set_state_context_to(self) do
-        self.run_callback(:before_unmount)
-        State.remove
+      def component_did_update(prev_props, prev_state)
+        React::State.set_state_context_to(self) do
+          self.run_callback(:after_update, Hash.new(prev_props), Hash.new(prev_state))
+          React::State.update_states_to_observe
+        end
+      rescue Exception => e
+        self.class.process_exception(e, self)
       end
-    rescue Exception => e
-      self.class.process_exception(e, self)
-    end
 
-    attr_reader :waiting_on_resources
+      def component_will_unmount
+        React::State.set_state_context_to(self) do
+          self.run_callback(:before_unmount)
+          React::State.remove
+        end
+      rescue Exception => e
+        self.class.process_exception(e, self)
+      end
 
-    def update_react_js_state(object, name, value)
-      if object
-        name = "#{object.class}.#{name}" unless object == self
-        set_state(
-          '***_state_updated_at-***' => Time.now.to_f,
-          name => value
-        )
-      else
-        set_state name => value
+      attr_reader :waiting_on_resources
+
+      def update_react_js_state(object, name, value)
+        if object
+          name = "#{object.class}.#{name}" unless object == self
+          set_state(
+            '***_state_updated_at-***' => Time.now.to_f,
+            name => value
+          )
+        else
+          set_state name => value
+        end
       end
-    end
 
-    def render
-      raise 'no render defined'
-    end unless method_defined?(:render)
-
-    def _render_wrapper
-      State.set_state_context_to(self, true) do
-        element = React::RenderingContext.render(nil) { render || '' }
-        @waiting_on_resources =
-          element.waiting_on_resources if element.respond_to? :waiting_on_resources
-        element
-      end
-    # rubocop:disable Lint/RescueException # we want to catch all exceptions regardless
-    rescue Exception => e
-      # rubocop:enable Lint/RescueException
-      self.class.process_exception(e, self)
-    end
+      def render
+        raise 'no render defined'
+      end unless method_defined?(:render)
+
+      def _render_wrapper
+        React::State.set_state_context_to(self, true) do
+          element = React::RenderingContext.render(nil) { render || '' }
+          @waiting_on_resources =
+            element.waiting_on_resources if element.respond_to? :waiting_on_resources
+          element
+        end
+      # rubocop:disable Lint/RescueException # we want to catch all exceptions regardless
+      rescue Exception => e
+        # rubocop:enable Lint/RescueException
+        self.class.process_exception(e, self)
+      end
 
-    def watch(value, &on_change)
-      Observable.new(value, on_change)
+      def watch(value, &on_change)
+        Observable.new(value, on_change)
+      end
+
+      def define_state(*args, &block)
+        React::State.initialize_states(self, self.class.define_state(*args, &block))
+      end
     end
+  end
+end
 
-    def define_state(*args, &block)
-      State.initialize_states(self, self.class.define_state(*args, &block))
+module React
+  module Component
+    def self.included(base)
+      # note this is turned off during old style testing:  See the spec_helper
+      deprecation_warning base, "The module name React::Component has been deprecated.  Use Hyperloop::Component::Mixin instead."
+      base.include Hyperloop::Component::Mixin
+    end
+    def self.deprecation_warning(name, message)
+      @deprecation_messages ||= []
+      message = "Warning: Deprecated feature used in #{name}. #{message}"
+      unless @deprecation_messages.include? message
+        @deprecation_messages << message
+        React::IsomorphicHelpers.log message, :warning
+      end
     end
   end
+  module ComponentNoNotice
+    def self.included(base)
+      base.include Hyperloop::Component::Mixin
+    end
+  end
+end
+
+module React
 end