xray-rails 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d3871d067a87b49c62b791a5c9d024ee00ea3ac
-  data.tar.gz: 592adbcc6c0975e1df1e7411986854f6b68bd02c
+  metadata.gz: 1ab0151106aea3b79331261ace9df12dfa45076d
+  data.tar.gz: b2994a45e8fda3d0e1db9e7558eb153996386ca0
 SHA512:
-  metadata.gz: f04e57f1a7f9922c997b89c45e5b5d370553f58892cf05e9171617a559475c8ffa9d0e0172abf0f2458da3bab0695debe505357da89efffb842fab262cbfb0d8
-  data.tar.gz: c3386c3905b7ced7ba04d9c4673e440a934f61e7ff6cde82fd789c451fb337b72727d167fc11332177dbf3f0d63ef4fbb4d6eb6e4a65e42f5b23e57b3c4506aa
+  metadata.gz: db9788224693472e9144b1569aa7a8d502d989df31557861c1ad51992e6724642d94f59af7341827a70ebddf8e374496e58b941ecb6dd3431330227adc012c1b
+  data.tar.gz: 246519cd7958eef5123b50eb611fd9d709bd1c53d1420aa6c2c61e2d3e3bb07aba97de79dc758cc463e633619e388721e0e9c61559355af7f85d4288673cf7ed

data/lib/xray-rails.rb

@@ -13,9 +13,8 @@ module Xray
 
   # Used to collect request information during each request cycle for use in
   # the Xray bar.
-  # TODO: there's nothing thread-safe about this. Not sure how big of a deal that is.
   def self.request_info
-    @request_info ||= {}
+    Thread.current[:request_info] ||= {}
   end
 
   # Patterns for the kind of JS constructors Xray is interested in knowing the
@@ -85,7 +84,7 @@ module Xray
       return source
     end
     # skim doesn't allow html comments, so use skim's comment syntax if it's skim
-    if path =~ /\.(skim)(\.|$)/
+    if path =~ /\.(skim|hamlc)(\.|$)/
       augmented = "/!XRAY START #{id} #{path}\n#{source}\n/!XRAY END #{id}"
     else
       augmented = "<!--XRAY START #{id} #{path}-->\n#{source}\n<!--XRAY END #{id}-->"

data/lib/xray/engine.rb

@@ -30,9 +30,16 @@ module Xray
       ActionView::Template.class_eval do
         def render_with_xray(*args, &block)
           path = identifier
+          view = args.first
           source = render_without_xray(*args, &block)
-          suitable_template = path =~ /\.(html|slim|haml)(\.|$)/ && !path.match(/\.(js|json|css)\./) && !path.include?('_xray_bar')
+
+          suitable_template = !(view.respond_to?(:mailer) && view.mailer) &&
+                              !path.include?('_xray_bar') &&
+                              path =~ /\.(html|slim|haml|hamlc)(\.|$)/ &&
+                              path !~ /\.(js|json|css)(\.|$)/
+
           options = args.last.kind_of?(Hash) ? args.last : {}
+
           if suitable_template && !(options.has_key?(:xray) && (options[:xray] == false))
             Xray.augment_template(source, path)
           else
@@ -61,8 +68,6 @@ module Xray
         action_name     = event.payload[:action]
         path            = ActiveSupport::Dependencies.search_for_file(controller_name.underscore)
 
-        # Reset the request info hash for this request.
-        # NOTE: Nothing about this is thread-safe. Could this affect anyone in dev mode?
         Xray.request_info.clear
 
         Xray.request_info[:controller] = {

data/lib/xray/middleware.rb

@@ -32,18 +32,30 @@ module Xray
           res.status = 400
         end
         res.finish
+
       # Inject xray.js and friends if this is a successful HTML response
       else
         status, headers, response = @app.call(env)
 
         if html_headers?(status, headers) && body = response_body(response)
-          body = body.sub(/<body[^>]*>/) { "#{$~}\n#{xray_bar(response)}" }
-          # Inject js script tags if assets are unbundled
-          if Rails.application.config.assets.debug
-            append_js!(body, 'jquery', 'xray')
-            append_js!(body, 'backbone', 'xray-backbone')
+          if body =~ script_matcher('xray')
+            # Inject the xray bar if xray.js is already on the page
+            inject_xray_bar!(body)
+          elsif Rails.application.config.assets.debug
+            # Otherwise try to inject xray.js if assets are unbundled
+            if append_js!(body, 'jquery', 'xray')
+              append_js!(body, 'backbone', 'xray-backbone')
+              inject_xray_bar!(body)
+            end
           end
+
           content_length = body.bytesize.to_s
+
+          # For rails v4.2.0+ compatibility
+          if defined?(ActionDispatch::Response::RackBody) && ActionDispatch::Response::RackBody === response
+            response = response.instance_variable_get(:@response)
+          end
+
           # Modifying the original response obj maintains compatibility with other middlewares
           if ActionDispatch::Response === response
             response.body = [body]
@@ -61,22 +73,24 @@ module Xray
 
     private
 
-    def xray_bar(response)
+    def inject_xray_bar!(html)
+      html.sub!(/<body[^>]*>/) { "#{$~}\n#{render_xray_bar}" }
+    end
+
+    def render_xray_bar
       ac = ActionController::Base.new
-      ac.request = response.request if response.respond_to?(:request)
       ac.render_to_string(:partial => '/xray_bar').html_safe
     end
 
-    # Appends the given `script_name` after the `after_script_name`.
-    def append_js!(html, after_script_name, script_name)
-      # Matches:
-      #   <script src="/assets/jquery.js"></script>
-      #   <script src="/assets/jquery-min.js"></script>
-      #   <script src="/assets/jquery.min.1.9.1.js"></script>
-      #   <script src="/assets/jquery.min.1.9.1-89255b9dbf3de2fbaa6754b3a00db431.js"></script>
-      script_pattern = /
+    # Matches:
+    #   <script src="/assets/jquery.js"></script>
+    #   <script src="/assets/jquery-min.js"></script>
+    #   <script src="/assets/jquery.min.1.9.1.js"></script>
+    #   <script src="/assets/jquery.min.1.9.1-89255b9dbf3de2fbaa6754b3a00db431.js"></script>
+    def script_matcher(script_name)
+      /
         <script[^>]+
-        \/#{after_script_name} # Name of the script itself
+        \/#{script_name}
         ([-.]{1}[\d\.]+)?      # Optional version identifier (e.g. -1.9.1)
         ([-.]{1}min)?          # Optional -min suffix
         (\.self)?              # Sprockets 3 appends .self to the filename
@@ -84,12 +98,19 @@ module Xray
         \.js                   # Must have .js extension
         [^>]+><\/script>
       /x
-      html.sub!(script_pattern) do
-        h = ActionController::Base.helpers
-        "#{$~}\n" + h.javascript_include_tag(script_name)
+    end
+
+    # Appends the given `script_name` after the `after_script_name`.
+    def append_js!(html, after_script_name, script_name)
+      html.sub!(script_matcher(after_script_name)) do
+        "#{$~}\n" + helper.javascript_include_tag(script_name)
       end
     end
 
+    def helper
+      ActionController::Base.helpers
+    end
+
     def html_headers?(status, headers)
       status == 200 &&
       headers['Content-Type'] &&

data/lib/xray/version.rb

@@ -1,3 +1,3 @@
 module Xray
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xray-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Brent Dillingham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Reveal the structure of your UI