redcar 0.3.2dev → 0.3.3

data/plugins/application_swt/spec/spec_helper.rb

@@ -2,7 +2,6 @@ $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
 
-Redcar.boot
 Redcar.load
 
 Spec::Runner.configure do |config|

data/plugins/auto_completer/lib/auto_completer.rb

@@ -1,4 +1,12 @@
-
+module Redcar
+  class ApplicationSWT
+    class Menu
+      def move(x, y)
+      	@menu_bar.setLocation(x, y)
+      end
+    end
+  end
+end
 
 require 'auto_completer/document_controller'
 require 'auto_completer/word_iterator'
@@ -13,8 +21,6 @@ module Redcar
     end
     
     class AutoCompleteCommand < Redcar::EditTabCommand
-      key :osx => "Ctrl+Escape", :linux => "Ctrl+Space",
-          :windows => "Ctrl+Space"
       
       def execute
         controller = doc.controllers(AutoCompleter::DocumentController).first
@@ -95,5 +101,53 @@ module Redcar
         return [offset+left_range, offset+right_range]
       end
     end
+    
+    class MenuAutoCompleterCommand < AutoCompleteCommand
+    
+      def execute
+        controller = doc.controllers(AutoCompleter::DocumentController).first
+        input_word = ""
+        word_list = controller.word_list
+        word, left, right = touched_word
+        if word
+          iterator = WordIterator.new(doc, WORD_CHARACTERS)
+          word_list = WordList.new
+          iterator.each_word_with_offset(word) do |matching_word, offset|
+            distance = (offset - doc.cursor_offset).abs
+            unless (distance - matching_word.length) == 0
+	            word_list.add_word(matching_word, distance)
+	          else
+	          	input_word = matching_word
+	          end
+          end
+          controller.word_list = word_list
+          controller.word      = word
+          controller.left      = left
+          controller.right     = right
+        end
+
+		    cur_doc = doc
+      	builder = Menu::Builder.new do
+      	  word_list.words.each do |current_word, word_distance|
+      	  	item(current_word) do
+      	  		cur_doc.insert(cur_doc.cursor_offset, current_word[input_word.length..current_word.length])
+      	  		cur_doc.cursor_offset = cur_doc.cursor_offset + current_word[input_word.length..current_word.length].length
+      	  	end
+      	  end
+      	end
+      	
+      	window = Redcar.app.focussed_window
+      	location = window.focussed_notebook.focussed_tab.controller.edit_view.mate_text.viewer.getTextWidget.getLocationAtOffset(window.focussed_notebook.focussed_tab.controller.edit_view.cursor_offset)
+      	absolute_x = location.x
+      	absolute_y = location.y
+      	location = window.focussed_notebook.focussed_tab.controller.edit_view.mate_text.viewer.getTextWidget.toDisplay(0,0)
+      	absolute_x += location.x
+      	absolute_y += location.y
+      	menu = ApplicationSWT::Menu.new(window.controller, builder.menu, nil, Swt::SWT::POP_UP)
+        menu.move(absolute_x, absolute_y)
+        menu.show
+      end
+
+    end
   end
 end

data/plugins/auto_indenter/lib/auto_indenter.rb

@@ -7,6 +7,6 @@ module Redcar
     def self.start
       Document.register_controller_type(AutoIndenter::DocumentController)
     end
+    
   end
 end
-

data/plugins/core/lib/core.rb

@@ -1,11 +1,15 @@
 
+require 'java'
 require 'fileutils'
 
 require "core/logger"
+require "core/reentry_helpers"
 require "core/controller"
 require "core/gui"
+require "core/interface"
 require "core/model"
 require "core/observable"
+require "core/observable_struct"
 require "core/plugin"
 require "core/plugin/storage"
 
@@ -18,9 +22,7 @@ module Redcar
       unless File.exist?(Redcar.user_dir)
         FileUtils.mkdir(Redcar.user_dir)
       end
-      
     end
-
+    
   end
 end
