redcar 0.3.2dev → 0.3.3

data/plugins/application/lib/application/speedbar.rb

@@ -3,25 +3,19 @@ module Redcar
   class Speedbar
     include Redcar::Model
     
-    LabelItem   = Struct.new(:text)
-    ToggleItem  = Struct.new(:name, :text, :key, :listener, :value)
-    TextBoxItem = Struct.new(:name, :listener, :value)
-    ButtonItem  = Struct.new(:text, :key, :listener)
-    KeyItem     = Struct.new(:key, :listener)
-    
-    attr_reader :__items, :__context
-    
-    def initialize(context)
-      @__items = []
-      @__context = context
-      self.class.items.each {|i| @__items << i.clone }
-    end
+    LabelItem   = ObservableStruct.new(:name, :text)
+    ToggleItem  = ObservableStruct.new(:name, :text, :key, :listener, :value)
+    TextBoxItem = ObservableStruct.new(:name, :listener, :value, :edit_view)
+    ButtonItem  = ObservableStruct.new(:name, :text, :key, :listener)
+    ComboItem   = ObservableStruct.new(:name, :items, :value, :listener)
+    KeyItem     = ObservableStruct.new(:key, :listener)
     
     def self.items
       @items ||= []
     end
 
     def self.append_item(item)
+      return if items.detect {|i| i.respond_to?(:name) and i.name == item.name }
       items << item
     end
     
@@ -29,15 +23,15 @@ module Redcar
       File.join(Redcar.root, %w(plugins application icons close.png))
     end
     
