reactive-ruby 0.7.27 → 0.7.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 579a244953ecf04793186edfc376b776ee208bfa
-  data.tar.gz: cbd731345dd42377ab1d8890f5ff13eab3dacf08
+  metadata.gz: 7b3ccefdd8c89194824329a42a3f700461a3349c
+  data.tar.gz: 8f93442f60fa15f99bc7545e125f11ac9fc5b11e
 SHA512:
-  metadata.gz: 2b7aef0925c62a1e75cf8a6d7da93ab633ccbe0af4a6940b8d80af13213324b18323a3c9203c147c706e0742acfbf1dca13189a9ca5381e8b72738e494159168
-  data.tar.gz: d8df70a1a64040aae4e2a621353276d5df6da37f51928e286c8d598596a36e45aca958960d7821582eea0085e0619c486c99bc49abfeb4585f472299817cf4bc
+  metadata.gz: f49d3a2e156abbf32602e494a0c7fb356f090526ea8a19a3fc53d65e4d02be16dc84b79119cefcbc46ba25f280fe8f57085491a5780084db8453acce12b3da78
+  data.tar.gz: 7828530b6d13396f33d8a91bd1fd6c02b80d8ccb3a1209af0dc5001b49b43fc8668b77a5c8a5f8b2802d4fff05e13354a583ea5766285a1843422a7a6d94578a

data/Gemfile

@@ -3,5 +3,6 @@ group :development, :test do
   gem 'therubyracer', platforms: :ruby
   gem 'rails'
   gem 'react-rails'
+  gem 'opal-rails'
 end
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reactive-ruby (0.7.25)
+    reactive-ruby (0.7.27)
       opal
       opal-activesupport (>= 0.2.0)
       opal-browser

data/README.md

@@ -1,5 +1,7 @@
 # Reactive-Ruby
 