-

data/plugins/core/lib/core/interface.rb

@@ -0,0 +1,73 @@
+# This module helps API authors to document the interfaces their API requires objects
+# to implement.
+# 
+# Example.
+#
+# The EditView class allows plugins to register tab handlers. A tab handler must implement
+# the "handle" method:
+#
+#   class MyTabHandler
+#     def handle(edit_view)
+#     end
+#   end
+#
+# The EditView class wants to check that the object (at least minimally) conforms to the
+# tab handler interface, so it defines an 'example' module and mixes in Interface::Abstract.
+#
+#   class EditView
+#     module Handler
+#       include Interface::Abstract
+#       
+#       def handle(edit_view)
+#       end
+#     end
+#
+# The Abstract module will not allow this example interface to be mixed in anywhere.
+# To verify that any given object conforms to the interface, EditView calls verify_interface!:
+#
+#     def self.register_tab_handler(tab_handler)
+#       EditView::Handler.verify_interface!(tab_handler)
+#       @tab_handlers << tab_handler
+#     end
+#   end
+#
+# This will raise an error if the instance does not implement all the methods in the example
+# interface with the correct aritys.
+class Interface
+  module Abstract
+    def self.included(klass)
+      klass.class_eval do
+        def self.included(klass)
+          raise "#{klass} is trying to mixin #{self}, which is an abstract interface"
+        end
+        
+        def self.verify_interface!(instance)
+          Interface.verify!(self, instance)
+        end
+      end
+    end
+  end
+      
+  class BadInterfaceError < StandardError; end
+  
+  def self.verify(interface, instance)
+    interface.instance_methods.all? do |method_name| 
+      method = interface.instance_method(method_name)
+      instance.respond_to?(method_name) and 
+        instance.method(method_name).arity == method.arity
+    end
+  end
+  
+  def self.verify!(interface, instance)
+    interface.instance_methods.each do |method_name| 
+      method = interface.instance_method(method_name)
+      unless instance.respond_to?(method_name)
+        raise BadInterfaceError, "expected #{instance.inspect} to implement #{interface}, but was missing :#{method_name}"
+      end
+      unless instance.method(method_name).arity == method.arity
+        raise BadInterfaceError, "expected #{instance.inspect} to implement #{interface}, but :#{method_name} arity was not #{method.arity}"
+      end
+    end
+    true
+  end
+end

data/plugins/core/lib/core/model.rb

@@ -1,5 +1,7 @@
 module Redcar
   module Model
+    include Redcar::ReentryHelpers
+    
     attr_reader :controller
     
     def controller=(controller)

data/plugins/core/lib/core/observable.rb

@@ -58,7 +58,7 @@ module Redcar
       :after => 1
     }
     
-    # Attach a block to be called when any of the hooks in hooks are 
+    # Attach a block to be called when any of the hooks in event_names are 
     # called.
     #
     # @param [Array<Symbol>] names of the events to attach to
@@ -76,6 +76,17 @@ module Redcar
       block
     end
     
+    #  Same as add_listener
+    #  but only adds the listener once, based on 
+    #  @param [key] 
+    def add_listener_at_most_once(key, *event_names)
+      @already_here ||= {}
+      unless @already_here[key]
+        add_listener(*event_names) { |*args| yield(*args) }
+        @already_here[key] = true
+      end
+    end
+    
     # Remove a listener from this object.
     #
     # @param [Handler] an event handler as returned by add_listener

data/plugins/core/lib/core/observable_struct.rb

