Merge pull request #7 from zpao/jruby

Support & test JRuby

Closes #6

Author: zpao

.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
+  - jruby-19mode
 before_install:
   - gem install bundler --version '>= 1.2.2'
 before_script: 'bundle exec rake appraisal:install'

gemfiles/rails_3.1.gemfile.lock

@@ -1,5 +1,5 @@
 PATH
-  remote: /home/jakub/code/react-rails
+  remote: /Users/poshannessy/FB/code/react-rails
   specs:
     react-rails (0.4.1.0)
       execjs
@@ -48,6 +48,7 @@ GEM
     i18n (0.6.4)
     journey (1.0.4)
     json (1.8.0)
+    json (1.8.0-java)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -85,7 +86,6 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
     thor (0.18.1)
     tilt (1.4.1)
     treetop (1.4.14)
@@ -94,11 +94,11 @@ GEM
     tzinfo (0.3.37)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   appraisal
   bundler (>= 1.2.2)
   rails (~> 3.1)
   react-rails!
-  sqlite3

gemfiles/rails_3.2.gemfile.lock

@@ -1,5 +1,5 @@
 PATH
-  remote: /home/jakub/code/react-rails
+  remote: /Users/poshannessy/FB/code/react-rails
   specs:
     react-rails (0.4.1.0)
       execjs
@@ -48,6 +48,7 @@ GEM
     i18n (0.6.4)
     journey (1.0.4)
     json (1.8.0)
+    json (1.8.0-java)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -85,7 +86,6 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
     thor (0.18.1)
     tilt (1.4.1)
     treetop (1.4.14)
@@ -94,11 +94,11 @@ GEM
     tzinfo (0.3.37)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   appraisal
   bundler (>= 1.2.2)
   rails (~> 3.2)
   react-rails!
-  sqlite3

gemfiles/rails_4.0.gemfile.lock

@@ -1,5 +1,5 @@
 PATH
-  remote: /home/jakub/code/react-rails
+  remote: /Users/poshannessy/FB/code/react-rails
   specs:
     react-rails (0.4.1.0)
       execjs
@@ -38,6 +38,7 @@ GEM
       rake
     arel (4.0.0)
     atomic (1.1.12)
+    atomic (1.1.12-java)
     builder (3.1.4)
     erubis (2.7.0)
     execjs (1.4.0)
@@ -78,22 +79,23 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.7)
     thor (0.18.1)
     thread_safe (0.1.2)
       atomic
+    thread_safe (0.1.2-java)
+      atomic
     tilt (1.4.1)
     treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   appraisal
   bundler (>= 1.2.2)
   rails (~> 4.0)
   react-rails!
-  sqlite3

react-rails.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", [">= 1.2.2"]
   s.add_development_dependency "appraisal"
-  s.add_development_dependency "sqlite3" # needed for the dummy app
 
   s.add_dependency 'execjs'
   s.add_dependency 'rails', '>= 3.1'

test/dummy/config/application.rb

@@ -1,6 +1,11 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
+# Pick the frameworks you want:
+# require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "sprockets/railtie"
+require "rails/test_unit/railtie"
 
 Bundler.require(*Rails.groups)
 require "react-rails"

test/dummy/config/database.yml

@@ -19,9 +19,6 @@
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Raise an error on page load if there are pending migrations
-  config.active_record.migration_error = :page_load
-
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.