Ensure proper encoding when reading file from URL

justin808 · justin808 · commit 36134a5fc9f9 · 2018-12-05T16:27:35.000-10:00
diff --git a/docs/basics/configuration.md b/docs/basics/configuration.md
@@ -124,7 +124,6 @@ ReactOnRails.configure do |config|
   # While you may configure this to be the same as your client bundle file, this file is typically
   # different. Note, be sure to include the exact file name with the ".js" if you are not hashing this file.
   # If you are hashing this file (supposing you are using the same file for client rendering), then
-  # 
   # you should include a name that matches your bundle name in your webpack config.
   config.server_bundle_js_file = "server-bundle.js"
 
diff --git a/lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb b/lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb
@@ -104,7 +104,7 @@ def eval_js(js_code, _render_options)
         def read_bundle_js_code
           server_js_file = ReactOnRails::Utils.server_bundle_js_file_path
           if ReactOnRails::Utils.server_bundle_path_is_http?
-            Net::HTTP.get(URI.parse(server_js_file)).force_encoding("UTF-8")
+            file_url_to_string(server_js_file)
           else
             File.read(server_js_file)
           end
@@ -204,6 +204,19 @@ def console_polyfill
           JS
           # rubocop:enable Layout/IndentHeredoc
         end
+
+        private
+
+        def file_url_to_string(url)
+          response = Net::HTTP.get_response(URI.parse(url))
+          content_type_header = response["content-type"]
+          match = content_type_header.match(/\A.*; charset=(?<encoding>.*)\z/)
+          encoding_type = match[:encoding]
+          response.body.force_encoding(encoding_type)
+        rescue StandardError => e
+          msg = "file_url_to_string #{url} failed\nError is: #{e}"
+          raise ReactOnRails::Error, msg
+        end
       end
     end
   end
diff --git a/lib/react_on_rails/utils.rb b/lib/react_on_rails/utils.rb
@@ -96,7 +96,7 @@ def self.server_bundle_js_file_path
 
     def self.bundle_js_file_path(bundle_name)
       if ReactOnRails::WebpackerUtils.using_webpacker? && bundle_name != "manifest.json"
-        ReactOnRails::WebpackerUtils.bundle_js_file_path_from_webpacker(bundle_name)
+        ReactOnRails::WebpackerUtils.bundle_js_uri_from_webpacker(bundle_name)
       else
         # Default to the non-hashed name in the specified output directory, which, for legacy
         # React on Rails, this is the output directory picked up by the asset pipeline.
diff --git a/lib/react_on_rails/webpacker_utils.rb b/lib/react_on_rails/webpacker_utils.rb
@@ -9,7 +9,8 @@ def self.dev_server_running?
       Webpacker.dev_server.running?
     end
 
-    def self.bundle_js_file_path_from_webpacker(bundle_name)
+    # This returns either a URL for the webpack-dev-server or a file path
+    def self.bundle_js_uri_from_webpacker(bundle_name)
       # Note Webpacker 3.4.3 manifest lookup is inside of the public_output_path
       # [2] (pry) ReactOnRails::WebpackerUtils: 0> Webpacker.manifest.lookup("app-bundle.js")
       # "/webpack/development/app-bundle-c1d2b6ab73dffa7d9c0e.js"
diff --git a/spec/dummy/Procfile.static b/spec/dummy/Procfile.static
@@ -1,4 +1,7 @@
 # Run Rails without hot reloading (static assets).
+# For debugging with Pry:
+#   Tab 1: `foreman start -f Procfile.dev -m puma=0,all=1`
+#   Tab 2: `rails s webrick`
 rails: rails s -b 0.0.0.0
 
 # Build client assets, watching for changes.
