xray-rails 0.1.12 → 0.1.13

data/README.md

@@ -80,6 +80,14 @@ Or for something more complex, use the `$file` placeholder.
 * When the overlay is shown, `xray.js` examines the file path information inserted during asset compilation.
 * Another middleware piggybacks the Rails server to respond to requests to open file paths with the user's desired editor.
 
+## Disabling Xray in particular templates
+
+Xray augments HTML templates by wrapping their contents with HTML comments. For some environments such as [Angular.js](http://angularjs.org/), this can cause Angular templates to stop working because Angular expects only one root node in the template HTML. You can pass in the option `xray: false` to any render statements to ensure Xray does not augment that template. Example:
+
+```ruby
+render 'show', xray: false
+```
+
 ## Contributing
 
 If you have an idea, open an issue and let's talk about it, or fork away and send a pull request.

data/app/views/_xray_bar.html.erb

@@ -7,7 +7,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] && Xray.request_info[:controller][:name] != "Rails::InfoController" %>
+      <% if Xray.request_info[:view] && Xray.request_info.fetch(: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

@@ -28,7 +28,9 @@ module Xray
         def render_with_xray(*args, &block)
           path = identifier
           source = render_without_xray(*args, &block)
-          if path =~ /\.(html|slim|haml)(\.|$)/ && !path.match(/\.(js|json)\./) && !path.include?('_xray_bar')
+          suitable_template = path =~ /\.(html|slim|haml)(\.|$)/ && !path.match(/\.(js|json)\./) && !path.include?('_xray_bar')
+          options = args.last.kind_of?(Hash) ? args.last : {}
+          if suitable_template && !(options.has_key?(:xray) && (options[:xray] == false))
             Xray.augment_template(source, path)
           else
             source

data/lib/xray/version.rb

@@ -1,3 +1,3 @@
 module Xray
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xray-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -205,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3612644589838496871
+      hash: -1659673758590935188
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3612644589838496871
+      hash: -1659673758590935188
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23