@@ -0,0 +1,34 @@
+
+# Adds Redcar::Observable to Struct. e.g:
+#
+#   irb> Customer = ObservableStruct.new(:name, :address) 
+#   => Customer
+#   irb> customer = Customer.new("Dave", "123 Main")
+#   => #<Customer name="Dave", address="123 Main">
+#   irb> customer.add_listener(:changed_name) { |new_name| puts "the new name is: #{new_name}" }
+#   => #<Proc:0x65f4cdd2@(irb):203>
+#   irb> customer.name = "Dan"
+#   the new name is Dan
+#   => #<Customer name="Dan", address="123 Main">
+class ObservableStruct
+  def self.new(*args)
+    klass = Struct.new(*args)
+    klass.send(:include, Redcar::Observable)
+    if args.first.is_a?(String)
+      accessors = args[1..-1]
+    else
+      accessors = args
+    end
+    accessors.each do |accessor|
+      klass.class_eval %Q{
+        alias_method :real_#{accessor}=, :#{accessor}=
+        def #{accessor}=(val)
+          notify_listeners(:changed_#{accessor}, val) do
+            self.real_#{accessor} = val
+          end
+        end
+      }
+    end
+    klass
+  end
+end

data/plugins/core/lib/core/plugin/storage.rb

@@ -2,9 +2,12 @@
 module Redcar
   class Plugin
     class Storage
-      
+      class << self
+        attr_writer :storage_dir
+      end
+    
       def self.storage_dir
-        Redcar.user_dir
+        @user_dir ||= Redcar.user_dir
       end
 
       # Open a storage file or create it if it doesn't exist.
@@ -12,7 +15,6 @@ module Redcar
       # @param [String] a (short) name, should be suitable for use as a filename
       def initialize(name)
         @name    = name
-        @storage = {}
         rollback
       end
 
@@ -33,16 +35,27 @@ module Redcar
         self
       end
       
+      # retrieve key value
+      # note: it does not re-read from disk before returning you this value
       def [](key)
         @storage[key]
       end
       
+      # set key to value
+      # note: it automatically saves this to disk
       def []=(key, value)
         @storage[key] = value
         save
         value
       end
       
+      def set_default(key, value)
+        unless @storage[key]
+          self[key] = value
+        end
+        value
+      end
+      
       def keys
         @storage.keys
       end

data/plugins/core/lib/core/reentry_helpers.rb

@@ -0,0 +1,13 @@
+module Redcar
+  module ReentryHelpers
+    def ignore_changes
+      @ignore_changes ||= Hash.new(0)
+    end
+    
+    def ignore(name)
+      ignore_changes[name] += 1
+      yield if ignore_changes[name] == 1
+      ignore_changes[name] -= 1
+    end
+  end
+end

data/plugins/core/spec/core/observable_spec.rb

@@ -97,6 +97,19 @@ describe Redcar::Observable do
       @value.should be_nil
     end
   end
+  
+  
+  it "hooks only once if desired" do
+      sum = 0
+      2.times {
+        @obj.add_listener_at_most_once(self, :christmas) do
+          sum += 1
+        end
+      }
+      @obj.trigger_event(:christmas)
+      sum.should == 1    
+  end
+
 end
 
 

data/plugins/core/spec/core/storage_spec.rb

@@ -2,12 +2,15 @@
 require File.join(File.dirname(__FILE__), "..", "spec_helper")
 
 describe Redcar::Plugin::Storage do
+  
   it "acts like a hash" do
     storage = Redcar::Plugin::Storage.new('test')
     storage[:some_key] = "some value"
     storage[:some_key].should == "some value"
     storage[:some_key] = "some other value"
     storage[:some_key].should == "some other value"
+    
+    FileUtils.rm_rf(storage.send(:path))
   end
 
   it "saves to disk" do
@@ -17,5 +20,20 @@ describe Redcar::Plugin::Storage do
     storage[:some_key].should == "some value"
     
     FileUtils.rm_rf(storage.send(:path))
+    storage = Redcar::Plugin::Storage.new('test_storage_saved')
+    storage[:some_key].should be_nil
   end
+  
+  it "has a set default method" do
+    storage = Redcar::Plugin::Storage.new('test_storage_saved')
+    storage.set_default('a', 'b')    
+    storage['a'].should == 'b'
+    storage = Redcar::Plugin::Storage.new('test_storage_saved')
+    storage['a'].should == 'b'
+    storage['a'] = 'c'
+    storage['a'].should == 'c'
+    storage = Redcar::Plugin::Storage.new('test_storage_saved')
+    storage['a'].should == 'c'
+  end    
+  
 end

data/plugins/core/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
+Redcar.environment = :test
 Redcar.load

data/plugins/edit_view/features/cut_and_paste.feature

@@ -22,7 +22,7 @@ Feature: Cut and Paste
     And I cut text
     And I move the cursor to 2
     And I paste text
-    Then I should see "nkFra" in the edit tab
+    Then the contents should be "nkFra<c>"
 
   Scenario: Paste inserts the copied text
     When I open a new edit tab
@@ -32,6 +32,7 @@ Feature: Cut and Paste
     And I move the cursor to 2
     And I paste text
     Then I should see "FrFraank" in the edit tab
+    Then the contents should be "FrFra<c>ank"
 
   Scenario: Paste pastes the most recent copy
     When I open a new edit tab
@@ -42,4 +43,5 @@ Feature: Cut and Paste
     And I copy text
     And I move the cursor to 0
     And I paste text
-    Then I should see "nkFrank" in the edit tab 
+    Then the contents should be "nk<c>Frank"
+ 

data/plugins/edit_view/features/soft_tabs.feature

@@ -0,0 +1,243 @@
+Feature: Soft and hard tabs
+  
+  Scenario: Move left through soft tabs
+    When I open a new edit tab
+    And tabs are soft, 2 spaces
+    And I replace the contents with "    "
+    And I move the cursor to 4
+    And I press the Left key in the edit tab
+    Then the cursor should be at 2
+
+  Scenario: Move right through soft tabs
+    When I open a new edit tab
+    And tabs are soft, 2 spaces
+    And I replace the contents with "    "
+    And I move the cursor to 0
+    And I press the Right key in the edit tab
+    Then the cursor should be at 2
+    
+  Scenario: Moves left through part of a soft tab
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "Hacker  "
+    And I move the cursor to 8
+    And I press the Left key in the edit tab
+    Then the cursor should be at 6
+     
+  Scenario: Moves right through part of a soft tab
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "Hacker  "
+    And I move the cursor to 6
+    And I press the Right key in the edit tab
+    Then the cursor should be at 8
+    
+  Scenario: Moves left through spaces that don't make a full tab
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "Hacker    "
+    And I move the cursor to 10
+    And I press the Left key in the edit tab
+    Then the cursor should be at 9
+  
+  Scenario: Moves right through spaces that don't make a full tab
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "Hacker    "
+    And I move the cursor to 8
+    And I press the Right key in the edit tab
+    Then the cursor should be at 9
+
+  Scenario: Shouldn't die if the cursor is at the start of the document
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with ""
+    And I move the cursor to 0
+    And I press the Left key in the edit tab
+    Then the cursor should be at 0
+
+  Scenario: Shouldn't die if the cursor is at the end of the document
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with ""
+    And I move the cursor to 0
+    And I press the Right key in the edit tab
+    Then the cursor should be at 0
+  
+  Scenario: Move left through soft tabs, with a tab character
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "\tHa    "
+    And I move the cursor to 1
+    And I press the Left key in the edit tab
+    Then the cursor should be at 0
+
+  Scenario: Move left through soft tabs 2, with a tab character
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "\tHa    "
+    And I move the cursor to 2
+    And I press the Left key in the edit tab
+    Then the cursor should be at 1
+
+  Scenario: Move left through soft tabs 2, with a tab character
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "\tHa    "
+    And I move the cursor to 4
+    And I press the Left key in the edit tab
+    Then the cursor should be at 3
+
+  Scenario: Move left through soft tabs 3, with a tab character
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "\tHa    "
+    And I move the cursor to 5
+    And I press the Left key in the edit tab
+    Then the cursor should be at 3
+
+  Scenario: Move left through soft tabs 4, with a tab character
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "\tHa    "
+    And I move the cursor to 6
+    And I press the Left key in the edit tab
+    Then the cursor should be at 5
+  
+  Scenario: Move right through soft tabs, with a tab character
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "\tHa    "
+    And I move the cursor to 0
+    And I press the Right key in the edit tab
+    Then the cursor should be at 1
+
+  Scenario: Move right through soft tabs 2, with a tab character
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "\tHa    "
+    And I move the cursor to 1
+    And I press the Right key in the edit tab
+    Then the cursor should be at 2
+
+  Scenario: Move right through soft tabs 2, with a tab character
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "\tHa    "
+    And I move the cursor to 3
+    And I press the Right key in the edit tab
+    Then the cursor should be at 5
+
+  Scenario: Move right through soft tabs 3, with a tab character
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "\tHa    "
+    And I move the cursor to 5
+    And I press the Right key in the edit tab
+    Then the cursor should be at 6
+
+  Scenario: Move left through soft tabs, with a tab character ahead
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "    Wo\t"
+    And I move the cursor to 4
+    And I press the Left key in the edit tab
+    Then the cursor should be at 0
+    
+  Scenario: Select left through soft tabs
+    When I open a new edit tab
+    And tabs are soft, 2 spaces
+    And I replace the contents with "    "
+    And I move the cursor to 4
+    And I press Shift+Left key in the edit tab
+    Then the contents should be "  <c>  <s>"
+
+  Scenario: Select right through soft tabs
+    When I open a new edit tab
+    And tabs are soft, 2 spaces
+    And I replace the contents with "    "
+    And I move the cursor to 2
+    And I press Shift+Right key in the edit tab
+    Then the contents should be "  <s>  <c>"
+    
+  Scenario: Select left twice through soft tabs
+    When I open a new edit tab
+    And tabs are soft, 2 spaces
+    And I replace the contents with "    "
+    And I move the cursor to 4
+    And I press Shift+Left key in the edit tab
+    And I press Shift+Left key in the edit tab
+    Then the contents should be "<c>    <s>"
+    
+  Scenario: Select right through soft tabs
+    When I open a new edit tab
+    And tabs are soft, 2 spaces
+    And I replace the contents with "    "
+    And I move the cursor to 0
+    And I press Shift+Right key in the edit tab
+    And I press Shift+Right key in the edit tab
+    Then the contents should be "<s>    <c>"
+
+  Scenario: Shouldn't die if the cursor is at the start of the document
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with ""
+    And I move the cursor to 0
+    And I press Shift+Left key in the edit tab
+    Then the cursor should be at 0
+    
+  Scenario: Shouldn't die if the cursor is at the end of the document
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with ""
+    And I move the cursor to 0
+    And I press Shift+Right key in the edit tab
+    Then the cursor should be at 0
+  
+  Scenario: Can backspace a soft tab
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "    "
+    And I move the cursor to 4
+    And I press the Backspace key in the edit tab
+    Then the contents should be "<c>"
+    
+  Scenario: Can backspace part of a soft tab
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "Ha  "
+    And I move the cursor to 4
+    And I press the Backspace key in the edit tab
+    Then the contents should be "Ha<c>"
+
+  Scenario: Can delete a soft tab
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "    "
+    And I move the cursor to 0
+    And I press the Delete key in the edit tab
+    Then the contents should be "<c>"
+    
+  Scenario: Can delete part of a soft tab
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "Ha  "
+    And I move the cursor to 2
+    And I press the Delete key in the edit tab
+    Then the contents should be "Ha<c>"
+    
+  Scenario: Move left at the start of a line
+    When I open a new edit tab
+    And I replace the contents with "Hi\nHo"
+    And I move the cursor to 3
+    And I press the Left key in the edit tab
+    Then the contents should be "Hi<c>\nHo"
+    
+  Scenario: Shouldn't die if the cursor is at the end of the document
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with ""
+    And I move the cursor to 0
+    And I press the Delete key in the edit tab
+    Then the cursor should be at 0
+