react_on_rails 10.1.4 → 11.0.0.beta.1

data/rakelib/task_helpers.rb

@@ -4,7 +4,7 @@ module ReactOnRails
   module TaskHelpers
     # Returns the root folder of the react_on_rails gem
     def gem_root
-      File.expand_path("../../.", __FILE__)
+      File.expand_path("..", __dir__)
     end
 
     # Returns the folder where examples are located

data/react_on_rails.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "react_on_rails/version"
 
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rainbow", "~> 2.2"
 
   s.add_development_dependency "awesome_print"
-  s.add_development_dependency "bundler", "~> 1.10"
+  s.add_development_dependency "bundler", "~> 1"
   s.add_development_dependency "coveralls"
   s.add_development_dependency "gem-release"
   s.add_development_dependency "generator_spec"
@@ -44,14 +44,17 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pry-stack_explorer"
   s.add_development_dependency "pry-state"
   s.add_development_dependency "pry-toys"
-  s.add_development_dependency "rails", "~> 5.1.2"
+  s.add_development_dependency "rails", "~> 5.2"
+
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec"
-  
-  s.post_install_message = <<~MSG
-    Email contact@shakacode.com for access to our slack room and information about our "pro support plan"
-    which supports better performance, via caching helpers and our node rendering server.
-
-  MSG
+  s.add_development_dependency "rubocop", "0.55.0"
+
+  s.post_install_message = '
+--------------------------------------------------------------------------------
+Email contact@shakacode.com for access to our slack room and information about our "pro support plan"
+which supports better performance, via caching helpers and our node rendering server.
+--------------------------------------------------------------------------------
+'
 end
 # rubocop:enable Metrics/BlockLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 10.1.4
+  version: 11.0.0.beta.1
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +304,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.55.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.55.0
 description: See README.md
 email:
 - justin@shakacode.com
@@ -417,23 +431,24 @@ files:
 - lib/react_on_rails/configuration.rb
 - lib/react_on_rails/controller.rb
 - lib/react_on_rails/engine.rb
+- lib/react_on_rails/error.rb
 - lib/react_on_rails/git_utils.rb
 - lib/react_on_rails/json_output.rb
 - lib/react_on_rails/locales_to_js.rb
 - lib/react_on_rails/prerender_error.rb
 - lib/react_on_rails/react_component/options.rb
+- lib/react_on_rails/react_on_rails_helper.rb
 - lib/react_on_rails/server_rendering_pool.rb
-- lib/react_on_rails/server_rendering_pool/exec.rb
-- lib/react_on_rails/server_rendering_pool/node.rb
+- lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb
 - lib/react_on_rails/test_helper.rb
 - lib/react_on_rails/test_helper/ensure_assets_compiled.rb
-- lib/react_on_rails/test_helper/node_process_launcher.rb
 - lib/react_on_rails/test_helper/webpack_assets_compiler.rb
 - lib/react_on_rails/test_helper/webpack_assets_status_checker.rb
 - lib/react_on_rails/utils.rb
 - lib/react_on_rails/version.rb
 - lib/react_on_rails/version_checker.rb
 - lib/react_on_rails/version_syntax_converter.rb
+- lib/react_on_rails/webpacker_utils.rb
 - lib/tasks/assets.rake
 - lib/tasks/locale.rake
 - package.json
@@ -459,10 +474,12 @@ homepage: https://github.com/shakacode/react_on_rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: |+
+post_install_message: |2
+
+  --------------------------------------------------------------------------------
   Email contact@shakacode.com for access to our slack room and information about our "pro support plan"
   which supports better performance, via caching helpers and our node rendering server.
-
+  --------------------------------------------------------------------------------
 rdoc_options: []
 require_paths:
 - lib
@@ -473,9 +490,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14

data/lib/react_on_rails/server_rendering_pool/node.rb

@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-module ReactOnRails
-  module ServerRenderingPool
-    class Node
-      # This implementation of the rendering pool uses NodeJS to execute javasript code
-      def self.reset_pool
-        options = {
-          size: ReactOnRails.configuration.server_renderer_pool_size,
-          timeout: ReactOnRails.configuration.server_renderer_timeout
-        }
-        @js_context_pool = ConnectionPool.new(options) { create_js_context }
-      end
-
-      def self.reset_pool_if_server_bundle_was_modified
-        # No need for this method, the server bundle is automatically reset by node when changes
-        # Empty implementation to conform to ServerRenderingPool interface
-      end
-
-      # js_code: JavaScript expression that returns a string.
-      # Returns a Hash:
-      #   html: string of HTML for direct insertion on the page by evaluating js_code
-      #   consoleReplayScript: script for replaying console
-      #   hasErrors: true if server rendering errors
-      # Note, js_code does not have to be based on React.
-      # js_code MUST RETURN json stringify Object
-      # Calling code will probably call 'html_safe' on return value before rendering to the view.
-      def self.server_render_js_with_console_logging(js_code)
-        if trace_react_on_rails?
-          @file_index ||= 1
-          trace_messsage(js_code, "tmp/server-generated-#{@file_index % 10}.js")
-          @file_index += 1
-        end
-        json_string = eval_js(js_code)
-        JSON.parse(json_string)
-      end
-
-      class << self
-        private
-
-        def trace_messsage(js_code, file_name = "tmp/server-generated.js", force = false)
-          return unless trace_react_on_rails? || force
-          # Set to anything to print generated code.
-          puts "Z" * 80
-          puts "react_renderer.rb: 92"
-          puts "wrote file #{file_name}"
-          File.write(file_name, js_code)
-          puts "Z" * 80
-        end
-
-        def trace_react_on_rails?
-          ENV["TRACE_REACT_ON_RAILS"].present?
-        end
-
-        def eval_js(js_code)
-          eof_symbol = "\r\n\0"
-          max_int = (2**30 - 1)
-          @js_context_pool.with do |js_context|
-            js_context.send(js_code + eof_symbol, 0)
-            result = ""
-            result[-eof_symbol.length..-1] != eof_symbol while result += js_context.recv(max_int)
-            result[0..-eof_symbol.length]
-          end
-        end
-
-        def create_js_context
-          begin
-            client = UNIXSocket.new("client/node/node.sock")
-            client.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
-          rescue StandardError => e
-            Rails.logger.error("Unable to connect to socket: client/node/node.sock. \
-              Make sure node server is up and running.")
-            Rails.logger.error(e)
-            raise e
-          end
-          client
-        end
-      end
-    end
-  end
-end

data/lib/react_on_rails/test_helper/node_process_launcher.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module ReactOnRails
-  module TestHelper
-    def self.launch_node
-      return unless ReactOnRails.configuration.server_render_method == "NodeJS"
-
-      path = "#{::Rails.root}/client/node"
-      puts "Launching NodeJS server at #{path}"
-      system("cd #{path} && yarn start &")
-      sleep(1)
-    end
-  end
-end