+[![Build Status](https://travis-ci.org/zetachang/react.rb.svg?branch=reactive-ruby)](https://travis-ci.org/zetachang/react.rb)
+
 **Reactive-Ruby is an [Opal Ruby](http://opalrb.org) wrapper of [React.js library](http://facebook.github.io/react/)**.
 
 It lets you write reactive UI components, with Ruby's elegance using the tried and true React.js engine. :heart:

data/example/examples/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    reactive-ruby (0.7.25)
+    reactive-ruby (0.7.27)
       opal
       opal-activesupport (>= 0.2.0)
       opal-browser
@@ -65,7 +65,7 @@ GEM
     minitest (5.8.1)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    opal (0.8.0)
+    opal (0.8.1)
       hike (~> 1.2)
       sourcemap (~> 0.1.0)
       sprockets (~> 3.1)
@@ -117,15 +117,15 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    reactive-router (0.7.8)
+    reactive-router (0.7.11)
       reactive-ruby
     sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     sourcemap (0.1.1)
-    sprockets (3.3.4)
-      rack (~> 1.0)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)

data/example/examples/app/nodes.rb

@@ -0,0 +1,61 @@
+# This example shows how to save a node, instead of rendering it.
+
+# Normally the DSL "emits" nodes into the rendering buffer as they are generated
+# similar to a put statement.
+
+# But what if you want to create some nodes and then use them later.
+
+# The following example shows how to do this.  The key is the "as_node" method
+# which "pulls" the rendered node back out of the rendering buffer and returns it.
+# You may store it in some structure, or pass it as a parameter to another component.
+
+# When it is time to render the component use the .render method, which pushes the
+# node into the render buffer.
+
+# The example is also good to understand the difference between generating a node, and
+# rendering it.  You can see from the time stamps, that creating the node, does not
+# render it.  That happens only when react generates the rendered virtual DOM.  Cool huh?
+
+# This is slightly different and MORE typing than react, which is contrary to the goals
+# of reactive-ruby, so some explanation is in order.
+
+# In order to keep the DSL as short and sweet as possible, reactive-ruby assumes that
+# normally when you generate a node, you will want it pushed into the render buffer
+# (again just like a put statement.)
+
+# So when you DONT want this behavior you do have to do some extra typing, i.e. you have
+# explicitly use the .to_node and .render methods, to circumvent the rendering process.
+
+# Note that under the hood there is nothing going on different than in straight react.
+
+class NodeChildren
+
+  include React::Component
+
+  required_param :name
+
+  def render
+    tr { td {name}; td { '%.04f' %  Time.now.to_f } }
+  end
+
+end
+
+class Nodes
+
+  include React::Component
+
+  def render
+    start_time = Time.now
+    nodes = (0..10).collect { |i| NodeChildren(name: "I am node #{i}!").as_node }
+    div {
+      table {
+        tbody {
+          tr { th {"Node"}; th {"rendered at"} }
+          tr { td {"table (parent)"}; td {'%.04f' %  Time.now.to_f}}
+          nodes.each &:render
+        }
+      }
+    }
+  end
+
+end

data/example/examples/app/react_api_demo.rb

@@ -0,0 +1,29 @@
+class ReactAPIDemo
+
+  include React::Component
+
+  before_mount do
+    @click_count = 0 # normally we would just use a state variable, but we want to demo using force_update!
+  end
+
+  after_mount do
+    # to demonstrate the use of dom_node we will attach a click handler AFTER rendering is complete
+    Element[dom_node].on(:click) do
+      alert("I got attached using some low level stuff... now watch and you will see I will force a rerender") if @click_count == 0
+      @click_count += 1
+      force_update!
+    end
+  end
+
+  def render
+    #  Normally you would just attach the handler directly to the node like this:
+    # "Click Me Please".on(:click) { alert 'I was attached during rendering' }
+    if mounted?
+      "I was already mounted, and you have clicked me #{@click_count} time#{'s' if @click_count > 1}, but you can click me again!" #.on(:click) { alert("I was attached the normal way")}
+    else
+      "This is the first render.  click me to rerender!"
+    end
+
+  end
+
+end

data/example/examples/app/show.rb

@@ -10,6 +10,8 @@ require 'basics'
 require 'reuse'
 require 'items'
 require 'rerendering'
+require 'nodes'
+require 'react_api_demo'
 
 
 class Show
@@ -22,6 +24,8 @@ class Show
     route(path: "basics", name: "basics", handler: Basics)
     route(path: "reuse", name: "reuse", handler: Reuse)
     route(path: "rerendering", name: "rerendering", handler: Rerendering)
+    route(path: "nodes", name: "nodes", handler: Nodes)
+    route(path: "api_demo", name: "api_demo", handler: ReactAPIDemo)
     redirect(from: "/", to: "basics")
   end
 
@@ -32,6 +36,8 @@ class Show
         link(to: "basics") { "Basics" }; br
         link(to: "reuse") { "Reusable Components" }; br
         link(to: "rerendering") { "Rerendering Test" }; br
+        link(to: "nodes") { "Saving and using rendered nodes" }; br
+        link(to: "api_demo") { "Low Level React API" }; br
       end
     route_handler
     end

data/example/rails-tutorial/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    reactive-ruby (0.7.25)
+    reactive-ruby (0.7.27)
       opal
       opal-activesupport (>= 0.2.0)
       opal-browser

data/example/rails-tutorial/app/controllers/home_controller.rb

@@ -3,4 +3,4 @@ class HomeController < ApplicationController
   def show
     render_component  "Show", say_hello_to: params[:say_hello_to] # by default render_component will use the controller name to find the appropriate component
   end
-end
+end

data/example/rails-tutorial/app/views/components/home/show.rb

@@ -1,33 +1,33 @@
 # app/views/components/home/show.rb
 
 module Components
-  
+
   module Home
-    
+
     class Show
 
       include React::Component   # will create a new component named Show
-      
+
       optional_param :say_hello_to
       backtrace :on
-      def render  
+      def render
         puts "Rendering my first component!"
         List(first_element: div { "bhwahaha" }) do
           "hello #{'there '+say_hello_to if say_hello_to}".span # render "hello" with optional 'there ...'
-          "goodby".span  
+          "goodby".span
         end
       end
 
     end
-    
+
     class List
-      
-      include React::Component 
-      
+
+      include React::Component
+
       required_param :first_element #, type: React::Element
-      
+
       backtrace :on
-      
+
       def render
         ul do
           li do
@@ -43,6 +43,5 @@ module Components
       end
     end
   end
-  
-end
 
+end

data/lib/reactive-ruby/component.rb

@@ -311,9 +311,10 @@ module React
         if param_type == React::Observable
           (@two_way_params ||= []) << name
           define_method("#{name}") do
-            params[name].instance_variable_get("@value")
+            params[name].instance_variable_get("@value") if params[name]
           end
           define_method("#{name}!") do |*args|
+            return unless params[name]
             if args.count > 0
               current_value = params[name].instance_variable_get("@value")
               params[name].call args[0]
@@ -326,7 +327,7 @@ module React
           end
         elsif param_type == Proc
           define_method("#{name}") do |*args, &block|
-            params[name].call *args, &block
+            params[name].call(*args, &block) if params[name]
           end
         else
           define_method("#{name}") do
@@ -444,9 +445,21 @@ module React
     module API
       #include Native
 
-      alias_native :dom_node, :getDOMNode
-      alias_native :mounted?, :isMounted
-      alias_native :force_update!, :forceUpdate
+      def dom_node
+        if `typeof React.findDOMNode === 'undefined'`
+          `#{self}.native.getDOMNode`            # v0.12.0
+        else
+          `React.findDOMNode(#{self}.native)`    # v0.13.0
+        end
+      end
+
+      def mounted?
+        `#{self}.native.isMounted()`
+      end
+
+      def force_update!
+        `#{self}.native.forceUpdate()`
+      end
 
       def set_props(prop, &block)
         raise "No native ReactComponent associated" unless @native

data/lib/reactive-ruby/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = "0.7.27"
+  VERSION = "0.7.28"
 end

data/reactive-ruby.gemspec

@@ -6,6 +6,7 @@ require 'reactive-ruby/version'
 Gem::Specification.new do |s|
   s.name         = 'reactive-ruby'
   s.version      = React::VERSION
+
   s.author       = 'David Chang'
   s.email        = 'zeta11235813@gmail.com'
   s.homepage     = 'https://github.com/zetachang/react.rb'
@@ -19,10 +20,10 @@ Gem::Specification.new do |s|
   s.require_paths  = ['lib']
 
 
+
   s.add_dependency 'opal'
   s.add_dependency 'opal-activesupport', '>= 0.2.0'
   s.add_dependency 'opal-browser'
-  s.add_development_dependency 'opal-rails'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'timecop'

data/spec/controller_helper_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+if ruby?
 class TestController < ActionController::Base; end
 
 RSpec.describe TestController, type: :controller do
@@ -18,3 +19,4 @@ RSpec.describe TestController, type: :controller do
     end
   end
 end
+end

data/spec/reactive-ruby/component_loader_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+if ruby?
 RSpec.describe ReactiveRuby::ComponentLoader do
   GLOBAL_WRAPPER = <<-JS
     var global = global || this;
@@ -56,3 +57,4 @@ RSpec.describe ReactiveRuby::ComponentLoader do
     end
   end
 end
+end

data/spec/reactive-ruby/rails/component_mount_spec.rb

@@ -1,13 +1,11 @@
 require 'spec_helper'
 
+if ruby?
 RSpec.describe ReactiveRuby::Rails::ComponentMount do
   let(:helper) { described_class.new }
 
   before do
-    env = double
-    allow(env).to receive(:request).and_return(
-      { 'controller' => ActionView::TestCase::TestController.new })
-    helper.setup(env)
+    helper.setup(ActionView::TestCase::TestController.new)
   end
 
   describe '#react_component' do
@@ -45,7 +43,7 @@ RSpec.describe ReactiveRuby::Rails::ComponentMount do
       html = helper.react_component('Components::HelloWorld')
       props = react_props_for(html)
 
-      expect(props['controller']).to eq('ActionView::TestCase::TestController')
+      expect(props['controller']).to eq('ActionView::TestCase::Test')
     end
 
     it 'passes additional options through as html attributes' do
@@ -65,3 +63,4 @@ RSpec.describe ReactiveRuby::Rails::ComponentMount do
     JSON.parse(CGI.unescapeHTML("#{attr_value(html, 'data-react-props')}"))
   end
 end
+end

data/spec/reactive-ruby/server_rendering/contextual_renderer_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+if ruby?
 RSpec.describe ReactiveRuby::ServerRendering::ContextualRenderer do
   let(:renderer) { described_class.new({}) }
   let(:init) { Proc.new {} }
@@ -8,26 +9,27 @@ RSpec.describe ReactiveRuby::ServerRendering::ContextualRenderer do
   describe '#render' do
     it 'pre-renders HTML' do
       result = renderer.render('Components.Todo',
-                               { todo: 'finish reactive-ruby' },
-                               options)
+                                { todo: 'finish reactive-ruby' },
+                                options)
       expect(result).to match(/<li.*>finish reactive-ruby<\/li>/)
       expect(result).to match(/data-react-checksum/)
     end
 
     it 'accepts props as a string' do
       result = renderer.render('Components.Todo',
-                               { todo: 'finish reactive-ruby' }.to_json,
-                               options)
+                                { todo: 'finish reactive-ruby' }.to_json,
+                                options)
       expect(result).to match(/<li.*>finish reactive-ruby<\/li>/)
       expect(result).to match(/data-react-checksum/)
     end
 
     it 'pre-renders static content' do
       result = renderer.render('Components.Todo',
-                               { todo: 'finish reactive-ruby' },
-                               :static)
+                                { todo: 'finish reactive-ruby' },
+                                :static)
       expect(result).to match(/<li.*>finish reactive-ruby<\/li>/)
       expect(result).to_not match(/data-react-checksum/)
     end
   end
 end
