redcar 0.3.1dev → 0.3.2dev

data/plugins/auto_completer/lib/auto_completer/document_controller.rb

@@ -0,0 +1,52 @@
+module Redcar
+  class AutoCompleter
+    class DocumentController
+      include Redcar::Document::Controller
+      include Redcar::Document::Controller::ModificationCallbacks
+      
+      def start_completion
+        @in_completion = true
+      end
+      
+      def end_completion
+        @in_completion = false
+      end
+      
+      def in_completion?
+        @in_completion
+      end
+      
+      def start_modification
+        @in_modification = true
+      end
+      
+      def end_modification
+        @in_modification = false
+      end
+      
+      def in_modification?
+        @in_modification
+      end
+      
+      attr_accessor :index
+      attr_accessor :length_of_previous
+      attr_accessor :word_list, :word, :left, :right
+      
+      def before_modify(*_)
+      end
+      
+      def after_modify(*_)
+        unless in_modification?
+          @in_completion = false
+          @index         = 0
+          @length_of_previous = nil
+          @word_list = nil
+          @word = nil
+          @left = nil
+          @right = nil
+        end
+      end
+      
+    end
+  end
+end

data/plugins/auto_completer/lib/auto_completer/word_iterator.rb

@@ -0,0 +1,48 @@
+
+module Redcar
+  class AutoCompleter
+    class WordIterator
+      def initialize(document, word_chars)
+        @document = document
+        @word_chars = word_chars
+      end
+    
+      # word_chars is a regex, that defines word characters
+      def each_word_with_offset(prefix)
+        inside_word = false
+        text = @document.to_s
+        char_offset = 0
+        word_offset = 0
+        word = []
+
+        text.each_char do |char|
+         # p [inside_word, char, word]
+          if char =~ @word_chars
+            unless inside_word
+              word_offset = char_offset
+              inside_word = true
+            end
+            word << char
+          else
+            if inside_word
+              joined = word.join
+              if joined =~ /^#{prefix}/
+          #    p [:yield, joined]
+                yield joined, word_offset
+              end
+              inside_word = false
+              word = []
+            end
+          end
+          char_offset += 1
+        end
+        
+        # also yield the last word of the document if it matches
+        if word.join =~ /^#{prefix}/
+        #p [:yield, word.join]
+          yield word.join, word_offset
+        end
+      end
+    end
+  end
+end

data/plugins/auto_completer/lib/auto_completer/word_list.rb

@@ -0,0 +1,40 @@
+
+module Redcar
+  class AutoCompleter
+    # the list of words plus their relative distance (beginning of the word to the cursor)
+    # this information can just be updated, as long as the cursor is moving through the document.
+    # as soon as typing happens, a word will have to be added or replaced.
+    class WordList
+      include Enumerable
+      
+      attr_reader :words
+      
+      def initialize
+        @words = Hash.new
+        @offset = 0
+      end
+      
+      # adds a new word, iff it doesn't yet exist.
+      # if the word exists, the distance will be adjusted, if it's lower.
+      def add_word(word, distance)
+        if @words.include?(word)
+          if distance < @words[word]
+            @words[word] = distance
+          end
+        else
+          @words[word] = distance
+        end
+      end
+      
+      # yield the completions for the given prefix
+      def completions
+        filtered = @words.keys
+        return filtered.sort!{|a,b| @words[a] <=> @words[b] }
+      end
+      
+      def each
+        @words.each {|word,distance| yield word, distance }
+      end
+    end
+  end
+end

data/plugins/auto_completer/plugin.rb

@@ -0,0 +1,10 @@
+
+Plugin.define do
+  name    "Auto Completer"
+  version "0.3.2"
+  object  "Redcar::AutoCompleter"
+  file    "lib", "auto_completer"
+  
+  dependencies "core",      ">0",
+               "edit_view", ">0"
+end

data/plugins/auto_indenter/lib/auto_indenter.rb

@@ -4,7 +4,7 @@ require 'auto_indenter/document_controller'
 module Redcar
   class AutoIndenter
     
