react_on_rails 2.2.0 → 2.3.0

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {
@@ -13,7 +13,7 @@
     "babel": "^6.3.26",
     "babel-cli": "^6.4.5",
     "babel-core": "^6.4.5",
-    "babel-eslint": "^5.0.0-beta6",
+    "babel-eslint": "^5.0.0-beta8",
     "babel-loader": "^6.2.1",
     "babel-plugin-transform-runtime": "^6.4.3",
     "babel-preset-es2015": "^6.3.13",
@@ -28,14 +28,14 @@
     "eslint-config-shakacode": "1.0.0",
     "eslint-plugin-babel": "^3.0.0",
     "eslint-plugin-react": "^3.16.1",
-    "jscs": "^2.8.0",
-    "react": "^0.14.6",
-    "react-dom": "^0.14.6",
+    "jsdom": "^8.0.2",
+    "jscs": "^2.9.0",
+    "react": "^0.14.7",
+    "react-dom": "^0.14.7",
     "react-transform-hmr": "^1.0.1",
     "tap-spec": "^4.1.1",
     "tape": "^4.4.0",
-    "webpack": "^1.12.12",
-    "jsdom": "^8.0.0-0"
+    "webpack": "^1.12.12"
   },
   "peerDependencies": {
     "react": ">= 0.14",
@@ -51,8 +51,8 @@
     "prepublish": "npm run build",
     "build": "node_package/scripts/build",
     "build-watch": "$(npm bin)/babel --watch --out-dir node_package/lib node_package/src",
-    "eslint": "eslint . --ext .jsx and .js",
-    "jscs": "jscs . -e -v",
+    "eslint": "$(npm bin)/eslint . --ext .jsx and .js",
+    "jscs": "$(npm bin)/jscs . -e -v",
     "lint": "npm run eslint && npm run jscs",
     "lint:fix": "node_package/scripts/lint-fix",
     "check": "npm run lint && npm run test",

data/rakelib/dummy_apps.rake

@@ -5,12 +5,7 @@ namespace :dummy_apps do
   task :dummy_app do
     dummy_app_dir = File.join(gem_root, "spec/dummy")
     bundle_install_in(dummy_app_dir)
-    dummy_app_client_dir = File.join(dummy_app_dir, "client")
-
-    # Note, we do not put in "npm build" as npm install does that!
-    sh_in_dir(dummy_app_client_dir, ["npm install",
-                                     "$(npm bin)/webpack --config webpack.server.js",
-                                     "$(npm bin)/webpack --config webpack.client.js"])
+    sh_in_dir(dummy_app_dir, "npm install")
   end
 
   task dummy_apps: [:dummy_app, :node_package] do

data/rakelib/lint.rake

@@ -4,18 +4,18 @@ include ReactOnRails::TaskHelpers
 namespace :lint do
   desc "Run Rubocop as shell"
   task :rubocop do
-    sh_in_dir(gem_root, "rubocop .")
+    sh_in_dir(gem_root, "bundle exec rubocop .")
   end
 
   desc "Run ruby-lint as shell"
   task :ruby do
     puts "See /ruby-lint.yml for what directories are included."
-    sh_in_dir(gem_root, "ruby-lint .")
+    sh_in_dir(gem_root, "bundle exec ruby-lint .")
   end
 
   desc "Run scss-lint as shell"
   task :scss do
-    sh_in_dir(gem_root, "scss-lint spec/dummy/app/assets/stylesheets/")
+    sh_in_dir(gem_root, "bundle exec scss-lint spec/dummy/app/assets/stylesheets/")
   end
 
   desc "Run eslint as shell"

data/rakelib/node_package.rake

@@ -3,7 +3,7 @@ include ReactOnRails::TaskHelpers
 
 namespace :node_package do
   task :build do
-    sh 'npm run build'
+    sh "npm run build"
   end
 
   desc "Has all examples and dummy apps use local node_package folder for react-on-rails node dependency"

data/rakelib/run_rspec.rake

@@ -12,14 +12,17 @@ namespace :run_rspec do
     run_tests_in("", rspec_args: File.join("spec", "react_on_rails"))
   end
 
+  desc "Runs dummy rspec with turbolinks"
   task dummy: ["dummy_apps:dummy_app"] do
-    run_tests_in(File.join("spec", "dummy"), env_vars: "DRIVER=selenium_firefox")
+    run_tests_in(File.join("spec", "dummy"))
   end
 
+  desc "Runs dummy rspec without turbolinks"
   task dummy_no_turbolinks: ["dummy_apps:dummy_app"] do
     run_tests_in(File.join("spec", "dummy"),
-                 env_vars: "DRIVER=selenium_firefox DISABLE_TURBOLINKS=TRUE",
+                 env_vars: "DISABLE_TURBOLINKS=TRUE",
                  command_name: "dummy_no_turbolinks")
+    bundle_install_in(dummy_app_dir)
   end
 
   # Dynamically define Rake tasks for each example app found in the examples directory

data/rakelib/task_helpers.rb

@@ -24,6 +24,10 @@ module ReactOnRails
       sh_in_dir(dir, "bundle install")
     end
 
+    def bundle_install_in_no_turbolinks(dir)
+      sh_in_dir(dir, "DISABLE_TURBOLINKS=TRUE bundle install")
+    end
+
     # Runs bundle exec using that directory's Gemfile
     def bundle_exec(dir: nil, args: nil, env_vars: "")
       sh_in_dir(dir, "#{env_vars} #{args}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool