xray-rails 0.1.5 → 0.1.6

data/app/views/_xray_bar.html.erb

@@ -10,7 +10,7 @@
           <%= Xray.request_info[:controller][:name] %><span class="xray-bar-controller-action">#<%= Xray.request_info[:controller][:action] %></span>
         </span>
       <% end %>
-      <% if Xray.request_info[:view] %>
+      <% if Xray.request_info[:view] && Xray.request_info[:controller][:name] != "Rails::InfoController" %>
         <% layout_path = lookup_context.find(Xray.request_info[:view][:layout]).identifier %>
         <span class="xray-bar-btn xray-bar-layout xray-icon-columns" data-path="<%= layout_path %>">
           <b></b>

data/lib/xray/engine.rb

@@ -7,6 +7,7 @@ module Xray
   # xray.js and the xray bar into the app's response bodies.
   class Engine < ::Rails::Engine
     initializer "xray.initialize" do |app|
+      ensure_asset_pipeline_enabled! app
       app.middleware.use Xray::Middleware
 
       # Register as a Sprockets processor to augment JS files, including
@@ -27,7 +28,7 @@ module Xray
         def render_with_xray(*args, &block)
           path = identifier
           source = render_without_xray(*args, &block)
-          if path =~ /\.(html|slim|haml)(\.|$)/ && !path.include?('_xray_bar')
+          if path =~ /\.(html|slim|haml)(\.|$)/ && !path.match(/\.(js|json)\./) && !path.include?('_xray_bar')
             Xray.augment_template(source, path)
           else
             source
@@ -84,5 +85,13 @@ module Xray
         end
       end
     end
+
+    def ensure_asset_pipeline_enabled!(app)
+      unless app.assets
+        raise "xray-rails requires the Rails asset pipeline.
+The asset pipeline is currently disabled in this application.
+Either convert your application to use the asset pipeline, or remove xrail-rails from your Gemfile."
+      end
+    end
   end
 end

data/lib/xray/middleware.rb

@@ -60,7 +60,7 @@ module Xray
       #   <script src="/assets/jquery.js"></script>
       #   <script src="/assets/jquery-min.js"></script>
       #   <script src="/assets/jquery.min.1.9.1.js"></script>
-      html.sub!(/<script[^>]+#{after_script_name}([-.]{1}[\d\.]+)?([-.]{1}min)?\.js[^>]+><\/script>/) do
+      html.sub!(/<script[^>]+\/#{after_script_name}([-.]{1}[\d\.]+)?([-.]{1}min)?\.js[^>]+><\/script>/) do
         h = ActionController::Base.helpers
         "#{$~}\n" + h.javascript_include_tag(script_name)
       end

data/lib/xray/version.rb

@@ -1,3 +1,3 @@
 module Xray
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xray-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: eco
   requirement: !ruby/object:Gem::Requirement