xray-rails 0.1.6 → 0.1.7

data/app/views/_xray_bar.html.erb

@@ -37,7 +37,7 @@
       <label for="xray-editor-input">Editor</label>
       <input id="xray-editor-input" type="text" value="<%= Xray.config.editor %>">
       <button type="submit">Save</button>
-      <p>Settings are saved to ~/.xrayconfig</p>
+      <p>Settings are saved to <%= Xray.config.config_file %></p>
   </form>
   </div>
   <%= stylesheet_link_tag :xray %>

data/lib/xray/config.rb

@@ -7,7 +7,7 @@ module Xray
   class Config
     attr_accessor :editor
 
-    CONFIG_FILE = "#{Dir.home}/.xrayconfig"
+    CONFIG_FILE = ".xrayconfig"
     DEFAULT_EDITOR = '/usr/local/bin/subl'
 
     def editor
@@ -27,11 +27,19 @@ module Xray
       {editor: editor}.to_yaml
     end
 
+    def config_file
+      if File.exists?("#{Dir.pwd}/#{CONFIG_FILE}")
+        "#{Dir.pwd}/#{CONFIG_FILE}"
+      else
+        "#{Dir.home}/#{CONFIG_FILE}"
+      end
+    end
+
     private
 
     def write_config(new_config)
       config = load_config.merge(new_config)
-      File.open(CONFIG_FILE, 'w') { |f| f.write(config.to_yaml) }
+      File.open(config_file, 'w') { |f| f.write(config.to_yaml) }
     end
 
     def load_config
@@ -39,7 +47,7 @@ module Xray
     end
 
     def local_config
-      YAML.load_file(CONFIG_FILE)
+      YAML.load_file(config_file)
     rescue
       {}
     end

data/lib/xray/middleware.rb

@@ -61,11 +61,14 @@ module Xray
       #   <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
-        h = ActionController::Base.helpers
-        "#{$~}\n" + h.javascript_include_tag(script_name)
+        "#{$~}\n" + view_context.javascript_include_tag(script_name)
       end
     end
 
+    def view_context
+      @view_context ||= Rails.application.assets.context_class.new nil, nil, nil
+    end
+
     def should_inject_xray?(status, headers, response)
       status == 200 &&
       !empty?(response) &&

data/lib/xray/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xray-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails