code_buddy 0.0.6 → 0.0.7

data/.gitignore

@@ -1,4 +1,10 @@
 pkg/*
 *.gem
 .bundle
+bundler
+cache
 *.swp
+*~
+Gemfile.lock
+example_trace
+tmp

data/Gemfile

@@ -2,3 +2,8 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in code_buddy.gemspec
 gemspec
+
+
+group :test, :cucumber do
+  gem 'rails'
+end

data/History.md

@@ -0,0 +1,10 @@
+## Code Buddy release history
+
+### 0.0.7 / 2011-01-04
+
+[full changelog](https://github.com/patshaughnessy/code_buddy/compare/v0.0.6...v0.0.7)
+
+* Bug fix: Handles stack traces from haml files
+* 'e' opens an editor to current file (mvim and mate only based on EDITOR environment variable)
+* 'h' show/hide code window
+* Added some cucumber features so we know it works

data/Rakefile

@@ -3,8 +3,13 @@ Bundler::GemHelper.install_tasks
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
+
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+task :default => [:spec, :cucumber]
+
+Cucumber::Rake::Task.new(:cucumber)
+

data/code_buddy.gemspec

@@ -27,5 +27,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake',          '~> 0.8.7'
   s.add_development_dependency 'rspec',         '~> 2.2.0'
   s.add_development_dependency 'mocha',         '~> 0.9.10'
-
+  s.add_development_dependency 'cucumber',      '~> 0.9.4'
+  s.add_development_dependency 'aruba',         '~> 0.2.2'
+  # s.add_development_dependency 'capybara'
+  # s.add_development_dependency 'akephalos'
 end

data/features/rails2_app.feature

@@ -0,0 +1,21 @@
+Feature: Make sure CodeBuddy works with a Rails3 app
+
+@announce
+Scenario: See a stack trace with links
+  Given I have created a new Rails 2 app "new_rails2_app" with code_buddy 
+    And I run "script/generate scaffold user"
+    And I overwrite "app/views/users/index.html.erb" with:
+      """
+      <%= raise 'oops' %>
+      """
+    And I run "rake db:migrate"
+    And I run "cp ../../../features/templates/rails_exception.feature.template features/rails_exception.feature"
+    And I am pending
+    And I run "rake cucumber"
+    Then it should pass with:
+       """
+       1 scenario (1 passed)
+       4 steps (4 passed)
+       """
+      
+      

data/features/rails3_app.feature

@@ -0,0 +1,21 @@
+Feature: Make sure CodeBuddy works with a Rails3 app
+
+@announce
+Scenario: See a stack trace with links
+  Given I have created a new Rails 3 app "new_rails3_app" with code_buddy 
+    And I run "rails generate scaffold users"
+    And I overwrite "app/views/users/index.html.erb" with:
+      """
+      <%= raise 'oops' %>
+      """
+    And I run "rake db:migrate"
+    And I enable show_exceptions in "config/environments/test.rb"
+    And I run "cp ../../../features/templates/rails_exception.feature.template features/rails_exception.feature"
+    And I run "bundle exec rake cucumber -v"
+    Then it should pass with:
+       """
+       1 scenario (1 passed)
+       4 steps (4 passed)
+       """
+      
+      

data/features/sinatra.feature

@@ -0,0 +1,15 @@
+Feature: Make sure CodeBuddy works when started as a sinatra app
+
+@announce
+Scenario: See a stack trace with links
+  Given I have created a test harness "sinatra_testing" for sinatra
+    And I run "cp ../../../features/templates/sinatra_homepage.feature.template features/sinatra_homepage.feature"
+    And I run "cp ../../../features/templates/sinatra_paths.rb.template features/support/paths.rb"
+    And I run "cucumber ."
+    Then it should pass with:
+    """
+    1 scenario (1 passed)
+    2 steps (2 passed)
+    """
+      
+      

data/features/step_definitions/rails_setup_steps.rb

@@ -0,0 +1,68 @@
+Given /^I have created a new Rails 3 app "([^"]*)" with code_buddy$/ do |app_name|
+  steps <<-STEPS
+    Given I successfully run "rails new #{app_name}"
+    And I cd to "#{app_name}"
+    And I append to "Gemfile" with:
+      """
+      gem 'rspec'
+      # gem 'akephalos', :git => 'https://github.com/thoughtbot/akephalos.git'
+      gem "cucumber-rails"
+      gem "capybara",  '~> 0.3.8'
+      gem 'code_buddy', :path=>File.expand_path("../../../..", __FILE__)
+      """
+    And I run "bundle install"
+    And I run "rails generate cucumber:install"
+    And I run "rake db:migrate"
+  STEPS
+end
+
+Given /^I have created a new Rails 2 app "([^"]*)" with code_buddy$/ do |app_name|
+  steps <<-STEPS
+    Given I run "gem install rails --version '=2.3.10'"
+    And I successfully run "rails _2.3.10_ #{app_name}"
+    And I cd to "#{app_name}"
+    And I replace "# Specify gems that this application depends on and have them installed with rake gems:install" in "config/environment.rb" with:
+      """
+      # Specify gems that this application depends on and have them installed with rake gems:install
+      config.gem 'code_buddy' 
+      config.middleware.use "CodeBuddy::ShowApp"
+      
+      """
+    And I run "mkdir vendor/gems"
+    And I run "ln -s #{File.expand_path("../../..", __FILE__)} vendor/gems/code_buddy-#{CodeBuddy::VERSION}"
+    And I run "script/generate cucumber"
+    And I run "rake db:migrate"
+  STEPS
+end
+
+
+Given /^I have created a test harness "([^"]*)" for sinatra$/ do |app_name|
+  steps <<-STEPS
+    Given I run "gem install cucumber-sinatra"
+    And I successfully run "mkdir #{app_name}"
+    And I cd to "#{app_name}"
+    And I run "cucumber-sinatra init CodeBuddy::App ../../../spec/spec_helper.rb"
+  STEPS
+  # And I run "cp #{File.expand_path("../templates/sinatra_env.rb.template", __FILE__)} features/support/env.rb"
+end
+
+Given /^I enable show_exceptions in "([^"]*)"$/ do |file_name|
+  # Given %Q[I replace "config.action_dispatch.show_exceptions = false" in "#{file_name}"], pystring #Cucumber::Ast::PyString.parse('config.action_dispatch.show_exceptions = true')
+  cmd = "sed s/'config.action_dispatch.show_exceptions = false'/'config.action_dispatch.show_exceptions = true'/ #{file_name}"
+  run_simple(cmd)
+  create_file(file_name, stdout_from(cmd), true)
+end
+
+Given /^I replace "([^"]*)" in "([^"]*)" with:$/ do |marker, file_name, new_text|
+  file = File.readlines(File.join(current_dir, file_name))
+  new_content = file.map do |line|
+    if line =~ Regexp.new(marker)
+      new_text
+    else
+      line
+    end
+  end
+  create_file(file_name, new_content, true)
+end
+
+

data/features/support/env.rb

@@ -0,0 +1,9 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'rspec/expectations'
+require 'aruba/cucumber'
+
+Before do
+  unset_bundler_env_vars
+end
+

data/features/templates/rails_exception.feature.template

@@ -0,0 +1,8 @@
+Feature: Ensure CodeBuddy creates links in a Rails app
+
+@allow-rescue
+Scenario: Clicking on a line of a stack trace on the exception page
+   When I go to the users page
+   Then I should see "app/views/users/index.html.erb:1"
+    And I follow "app/views/users/index.html.erb:1"
+   Then I should see "CodeBuddySee your Ruby stack come alive"

data/features/templates/sinatra_env.rb.template

@@ -0,0 +1,22 @@
+# Some minor edits after being
+# Generated by cucumber-sinatra. (Wed Dec 22 13:32:12 -0500 2010)
+
+ENV['RACK_ENV'] = 'test'
+
+require File.join(File.dirname(__FILE__), '..', '..', '../../spec/spec_helper.rb')
+
+require 'capybara'
+require 'capybara/cucumber'
+require 'rspec'
+
+Capybara.app = CodeBuddy::App
+
+class CodeBuddyWorld
+  include Capybara
+  include RSpec::Expectations
+  include RSpec::Matchers
+end
+
+World do
+  CodeBuddyWorld.new
+end

data/features/templates/sinatra_homepage.feature.template

@@ -0,0 +1,6 @@
+Feature: Ensure CodeBuddy creates links as a stand alone Sinatra app
+
+Scenario: Clicking on a line of a stack trace on the exception page
+   When I go to the new stack form page
+   # And show me the page
+   Then I should see "CodeBuddySee your Ruby stack come alive"

data/features/templates/sinatra_paths.rb.template

@@ -0,0 +1,31 @@
+# Taken from the cucumber-rails project.
+
+module NavigationHelpers
+  # Maps a name to a path. Used by the
+  #
+  #   When /^I go to (.+)$/ do |page_name|
+  #
+  # step definition in web_steps.rb
+  #
+  def path_to(page_name)
+    case page_name
+
+    when /the home page/
+      '/'
+    when /the new stack form page/
+      '/new'
+
+    # Add more mappings here.
+    # Here is an example that pulls values out of the Regexp:
+    #
+    #   when /^(.*)'s profile page$/i
+    #     user_profile_path(User.find_by_login($1))
+
+    else
+      raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+        "Now, go and add a mapping in #{__FILE__}"
+    end
+  end
+end
+
+World(NavigationHelpers)

data/lib/code_buddy.rb

@@ -9,8 +9,7 @@ require 'code_buddy/stack_frame'
 require 'code_buddy/middleware'
 
 begin
-  if Rails.env.development?
-    CodeBuddy::App.rails = true
+  if Rails.env.development? || Rails.env.test?
     case Rails::VERSION::MAJOR
     when 2:
       require 'code_buddy/rails2/monkey_patch_action_controller'
@@ -21,3 +20,5 @@ begin
 rescue NameError
   nil
 end
+
+# CodeBuddy::App.run!

data/lib/code_buddy/app.rb

@@ -5,7 +5,7 @@ module CodeBuddy
 
     class << self
       attr_reader   :stack
-      attr_accessor :rails
+      attr_accessor :path_prefix
 
       def exception=(exception)
         @stack = Stack.new(exception)
@@ -17,7 +17,7 @@ module CodeBuddy
     end
 
     get '/' do
-      redirect "#{rails_prefix}/stack"
+      redirect "#{path_prefix}/stack"
     end
 
     get '/new' do
@@ -26,7 +26,7 @@ module CodeBuddy
 
     post '/new' do
       self.class.stack_string = params[:stack]
-      redirect "#{rails_prefix}/stack"
+      redirect "#{path_prefix}/stack"
     end
 
     get '/stack' do
@@ -38,18 +38,22 @@ module CodeBuddy
       display_stack(params[:selected].to_i)
     end
 
+    get '/edit/:selected' do
+      self.class.stack.edit(params[:selected].to_i)
+    end
+
     def display_stack(selected_param)
       @stack = self.class.stack
       if @stack
         @stack.selected = selected_param
         erb :index
       else
-        redirect "#{rails_prefix}/new"
+        redirect "#{path_prefix}/new"
       end
     end
 
-    def rails_prefix
-      self.class.rails ? '/code_buddy' : ''
+    def path_prefix
+      self.class.path_prefix 
     end
 
   end

data/lib/code_buddy/middleware.rb

@@ -5,7 +5,7 @@ module CodeBuddy
     end
 
     def call(env)
-      if env['PATH_INFO'] =~ /^\/code_buddy(.*)/ && Rails.env.development?
+      if env['PATH_INFO'] =~ /^\/code_buddy(.*)/ #&& Rails.env.development?
         env['PATH_INFO'] = $1
         App.new.call(env)
       else

data/lib/code_buddy/public/javascripts/code_buddy.js

@@ -1,16 +1,31 @@
-var Address = Backbone.Model.extend({
+var CodeBuddy = {
+  stack     : null,
+  stackView : null,
+  backbone  : {}
+}
+
+CodeBuddy.backbone.Address = Backbone.Model.extend({
   selected: function() {
-    return stack.selectedAddress() == this
-  },  
+    return CodeBuddy.stack.selectedAddress() == this
+  },
 });
 
-var Addresses = Backbone.Collection.extend({model:Address})
+CodeBuddy.backbone.Addresses = Backbone.Collection.extend({
+  model:CodeBuddy.backbone.Address,
+  
+  bookmarked: function() {
+    return this.select(function(address){
+      return address.get('bookmarked');
+    })
+  }
+})
 
-var Stack = Backbone.Model.extend({
+CodeBuddy.backbone.Stack = Backbone.Model.extend({
   initialize: function() {
+    _.bindAll(this, 'toggleBookmark', 'selectNextBookmark')
     this.bind('change:selected', this.selectionChanged);
     this.set({
-      addresses: new Addresses(this.get('stack_frames')) 
+      addresses: new CodeBuddy.backbone.Addresses(this.get('stack_frames')) 
     })
   },
 
@@ -19,6 +34,14 @@ var Stack = Backbone.Model.extend({
       this.set({ selected: newSelected })
     }
   },
+  
+  selectPrevious: function() {
+    this.setSelection(this.get('selected') - 1)
+  },
+  
+  selectNext: function() {
+    this.setSelection(this.get('selected') + 1)
+  },
 
   addresses: function() {
     return this.get('addresses')
@@ -30,100 +53,138 @@ var Stack = Backbone.Model.extend({
   },
 
   selectionChanged: function(x) {
-    this.updateSelectedAddress(x)
-    this.view.render()
-  },
-
-  updateSelectedAddress: function(x) {
     this.addresses().at(x.previousAttributes().selected).view.render()
     this.addresses().at(x.changedAttributes().selected).view.render()
-  }
+    this.view.render()
+  },
 
+  toggleBookmark: function() {
+    this.selectedAddress().set({bookmarked:!this.get('bookmarked')})
+    this.selectedAddress().view.render();
+  },
 
+  selectNextBookmark: function() {
+    var bookmarked = this.addresses().bookmarked();
+    var length = bookmarked.length;
+    var toSelect;
+    if(length > 0) {
+      var current = _.indexOf(bookmarked, this.selectedAddress())
+      if(current > -1 && current < length - 1) {
+        toSelect = bookmarked[current + 1]
+      } else {
+        toSelect = bookmarked[0]
+      }
+      return this.setSelection(toSelect.cid.substr(1)-1)
+    }
+  }
 });
 
 // ADDRESS VIEW - SELECTED ADDRESS IN BOLD
-var AddressView = Backbone.View.extend({
+CodeBuddy.backbone.AddressView = Backbone.View.extend({
   tagName:  "li",
 
   template: _.template("<span class='container'><%= path %>:<%= line%><span class='overlay'></span></span>"),
 
   initialize: function() {
-    _.bindAll(this, 'render', 'close');
-    this.model.bind('change', this.render);
     this.model.view = this;
   },
 
   events: {
-    click: "open"
+    click: "open",
+    dblclick: "toggleBookmark"
   },
+  
   open: function() {
-    stack.set({selected: this.model.cid.substr(1)-1});
+    CodeBuddy.stack.set({selected: this.model.cid.substr(1)-1});
+  },
+  
+  toggleBookmark: function() {
+    this.open();
+    CodeBuddy.stack.toggleBookmark();
   },
 
   render: function() {
+    $(this.el).removeClass('selected bookmarked')
+    
     var html = this.template(this.model.toJSON())
 
     $(this.el).html(html);
     if (this.model.selected()) {
       $(this.el).addClass('selected')
-    } else {
-      $(this.el).removeClass('selected')
+    }
+    if (this.model.get('bookmarked')) {
+      $(this.el).addClass('bookmarked')
     }
     return this;
   }
 })
 
 // STACK VIEW - LOGIC FOR ASSIGNING EACH ADDRESS VIEW TO EACH LI TAG
-var StackView = Backbone.View.extend({
+CodeBuddy.backbone.StackView = Backbone.View.extend({
 
   el: $("#stack"),
 
-  events: {
-    "keypress #stack"      : "changeSelectionOnArrow"
-  },    
-
   initialize: function() {
-    _.bindAll(this, 'render', 'close');
-    this.model.bind('change', this.render);
+    _.bindAll(this, 'selectNext', 'selectPrevious')
     this.model.view = this;
-
     this.model.get('addresses').each(this.addOneAddress);
   },
-
-  changeSelectionOnArrow: function(event) {
-    var origSelection = this.model.get('selected')
-    var newSelection  = origSelection
-    if (event.keyCode == 38) {
-      newSelection = origSelection - 1
-    } else if (event.keyCode == 40) {
-      newSelection = origSelection + 1
-    }
-    if (newSelection != origSelection) {
-      this.model.setSelection(newSelection)
-
-      var offset = $(stack.selectedAddress().view.el).offset()
-      var windowHeight = $(window).height()
-      if (offset.top > windowHeight + $(window).scrollTop() - 10) {
-        // scroll down
-        $('html,body').animate({scrollTop: offset.top - 200}, 500);
-      } else if (offset.top < $(window).scrollTop() + 100) {
-        // scroll up
-        $('html,body').animate({scrollTop: offset.top - 500}, 500);
-      }
-      return false
-    } else {
-      return true
+  
+  selectPrevious: function() {
+    this.model.selectPrevious();
+    this.ensureVisibility();
+    return false;
+  },
+  
+  selectNext: function() {
+    this.model.selectNext();
+    this.ensureVisibility();
+    return false;
+  },
+  
+  ensureVisibility: function() {
+    var offset = $(CodeBuddy.stack.selectedAddress().view.el).offset()
+    var windowHeight = $(window).height()
+    if (offset.top > windowHeight + $(window).scrollTop() - 10) {
+      // scroll down
+      $('html,body').animate({scrollTop: offset.top - 200}, 500);
+    } else if (offset.top < $(window).scrollTop() + 100) {
+      // scroll up
+      $('html,body').animate({scrollTop: offset.top - 500}, 500);
     }
+    return false
   },
 
   addOneAddress: function(address, index) {
-    var view = new AddressView({model: address});
+    var view = new CodeBuddy.backbone.AddressView({model: address});
     this.$("#stack").append(view.render().el);
   },
 
   render: function() {
     $('#code').html(this.model.selectedAddress().get('code'))
+  },
+
+  toggleCodeWindow: function() {
+	$('#code').toggle()
+  },
+
+  editCode: function() {
+	$.get('../edit/' + CodeBuddy.stack.get('selected'))
   }
+})
 
-})
+CodeBuddy.setKeyBindings = function(){
+  $(document).bind('keydown', 'up',   CodeBuddy.stackView.selectPrevious)
+  $(document).bind('keydown', 'down', CodeBuddy.stackView.selectNext)
+  $(document).bind('keydown', 'a',    CodeBuddy.stack.toggleBookmark)
+  $(document).bind('keydown', 's',    CodeBuddy.stack.selectNextBookmark)
+  $(document).bind('keydown', 'h',    CodeBuddy.stackView.toggleCodeWindow)
+  $(document).bind('keydown', 'e',    CodeBuddy.stackView.editCode)
+}
+
+CodeBuddy.setup = function(stackJson) {
+  this.stack = new this.backbone.Stack(stackJson);
+  this.stackView = new this.backbone.StackView({model: this.stack});
+  this.stackView.render();
+  this.setKeyBindings();
+}

data/lib/code_buddy/public/javascripts/jquery.hotkeys.js

@@ -0,0 +1,99 @@
+/*
+ * jQuery Hotkeys Plugin
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Based upon the plugin by Tzury Bar Yochay:
+ * http://github.com/tzuryby/hotkeys
+ *
+ * Original idea by:
+ * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
+*/
+
+(function(jQuery){
+	
+	jQuery.hotkeys = {
+		version: "0.8",
+
+		specialKeys: {
+			8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
+			20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home",
+			37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", 
+			96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7",
+			104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/", 
+			112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8", 
+			120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 191: "/", 224: "meta"
+		},
+	
+		shiftNums: {
+			"`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", 
+			"8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", 
+			".": ">",  "/": "?",  "\\": "|"
+		}
+	};
+
+	function keyHandler( handleObj ) {
+		// Only care when a possible input has been specified
+		if ( typeof handleObj.data !== "string" ) {
+			return;
+		}
+		
+		var origHandler = handleObj.handler,
+			keys = handleObj.data.toLowerCase().split(" ");
+	
+		handleObj.handler = function( event ) {
+			// Don't fire in text-accepting inputs that we didn't directly bind to
+			if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
+				 event.target.type === "text") ) {
+				return;
+			}
+			
+			// Keypress represents characters, not special keys
+			var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ],
+				character = String.fromCharCode( event.which ).toLowerCase(),
+				key, modif = "", possible = {};
+
+			// check combinations (alt|ctrl|shift+anything)
+			if ( event.altKey && special !== "alt" ) {
+				modif += "alt+";
+			}
+
+			if ( event.ctrlKey && special !== "ctrl" ) {
+				modif += "ctrl+";
+			}
+			
+			// TODO: Need to make sure this works consistently across platforms
+			if ( event.metaKey && !event.ctrlKey && special !== "meta" ) {
+				modif += "meta+";
+			}
+
+			if ( event.shiftKey && special !== "shift" ) {
+				modif += "shift+";
+			}
+
+			if ( special ) {
+				possible[ modif + special ] = true;
+
+			} else {
+				possible[ modif + character ] = true;
+				possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true;
+
+				// "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
+				if ( modif === "shift+" ) {
+					possible[ jQuery.hotkeys.shiftNums[ character ] ] = true;
+				}
+			}
+
+			for ( var i = 0, l = keys.length; i < l; i++ ) {
+				if ( possible[ keys[i] ] ) {
+					return origHandler.apply( this, arguments );
+				}
+			}
+		};
+	}
+
+	jQuery.each([ "keydown", "keyup", "keypress" ], function() {
+		jQuery.event.special[ this ] = { add: keyHandler };
+	});
+
+})( jQuery );