-    def self.load
+    def self.start
       Document.register_controller_type(AutoIndenter::DocumentController)
     end
   end

data/plugins/auto_indenter/lib/auto_indenter/document_controller.rb

@@ -7,7 +7,7 @@ module Redcar
       
       def after_newline(line_ix)
         if line_ix > 0
-          previous_line     = document.get_line(line_ix - 1)
+          previous_line     = document.get_line(line_ix - 1).gsub("\n", "")
           whitespace_prefix = whitespace_prefix(previous_line)
           offset            = document.offset_at_line(line_ix)
           document.insert(offset, whitespace_prefix)

data/plugins/auto_indenter/plugin.rb

@@ -0,0 +1,8 @@
+
+Plugin.define do
+  name    "auto_indenter"
+  version "1.0"
+  file    "lib", "auto_indenter"
+  object  "Redcar::AutoIndenter"
+  dependencies "edit_view", ">0"
+end

data/plugins/core/lib/core.rb

@@ -1,4 +1,6 @@
 
+require 'fileutils'
+
 require "core/logger"
 require "core/controller"
 require "core/gui"
@@ -11,38 +13,12 @@ module Redcar
   class Core
     include HasLogger
     
-    def self.load
+    def self.loaded
       Core::Logger.init
-    end
-    
-    # Platform symbol
-    #
-    # @return [:osx/:windows/:linux]
-    def self.platform
-      case Config::CONFIG["target_os"]
-      when /darwin/
-        :osx
-      when /mswin/
-        :windows
-      when /linux/
-        :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?
+      unless File.exist?(Redcar.user_dir)
+        FileUtils.mkdir(Redcar.user_dir)
       end
-      File.expand_path(userdir)
+      
     end
 
   end

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

@@ -31,8 +31,13 @@ module Redcar
     
     # Starts the event loop for this gui.
     def start
-      logger.info("Starting event loop")
-      @event_loop.start
+      if ARGV.include?("--quit-immediately")
+        logger.info("Quitting straight away")
+        exit
+      else
+        logger.info("Starting event loop")
+        @event_loop.start
+      end
     end
     
     # Stops the event loop for this gui.

data/plugins/core/lib/core/logger.rb

@@ -1,3 +1,5 @@
+require 'logger'
+
 module Redcar
   def self.logger
     Core::Logger.root_logger
@@ -6,19 +8,20 @@ module Redcar
   class Core
     module HasLogger
       def logger
-        Logging::Logger[self.class.name]
+        Core::Logger.root_logger
       end
     end
     
     module Logger
       def self.init
         level = ENV["REDCAR_LOG"] || "error"
-        appender = Logging::Appenders.stdout(:level => level)
-        root_logger.add_appenders(appender)
+        root_logger.level = ::Logger::ERROR
+#        appender = Logging::Appenders.stdout(:level => level)
+#        root_logger.add_appenders(appender)
       end
       
       def self.root_logger
-        Logging::Logger[:root]
+        @logger ||= ::Logger.new(STDOUT)
       end
     end
   end

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

@@ -2,13 +2,9 @@
 module Redcar
   class Plugin
     class Storage
-    
-      extend Forwardable
-      
-      def_delegators :@storage, :[], :[]=, :keys
       
       def self.storage_dir
-        Core.user_dir
+        Redcar.user_dir
       end
 
       # Open a storage file or create it if it doesn't exist.
@@ -37,6 +33,20 @@ module Redcar
         self
       end
       
+      def [](key)
+        @storage[key]
+      end
+      
+      def []=(key, value)
+        @storage[key] = value
+        save
+        value
+      end
+      
+      def keys
+        @storage.keys
+      end
+      
       private
       
       def path

data/plugins/core/plugin.rb

@@ -0,0 +1,7 @@
+
+Plugin.define do
+  name    "core"
+  version "1.0"
+  object  "Redcar::Core"
+  file    "lib", "core"
+end

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

