xray-rails 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a615b22a493e07b3115b382f002c36c50b7268f
-  data.tar.gz: b97fa1653ebed9c29ec48397e97e918c722d33b2
+  metadata.gz: 0be94e713039493a6168e678b79e2f17767bfdb8
+  data.tar.gz: ff587e289d5ff5afd817a3ab1aad742b2181c7da
 SHA512:
-  metadata.gz: cd87e68ea5c4844c4c9f871cbae0d7cf7232218132c3c733f74ff2d599f309e89049f055758768612e84c143afbf99348869cf1dcbd4ac88b1d7c42da1cad697
-  data.tar.gz: f19ecffa3407856add279ed5af297ff9b93719caebfb3d7e01c94ff81b798f33210e1569d9ab0c54bd423b697bb71c14a4749c70477a24f84df84fbbe7a40559
+  metadata.gz: 070abce68bfd8b9c26d4367c6a53b758502b51cb188475f808cbb70c462f053457a8c5026d18fb5be8f830d219e8f37658d136f1f7007c364166625379fcdd80
+  data.tar.gz: 9b2b354cd8fc4fbbb832dc0dfc2085b4377465c8edc76e204a3880039ba9cf6480d5eea1619a75b53c8455b2d289053cd4c76641901096fabb39ffb89beaadb0

data/README.md

@@ -1,5 +1,5 @@
-Xray
-====
+Xray-rails
+==========
 
 ### Reveal your UI's bones
 
@@ -11,7 +11,7 @@ Xray is the missing link between the browser and your app code. Press **cmd+shif
 
 ## Current Support
 
-Xray is intended for Rails 3.1+ and Ruby 1.9.
+Xray is intended for Rails 3.1+ and Ruby 1.9+.
 
 So far, Xray can reveal:
 
@@ -75,10 +75,10 @@ Or for something more complex, use the `$file` placeholder.
 
 ## How this works
 
-* During asset compilation, JS files and templates are modified to contain file path information.
+* At run time, HTML responses from Rails are wrapped with HTML comments containing filepath info.
+* Additionally, JS templates and Backbone view constructors are modified during asset compilation.
 * A middleware inserts `xray.js`, `xray.css`, and the Xray bar into all successful HTML response bodies.
-* 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.
+* When the overlay is shown, `xray.js` examines the inserted filepath info to build the overlay.
 
 ## Disabling Xray in particular templates
 

data/app/assets/javascripts/xray.js.coffee

@@ -110,7 +110,7 @@ class Xray.Specimen
 
   makeBox: ->
     @bounds = util.computeBoundingBox(@$contents)
-    @$box = $("<div class='xray-specimen #{@constructor.name}'>").css(@bounds)
+    @$box = $("<div class='xray-specimen #{@constructor.name}'>").css(@bounds).attr('title', @path)
 
     # If the element is fixed, override the computed position with the fixed one.
     if @$contents.css('position') == 'fixed'
@@ -155,7 +155,7 @@ class Xray.Overlay
     @reset()
     Xray.isShowing = true
     util.bm 'show', =>
-      @bar.$el.find('#xray-bar-togglers .xray-bar-btn').removeClass('active')
+      @bar.$el().find('#xray-bar-togglers .xray-bar-btn').removeClass('active')
       unless @$overlay.is(':visible')
         $('body').append @$overlay
         @bar.show()
@@ -163,14 +163,14 @@ class Xray.Overlay
         when 'templates'
           Xray.findTemplates()
           specimens = Xray.TemplateSpecimen.all
-          @bar.$el.find('.xray-bar-templates-toggler').addClass('active')
+          @bar.$el().find('.xray-bar-templates-toggler').addClass('active')
         when 'views'
           specimens = Xray.ViewSpecimen.all
-          @bar.$el.find('.xray-bar-views-toggler').addClass('active')
+          @bar.$el().find('.xray-bar-views-toggler').addClass('active')
         else
           Xray.findTemplates()
           specimens = Xray.specimens()
-          @bar.$el.find('.xray-bar-all-toggler').addClass('active')
+          @bar.$el().find('.xray-bar-all-toggler').addClass('active')
       for element in specimens
         continue unless element.isVisible()
         element.makeBox()
@@ -196,37 +196,51 @@ class Xray.Overlay
 # toggle buttons for showing the different types of specimens in the overlay.
 class Xray.Bar
   constructor: (el) ->
-    @$el = $(el)
-    @$el.css(zIndex: MAX_ZINDEX)
-    @$el.find('#xray-bar-controller-path .xray-bar-btn').click ->
+    @el = el
+
+  # Defer wiring up jQuery event handlers until needed and then memoize the
+  # result. If the Bar element no longer exists in the DOM, re-wire it.
+  # This allows the Bar to keep working even if e.g. Turbolinks replaces the
+  # DOM out from under us.
+  $el: ->
+    return @$el_memo if @$el_memo? && $.contains(window.document, @$el_memo[0])
+    @$el_memo = $(@el)
+    @$el_memo.css(zIndex: MAX_ZINDEX)
+    @$el_memo.find('#xray-bar-controller-path .xray-bar-btn').click ->
       Xray.open($(this).attr('data-path'))
