redcar 0.3.0dev → 0.3.1dev

data/plugins/application_swt/lib/application_swt/swt/listener_helpers.rb

@@ -0,0 +1,20 @@
+module Redcar
+  class ApplicationSWT
+    module ListenerHelpers
+      def ignore_within_self
+        name = __calling_method__
+        unless singly_hash[name]
+          singly_hash[name] = true
+          yield
+          singly_hash.delete(name)
+        end
+      end
+      
+      private
+      
+      def singly_hash
+        @singly_hash ||= {}
+      end
+    end
+  end
+end

data/plugins/application_swt/lib/application_swt/swt_wrapper.rb

@@ -23,6 +23,7 @@ module Swt
 
   path = File.expand_path(File.dirname(__FILE__) + "/../../vendor/swt/" + Swt.jar_path)
   if File.exist?(path + ".jar")
+    puts "loading #{Swt.jar_path}"
     require path
   else
     puts "SWT jar file required: #{path}.jar"
@@ -41,6 +42,7 @@ module Swt
     import org.eclipse.swt.widgets.DirectoryDialog
     import org.eclipse.swt.widgets.FileDialog
     import org.eclipse.swt.widgets.Label
+    import org.eclipse.swt.widgets.List
     import org.eclipse.swt.widgets.Menu
     import org.eclipse.swt.widgets.MenuItem
     import org.eclipse.swt.widgets.Shell
@@ -61,6 +63,7 @@ module Swt
     import org.eclipse.swt.layout.GridLayout
     import org.eclipse.swt.layout.GridData
     import org.eclipse.swt.layout.RowLayout
+    import org.eclipse.swt.layout.RowData
   end
   
   module Graphics
@@ -100,4 +103,12 @@ module JFace
     import org.eclipse.jface.viewers.ILazyTreeContentProvider
     import org.eclipse.jface.viewers.ILabelProvider
   end
+  
+  module Text
+    import org.eclipse.jface.text.TextViewerUndoManager
+  end
+  
+  module Dialogs
+    import org.eclipse.jface.dialogs.Dialog
+  end
 end

data/plugins/application_swt/lib/application_swt/tab.rb

@@ -55,4 +55,5 @@ module Redcar
       end
     end
   end
-end
+end
+

data/plugins/application_swt/lib/application_swt/window.rb

@@ -5,25 +5,23 @@ module Redcar
       attr_reader :shell, :window, :shell_listener
       
       class ShellListener
+        include ListenerHelpers
+        
         def initialize(controller)
           @controller = controller
         end
         
         def shell_closed(e)
-          unless @in_close_operation
-            @in_close_operation = true
+          ignore_within_self do
             e.doit = false
             @controller.swt_event_closed
-            @in_close_operation = false
           end
         end
 
         def shell_activated(e)
-          unless @in_activate_operation
-            @in_activate_operation = true
+          ignore_within_self do
             e.doit = false
             @controller.swt_event_activated
-            @in_activate_operation = false
           end
         end
         

data/plugins/application_swt/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+
 require 'redcar'
-Redcar.require 
+
+Redcar.boot
+Redcar.require_files
 
 Spec::Runner.configure do |config|
   config.before(:suite) do

data/plugins/core/lib/core.rb

@@ -5,6 +5,7 @@ require "core/gui"
 require "core/model"
 require "core/observable"
 require "core/plugin"
+require "core/plugin/storage"
 
 module Redcar
   class Core
@@ -14,6 +15,9 @@ module Redcar
       Core::Logger.init
     end
     
+    # Platform symbol
+    #
+    # @return [:osx/:windows/:linux]
     def self.platform
       case Config::CONFIG["target_os"]
       when /darwin/
@@ -24,6 +28,23 @@ module Redcar
         :linux
       end
     end
+    
+    # Platform specific ~/.redcar
+    #
+    # @return [String] expanded path
+    def self.user_dir
+      if platform == :windows
+        if ENV['USERPROFILE'].nil?
+          userdir = "C:/My Documents/.redcar/"
+        else
+          userdir = File.join(ENV['USERPROFILE'], "redcar")
+        end
+      else
+        userdir = File.join(ENV['HOME'], ".redcar") unless ENV['HOME'].nil?
+      end
+      File.expand_path(userdir)
+    end
+
   end
 end
 

