Merge branch '0-7-stable'. Includes JRuby Support

closes #98

Conflicts:
	Gemfile.lock

Author: ajjahn

.gitignore

@@ -30,3 +30,4 @@ node_modules
 .bundle
 
 spec/test_app
+Gemfile.lock

.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
+  - jruby-19mode
 script:
   - bundle exec rake test_app
   - bundle exec rake

Gemfile

@@ -1,8 +1,2 @@
 source 'https://rubygems.org'
-group :development, :test do
-  gem 'therubyracer', platforms: :ruby
-  gem 'rails'
-  gem 'react-rails'
-  gem 'opal-rails'
-end
 gemspec

README.md

@@ -61,6 +61,9 @@ gem 'reactive-ruby'
 gem 'react-rails', '~> 1.3.2'
 gem 'opal-rails'
 gem 'therubyracer', platforms: :ruby # Required for prerendering
+# for JRuby you need the below line instead
+# gem 'therubyrhino, platforms: :jruby
+
 ```
 
 Run `bundle install` and restart your rails server.
@@ -136,7 +139,7 @@ props), to render the component:
 class HomeController < ApplicationController
   def show
     # render_component uses the controller name to find the 'show' component.
-    render_component say_hello_to: params[:say_hello_to] 
+    render_component say_hello_to: params[:say_hello_to]
   end
 end
 ```
@@ -161,11 +164,11 @@ regardless of the name of the controller method.
 
 Searching for components works like this:  Given a controller named
 "Foo" then react.rb will search for a module named `Foo` containing the component.
-If this fails all modules will be searched (i.e. the name of the controller will be 
+If this fails all modules will be searched (i.e. the name of the controller will be
 ignored.)  In either case the search begins at the outer most scope until a match is made.
 
 Thus for example given a controller named `Foo`, components could be found in the `Foo` module,
-the `Components::Foo` module, in the outer most scope, or in any nested module. 
+the `Components::Foo` module, in the outer most scope, or in any nested module.
 The way the search works allows for small projects that do not need a lot
 of name spacing, and also allows components to be shared across several controllers.
 

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

@@ -1,15 +1,13 @@
-<% if defined? application_definition %>
+<% if defined? application_definition -%>
+require File.expand_path('../boot', __FILE__) 
+require 'rails/all'
 
-  require File.expand_path('../boot', __FILE__)
+# 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 'rails/all'
+require 'opal-rails'
+require 'reactive-ruby'
 
-  # 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 %>
-
-<% end %>
+<%= application_definition %>
+<% end -%>

lib/reactive-ruby/server_rendering/contextual_renderer.rb

@@ -1,15 +1,24 @@
 module ReactiveRuby
   module ServerRendering
+    def self.context_instance_name
+      return '@rhino_context' if RUBY_PLATFORM == 'java'
+      '@v8_context'
+    end
+
+    def self.context_instance_for(context)
+      context.instance_variable_get(context_instance_name)
+    end
+
     class ContextualRenderer < React::ServerRendering::SprocketsRenderer
       def initialize(options = {})
         super(options)
         ComponentLoader.new(v8_context).load
       end
 
       def render(component_name, props, prerender_options)
-        if prerender_options.is_a? Hash
+        if prerender_options.is_a?(Hash)
           if v8_runtime? && prerender_options[:context_initializer]
-            raise React::ServerRendering::PrerenderError.new(component_name, props, "you must use 'therubyracer' with the prerender[:context] option") unless v8_runtime?
+            raise PrerenderError.new(component_name, props, "you must use 'therubyracer' with the prerender[:context] option") unless v8_runtime?
           else
             prerender_options[:context_initializer].call v8_context
             prerender_options = prerender_options[:static] ? :static : true
@@ -22,12 +31,11 @@ def render(component_name, props, prerender_options)
       private
 
       def v8_runtime?
-        ExecJS.runtime.name == "(V8)" || ExecJS.runtime.name == "therubyrhino (Rhino)"
+        ["(V8)", "therubyrhino (Rhino)"].include?(ExecJS.runtime.name)
       end
 
       def v8_context
-        @v8_context ||= @context.instance_variable_get("@v8_context")
-        @v8_context ||= @context.instance_variable_get("@rhino_context")
+        @v8_context ||= ReactiveRuby::ServerRendering.context_instance_for(@context)
       end
     end
   end

reactive-ruby.gemspec

@@ -20,13 +20,25 @@ Gem::Specification.new do |s|
 
 
 
-  s.add_dependency 'opal'
+  s.add_dependency 'opal', '0.8.0'
   s.add_dependency 'opal-activesupport', '>= 0.2.0'
-  s.add_dependency 'opal-browser'
+  s.add_dependency 'opal-browser', '0.2.0'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'rspec-rails', '3.3.3'
   s.add_development_dependency 'timecop'
-  s.add_development_dependency 'opal-rspec'
+  s.add_development_dependency 'opal-rspec', '0.4.3'
   s.add_development_dependency 'sinatra'
-  s.add_development_dependency 'sqlite3' # For Test Rails App
+
+  # For Test Rails App
+  s.add_development_dependency 'rails', '4.2.4'
+  s.add_development_dependency 'react-rails', '1.3.1'
+  s.add_development_dependency 'opal-rails', '0.8.0'
+  if RUBY_PLATFORM == 'java'
+    s.add_development_dependency 'jdbc-sqlite3'
+    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
+    s.add_development_dependency 'therubyrhino'
+  else
+    s.add_development_dependency 'sqlite3', '1.3.10'
+    s.add_development_dependency 'therubyracer', '0.12.2'
+  end
 end

spec/reactive-ruby/component_loader_spec.rb

@@ -10,7 +10,7 @@
 
   let(:js) { ::Rails.application.assets['components'].to_s }
   let(:context) { ExecJS.compile(GLOBAL_WRAPPER + js) }
-  let(:v8_context) { context.instance_variable_get(:@v8_context) }
+  let(:v8_context) { ReactiveRuby::ServerRendering.context_instance_for(context) }
 
   describe '.new' do
     it 'raises a meaningful exception when initialized without a context' do

spec/reactive-ruby/isomorphic_helpers_spec.rb

@@ -73,7 +73,7 @@ def test_context(files = nil)
       end
       js = "#{React::ServerRendering::ExecJSRenderer::GLOBAL_WRAPPER}#{js}"
       ctx = ExecJS.compile(js)
-      ctx = ctx.instance_variable_get("@v8_context")
+      ctx = ReactiveRuby::ServerRendering.context_instance_for(ctx)
     end
 
     def react_context