react_on_rails 4.0.0.beta.1 → 4.0.0.beta.2

data/lib/react_on_rails/test_helper/webpack_process_checker.rb

@@ -5,28 +5,32 @@ module ReactOnRails
     class WebpackProcessChecker
       def initialize
         @printed_once = {}
+        @needs_client_compile = true
+        @needs_server_compile = Utils.server_rendering_is_enabled?
+        @wait_longer = false
       end
 
-      def running?
+      # Return true if we should keep waiting
+      # type is either client or server
+      def client_running?
         client_running = check_running_for_type("client")
-        return client_running unless Utils.server_rendering_is_enabled?
+        return false unless client_running
+      end
 
-        server_running = check_running_for_type("server")
-        fail_if_only_running_for_one_type(client_running, server_running)
+      def server_running?
+        if Utils.server_rendering_is_enabled?
+          return true if check_running_for_type("server")
+        end
+        false
+      end
 
-        client_running && server_running
+      def hot_running?
+        _response = `pgrep -fl 'babel-node +server-rails-hot.js'`
+        Utils.last_process_completed_successfully?
       end
 
       private
 
-      # We only want to do this if server rendering is enabled.
-      def fail_if_only_running_for_one_type(client_running, server_running)
-        return unless client_running ^ server_running
-        raise "\n\nError: detected webpack is not running for both types of assets:\n"\
-         "***Webpack Client Process Running?: #{client_running}\n"\
-         "***Webpack Server Process Running?: #{server_running}"
-      end
-
       def check_running_for_type(type)
         type = type.to_sym
 

data/lib/react_on_rails/utils.rb

@@ -13,5 +13,10 @@ module ReactOnRails
     def self.last_process_completed_successfully?
       $CHILD_STATUS.exitstatus == 0
     end
+
+    def self.default_server_bundle_js_file_path
+      File.join(ReactOnRails.configuration.generated_assets_dir,
+                ReactOnRails.configuration.server_bundle_js_file)
+    end
   end
 end

data/lib/react_on_rails/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ReactOnRails
-  VERSION = "4.0.0.beta.1".freeze
+  VERSION = "4.0.0.beta.2".freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.2",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {
@@ -47,7 +47,6 @@
   "scripts": {
     "test": "node_package/scripts/test",
     "clean": "node_package/scripts/clean",
-    "symlink-node-package": "node_package/scripts/symlink-node-package",
     "prepublish": "npm run build",
     "build": "node_package/scripts/build",
     "build-watch": "$(npm bin)/babel --watch --out-dir node_package/lib node_package/src",

data/rakelib/node_package.rake

@@ -5,14 +5,7 @@ namespace :node_package do
   task :build do
     sh "npm run build"
   end
-
-  desc "Has all examples and dummy apps use local node_package folder for react-on-rails node dependency"
-  task :symlink do
-    sh_in_dir(gem_root, "npm run symlink-node-package")
-  end
 end
 
 desc "Prepares node_package by building and symlinking any example/dummy apps present"
-task node_package: "node_package:build" do
-  Rake::Task["node_package:symlink"].invoke
-end
+task node_package: "node_package:build"

data/rakelib/run_rspec.rake

@@ -7,6 +7,8 @@ require_relative "example_type"
 include ReactOnRails::TaskHelpers
 
 namespace :run_rspec do
+  spec_dummy_dir = File.join("spec", "dummy")
+
   desc "Run RSpec for top level only"
   task :gem do
     run_tests_in("", rspec_args: File.join("spec", "react_on_rails"))
@@ -14,12 +16,14 @@ namespace :run_rspec do
 
   desc "Runs dummy rspec with turbolinks"
   task dummy: ["dummy_apps:dummy_app"] do
-    run_tests_in(File.join("spec", "dummy"))
+    clean_gen_assets(spec_dummy_dir)
+    run_tests_in(spec_dummy_dir)
   end
 
   desc "Runs dummy rspec without turbolinks"
   task dummy_no_turbolinks: ["dummy_apps:dummy_app"] do
-    run_tests_in(File.join("spec", "dummy"),
+    clean_gen_assets(spec_dummy_dir)
+    run_tests_in(spec_dummy_dir,
                  env_vars: "DISABLE_TURBOLINKS=TRUE",
                  command_name: "dummy_no_turbolinks")
     bundle_install_in(dummy_app_dir)
@@ -27,7 +31,8 @@ namespace :run_rspec do
 
   desc "Runs dummy respec with turbolinks 5"
   task dummy_turbolinks_5: ["dummy_apps:dummy_app_with_turbolinks_5"] do
-    run_tests_in(File.join("spec", "dummy"), env_vars:
+    clean_gen_assets(spec_dummy_dir)
+    run_tests_in(spec_dummy_dir, env_vars:
       "ENABLE_TURBOLINKS_5=TRUE BUNDLE_GEMFILE=#{dummy_app_dir}/Gemfile")
   end
 
@@ -51,8 +56,13 @@ namespace :run_rspec do
 
   Coveralls::RakeTask.new
 
+  desc "run all tests no examples"
+  task all_but_examples: [:gem, :dummy, :dummy_no_turbolinks, :dummy_turbolinks_5, :empty, :js_tests] do
+    puts "Completed all RSpec tests"
+  end
+
   desc "run all tests"
-  task run_rspec: [:gem, :dummy, :dummy_no_turbolinks, :dummy_turbolinks_5, :examples, :empty, :js_tests] do
+  task run_rspec: [:all_but_examples, :examples] do
     puts "Completed all RSpec tests"
   end
 end
@@ -66,12 +76,7 @@ desc "Runs all tests. Run `rake -D run_rspec` to see all available test options"
 task run_rspec: ["run_rspec:run_rspec"]
 
 private
-
-# Runs rspec in the given directory.
-# If string is passed and it's not absolute, it's converted relative to root of the gem.
-# TEST_ENV_COMMAND_NAME is used to make SimpleCov.command_name unique in order to
-# prevent a name collision. Defaults to the given directory's name.
-def run_tests_in(dir, options = {})
+def calc_path(dir)
   if dir.is_a?(String)
     path = if dir.start_with?(File::SEPARATOR)
              Pathname.new(dir)
@@ -81,9 +86,23 @@ def run_tests_in(dir, options = {})
   else
     path = dir
   end
+  path
+end
+
+# Runs rspec in the given directory.
+# If string is passed and it's not absolute, it's converted relative to root of the gem.
+# TEST_ENV_COMMAND_NAME is used to make SimpleCov.command_name unique in order to
+# prevent a name collision. Defaults to the given directory's name.
+def run_tests_in(dir, options = {})
+  path = calc_path(dir)
 
   command_name = options.fetch(:command_name, path.basename)
   rspec_args = options.fetch(:rspec_args, "")
   env_vars = %(#{options.fetch(:env_vars, '')} COVERAGE=true TEST_ENV_COMMAND_NAME="#{command_name}")
   sh_in_dir(path.realpath, "#{env_vars} bundle exec rspec #{rspec_args}")
 end
+
+def clean_gen_assets(dir)
+  path = calc_path(dir)
+  sh_in_dir(path.realpath, "npm run build:clean")
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta.1
+  version: 4.0.0.beta.2
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -462,7 +462,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Rails with react server rendering with webpack.