--- a/Support/lib/go_to_external.rb
+++ b/Support/lib/go_to_external.rb
@@ -1,18 +1,29 @@
 require 'rubygems'
 $:.unshift "#{ENV['TM_BUNDLE_SUPPORT']}/lib"
+require "ruby_tm_helpers"
 require "grep_helpers"
 # DEMO TARGET: require 'hpricot'
+# DEMO TARGET: require 'ruby-debug'
+# DEMO TARGET: require 'map_by_method'
 
-class GoToExternal
+module GoToExternal
+  extend self
   # Returns the path of the project or file that best
   # matches the context of where the cursor/caret is currently
-  def self.run
-    target_gem = ENV['TM_CURRENT_WORD']
+  def run
+    target_gem = target_term #ENV['TM_CURRENT_WORD']
     if gem_spec = Gem.source_index.find_name(target_gem).last
-    	gem_path = gem_spec.full_gem_path 
-    	%x{open -a TextMate #{gem_path}}
+    	gem_path = gem_spec.full_gem_path
+    	tm_open gem_path
     else
     	puts "No RubyGem with name '#{target_gem}'"
     end
   end
+
+  def target_term
+    filepath = tm_expanded_selection(
+      :backward => /[\w\/.-]+/,
+      :forward =>  /[\w\/.-]+/
+    ).strip
+  end
 end
\ No newline at end of file

--- a/Support/lib/ruby_tm_helpers.rb
+++ b/Support/lib/ruby_tm_helpers.rb
@@ -42,11 +42,11 @@ def tm_open(file, options = {})
     file = $1
     line = $2
   end
-  
+
   unless /^\//.match(file)
     file = File.join((ENV['TM_PROJECT_DIRECTORY'] || Dir.pwd), file)
   end
-  
+
   args = []
   args << "-w" if wait
   args << e_sh(file)
@@ -58,7 +58,7 @@ end
 def tm_expanded_selection(options = {})
   text=ENV['TM_SELECTED_TEXT'].to_s
   return text unless text.empty?
-  
+
   options = {
     :input_type => :doc,
     :input => nil,
@@ -67,19 +67,19 @@ def tm_expanded_selection(options = {})
     :line_number => ENV['TM_LINE_NUMBER'].to_i,
     :col_number => ENV['TM_COLUMN_NUMBER'].to_i
   }.merge(options)
-  
+
   col_number, line_number = options[:col_number], options[:line_number]
-  
+
   doc = options[:input] ||= $stdin.read
-  
-  line = 
+
+  line =
     case options[:input_type]
     when :doc  then doc.split("\n")[line_number - 1]
     when :line then doc
-    else 
+    else
       raise "Can't handle input_type #{options[:input_type]} for tm_expanded_selection"
     end
-  
+
   last_part = line[ (col_number - 1)..-1]
   first_part = line[ 0..col_number - 2]