+end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ def ruby?
 end
 
 if RUBY_ENGINE == 'opal'
+  require 'reactive-ruby'
   RSpec.configure do |config|
     config.filter_run_excluding :ruby
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.27
+  version: 0.7.28
 platform: ruby
 authors:
 - David Chang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: opal-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +156,9 @@ files:
 - example/examples/app/basics.js.rb
 - example/examples/app/items.rb
 - example/examples/app/jquery.js
+- example/examples/app/nodes.rb
 - example/examples/app/react-router.js
+- example/examples/app/react_api_demo.rb
 - example/examples/app/rerendering.rb
 - example/examples/app/reuse.rb
 - example/examples/app/show.rb
@@ -260,14 +248,6 @@ files:
 - example/todos/vendor/base.css
 - example/todos/vendor/bg.png
 - example/todos/vendor/jquery.js
-- lib/generators/reactive_ruby/test_app/templates/application.rb
-- lib/generators/reactive_ruby/test_app/templates/assets/javascripts/application.rb
-- lib/generators/reactive_ruby/test_app/templates/assets/javascripts/components.rb
-- lib/generators/reactive_ruby/test_app/templates/boot.rb
-- lib/generators/reactive_ruby/test_app/templates/script/rails
-- lib/generators/reactive_ruby/test_app/templates/views/components/hello_world.rb
-- lib/generators/reactive_ruby/test_app/templates/views/components/todo.rb
-- lib/generators/reactive_ruby/test_app/test_app_generator.rb
 - lib/rails-helpers/top_level_rails_component.rb
 - lib/reactive-ruby.rb
 - lib/reactive-ruby/api.rb

