Merge pull request #179 from ruby-hyperloop/hyper-react

hyper-react rename & various patches

Author: zetachang

README.md

@@ -1,27 +1,27 @@
-# Reactrb
+# 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/reactrb/reactrb.svg?branch=master)](https://travis-ci.org/reactrb/reactrb)
+[![Build Status](https://travis-ci.org/ruby-hyperloop/reactrb.svg?branch=master)](https://travis-ci.org/reactrb/reactrb)
 [![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)
 
-**Reactrb is an [Opal Ruby](http://opalrb.org) wrapper of
-[React.js library](http://facebook.github.io/reactrb/)**.
+**hyper-react is an [Opal Ruby](http://opalrb.org) wrapper of
+[React.js library](https://facebook.github.io/react)**.
 
 It lets you write reactive UI components, with Ruby's elegance using the tried
 and true React.js engine. :heart:
 
-Visit [** ruby-hyperloop.io**](http://ruby-hyperloop.io) for the full story.
+Visit [ruby-hyperloop.io](http://ruby-hyperloop.io) for the full story.
 
-### Important: `react.rb` and `reactive-ruby` gems are **deprecated.** Please [read this!](#upgrading-to-reactrb)
+### Important: `react.rb`, `reactive-ruby` and `reactrb` gems are **deprecated.**. See [**UPGRADING**](UPGRADING.md) for details.
 
 ## Installation
 
 Install the gem, or load the js library
 
-1. Add `gem 'reactrb'` to your **Gemfile**
-2. Or `gem install reactrb`
-3. Or install (or load via cdn) from [reactrb-express.js](http://github.com/reactrb/reactrb-express)
+1. Add `gem 'hyper-react'` to your **Gemfile**
+2. Or `gem install hyper-react`
+3. Or install (or load via cdn) from [reactrb-express.js](http://github.com/ruby-hyperloop/reactrb-express)
 
 For gem installation it is highly recommended to read the [getting started](http://ruby-hyperloop.io/get_started/) and [installation](http://ruby-hyperloop.io/installation/) guides at [ruby-hyperloop.io.](http://ruby-hyperloop.io)
 
@@ -66,11 +66,11 @@ every(1) do
 end
 ```
 
-Reactrb components are *isomorphic* (or *univeral*) meaning they can run on the server as well as the client.
+hyper-react components are *isomorphic* (or *univeral*) meaning they can run on the server as well as the client.
 
-Reactrb integrates well with Rails, Sinatra, and simple static sites, and can be added to existing web pages very easily.
+hyper-react integrates well with Rails, Sinatra, and simple static sites, and can be added to existing web pages very easily.
 
-Under the hood the actual work is effeciently done by the [React.js](http://facebook.github.io/reactrb/) engine.
+Under the hood the actual work is effeciently done by the [React.js](https://facebook.github.io/react) engine.
 
 
 ## Why ?
@@ -89,37 +89,17 @@ Under the hood the actual work is effeciently done by the [React.js](http://face
 + [Github Issues](https://github.com/reactrb/reactrb/issues) for bugs, feature enhancements, etc.
 
 
-## Upgrading to Reactrb
-
-The original gem `react.rb` was superceeded by `reactive-ruby`, which has had over 15,000 downloads.  This name has now been superceeded by `reactrb` (see #144 for detailed discussion on why.)
-
-Going forward the name `reactrb` will be used consistently as the organization name, the gem name, the domain name, the twitter handle, etc.
-
-The first initial version of `reactrb` is 0.8.x.  
-
-It is very unlikely that there will be any more releases of the `reactive-ruby` gem, so users should upgrade to `reactrb`.
-
-There are no syntactic or semantic breaking changes between `reactrb` v 0.8.x and
-previous versions, however the `reactrb` gem does *not* include the react-js source as previous versions did.  This allows you to pick the react js source compatible with other gems and react js components you may be using.
-
-Follow these steps to upgrade:
-
-1. Replace `reactive-ruby` with `reactrb` both in **Gemfile** and any `require`s in your code.
-2. To include the React.js source, the suggested way is to add `require 'react/react-source'` before `require 'reactrb'`. This will use the copy of React.js source from `react-rails` gem.
-
 ## Roadmap
 
-Upcoming will be an 0.9.x release which will deprecate a number of features and DSL elements.  [click for detailed feature list](https://github.com/reactrb/reactrb/milestones/0.9.x)
-
-Version 0.10.x **will not be** 100% backward compatible with 0.3.0 (`react.rb`) or 0.7.x (`reactive-ruby`) so its very important to begin your upgrade process now by switching to `reactrb` now.
+Version 0.10.x **will not be** 100% backward compatible with 0.3.0 (`react.rb`) or 0.7.x (`reactive-ruby`).
 
 Please let us know either at [Gitter.im](https://gitter.im/reactrb/chat) or [via an issue](https://github.com/reactrb/reactrb/issues) if you have specific concerns with the upgrade from 0.3.0 to 0.10.x.
 
 ## Developing
 
 `git clone` the project.
 
-To play with some live examples, refer to https://github.com/reactrb/reactrb-examples.
+To play with some live examples, refer to https://github.com/ruby-hyperloop/reactrb-examples.
 
 Note that these are very simple examples, for the purpose of showing how to configure the gem in various server environments.  For more examples and information see [ruby-hyperloop.io.](http://ruby-hyperloop.io)
 
@@ -132,10 +112,10 @@ Note that these are very simple examples, for the purpose of showing how to conf
 ## Contributions
 
 This project is still in early stage, so discussion, bug reports and PRs are
-really welcome :wink:.   
+really welcome :wink:.
 
 
 ## License
 
-In short, Reactrb is available under the MIT license. See the LICENSE file for
+In short, hyper-react is available under the MIT license. See the LICENSE file for
 more info.

UPGRADING.md

@@ -0,0 +1,24 @@
+## Upgrading to hyper-react from Reactrb
+
+Follow these steps to upgrade:
+
+1. Replace `reactrb` with `hyper-react` both in **Gemfile** and any `require`s in your code.
+2. To include the React.js source, the suggested way is to add `require 'react/react-source'` before `require 'hyper-react'`. This will use the copy of React.js source from `react-rails` gem.
+
+## Upgrading to Reactrb
+
+The original gem `react.rb` was superceeded by `reactive-ruby`, which has had over 15,000 downloads.  This name has now been superceeded by `reactrb` (see #144 for detailed discussion on why.)
+
+Going forward the name `reactrb` will be used consistently as the organization name, the gem name, the domain name, the twitter handle, etc.
+
+The first initial version of `reactrb` is 0.8.x.
+
+It is very unlikely that there will be any more releases of the `reactive-ruby` gem, so users should upgrade to `reactrb`.
+
+There are no syntactic or semantic breaking changes between `reactrb` v 0.8.x and
+previous versions, however the `reactrb` gem does *not* include the react-js source as previous versions did.  This allows you to pick the react js source compatible with other gems and react js components you may be using.
+
+Follow these steps to upgrade:
+
+1. Replace `reactive-ruby` with `reactrb` both in **Gemfile** and any `require`s in your code.
+2. To include the React.js source, the suggested way is to add `require 'react/react-source'` before `require 'reactrb'`. This will use the copy of React.js source from `react-rails` gem.

reactrb.gemspec hyper-react.gemspec

@@ -4,12 +4,12 @@ $:.push File.expand_path('../lib/', __FILE__)
 require 'reactive-ruby/version'
 
 Gem::Specification.new do |s|
-  s.name         = 'reactrb'
+  s.name         = 'hyper-react'
   s.version      = React::VERSION
 
   s.authors       = ['David Chang', 'Adam Jahn', 'Mitch VanDuyn']
   s.email        = '[email protected]'
-  s.homepage     = 'http://reactrb.org'
+  s.homepage     = 'http://ruby-hyperloop.io/gems/reactrb/'
   s.summary      = 'Opal Ruby wrapper of React.js library.'
   s.license      = 'MIT'
   s.description  = "Write React UI components in pure Ruby."

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

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

lib/generators/reactive_ruby/test_app/templates/test_application.rb.erb

@@ -7,7 +7,7 @@ require File.expand_path('../boot', __FILE__)
 Bundler.require(*Rails.groups(assets: %w(development test)))
 
 require 'opal-rails'
-require 'reactrb'
+require 'hyper-react'
 
 <%= application_definition %>
 <% end %>

lib/reactrb.rb lib/hyper-react.rb

@@ -39,23 +39,67 @@ class State
     class << self
       attr_reader :current_observer
 
+      def has_observers?(object, name)
+        !observers_by_name[object][name].empty?
+      end
+
+      def bulk_update
+        saved_bulk_update_flag = @bulk_update_flag
+        @bulk_update_flag = true
+        yield
+      ensure
+        @bulk_update_flag = saved_bulk_update_flag
+      end
+
+      def set_state2(object, name, value, updates, exclusions = nil)
+        # set object's name state to value, tell all observers it has changed.
+        # Observers must implement update_react_js_state
+        object_needs_notification = object.respond_to? :update_react_js_state
+        observers_by_name[object][name].dup.each do |observer|
+          next if exclusions && exclusions.include?(observer)
+          updates[observer] += [object, name, value]
+          object_needs_notification = false if object == observer
+        end
+        updates[object] += [nil, name, value] if object_needs_notification
+      end
+
       def initialize_states(object, initial_values) # initialize objects' name/value pairs
         states[object].merge!(initial_values || {})
       end
 
       def get_state(object, name, current_observer = @current_observer)
         # get current value of name for object, remember that the current object depends on this state,
         # current observer can be overriden with last param
-        new_observers[current_observer][object] << name if current_observer && !new_observers[current_observer][object].include?(name)
+        if current_observer && !new_observers[current_observer][object].include?(name)
+          new_observers[current_observer][object] << name
+        end
+        if @delayed_updates && @delayed_updates[object][name]
+          @delayed_updates[object][name][1] << current_observer
+        end
         states[object][name]
       end
 
-      def set_state(object, name, value, wait_till_thread_completes = nil)
+      def set_state(object, name, value, delay=nil)
         states[object][name] = value
-        if wait_till_thread_completes
-          notify_observers_after_thread_completes(object, name, value)
+        if delay || @bulk_update_flag
+          @delayed_updates ||= Hash.new { |h, k| h[k] = {} }
+          @delayed_updates[object][name] = [value, Set.new]
+          @delayed_updater ||= after(0.001) do
+            delayed_updates = @delayed_updates
+            @delayed_updates = Hash.new { |h, k| h[k] = {} } # could this be nil???
+            @delayed_updater = nil
+            updates = Hash.new { |hash, key| hash[key] = Array.new }
+            delayed_updates.each do |object, name_hash|
+              name_hash.each do |name, value_and_set|
+                set_state2(object, name, value_and_set[0], updates, value_and_set[1])
+              end
+            end
+            updates.each { |observer, args| observer.update_react_js_state(*args) }
+          end
         elsif @rendering_level == 0
-          notify_observers(object, name, value)
+          updates = Hash.new { |hash, key| hash[key] = Array.new }
+          set_state2(object, name, value, updates)
+          updates.each { |observer, args| observer.update_react_js_state(*args) }
         end
         value
       end

lib/react/state.rb

@@ -6,12 +6,20 @@ def self.included(base)
 
     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?
+           `console.history = []` rescue nil
+            message = "************************ React Prerendering Context Initialized #{name} ***********************"
+          else
+            message = "************************ React Browser Context Initialized ****************************"
+          end
+          log(message)
           @context = Context.new(unique_id)
         end
         @context
@@ -65,10 +73,10 @@ def on_opal_client?
       self.class.on_opal_client?
     end
 
-    def self.prerender_footers
-      footer = Context.prerender_footer_blocks.collect { |block| block.call }.join("\n")
+    def self.prerender_footers(controller = nil)
+      footer = Context.prerender_footer_blocks.collect { |block| block.call controller }.join("\n")
       if RUBY_ENGINE != 'opal'
-        footer = (footer + "#{@context.send_to_opal(:prerender_footers)}") if @context
+        footer = (footer + @context.send_to_opal(:prerender_footers).to_s) if @context
         footer = footer.html_safe
       end
       footer

lib/reactive-ruby/isomorphic_helpers.rb

@@ -39,7 +39,7 @@ def top_level_name
       end
 
       def footers
-        React::IsomorphicHelpers.prerender_footers #if options[:prerender]
+        React::IsomorphicHelpers.prerender_footers(controller)
       end
     end
   end

lib/reactive-ruby/rails/component_mount.rb

@@ -16,7 +16,7 @@ def ruby?
 if RUBY_ENGINE == 'opal'
   require File.expand_path('../vendor/jquery-2.2.4.min', __FILE__)
   require 'react/react-source'
-  require 'reactrb'
+  require 'hyper-react'
   require 'react/test/rspec'
 
   require File.expand_path('../support/react/spec_helpers', __FILE__)