@@ -10,18 +10,9 @@ describe Redcar::Plugin::Storage do
     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"
     

data/plugins/edit_view/features/cut_and_paste.feature

@@ -0,0 +1,45 @@
+Feature: Cut and Paste
+
+  Scenario: Cut removes the text
+    When I open a new edit tab
+    And I replace the contents with "Frank"
+    And I select from 0 to 3
+    And I cut text
+    Then I should not see "Fra" in the edit tab  
+    And I should see "nk" in the edit tab  
+
+  Scenario: Copy leaves the text
+    When I open a new edit tab
+    And I replace the contents with "Frank"
+    And I select from 0 to 3
+    And I copy text
+    Then I should see "Frank" in the edit tab  
+
+  Scenario: Paste inserts the cut text
+    When I open a new edit tab
+    And I replace the contents with "Frank"
+    And I select from 0 to 3
+    And I cut text
+    And I move the cursor to 2
+    And I paste text
+    Then I should see "nkFra" in the edit tab
+
+  Scenario: Paste inserts the copied text
+    When I open a new edit tab
+    And I replace the contents with "Frank"
+    And I select from 0 to 3
+    And I copy text
+    And I move the cursor to 2
+    And I paste text
+    Then I should see "FrFraank" in the edit tab
+
+  Scenario: Paste pastes the most recent copy
+    When I open a new edit tab
+    And I replace the contents with "Frank"
+    And I select from 0 to 3
+    And I copy text
+    And I select from 3 to 5
+    And I copy text
+    And I move the cursor to 0
+    And I paste text
+    Then I should see "nkFrank" in the edit tab 

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

@@ -5,3 +5,25 @@ end
 When /^I redo$/ do
   Redcar::Top::RedoCommand.new.run
 end
+
+When /^I select from (\d+) to (\d+)$/ do |start_offset, end_offset|
+  doc = Redcar.app.focussed_window.focussed_notebook.focussed_tab.edit_view.document
+  doc.set_selection_range((start_offset.to_i)..(end_offset.to_i))
+end
+
+When /^I copy text$/ do
+  Redcar::Top::CopyCommand.new.run
+end
+
+When /^I cut text$/ do
+  Redcar::Top::CutCommand.new.run
+end
+
+When /^I paste text$/ do
+  Redcar::Top::PasteCommand.new.run
+end
+
+When /^I move the cursor to (\d+)$/ do |offset|
+  doc = Redcar.app.focussed_window.focussed_notebook.focussed_tab.edit_view.document
+  doc.cursor_offset = offset.to_i
+end

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

@@ -32,7 +32,7 @@ end
 World(SwtKeyHelper)
 
 When /^I press m"([^\"]*)" l"([^\"]*)" w"([^\"]*)"$/ do |key_mac, key_linux, key_windows|
-  case Redcar::Core.platform
+  case Redcar.platform
   when :osx
     key = key_mac
   when :linux

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

@@ -5,7 +5,7 @@ module NotebookSwtHelper
   end
   
   def ctab_folders
-    sash.children.to_a[1].children.to_a.select do |c| 
+    sash.children.to_a[1].children.to_a[0].children.to_a.select do |c| 
       c.class == Java::OrgEclipseSwtCustom::CTabFolder
     end
   end

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

@@ -19,6 +19,7 @@ When /^I close the focussed tab$/ do
 end
 
 When /^I replace the contents with "([^\"]*)"$/ do |arg1|
+  arg1 = arg1.gsub("\\n", "\n")
   win = Redcar.app.windows.first
   tab = win.focussed_notebook.focussed_tab
   tab.edit_view.document.text = arg1
@@ -76,6 +77,7 @@ Then /^the tab should have the keyboard focus$/ do
 end
 
 Then /^I should (not )?see "(.*)" in the edit tab$/ do |bool, content|
+  content = content.gsub("\\n", "\n")
   bool = !bool
   matcher = bool ? be_true : be_false
   focussed_tab.edit_view.document.to_s.include?(content).should matcher