data/lib/generators/reactive_ruby/test_app/templates/application.rb

@@ -1,11 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
-
-# Require the gems listed in Gemfile, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(*Rails.groups(assets: %w(development test)))
-
-require 'reactive-ruby'
-
-<%= application_definition %>

data/lib/generators/reactive_ruby/test_app/templates/assets/javascripts/application.rb

@@ -1,2 +0,0 @@
-require 'components'
-require 'react_ujs'

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

@@ -1,3 +0,0 @@
-require 'opal'
-require 'reactive-ruby'
-require_tree './components'

data/lib/generators/reactive_ruby/test_app/templates/boot.rb

@@ -1,6 +0,0 @@
-require 'rubygems'
-gemfile = File.expand_path("<%= gemfile_path %>", __FILE__)
-
-ENV['BUNDLE_GEMFILE'] = gemfile
-require 'bundler'
-Bundler.setup

data/lib/generators/reactive_ruby/test_app/templates/script/rails

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'

data/lib/generators/reactive_ruby/test_app/templates/views/components/hello_world.rb

@@ -1,11 +0,0 @@
-module Components
-  class HelloWorld
-    include React::Component
-
-    def render
-      div do
-        "Hello, World!".span
-      end
-    end
-  end
-end

data/lib/generators/reactive_ruby/test_app/templates/views/components/todo.rb