data/plugins/core/lib/core/gui.rb

@@ -71,7 +71,12 @@ module Redcar
     #
     # @param [Object] an instance of a Redcar model
     def controller_for(model)
-      controller_class = @controllers[model.class].first
+      klass, controller_class = model.class, nil
+      while controller_class == nil and klass != Object
+        unless controller_class = @controllers[klass].first
+          klass = klass.superclass
+        end
+      end
       raise "no controller for #{model.class}" unless controller_class
       controller_class
     end

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

@@ -99,8 +99,8 @@ module Redcar
     private
     
     def run_blocks(event_name, aspect, args)
-      blocks = events(event_name.to_s)[ASPECTS[aspect]]
-      blocks.each { |b| b.call(*args) }
+      blocks = events(event_name.to_s)[ASPECTS[aspect]].clone
+      blocks.each {|b| b.call(*args) }
     end
     
     def events(event_name)
@@ -108,4 +108,8 @@ module Redcar
       @events[event_name.to_s] ||= [[], []]
     end
   end
-end
+end
+
+
+
+

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

@@ -0,0 +1,48 @@
+
+module Redcar
+  class Plugin
+    class Storage
+    
+      extend Forwardable
+      
+      def_delegators :@storage, :[], :[]=, :keys
+      
+      def self.storage_dir
+        Core.user_dir
+      end
+
+      # Open a storage file or create it if it doesn't exist.
+      #
+      # @param [String] a (short) name, should be suitable for use as a filename
+      def initialize(name)
+        @name    = name
+        @storage = {}
+        rollback
+      end
+
+      # Save the storage to disk.
+      def save
+        File.open(path, "w") { |f| YAML.dump(@storage, f) }
+        self
+      end
+
+      # Rollback the storage to the latest revision saved to disk or empty it if
+      # it hasn't been saved.
+      def rollback
+        if File.exists?(path)
+          @storage = YAML.load_file(path)
+        else
+          @storage = {}
+        end
+        self
+      end
+      
+      private
+      
+      def path
+        File.join(Storage.storage_dir, @name + ".yaml")
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,30 @@
+
+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"
+  end
+
+  it "rolls back to an empty hash if it hasn't been saved" do
+    storage = Redcar::Plugin::Storage.new('test')
+    storage[:some_key] = "some value"
+    storage[:some_key].should == "some value"
+    storage.rollback
+    storage[:some_key].should be_nil
+  end
+
+  it "saves to disk" do
+    storage = Redcar::Plugin::Storage.new('test_storage_saved')
+    storage[:some_key] = "some value"
+    storage.save
+    storage = Redcar::Plugin::Storage.new('test_storage_saved')
+    storage[:some_key].should == "some value"
+    
+    FileUtils.rm_rf(storage.send(:path))
+  end
+end

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

@@ -0,0 +1,7 @@
+When /^I undo$/ do
+  Redcar::Top::UndoCommand.new.run
+end
+
+When /^I redo$/ do
+  Redcar::Top::RedoCommand.new.run
+end

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

@@ -25,6 +25,10 @@ When /^I close the current notebook$/ do
   Redcar::Top::CloseNotebookCommand.new.run
 end
 
+When /^I switch notebooks$/ do
+  Redcar::Top::SwitchNotebookCommand.new.run
+end
+
 When /^I focus on the edit_view in the tab in notebook (\d)$/ do |index|
   index = index.to_i - 1
   notebook = Redcar.app.windows.first.notebooks[index]

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

@@ -24,10 +24,25 @@ When /^I replace the contents with "([^\"]*)"$/ do |arg1|
   tab.edit_view.document.text = arg1
 end
 
-Then /^there should be one (.*) tab$/ do |tab_type|
+When /I move (up|down) a tab/ do |type|
+  case type
+  when "down"
+    Redcar::Top::SwitchTabDownCommand.new.run
+  when "up"
+    Redcar::Top::SwitchTabUpCommand.new.run
+  end
+end
+
+Then /^there should be (one|\d+) (.*) tabs?$/ do |num, tab_type|
+  if num == "one"
+    num = 1
+  else
+    num = num.to_i
+  end
+  
   # in the model
   tabs = Redcar.app.windows.first.notebooks.map {|nb| nb.tabs }.flatten