-    def self.define_value_finder(name)
+    def self.define_item_finder(name)
       self.class_eval %Q{
         def #{name}
-          __get_value_of(#{name.to_s.inspect})
+          __get_item(#{name.to_s.inspect})
         end
       }
     end
     
-    def __get_value_of(name)
+    def __get_item(name)
       item = __items.detect do |i| 
         i.respond_to?(:name) and
           i.name.to_s == name
@@ -45,29 +39,44 @@ module Redcar
       unless item
         raise "can't find item #{name}"
       end
-      item.value
+      item
+    end
+    
+    def __items
+      @__items ||= self.class.items.map {|i| i.clone }
     end
     
-    def self.label(text)
-      append_item LabelItem.new(text)
+    def self.label(name, text)
+      append_item LabelItem.new(name, text)
+      define_item_finder(name)
     end
     
     def self.toggle(name, text, key, value=false, &block)
       append_item ToggleItem.new(name, text, key, block, value)
-      define_value_finder(name)
+      define_item_finder(name)
     end
     
     def self.textbox(name, value="", &block)
       append_item TextBoxItem.new(name, block, value)
-      define_value_finder(name)
+      define_item_finder(name)
     end
     
-    def self.button(text, key, &block)
-      append_item ButtonItem.new(text, key, block)
+    def self.button(name, text, key, &block)
+      append_item ButtonItem.new(name, text, key, block)
+      define_item_finder(name)
+    end
+    
+    def self.combo(name, items=[], value=nil, &block)
+      append_item ComboItem.new(name, items, value, block)
+      define_item_finder(name)
     end
     
     def self.key(key, &block)
       append_item KeyItem.new(key, block)
     end
+    
+    def inspect
+      "#<Speedbar #{__items.inspect}"
+    end
   end
-end
+end

data/plugins/application/lib/application/tab.rb

@@ -42,5 +42,20 @@ module Redcar
     def set_notebook(notebook)
       @notebook = notebook
     end
+    
+    def edit_tab?
+      is_a?(EditTab)
+    end
+    
+    # Helper method to get the edit_view's document, if applicable.
+    def document
+      edit_view.document if edit_tab?
+    end
+    
+    # Helper method to get this tab's Mirror object for the current
+    # document, if applicable.
+    def document_mirror
+      document.mirror if document
+    end
   end
 end

data/plugins/application/lib/application/window.rb

@@ -67,6 +67,9 @@ module Redcar
             new_notebook.focussed_tab.focus
           end
         end
+        if speedbar and speedbar.respond_to?(:tab_changed)
+          speedbar.tab_changed(tab)
+        end
       end
       notebook.add_listener(:tab_closed) do
         notify_listeners(:tab_closed)
@@ -98,6 +101,14 @@ module Redcar
       @focussed_notebook
     end
     
+    def focussed_notebook_tab
+      @focussed_notebook.focussed_tab
+    end
+    
+    def focussed_notebook_tab_document
+      focussed_notebook_tab.document if focussed_notebook_tab
+    end    
+    
     def focussed_notebook=(notebook)
       if notebook != @focussed_notebook
         set_focussed_notebook(notebook)
@@ -135,32 +146,41 @@ module Redcar
       focussed_notebook.new_tab(*args, &block)
     end
     
-    attr_reader :menu
+    attr_reader :menu, :keymap
 
     def menu=(menu)
       @menu = menu
-      notify_listeners(:menu_changed, menu)
+    end
+
+    def keymap=(keymap)
+      @keymap = keymap
     end
 
     def popup_menu(menu)
       notify_listeners(:popup_menu, menu)
     end
     
+    def refresh_menu
+      notify_listeners(:refresh_menu)
+    end
+    
     # Focus the Window.
     def focus
       treebook.refresh_trees
       notify_listeners(:focussed, self)
     end
 
-    # LINUXTODO: should close the app if it is the last window
     def close
+      notify_listeners(:about_to_close, self)
       notebooks.each do |notebook| 
         notebook.tabs.each {|tab| tab.close }
       end
       if notebooks.length > 1
         close_notebook
       end
-      notify_listeners(:closed, self)
+      ignore(:closing) do
+        notify_listeners(:closed, self)
+      end
     end
     
     def inspect
@@ -177,8 +197,11 @@ module Redcar
     
     def close_speedbar
       notify_listeners(:speedbar_closed, @speedbar)
+      @speedbar.close if @speedbar.respond_to?(:close)
       @speedbar = nil
-      focussed_notebook.focussed_tab.focus
+      if tab = focussed_notebook.focussed_tab
+        tab.focus
+      end
     end
   end
 end

data/plugins/application/spec/application/clipboard_spec.rb

@@ -10,7 +10,7 @@ describe Redcar::Clipboard do
     @clipboard.last.should == ["havelock"]
   end
   
-  it "reports it's length" do
+  it "reports its length" do
     @clipboard.length.should == 0
     @clipboard << "havelock"
     @clipboard.length.should == 1
@@ -26,6 +26,25 @@ describe Redcar::Clipboard do
     @clipboard[1].should == ["samuel"]
     @clipboard[0].should == ["sybil"]
   end
+
+  it "loads well when the clipboard starts as blank" do
+    cont = "fake controller"
+    def cont.changed?; true; end
+    def cont.last_set=(something); @a = something;end
+    def cont.get_contents; @a; end
+    @clipboard.controller = cont
+    @clipboard.length.should == 0 # shouldn't blow up
+  end
+  
+  it "should allow for the controller to return contents" do
+    cont = "fake controller"
+    def cont.changed?; true; end
+    def cont.last_set=(something); @a = something;end
+    def cont.get_contents; @a; end
+    @clipboard.controller = cont
+    @clipboard << "yo"
+    @clipboard.length.should == 2
+  end
   
   it "has a maximum length" do
     (Redcar::Clipboard.max_length + 1).times do |i|

data/plugins/application/spec/application/command/executor_spec.rb

@@ -2,9 +2,14 @@ require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 
 class Redcar::Command
   describe Executor do
+    class FakeApp
+      attr_accessor :history
+    end
+    
     before do
       Executor.stub!(:current_environment).and_return(:current_environment)
-      Redcar.history = History.new
+      Redcar.app = FakeApp.new
+      Redcar.app.history = History.new
     end
     
     describe "executing a command" do
@@ -32,7 +37,7 @@ class Redcar::Command
     
       it "should add the command to the History" do
         @executor.execute
-        Redcar.history.last.should == @command
+        Redcar.app.history.last.should == @command
       end
     
       it "should set the command environment" do

data/plugins/application/spec/application/command_spec.rb

@@ -7,17 +7,12 @@ describe Redcar::Command do
     end
     
     class MyCommand < Redcar::Command
-      key "Ctrl+K"
       
       def execute
         $spec_command_env = {:win => win}
       end
     end
 
-    it "stores the keybinding " do
-      MyCommand.get_key.should == "Ctrl+K"
-    end
-  
     it "is recordable by default" do
       MyCommand.record?.should be_true
     end

data/plugins/application/spec/application/keymap/builder_spec.rb

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+
+describe "Redcar::Keymap::Builder DSL" do
+  it "creates a keymap" do
+    builder = Redcar::Keymap::Builder.new("test", :osx) {}
+    builder.keymap.should be_an_instance_of(Redcar::Keymap)
+    builder.keymap.length.should == 0
+  end
+  
+  it "add entries to the keymap" do
+    builder = Redcar::Keymap::Builder.new("test", :osx) do
+      link "Ctrl+S", :NewCommand
+    end
+    builder.keymap.length.should == 1
+    builder.keymap.command("Ctrl+S")
+  end
+end

data/plugins/application/spec/application/menu_spec.rb

@@ -114,6 +114,36 @@ describe Redcar::Menu do
         item "REPL", 101
       end
     end
+    
+    it "puts newer ones on the end" do
+      menu = build "Plugins" do
+        sub_menu "REPL" do
+        end
+        sub_menu "Encryption" do
+        end
+        sub_menu "My Plugin" do
+        end
+      end
+
+      menu2 = build "Plugins" do
+        sub_menu "My Plugin" do
+          item "Open", 101
+        end
+      end
+      
+      menu.merge(menu2)
+      
+      menu.should == build("Plugins") do
+        sub_menu "REPL" do
+        end
+        sub_menu "Encryption" do
+        end
+        sub_menu "My Plugin" do
+          item "Open", 101
+        end
+      end
+
+    end
   end
 end
 

data/plugins/application/spec/application/speedbar_spec.rb

@@ -3,9 +3,9 @@ require File.join(File.dirname(__FILE__), "..", "spec_helper")
 describe Redcar::Speedbar do
   it "should let you add labels" do
     class LabelSpeedbar < Redcar::Speedbar
-      label "Here is a speedbar"
+      label :label, "Here is a speedbar"
     end
-    LabelSpeedbar.items.should == [Redcar::Speedbar::LabelItem.new("Here is a speedbar")]
+    LabelSpeedbar.items.should == [Redcar::Speedbar::LabelItem.new(:label, "Here is a speedbar")]
   end
 
   it "should let you add toggles" do
@@ -24,9 +24,16 @@ describe Redcar::Speedbar do
   
   it "should let you add buttons" do
     class ButtonSpeedbar < Redcar::Speedbar
-      button :search, "Ctrl+S"
+      button :search, "Search", "Ctrl+S"
     end
-    ButtonSpeedbar.items.should == [Redcar::Speedbar::ButtonItem.new(:search, "Ctrl+S")]
+    ButtonSpeedbar.items.should == [Redcar::Speedbar::ButtonItem.new(:search, "Search", "Ctrl+S")]
+  end
+
+  it "should let you add combos" do
+    class ComboSpeedbar < Redcar::Speedbar
+      combo :tab_widths, %w"1 2 3 4", "1"
+    end
+    ComboSpeedbar.items.should == [Redcar::Speedbar::ComboItem.new(:tab_widths, %w(1 2 3 4), "1")]
   end
 
   it "should let you add keys" do
@@ -40,7 +47,24 @@ describe Redcar::Speedbar do
     class GetValueSpeedbar < Redcar::Speedbar
       textbox :query, "start"
     end
-    sp = GetValueSpeedbar.new(self)
-    sp.query.should == "start"
+    sp = GetValueSpeedbar.new
+    sp.query.value.should == "start"
   end
+  
+  it "should let you set values for instances" do
+    class SetValueSpeedbar < Redcar::Speedbar
+      textbox :query, "start"
+    end
+    sp = GetValueSpeedbar.new
+    sp.query.value = "yoyo"
+    sp.query.value.should == "yoyo"
+   end
+   
+   it "should let only add an item with the same name once" do
+     class TextBoxSpeedbar < Redcar::Speedbar
+       textbox :query
+       textbox :query
+     end
+     TextBoxSpeedbar.items.should == [Redcar::Speedbar::TextBoxItem.new(:query, nil, "")]
+   end
 end

data/plugins/application/spec/application/window_spec.rb

@@ -9,10 +9,10 @@ describe Redcar::Window do
     
     it "notifies the controller that the menu has changed" do
       @called_menu_changed = false
-      @window.add_listener(:menu_changed) do
+      @window.add_listener(:refresh_menu) do
         @called_menu_changed = true
       end
-      @window.menu = 1
+      @window.refresh_menu
       @called_menu_changed.should be_true
     end
 

data/plugins/application/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 require 'redcar'
-Redcar.boot
+Redcar.environment = :test
 Redcar.load
 Dir[File.dirname(__FILE__) + "/application/controllers/*.rb"].each do |fn|
   require fn

data/plugins/application_swt/lib/application_swt.rb

@@ -55,6 +55,9 @@ module Redcar
       @gui
     end
     
+    #
+    # allow other threads to run code "back in the GUI"
+    #  
     def self.sync_exec(&block)
       runnable = Swt::RRunnable.new(&block)
       Redcar::ApplicationSWT.display.syncExec(runnable)

data/plugins/application_swt/lib/application_swt/dialogs/filter_list_dialog_controller.rb

@@ -20,6 +20,15 @@ module Redcar
         end
       end
       
+          
+      def self.storage
+        @storage ||= begin
+          storage = Plugin::Storage.new('filter_list_dialog_controller')
+          storage.set_default('pause_before_update_seconds', 0.25)
+          storage
+        end
+      end    
+      
       def initialize(model)
         @model = model
         @dialog = FilterListDialog.new(Redcar.app.focussed_window.controller.shell)
@@ -72,7 +81,7 @@ module Redcar
       def update_list
         @last_keypress = Time.now
         Swt::Widgets::Display.getCurrent.timerExec(300, Swt::RRunnable.new { 
-          if @dialog and @last_keypress and Time.now - @last_keypress > 0.250
+          if @dialog and @last_keypress and Time.now - @last_keypress > FilterListDialogController.storage['pause_before_update_seconds']
             @last_keypress = nil
             s = Time.now
             list = @model.update_list(@dialog.text.get_text)