@@ -1,14 +0,0 @@
-module Components
-  class Todo
-    include React::Component
-    export_component
-
-    params do
-      requires :todo
-    end
-
-    def render
-      li { "#{params[:todo]}" }
-    end
-  end
-end

data/lib/generators/reactive_ruby/test_app/test_app_generator.rb

@@ -1,105 +0,0 @@
-require 'rails/generators/rails/app/app_generator'
-
-module ReactiveRuby
-  class TestAppGenerator < ::Rails::Generators::Base
-    def self.source_paths
-      paths = self.superclass.source_paths
-      paths << File.expand_path('../templates', __FILE__)
-      paths.flatten
-    end
-
-    def remove_existing_app
-      remove_dir(test_app_path) if File.directory?(test_app_path)
-    end
-
-    def generate_test_app
-      opts = options.dup
-      opts[:database] = 'sqlite3' if opts[:database].blank?
-      opts[:force] = true
-      opts[:skip_bundle] = true
-
-      puts "Generating Test Rails Application..."
-      invoke ::Rails::Generators::AppGenerator,
-        [ File.expand_path(test_app_path, destination_root) ], opts
-    end
-
-    def configure_test_app
-      template 'boot.rb', "#{test_app_path}/config/boot.rb", force: true
-      template 'application.rb', "#{test_app_path}/config/application.rb", force: true
-      template 'assets/javascripts/application.rb',
-        "#{test_app_path}/app/assets/javascripts/application.rb", force: true
-      template 'assets/javascripts/components.rb',
-        "#{test_app_path}/app/views/components.rb", force: true
-      template 'views/components/hello_world.rb',
-        "#{test_app_path}/app/views/components/hello_world.rb", force: true
-      template 'views/components/todo.rb',
-        "#{test_app_path}/app/views/components/todo.rb", force: true
-    end
-
-    def clean_superfluous_files
-      inside test_app_path do
-        remove_file '.gitignore'
-        remove_file 'doc'
-        remove_file 'Gemfile'
-        remove_file 'lib/tasks'
-        remove_file 'app/assets/images/rails.png'
-        remove_file 'app/assets/javascripts/application.js'
-        remove_file 'public/index.html'
-        remove_file 'public/robots.txt'
-        remove_file 'README.rdoc'
-        remove_file 'test'
-        remove_file 'vendor'
-        remove_file 'spec'
-      end
-    end
-
-    def configure_opal_rspec
-      inject_into_file "#{test_app_path}/config/application.rb",
-        after: /class Application < Rails::Application/, verbose: true do
-        %Q[
-    config.opal.method_missing = true
-    config.opal.optimized_operators = true
-    config.opal.arity_check = false
-    config.opal.const_missing = true
-    config.opal.dynamic_require_severity = :ignore
-    config.opal.enable_specs = true
-    config.opal.spec_location = 'spec-opal'
-]
-      end
-    end
-
-    protected
-
-    def application_definition
-      @application_definition ||= begin
-                                    test_application_contents
-                                  end
-    end
-    alias :store_application_definition! :application_definition
-
-    private
-
-    def test_app_path
-      'spec/test_app'
-    end
-
-    def test_application_path
-      File.expand_path("#{test_app_path}/config/application.rb",
-                       destination_root)
-    end
-
-    def test_application_contents
-      return unless File.exists?(test_application_path) && !options[:pretend]
-      contents = File.read(test_application_path)
-      contents[(contents.index("module #{module_name}"))..-1]
-    end
-
-    def module_name
-      'TestApp'
-    end
-
-    def gemfile_path
-      '../../../../Gemfile'
-    end
-  end
-end