-    @$el.find('.xray-bar-all-toggler').click       -> Xray.show()
-    @$el.find('.xray-bar-templates-toggler').click -> Xray.show('templates')
-    @$el.find('.xray-bar-views-toggler').click     -> Xray.show('views')
-    @$el.find('.xray-bar-settings-btn').click      -> Xray.toggleSettings()
+    @$el_memo.find('.xray-bar-all-toggler').click       -> Xray.show()
+    @$el_memo.find('.xray-bar-templates-toggler').click -> Xray.show('templates')
+    @$el_memo.find('.xray-bar-views-toggler').click     -> Xray.show('views')
+    @$el_memo.find('.xray-bar-settings-btn').click      -> Xray.toggleSettings()
+    @$el_memo
 
   show: ->
-    @$el.show()
+    @$el().show()
     @originalPadding = parseInt $('html').css('padding-bottom')
     if @originalPadding < 40
       $('html').css paddingBottom: 40
 
   hide: ->
-    @$el.hide()
+    @$el().hide()
     $('html').css paddingBottom: @originalPadding
 
 
 class Xray.Settings
   constructor: (el) ->
-    @$el = $(el)
-    @$el.find('form').submit @save
+    @el = el
+
+  $el: ->
+    return @$el_memo if @$el_memo? && $.contains(window.document, @$el_memo[0])
+    @$el_memo = $(@el)
+    @$el_memo.find('form').submit @save
+    @$el_memo
 
   toggle: =>
-    @$el.toggle()
+    @$el().toggle()
 
   save: (e) =>
     e.preventDefault()
-    editor = @$el.find('#xray-editor-input').val()
+    editor = @$el().find('#xray-editor-input').val()
     $.ajax
       url: '/_xray/config'
       type: 'POST'
@@ -239,7 +253,7 @@ class Xray.Settings
       $msg = $("<span class='xray-settings-success xray-settings-update-msg'>Success!</span>")
     else
       $msg = $("<span class='xray-settings-error xray-settings-update-msg'>Uh oh, something went wrong!</span>")
-    @$el.append($msg)
+    @$el().append($msg)
     $msg.delay(2000).fadeOut(500, => $msg.remove(); @toggle())
 
 

data/app/assets/stylesheets/xray.css

@@ -97,7 +97,7 @@
                     url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpDRkNBMTUwNzdGRTIxMUUyQjBGQ0NBRTc5RDQ3MEJFNSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpDRkNBMTUwODdGRTIxMUUyQjBGQ0NBRTc5RDQ3MEJFNSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkNGQ0ExNTA1N0ZFMjExRTJCMEZDQ0FFNzlENDcwQkU1IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkNGQ0ExNTA2N0ZFMjExRTJCMEZDQ0FFNzlENDcwQkU1Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+aIv7XwAAAEVJREFUeNpiFBMTY2BgEBISYsAGWICAATdgkZeXB1Lv37/HLo1LAgKYGPACdOl3YIAwHNOpKFw0aTSXokujuZSA0wACDABh2BIyJ1wQkwAAAABJRU5ErkJggg==);
 }
 
-  @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
+  @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dppx) {
     #xray-bar {
       background-image: linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.3)),
                         url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo0Q0ZGQkRGRTdGRTMxMUUyQjBGQ0NBRTc5RDQ3MEJFNSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo0Q0ZGQkRGRjdGRTMxMUUyQjBGQ0NBRTc5RDQ3MEJFNSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkNGQ0ExNTA5N0ZFMjExRTJCMEZDQ0FFNzlENDcwQkU1IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkNGQ0ExNTBBN0ZFMjExRTJCMEZDQ0FFNzlENDcwQkU1Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+T6y4zwAAAIZJREFUeNrkkjEKwCAMRWMbERw8gE5O3v9q6lIEbbDQMZJ2Kv0gBOSR8HkqxphzBgDnnDEGJNkRsfc+xmitWWtF8KaUuqZ7EMDee1qutQ4hSGGkl1Kis2utYviYgUfZ4EU+CiP/TV0y/i02l1L6DA3is3n/FjDvHy5bYfxbF8b490fDTgEGAJveOCvuYEabAAAAAElFTkSuQmCC);

data/lib/xray/engine.rb

@@ -31,7 +31,7 @@ module Xray
         def render_with_xray(*args, &block)
           path = identifier
           source = render_without_xray(*args, &block)
-          suitable_template = path =~ /\.(html|slim|haml)(\.|$)/ && !path.match(/\.(js|json)\./) && !path.include?('_xray_bar')
+          suitable_template = path =~ /\.(html|slim|haml)(\.|$)/ && !path.match(/\.(js|json|css)\./) && !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)

data/lib/xray/middleware.rb

@@ -73,7 +73,8 @@ 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
+      #   <script src="/assets/jquery.min.1.9.1-89255b9dbf3de2fbaa6754b3a00db431.js"></script>
+      html.sub!(/<script[^>]+\/#{after_script_name}([-.]{1}[\d\.]+)?([-.]{1}min)?(-\h{32})?\.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.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xray-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Brent Dillingham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails