redcar 0.3.7.1 → 0.3.8

data/plugins/document_search/plugin.rb

@@ -0,0 +1,8 @@
+
+Plugin.define do
+  name    "document_search"
+  version "1.0"
+  file    "lib", "document_search"
+  object  "DocumentSearch"
+  dependencies "edit_view", ">0"
+end

data/plugins/edit_view/features/line_delimiter.feature

@@ -37,4 +37,11 @@ Feature: Line delimiter
     And I move the cursor to 4
     And I press the Backspace key in the edit tab
     Then the contents should be "foobar\nbaz\n"
+    
+  Scenario: End goes to end of line (Windows)
+    When I open a new edit tab
+    And I replace the contents with "foo\r\nbar\r\nbaz\r\n"
+    And I move the cursor to 0
+    And I run the command Redcar::Top::MoveEndCommand
+    Then the cursor should be at 3
     

data/plugins/edit_view/features/step_definitions/editing_steps.rb

@@ -132,7 +132,25 @@ Then /^the selection range should be from (\d+) to (\d+)$/ do |from_str, to_str|
   r.begin.should == from_str.to_i
   r.end.should == to_str.to_i
 end
+
+Then /^the selection should be on line (.*)$/ do |line_num|
+  line_num = line_num.to_i
+  doc = Redcar::EditView.focussed_edit_view_document
+  r = doc.selection_range
+  doc.line_at_offset(r.begin).should == line_num
+  doc.line_at_offset(r.end).should == line_num
+end
  
+Then /^there should not be any text selected$/ do
+  doc = Redcar::EditView.focussed_edit_view_document
+  doc.selected_text.should == ""
+end
+
+Then /^the selected text should be "([^"]*)"$/ do |selected_text|
+  doc = Redcar::EditView.focussed_edit_view_document
+  doc.selected_text.should == selected_text
+end
+
 Then /the line delimiter should be "(.*)"/ do |delim|
   doc = Redcar::EditView.focussed_edit_view_document
   doc.delim.should == unescape_text(delim)
@@ -148,4 +166,34 @@ Then /^the cursor should be on line (\d+)$/ do |num|
   doc.cursor_line.should == num.to_i
 end
 
