Fix bugs

Author: gmcgibbon

.rubocop.yml

@@ -5,3 +5,6 @@ require: rubocop-performance
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
+
+AllCops:
+    SuggestExtensions: false

lib/app_profiler.rb

@@ -125,11 +125,11 @@ def backend=(new_backend)
     end
 
     def stackprof_viewer
-      @@stackprof_viewer ||= Viewer::SpeedscopeViewer
+      @@stackprof_viewer ||= Viewer::SpeedscopeViewer # rubocop:disable Style/ClassVars
     end
 
     def vernier_viewer
-      @@vernier_viewer ||= Viewer::FirefoxRemoteViewer
+      @@vernier_viewer ||= Viewer::FirefoxRemoteViewer # rubocop:disable Style/ClassVars
     end
 
     def profile_sampler_enabled=(value)

lib/app_profiler/railtie.rb

@@ -11,8 +11,12 @@ class Railtie < Rails::Railtie
       AppProfiler.logger = app.config.app_profiler.logger || Rails.logger
       AppProfiler.root = app.config.app_profiler.root || Rails.root
       AppProfiler.storage = app.config.app_profiler.storage || Storage::FileStorage
-      AppProfiler.stackprof_viewer = app.config.app_profiler.stackprof_viewer if app.config.app_profiler.stackprof_viewer
-      AppProfiler.vernier_viewer = app.config.app_profiler.vernier_viewer if app.config.app_profiler.vernier_viewer
+      if app.config.app_profiler.stackprof_viewer
+        AppProfiler.stackprof_viewer = app.config.app_profiler.stackprof_viewer
+      end
+      if app.config.app_profiler.vernier_viewer
+        AppProfiler.vernier_viewer = app.config.app_profiler.vernier_viewer
+      end
       AppProfiler.storage.bucket_name = app.config.app_profiler.storage_bucket_name || "profiles"
       AppProfiler.storage.credentials = app.config.app_profiler.storage_credentials || {}
       AppProfiler.middleware = app.config.app_profiler.middleware || Middleware
@@ -50,7 +54,7 @@ class Railtie < Rails::Railtie
 
     initializer "app_profiler.add_middleware" do |app|
       unless AppProfiler.middleware.disabled
-        if Rails.env.development? || Rails.env.test? && AppProfiler.stackprof_viewer.remote?
+        if (Rails.env.development? || Rails.env.test?) && AppProfiler.stackprof_viewer.remote?
           app.middleware.insert_before(0, AppProfiler.viewer::Middleware)
         end
         app.middleware.insert_before(0, AppProfiler.middleware)

lib/app_profiler/stackprof_profile.rb

@@ -2,7 +2,7 @@
 
 module AppProfiler
   class StackprofProfile < BaseProfile
-    FILE_EXTENSION = ".json"
+    FILE_EXTENSION = ".stackprof.json"
 
     def mode
       @data[:mode]

lib/app_profiler/vernier_profile.rb

@@ -2,7 +2,7 @@
 
 module AppProfiler
   class VernierProfile < BaseProfile
-    FILE_EXTENSION = ".gecko.json"
+    FILE_EXTENSION = ".vernier.json"
 
     def mode
       @data[:meta][:mode]

lib/app_profiler/viewer/firefox_remote_viewer/middleware.rb

@@ -18,10 +18,9 @@ def initialize(app)
 
         def call(env)
           request = Rack::Request.new(env)
-          @app.call(env) if request.path_info.end_with?(AppProfiler::StackprofProfile::FILE_EXTENSION)
           # Firefox profiler *really* doesn't like for /from-url/ to be at any other mount point
           # so with this enabled, we take over both /app_profiler and /from-url in the app in development.
-          return from(env, Regexp.last_match(1))   if request.path_info =~ %r(\A/from-url(.*)\z)
+          return from(env, Regexp.last_match(1))   if request.path_info =~ %r(\A/from-url/(.*)\z)
           return viewer(env, Regexp.last_match(1)) if request.path_info =~ %r(\A/app_profiler/firefox/viewer/(.*)\z)
           return show(env, Regexp.last_match(1))   if request.path_info =~ %r(\A/app_profiler/firefox/(.*)\z)
 
@@ -39,10 +38,9 @@ def viewer(env, path)
             proto = env["rack.url_scheme"]
             host = env["HTTP_HOST"]
             source = "#{proto}://#{host}/app_profiler/firefox/#{path}"
-
             target = "/from-url/#{CGI.escape(source)}"
 
-            [302, { "Location" => target }, []]
+            [302, { "Location" => target }, [""]]
           else
             env[Rack::PATH_INFO] = path.delete_prefix("/app_profiler")
             firefox_profiler.call(env)

lib/app_profiler/viewer/speedscope_remote_viewer/middleware.rb

@@ -18,7 +18,7 @@ def initialize(app)
 
         def call(env)
           request = Rack::Request.new(env)
-          @app.call(env) if request.path_info.end_with?(AppProfiler::VernierProfile::FILE_EXTENSION)
+
           return viewer(env, Regexp.last_match(1)) if request.path_info =~ %r(\A/app_profiler/speedscope/viewer/(.*)\z)
           return show(env, Regexp.last_match(1))   if request.path_info =~ %r(\A/app_profiler/speedscope/(.*)\z)
 
@@ -32,15 +32,8 @@ def call(env)
         def viewer(env, path)
           setup_yarn unless yarn_setup
 
-          if path.end_with?(AppProfiler::StackprofProfile::FILE_EXTENSION)
-            source = "/app_profiler/speedscope/#{path}"
-            target = "/app_profiler/speedscope/viewer/index.html#profileURL=#{CGI.escape(source)}"
-
-            [302, { "Location" => target }, []]
-          else
-            env[Rack::PATH_INFO] = path.delete_prefix("/app_profiler/speedscope")
-            speedscope.call(env)
-          end
+          env[Rack::PATH_INFO] = path.delete_prefix("/app_profiler/speedscope")
+          speedscope.call(env)
         end
 
         def show(_env, name)

lib/app_profiler/yarn/with_firefox_profiler.rb

@@ -22,8 +22,6 @@ def firefox_profiler_added?
       end
 
       def fetch_firefox_profiler
-        raise ArgumentError unless PACKAGE.start_with?("https://github.com")
-
         repo, branch = PACKAGE.to_s.split("#")
 
         dir = "./tmp"

test/app_profiler/viewer/remote/middleware/firefox_middleware_test.rb

@@ -68,7 +68,8 @@ class MiddlewareTest < TestCase
           @app.expects(:system).with("which", "yarn", out: File::NULL).returns(true)
           @app.expects(:system).with("yarn", "init", "--yes").returns(true)
 
-          url, branch = "https://github.com/tenderlove/profiler", "v0.0.2"
+          url = "https://github.com/tenderlove/profiler"
+          branch = "v0.0.2"
           @app.expects(:system).with("git", "clone", url, "firefox-profiler", "--branch=#{branch}").returns(true)
 
           File.expects(:read).returns("{}")