data/lib/code_buddy/public/stylesheets/code_buddy.css

@@ -108,4 +108,8 @@ li {
 li:hover {
   background:#444;
   cursor:pointer;
+}
+
+.bookmarked {
+  background:#666;
 }

data/lib/code_buddy/rails2/monkey_patch_action_controller.rb

@@ -17,3 +17,5 @@ module ActionController
     end
   end
 end
+
+CodeBuddy::App.path_prefix = '/code_buddy'

data/lib/code_buddy/rails3/railtie.rb

@@ -6,6 +6,7 @@ module CodeBuddy
         app.middleware.insert_before CodeBuddy::ShowExceptions, CodeBuddy::ShowApp
       end
     end
+    CodeBuddy::App.path_prefix = '/code_buddy'
   end
 
   class ShowExceptions < ActionDispatch::ShowExceptions
@@ -20,3 +21,5 @@ module CodeBuddy
     end
   end
 end
+
+

data/lib/code_buddy/stack.rb

@@ -5,15 +5,19 @@ module CodeBuddy
 
     def initialize(exception_or_string)
       if exception_or_string.is_a?(Exception)
-        @selected = selected
-        @stack_frames = exception_or_string.backtrace.collect do |string|
-          StackFrame.new(string)
-        end
+        backtrace = exception_or_string.backtrace
+        backtrace = backtrace.first.split("\n") if backtrace.size == 1  #haml errors come through this way
       else
-        @stack_frames = exception_or_string.collect do |string|
-          StackFrame.new(string)
-        end
+        backtrace = exception_or_string
       end
+
+      @stack_frames = backtrace.collect do |string|
+        StackFrame.new(string)
+      end
+    end
+
+    def edit(index)
+      @stack_frames[index].open_in_editor
     end
   end
 end

data/lib/code_buddy/stack_frame.rb

@@ -39,5 +39,16 @@ module CodeBuddy
         "<span class=\"coderay\">Unable to read file:\n&nbsp;\"#{@path}\"</span>"
       end
     end
+    
+    def open_in_editor
+      case ENV['EDITOR']
+      when 'mate'
+        `mate #{path} -l #{line}`
+      when 'mvim'
+        `mvim +#{line} #{path}` 
+      else
+        puts "Sorry unable to open the file for editing.  Please set your environment variable to either mate or mvim 'export EDITOR=mate' and restart the server"
+      end
+    end
   end
 end

data/lib/code_buddy/version.rb

@@ -1,3 +1,3 @@
 module CodeBuddy
-  VERSION = "0.0.6"
+  VERSION = '0.0.7'
 end

data/lib/code_buddy/views/header.erb

@@ -3,6 +3,7 @@
   <link href="<%= @static_file_prefix  %>stylesheets/code_buddy.css" media="screen" rel="stylesheet" type="text/css" />
   <link href="<%= @static_file_prefix  %>stylesheets/coderay.css" media="screen" rel="stylesheet" type="text/css" />
   <script src="<%= @static_file_prefix  %>javascripts/jquery.js" type="text/javascript"></script>
+  <script src="<%= @static_file_prefix  %>javascripts/jquery.hotkeys.js" type="text/javascript"></script>
   <script src="<%= @static_file_prefix  %>javascripts/underscore.js" type="text/javascript"></script>
   <script src="<%= @static_file_prefix  %>javascripts/backbone.js" type="text/javascript"></script>
 </head>

data/lib/code_buddy/views/index.erb

@@ -14,12 +14,7 @@
 <div id='code'></div>
 <script src="<%= @static_file_prefix  %>javascripts/code_buddy.js" type="text/javascript"></script>
 <script>
-  var stack = new Stack(<%= @stack.to_json %>);
-  var stackView = new StackView({model: stack});
-  stackView.render();
-  $(document).keydown(function(event) {
-    return stack.view.changeSelectionOnArrow(event)
-  })
+  CodeBuddy.setup(<%= @stack.to_json %>)
 </script>
 </body>
 </html>

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: code_buddy
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Pat Shaughnessy, Alex Rothenberg, Daniel Higginbotham
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 -05:00
+date: 2011-01-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -47,9 +52,11 @@ dependencies:
   name: json_pure
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 4
@@ -61,9 +68,11 @@ dependencies:
   name: coderay
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 55
         segments: 
         - 0
         - 9
@@ -75,9 +84,11 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 8
@@ -89,9 +100,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 2
@@ -103,9 +116,11 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 0
         - 9
@@ -113,6 +128,38 @@ dependencies:
         version: 0.9.10
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 9
+        - 4
+        version: 0.9.4
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 2
+        - 2
+        version: 0.2.2
+  type: :development
+  version_requirements: *id009
 description: See the Ruby code running in your app.
 email: 
 - pat@patshaughnessy.net, alex@alexrothenberg.com, daniel@flyingmachinestudios.com
@@ -126,18 +173,28 @@ files:
 - .gitignore
 - .rvmrc
 - Gemfile
-- Gemfile.lock
+- History.md
 - LICENSE
 - README.rdoc
 - Rakefile
 - bin/code_buddy
 - code_buddy.gemspec
+- features/rails2_app.feature
+- features/rails3_app.feature
+- features/sinatra.feature
+- features/step_definitions/rails_setup_steps.rb
+- features/support/env.rb
+- features/templates/rails_exception.feature.template
+- features/templates/sinatra_env.rb.template
+- features/templates/sinatra_homepage.feature.template
+- features/templates/sinatra_paths.rb.template
 - lib/code_buddy.rb
 - lib/code_buddy/app.rb
 - lib/code_buddy/middleware.rb
 - lib/code_buddy/public/images/buddy.jpeg
 - lib/code_buddy/public/javascripts/backbone.js
 - lib/code_buddy/public/javascripts/code_buddy.js
+- lib/code_buddy/public/javascripts/jquery.hotkeys.js
 - lib/code_buddy/public/javascripts/jquery.js
 - lib/code_buddy/public/javascripts/underscore.js
 - lib/code_buddy/public/stylesheets/code_buddy.css
@@ -182,27 +239,40 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: code_buddy
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: See the Ruby code running in your app.
 test_files: 
+- features/rails2_app.feature
+- features/rails3_app.feature
+- features/sinatra.feature
+- features/step_definitions/rails_setup_steps.rb
+- features/support/env.rb
+- features/templates/rails_exception.feature.template
+- features/templates/sinatra_env.rb.template
+- features/templates/sinatra_homepage.feature.template
+- features/templates/sinatra_paths.rb.template
 - spec/app_spec.rb
 - spec/middleware_spec.rb
 - spec/spec_helper.rb

data/Gemfile.lock

@@ -1,44 +0,0 @@
-PATH
-  remote: .
-  specs:
-    code_buddy (0.0.6)
-      coderay (~> 0.9.6)
-      json_pure (~> 1.4.6)
-      rack
-      sinatra (~> 1.1.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    coderay (0.9.6)
-    diff-lcs (1.1.2)
-    json_pure (1.4.6)
-    mocha (0.9.10)
-      rake
-    rack (1.2.1)
-    rake (0.8.7)
-    rspec (2.2.0)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-    rspec-core (2.2.1)
-    rspec-expectations (2.2.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.2.0)
-    sinatra (1.1.0)
-      rack (~> 1.1)
-      tilt (~> 1.1)
-    tilt (1.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  code_buddy!
-  coderay (~> 0.9.6)
-  json_pure (~> 1.4.6)
-  mocha (~> 0.9.10)
-  rack
-  rake (~> 0.8.7)
-  rspec (~> 2.2.0)
-  sinatra (~> 1.1.0)