-  tabs.length.should == 1
+  tabs.length.should == num
   
   # in the GUI
   case tab_type
@@ -36,7 +51,7 @@ Then /^there should be one (.*) tab$/ do |tab_type|
   end
   
   tabs = get_tabs
-  tabs.length.should == 1
+  tabs.length.should == num
 end
 
 Then /^the edit tab should have the focus$/ do
@@ -60,7 +75,10 @@ Then /^the tab should have the keyboard focus$/ do
   tab.controller.edit_view.has_focus?.should be_true
 end
 
-Then /^I should see "(.*)" in the edit tab$/ do |content|
-  tab = get_tab(get_tab_folder)
-  tab.edit_view.document.to_s.include?(content).should be_true
+Then /^I should (not )?see "(.*)" in the edit tab$/ do |bool, content|
+  bool = !bool
+  matcher = bool ? be_true : be_false
+  focussed_tab.edit_view.document.to_s.include?(content).should matcher
 end
+
+

data/plugins/edit_view/features/support/env.rb

@@ -15,6 +15,10 @@ module SwtTabHelpers
     tab = Redcar.app.windows.first.notebooks.map{|n| n.tabs}.flatten.detect{|t| t.controller.item == item1}
   end
   
+  def focussed_tab
+    Redcar.app.windows.first.focussed_notebook.focussed_tab
+  end
+  
   def get_tabs
     display = Redcar::ApplicationSWT.display
     shell   = display.get_shells.to_a.first

data/plugins/edit_view/features/switch_tabs.feature

@@ -0,0 +1,55 @@
+Feature: Switch and move tabs within a notebook
+
+  Scenario: Switch 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 "Anne Boleyn" in the edit tab
+
+  Scenario: Switch tab down too far
+    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
+
+  Scenario: Switch 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 move down a tab
+    And I move up a tab
+    Then I should see "Elizabeth Woodville" in the edit tab
+    
+  Scenario: Switch tab up too far
+    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
+  
+  Scenario: Switch notebooks
+    When I open a new edit tab
+    And I replace the contents with "Anne Boleyn"
+    And I make a new notebook
+    When I open a new edit tab
+    And I replace the contents with "Scarlett"
+    And I move the tab to the other notebook
+    When I switch notebooks
+    Then I should see "Anne Boleyn" in the edit tab
+    
+    
+    
+    
+    
+  

data/plugins/edit_view/features/undo_and_redo.feature

@@ -0,0 +1,52 @@
+Feature: Undo and Redo
+
+  Scenario: Commands are inactive for a new tab
+    When I open a new edit tab
+    Then the menu item "Edit|Undo" should be inactive
+    And the menu item "Edit|Redo" should be inactive
+  
+  Scenario: Undo becomes active when I type something
+    When I open a new edit tab
+    And I replace the contents with "Bolzano"
+    Then the menu item "Edit|Undo" should be active
+    And the menu item "Edit|Redo" should be inactive
+    
+  Scenario: Undo undoes typing
+    When I open a new edit tab
+    And I replace the contents with "Bolzano"
+    And I undo
+    Then I should not see "Bolzano" in the edit tab
+
+  Scenario: Undo undoes typing twice
+    When I open a new edit tab
+    And I replace the contents with "Bolzano"
+    And I replace the contents with "Weierstrass"
+    And I undo
+    Then I should not see "Weierstrass" in the edit tab
+    And I should see "Bolzano" in the edit tab
+    And I undo
+    Then I should not see "Weierstrass" in the edit tab
+    And I should not see "Bolzano" in the edit tab
+
+  Scenario: Undo becomes inactive and redo active when I undo everything
+    When I open a new edit tab
+    And I replace the contents with "Bolzano"
+    And I undo
+    Then the menu item "Edit|Undo" should be inactive
+    And the menu item "Edit|Redo" should be active
+    
+  Scenario: Redo redoes typing
+    When I open a new edit tab
+    And I replace the contents with "Bolzano"
+    And I undo
+    And I redo
+    And I should see "Bolzano" in the edit tab
+    
+  Scenario: Redo becomes inactive when I redo everything
+    When I open a new edit tab
+    And I replace the contents with "Bolzano"
+    And I undo
+    And I redo
+    Then the menu item "Edit|Undo" should be active
+    And the menu item "Edit|Redo" should be inactive
+