- 
+When /^I replace the contents with "([^\"]*)"$/ do |contents|
+  contents = unescape_text(contents)
+  doc = Redcar::EditView.focussed_edit_view_document
+  cursor_offset = (contents =~ /<c>/)
+  contents = contents.gsub("<c>", "")
+  doc.text = contents
+  doc.cursor_offset = cursor_offset
+end
+
+When /^I replace the contents with 100 lines of "([^"]*)" then "([^"]*)"$/ do |contents1, contents2|
+  contents1 = unescape_text(contents1)
+  contents2 = unescape_text(contents2)
+  doc = Redcar::EditView.focussed_edit_view_document
+  doc.text = (contents1 + "\n")*100 + contents2
+end
+
+When /^I scroll to the top of the document$/ do
+  doc = Redcar::EditView.focussed_edit_view_document
+  doc.scroll_to_line(0)
+end
+
+Then /^line number (\d+) should be visible$/ do |line_num|
+  line_num = line_num.to_i
+  doc = Redcar::EditView.focussed_edit_view_document
+  (doc.biggest_visible_line >= line_num).should be_true
+  (doc.smallest_visible_line <= line_num).should be_true
+end
+
+
+
+

data/plugins/edit_view/features/step_definitions/tab_steps.rb

@@ -18,22 +18,21 @@ When /^I close the focussed tab$/ do
   Redcar::Top::CloseTabCommand.new.run
 end
 
-When /^I replace the contents with "([^\"]*)"$/ do |contents|
-  contents = unescape_text(contents)
-  win = Redcar.app.windows.first
-  tab = win.focussed_notebook.focussed_tab
-  cursor_offset = (contents =~ /<c>/)
-  contents = contents.gsub("<c>", "")
-  tab.edit_view.document.text = contents
-  tab.edit_view.document.cursor_offset = cursor_offset
+When /I switch (up|down) a tab/ do |type|
+  case type
+  when "down"
+    Redcar::Top::SwitchTabDownCommand.new.run
+  when "up"
+    Redcar::Top::SwitchTabUpCommand.new.run
+  end
 end
 
 When /I move (up|down) a tab/ do |type|
   case type
   when "down"
-    Redcar::Top::SwitchTabDownCommand.new.run
+    Redcar::Top::MoveTabDownCommand.new.run
   when "up"
-    Redcar::Top::SwitchTabUpCommand.new.run
+    Redcar::Top::MoveTabUpCommand.new.run
   end
 end
 
@@ -45,7 +44,7 @@ Then /^there should be (one|\d+) (.*) tabs?$/ do |num, tab_type|
   end
   
   # in the model
-  tabs = Redcar.app.windows.first.notebooks.map {|nb| nb.tabs }.flatten
+  tabs = Redcar.app.focussed_window.notebooks.map {|nb| nb.tabs }.flatten
   tabs.length.should == num
   
   # in the GUI

data/plugins/edit_view/features/switch_tabs.feature

@@ -6,18 +6,18 @@ Feature: Switch and move tabs within a notebook
     And I open a new edit tab
     And I replace the contents with "Elizabeth Woodville"
     Then I should see "Elizabeth Woodville" in the edit tab
-    And I move down a tab
+    And I switch down a tab
     Then I should see "Anne Boleyn" in the edit tab
 
-  Scenario: Switch tab down too far
+  Scenario: Switching tabs down will wrap
     When I open a new edit tab
     And I replace the contents with "Anne Boleyn"
     And I open a new edit tab
     And I replace the contents with "Elizabeth Woodville"
     Then I should see "Elizabeth Woodville" in the edit tab
-    And I move down a tab
-    And I move down a tab
-    Then I should see "Anne Boleyn" in the edit tab
+    And I switch down a tab
+    And I switch down a tab
+    Then I should see "Elizabeth Woodville" in the edit tab
 
   Scenario: Switch tab up
     When I open a new edit tab
@@ -25,18 +25,18 @@ Feature: Switch and move tabs within a notebook
     And I open a new edit tab
     And I replace the contents with "Elizabeth Woodville"
     Then I should see "Elizabeth Woodville" in the edit tab
-    And I move down a tab
-    And I move up a tab
+    And I switch down a tab
+    And I switch up a tab
     Then I should see "Elizabeth Woodville" in the edit tab
     
-  Scenario: Switch tab up too far
+  Scenario: Switching tabs up will wrap
     When I open a new edit tab
     And I replace the contents with "Anne Boleyn"
     And I open a new edit tab
     And I replace the contents with "Elizabeth Woodville"
     Then I should see "Elizabeth Woodville" in the edit tab
-    And I move up a tab
-    Then I should see "Elizabeth Woodville" in the edit tab
+    And I switch up a tab
+    Then I should see "Anne Boleyn" in the edit tab
   
   Scenario: Switch notebooks
     When I open a new edit tab
@@ -48,8 +48,59 @@ Feature: Switch and move tabs within a notebook
     When I switch notebooks
     Then I should see "Anne Boleyn" in the edit tab
     
+  Scenario: Move tab up
+    When I open a new edit tab
+    And I replace the contents with "Anne Boleyn"
+    And I open a new edit tab
+    And I replace the contents with "Elizabeth Woodville"
+    Then I should see "Elizabeth Woodville" in the edit tab
+    And I switch down a tab
+    Then I should see "Anne Boleyn" in the edit tab
+    And I move up a tab
+    Then I should see "Anne Boleyn" in the edit tab
+    And I switch down a tab
+    Then I should see "Elizabeth Woodville" in the edit tab
+    
     
+  Scenario: Moving tabs up will wrap
+    When I open a new edit tab
+    And I replace the contents with "Anne Boleyn"
+    And I open a new edit tab
+    And I replace the contents with "Elizabeth Woodville"
+    And I open a new edit tab
+    And I replace the contents with "Catherine of Aragon"
+    Then I should see "Catherine of Aragon" in the edit tab
+    And I move up a tab
+    And I move up a tab
+    And I move up a tab
+    And I move up a tab
+    And I switch up a tab
+    Then I should see "Anne Boleyn" in the edit tab
     
+  Scenario: Move tab down
+    When I open a new edit tab
+    And I replace the contents with "Anne Boleyn"
+    And I open a new edit tab
+    And I replace the contents with "Elizabeth Woodville"
+    Then I should see "Elizabeth Woodville" in the edit tab
+    And I move down a tab
+    Then I should see "Elizabeth Woodville" in the edit tab
+    And I switch up a tab
+    Then I should see "Anne Boleyn" in the edit tab
     
+  Scenario: Moving tabs down will wrap
+    When I open a new edit tab
+    And I replace the contents with "Anne Boleyn"
+    And I open a new edit tab
+    And I replace the contents with "Elizabeth Woodville"
+    And I open a new edit tab
+    And I replace the contents with "Catherine of Aragon"
+    Then I should see "Catherine of Aragon" in the edit tab
+    And I move down a tab
+    And I move down a tab
+    And I move down a tab
+    And I move down a tab
+    And I switch down a tab
+    Then I should see "Anne Boleyn" in the edit tab
     
   

data/plugins/edit_view/lib/edit_view.rb

@@ -301,6 +301,10 @@ module Redcar
     def focus
       notify_listeners(:focussed)
     end
+    
+    def exists?
+      controller.exists?
+    end
 
     def tab_width
       @tab_width

data/plugins/edit_view/lib/edit_view/document.rb

@@ -8,6 +8,8 @@ module Redcar
     include Redcar::Observable
     extend Forwardable
     
+    WORDCHARS = /\w|_/
+    
     def self.all_document_controller_types
       result = []
       Redcar.plugin_manager.objects_implementing(:document_controller_types).each do |object|
@@ -71,6 +73,10 @@ module Redcar
       end
     end
     
+    def exists?
+      edit_view.exists?
+    end
+    
     def mirror=(new_mirror)
       notify_listeners(:new_mirror, new_mirror) do
         @mirror = new_mirror
@@ -278,6 +284,54 @@ module Redcar
       end
     end
     
+    # The word at an offset.
+    #
+    # @param [Integer] an offset
+    # @return [String] the text of the word
+    def word_at_offset(offset)
+      range = word_range_at_offset(offset)
+      get_range(range.first, range.last - range.first)
+    end
+    
+    # The word found at the current cursor offset.
+    #
+    # @return [String] the text of the word
+    def current_word
+      word_at_offset(cursor_offset)
+    end
+    
+    # The range of the word at an offset.
+    #
+    # @param [Integer] an offset
+    # @return [Range<Integer>] a range between two character offsets
+    def word_range_at_offset(offset)
+      line_index = line_at_offset(offset)
+      line_start_offset = offset_at_line(line_index)
+      line_chars = get_line(line_index)
+      left_range = 0
+      right_range = 0
+      left = offset - line_start_offset - 1
+      right = offset - line_start_offset
+      
+      until left == -1 || (line_chars[left].chr !~ WORDCHARS)
+        left -= 1
+        left_range -= 1
+      end
+      
+      until right == length || (line_chars[right].chr !~ WORDCHARS)
+        right += 1
+        right_range += 1
+      end
+      (offset + left_range..offset + right_range)
+    end
+    
+    # The range of the word at the current cursor position.
+    #
+    # @return [Range<Integer>] a range between two character offsets
+    def current_word_range
+      word_range_at_offset(cursor_offset)
+    end
+    
     # The range of text selected by the user.
     #
     # @return [Range<Integer>] a range between two character offsets
@@ -321,10 +375,12 @@ module Redcar
       get_range(selection_range.begin, selection_range.count)
     end
     
+    # Is the document in block selection mode.
     def block_selection_mode?
       controller.block_selection_mode?
     end
     
+    # Turn the block selection mode on or off.
     def block_selection_mode=(boolean)
       controller.block_selection_mode = !!boolean
     end

data/plugins/edit_view/lib/edit_view/document/command.rb

@@ -5,7 +5,7 @@ module Redcar
     private
     
     def doc
-      EditView.current.document
+      EditView.focussed_edit_view.document
     end
   end
 end

data/plugins/edit_view/lib/edit_view/edit_tab.rb

@@ -19,13 +19,5 @@ module Redcar
     def edit_view_focussed
       notify_listeners(:focus)
     end
-
-    def serialize
-      { :title     => title }
-    end
-    
-    def deserialize(data)
-      self.title = data[:title]
-    end
   end
 end

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -219,6 +219,10 @@ module Redcar
       focus_control = ApplicationSWT.display.get_focus_control
       focus_control == @mate_text.get_control
     end
+    
+    def exists?
+      @mate_text.get_control and !@mate_text.get_control.disposed
+    end
   
     def attach_listeners
       # h = @document.add_listener(:set_text, &method(:reparse))

data/plugins/html_view/lib/html_controller.rb

@@ -1,5 +1,23 @@
 
 module Redcar
-  class HtmlController
+  module HtmlController
+    include Redcar::Observable
+    
+    # Override this to return a message if the user should be prompted
+    # before closing the tab.
+    def ask_before_closing
+      nil
+    end
+    
+    # Override this to run code right before the tab is closed.
+    def close
+      nil
+    end
+    
+    # Call execute with a string of javascript to execute the script
+    # in the context of the browser widget.
+    def execute(script)
+      notify_listeners(:execute_script, script)
+    end
   end
 end

data/plugins/html_view/lib/html_view.rb

@@ -1,5 +1,6 @@
 
 require 'html_view/html_tab'
+require 'html_controller'
 
 module Redcar
   class HtmlView
@@ -24,6 +25,28 @@ module Redcar
       func = RubyFunc.new(@html_tab.controller.browser, "rubyCall")
       func.controller = @controller
       controller_action("index")
+      attach_controller_listeners
+    end
+    
+    def attach_controller_listeners
+      @controller.add_listener(:execute_script) do |script|
+        begin
+          Redcar.update_gui do
+            begin
+              browser = @html_tab.controller.browser
+              unless browser.is_disposed
+                browser.execute(script)
+              end
+            rescue => e
+              puts e.message
+              puts e.backtrace
+            end
+          end
+        rescue => e
+          puts e.message
+          puts e.backtrace
+        end
+      end
     end
     
     def controller_action(action_name, params=nil)
@@ -58,7 +81,11 @@ module Redcar
       def function(args)
         func_name = args.to_a.first
         func_args = args.to_a.last.to_a
-        JSON(controller.send(func_name.to_sym, *func_args))
+        begin
+          JSON(controller.send(func_name.to_sym, *func_args))
+        rescue JSON::GeneratorError => e
+          nil
+        end
       end
       
       attr_accessor :controller

data/plugins/html_view/lib/html_view/html_tab.rb

@@ -9,6 +9,11 @@ module Redcar
       create_html_view
     end
     
+    def close
+      html_view.controller.close if html_view.controller
+      super
+    end
+    
     def create_html_view
       @html_view = HtmlView.new(self)
     end
@@ -16,5 +21,9 @@ module Redcar
     def controller_action(action, params)
       notify_listeners(:controller_action, action, params)
     end
+    
+    def go_to_location(url)
+      controller.go_to_location(url)
+    end
   end
-end
+end