ruber 0.0.8 → 0.0.9

data/plugins/state/ui/config_widget.rb

@@ -1,8 +1,8 @@
 =begin
 ** Form generated from reading ui file 'config_widget.ui'
 **
-** Created: mer gen 12 12:12:11 2011
-**      by: Qt User Interface Compiler version 4.7.1
+** Created: gio apr 21 20:42:42 2011
+**      by: Qt User Interface Compiler version 4.7.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
 =end
@@ -72,9 +72,9 @@ class Ui_StateConfigWidget
     @_state__restore_cursor_position.text = Qt::Application.translate("StateConfigWidget", "Restore cursor position when opening documents", nil, Qt::Application::UnicodeUTF8)
     @_state__restore_project_files.text = Qt::Application.translate("StateConfigWidget", "Restore open files when opening a project", nil, Qt::Application::UnicodeUTF8)
     @label_2.text = Qt::Application.translate("StateConfigWidget", "On startup", nil, Qt::Application::UnicodeUTF8)
-    @_state__startup_behaviour.insertItems(0, [Qt::Application.translate("StateConfigWidget", "Restore open project and files", nil, Qt::Application::UnicodeUTF8),
-        Qt::Application.translate("StateConfigWidget", "Restore open files only", nil, Qt::Application::UnicodeUTF8),
-        Qt::Application.translate("StateConfigWidget", "Restore open project only", nil, Qt::Application::UnicodeUTF8),
+    @_state__startup_behaviour.insertItems(0, [Qt::Application.translate("StateConfigWidget", "Restore everything", nil, Qt::Application::UnicodeUTF8),
+        Qt::Application.translate("StateConfigWidget", "Restore projects", nil, Qt::Application::UnicodeUTF8),
+        Qt::Application.translate("StateConfigWidget", "Restore documents not associated with projects", nil, Qt::Application::UnicodeUTF8),
         Qt::Application.translate("StateConfigWidget", "Keep empty workspace", nil, Qt::Application::UnicodeUTF8)])
     @_state__startup_behaviour.setProperty("access", Qt::Variant.new(Qt::Application.translate("StateConfigWidget", "$startup_behaviour", nil, Qt::Application::UnicodeUTF8)))
     end # retranslateUi

data/plugins/state/ui/config_widget.ui

@@ -50,17 +50,17 @@
           </property>
           <item>
            <property name="text">
-            <string>Restore open project and files</string>
+            <string>Restore everything</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>Restore open files only</string>
+            <string>Restore projects</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>Restore open project only</string>
+            <string>Restore documents not associated with projects</string>
            </property>
           </item>
           <item>

data/plugins/syntax_checker/syntax_checker.rb

@@ -379,6 +379,10 @@ the one that a syntax checker's @check@ method). It is passed to the syntax chec
         nil
       end
       
+      def check_syntax async = false
+        
+      end
+      
 =begin rdoc
 Starts a syntax check for the document
 

data/spec/annotation_model_spec.rb

@@ -8,7 +8,7 @@ describe Ruber::AnnotationModel do
     @components = flexmock{|m| m.should_ignore_missing}
     @w = Qt::Widget.new
     flexmock(Ruber).should_receive(:[]).with(:components).and_return(@components).by_default
-    @doc = Ruber::Document.new @app
+    @doc = Ruber::Document.new nil, @app
     @model = Ruber::AnnotationModel.new @doc
   end
 

data/spec/auto_end_spec.rb

@@ -71,7 +71,7 @@ describe Ruber::AutoEnd::Extension do
   before do
     Ruber[:components].load_plugin 'plugins/auto_end/'
     @file = Tempfile.new ['auto_end_test', '.rb']
-    @doc = Ruber[:documents].document @file.path
+    @doc = Ruber[:world].document @file.path
     @ext = @doc.extension(:auto_end)
   end
   
@@ -148,7 +148,7 @@ describe Ruber::AutoEnd::Extension do
 
     end
     
-    context "and the last line contains an if " do
+    context "and the last line contains an if" do
       
       it_should_insert_end "if the if is at the beginning of the line", "if kkk\n", "class X\n%\nend", "class X\nif kkk\n\nend\nend", [2, 0]
       
@@ -161,6 +161,48 @@ describe Ruber::AutoEnd::Extension do
       
     end
     
+    context "and the last line contains a for followed by an identifier, and in and some other characters" do
+      
+      it_should_insert_end "if the for is at the beginning of the line", "for kkk in abc\n", "class X\n%\nend", "class X\nfor kkk in abc\n\nend\nend", [2, 0]
+      
+      it_should_insert_end "if the for is preceded only by whitespaces", "  for kkk in abc\n", "class X\n%\nend", "class X\n  for kkk in abc\n\nend\nend", [2, 0]
+      
+      it_should_insert_end 'if the for is preceded by an =', "x =for kkk in abc\n",
+          "class X\n%\nend", "class X\nx =for kkk in abc\n\nend\nend"
+      
+      it_should_insert_end 'if the for is preceded by an = followed by spaces', "x = for kkk in abc\n", "class X\n%\nend", "class X\nx = for kkk in abc\n\nend\nend"
+      
+    end
+
+    context "and the last line contains an unless" do
+      
+      it_should_insert_end "if the unless is at the beginning of the line", "unless kkk\n", "class X\n%\nend", "class X\nunless kkk\n\nend\nend", [2, 0]
+      
+      it_should_insert_end "if the unless is preceded only by whitespaces", "  unless kkk\n", "class X\n%\nend", "class X\n  unless kkk\n\nend\nend", [2, 0]
+      
+      it_should_insert_end 'if the unless is preceded by an =', "x =unless kkk\n",
+          "class X\n%\nend", "class X\nx =unless kkk\n\nend\nend"
+      
+      it_should_insert_end 'if the unless is preceded by an = followed by spaces', "x = unless kkk\n", "class X\n%\nend", "class X\nx = unless kkk\n\nend\nend"
+      
+    end
+    
+    context "and the last line contains a while" do
+      
+      it_should_insert_end "if the while is at the beginning of the line", "while kkk\n", "class X\n%\nend", "class X\nwhile kkk\n\nend\nend", [2, 0]
+      
+      it_should_insert_end "if the while is preceded only by whitespaces", "  while kkk\n", "class X\n%\nend", "class X\n  while kkk\n\nend\nend", [2, 0]
+      
+    end
+    
+    context "and the last line contains a until" do
+      
+      it_should_insert_end "if the until is at the beginning of the line", "until kkk\n", "class X\n%\nend", "class X\nuntil kkk\n\nend\nend", [2, 0]
+      
+      it_should_insert_end "if the until is preceded only by whitespaces", "  until kkk\n", "class X\n%\nend", "class X\n  until kkk\n\nend\nend", [2, 0]
+      
+    end
+    
     context "and the line contains a do" do
       
       it_should_insert_end "if the do is at the end of the line", "x.each do\n", "def y x\n%\nend", "def y x\nx.each do\n\nend\nend", [2, 0]
@@ -198,54 +240,63 @@ describe Ruber::AutoEnd::Extension do
       
       it_should_insert_end 'if the begin is preceded by an = followed by spaces', "x = begin kkk\n", "class X\n%\nend", "class X\nx = begin kkk\n\nend\nend"
       
+      it 'does nothing if the line starts with =begin ' do
+        @doc.block_signals true
+        @doc.text = "def x\n\nend"
+        @doc.block_signals false
+        @doc.insert_text KTextEditor::Cursor.new(1,0), "=begin \n"
+        @doc.text.should == "def x\n=begin \n\nend"
+      end
+
+      
     end
     
     context "and the last line starts with =begin" do
-
-      context "and the active view is associated with the document" do
-        
-        before do
-          @view = @doc.create_view
-          flexmock(@doc).should_receive(:active_view).and_return @view
-          @doc.block_signals true
-          @doc.text= "abc\n"
-          @doc.block_signals false
-          @insert_pos = KTextEditor::Cursor.new(1,0)
-          #avoid messing up the text with indentation
-          flexmock(@view).should_receive(:execute_action).with('tools_align').by_default
-        end
-        
-        it "inserts an an empty line followed by a =end" do
-          @doc.insert_text @insert_pos, "=begin xyz\n"
-          @doc.text.should == "abc\n=begin xyz\n\n=end"
-        end
-        
-        it 'indents the text' do
-          flexmock(@view).should_receive(:execute_action).with('tools_align').once
-          @doc.insert_text @insert_pos, "=begin xyz\n"
-        end
-        
-        it 'moves the cursor to the line before the end' do
-          @doc.insert_text @insert_pos, "=begin xyz\n"
-          @view.cursor_position.should == KTextEditor::Cursor.new(2,0)
-        end
-        
-      end
-      
-      context 'and the active view is not associated with the document' do
-        
-        it 'does nothing' do
-          flexmock(@doc).should_receive(:active_view).and_return nil
-          @doc.block_signals true
-          old_text = "abc\n"
-          @doc.text = old_text
-          @doc.block_signals false
-          @doc.insert_text KTextEditor::Cursor.new(1,0), "=begin xyz\n"
-          @doc.text.should == "abc\n=begin xyz\n"
-        end
-        
-      end
-        
+      pending
+#       context "and the active view is associated with the document" do
+#         
+#         before do
+#           @view = @doc.create_view
+#           flexmock(@doc).should_receive(:active_view).and_return @view
+#           @doc.block_signals true
+#           @doc.text= "abc\n"
+#           @doc.block_signals false
+#           @insert_pos = KTextEditor::Cursor.new(1,0)
+#           #avoid messing up the text with indentation
+#           flexmock(@view).should_receive(:execute_action).with('tools_align').by_default
+#         end
+#         
+#         it "inserts an an empty line followed by a =end" do
+#           @doc.insert_text @insert_pos, "=begin xyz\n"
+#           @doc.text.should == "abc\n=begin xyz\n\n=end"
+#         end
+#         
+#         it 'indents the text' do
+#           flexmock(@view).should_receive(:execute_action).with('tools_align').once
+#           @doc.insert_text @insert_pos, "=begin xyz\n"
+#         end
+#         
+#         it 'moves the cursor to the line before the end' do
+#           @doc.insert_text @insert_pos, "=begin xyz\n"
+#           @view.cursor_position.should == KTextEditor::Cursor.new(2,0)
+#         end
+#         
+#       end
+#       
+#       context 'and the active view is not associated with the document' do
+#         
+#         it 'does nothing' do
+#           flexmock(@doc).should_receive(:active_view).and_return nil
+#           @doc.block_signals true
+#           old_text = "abc\n"
+#           @doc.text = old_text
+#           @doc.block_signals false
+#           @doc.insert_text KTextEditor::Cursor.new(1,0), "=begin xyz\n"
+#           @doc.text.should == "abc\n=begin xyz\n"
+#         end
+#         
+#       end
+#         
     end
     
   end

data/spec/component_manager_spec.rb

@@ -56,22 +56,45 @@ end
 
 describe 'Ruber::ComponentManager#each_component' do
   
-  it 'should call the block passing each component in turn, in reverse loading order' do
-    man = Ruber::ComponentManager.new
-    components = 5.times.map{|i| flexmock(i.to_s, :component_name => i.to_s, :plugin_description => OpenStruct.new({:features => []}))}
-    m = flexmock do |mk|
-      components.reverse_each{|c| mk.should_receive(:test).once.with(c).globally.ordered}
+  context 'if the argument is :normal or missing' do
+    
+    it 'calls the block passing each component in turn, in loading order' do
+      man = Ruber::ComponentManager.new
+      components = 5.times.map{|i| flexmock(i.to_s, :component_name => i.to_s, :plugin_description => OpenStruct.new({:features => []}))}
+      m = flexmock do |mk|
+        components.each{|c| mk.should_receive(:test).once.with(c).globally.ordered}
+      end
+      man.instance_variable_get(:@components).clear
+      components.each{|c| man.add c}
+      man.each_component(:normal){|i| m.test i}
+      m = flexmock do |mk|
+        components.each{|c| mk.should_receive(:test).once.with(c).globally.ordered}
+      end
+      man.each_component{|i| m.test i}
     end
-    man.instance_variable_get(:@components).clear
-    components.each{|c| man.add c}
-    man.each_component{|i| m.test i}
+    
+  end
+  
+  context 'if the argument is :reverse' do
+    
+    it 'should call the block passing each component in turn, in loading order' do
+      man = Ruber::ComponentManager.new
+      components = 5.times.map{|i| flexmock(i.to_s, :component_name => i.to_s, :plugin_description => OpenStruct.new({:features => []}))}
+      m = flexmock do |mk|
+        components.reverse_each{|c| mk.should_receive(:test).once.with(c).globally.ordered}
+      end
+      man.instance_variable_get(:@components).clear
+      components.each{|c| man.add c}
+      man.each_component(:reverse){|i| m.test i}
+    end
+  
   end
   
 end
 
 describe 'Ruber::ComponentManager#components' do
   
-  it 'should call the block passing each component in turn, in reverse loading order' do
+  it 'calls the block passing each component in turn, in reverse loading order' do
     man = Ruber::ComponentManager.new
     components = 5.times.map{|i| flexmock(i.to_s, :component_name => i.to_s, :plugin_description => OpenStruct.new({:features => []}))}
     man.instance_variable_get(:@components).clear
@@ -83,22 +106,54 @@ end
 
 describe 'Ruber::ComponentManager#each_plugin' do
   
-  it 'should call the block passing each plugin in turn, in reverse loading order' do
-    man = Ruber::ComponentManager.new
-    components = 5.times.map{|i| flexmock("component #{i}", :component_name => :"#{i}",:plugin_description => OpenStruct.new({:features => []}))}
-    m = flexmock("test")
-    plugins = [1, 3, 4]
-    components.each_with_index do |c, i|
-      is_plugin = plugins.include?(i)
-      c.should_receive(:is_a?).with(Ruber::Plugin).and_return( is_plugin)
-      if is_plugin then m.should_receive(:test).with(c).once.globally.ordered
-      else m.should_receive(:test).with(c).never
+  context 'when the argument is :normal or missing' do
+    
+    it 'calls the block passing each plugin in turn, in loading order' do
+      man = Ruber::ComponentManager.new
+      components = 5.times.map{|i| flexmock("component #{i}", :component_name => :"#{i}",:plugin_description => OpenStruct.new({:features => []}))}
+      m = flexmock("test")
+      plugins = [1, 3, 4]
+      components.each_with_index do |c, i|
+        is_plugin = plugins.include?(i)
+        c.should_receive(:is_a?).with(Ruber::Plugin).and_return( is_plugin)
+        if is_plugin then m.should_receive(:test).with(c).once.globally.ordered
+        else m.should_receive(:test).with(c).never
+        end
+      end
+      components.each{|c| man.add c}
+      man.each_plugin(:normal){|i| m.test i}
+      components.each_with_index do |c, i|
+        is_plugin = plugins.include?(i)
+        c.should_receive(:is_a?).with(Ruber::Plugin).and_return( is_plugin)
+        if is_plugin then m.should_receive(:test).with(c).once.globally.ordered
+        else m.should_receive(:test).with(c).never
+        end
       end
+      man.each_plugin(:normal){|i| m.test i}
     end
-    components.reverse_each{|c| man.add c}
-    man.each_plugin{|i| m.test i}
+  
   end
   
+  context 'when the argument is :reverse' do
+    
+    it 'should call the block passing each plugin in turn, in reverse loading order' do
+      man = Ruber::ComponentManager.new
+      components = 5.times.map{|i| flexmock("component #{i}", :component_name => :"#{i}",:plugin_description => OpenStruct.new({:features => []}))}
+      m = flexmock("test")
+      plugins = [1, 3, 4]
+      components.each_with_index do |c, i|
+        is_plugin = plugins.include?(i)
+        c.should_receive(:is_a?).with(Ruber::Plugin).and_return( is_plugin)
+        if is_plugin then m.should_receive(:test).with(c).once.globally.ordered
+        else m.should_receive(:test).with(c).never
+        end
+      end
+      components.reverse_each{|c| man.add c}
+      man.each_plugin(:reverse){|i| m.test i}
+    end
+
+  end
+ 
 end
 
 describe 'Ruber::ComponentManager#plugins' do
@@ -1038,6 +1093,10 @@ describe 'Ruber::ComponentManager#unload_plugin' do
     @manager.instance_variable_get(:@components).keys.map(&:to_s).should =~ [:p0, :p2, :c0, :c1, :components].map(&:to_s)
   end
   
+  it 'raises ArgumentError if there\'s no plugin with that name' do
+    lambda{@manager.unload_plugin(:xyz)}.should raise_error(ArgumentError, "No plugin with name xyz")
+  end
+  
   it 'should raise ArgumentError if the name corresponds to a component instead of a plugin' do
     lambda{@manager.unload_plugin(:c1)}.should raise_error(ArgumentError, "A component can't be unloaded")
   end

data/spec/document_factory_spec.rb

@@ -0,0 +1,115 @@
+require './spec/framework'
+require './spec/common'
+require 'ruber/world/document_factory'
+
+describe Ruber::World::DocumentFactory do
+  
+  it 'derives from Qt::Object' do
+    Ruber::World::DocumentFactory.ancestors.should include(Qt::Object)
+  end
+  
+  before do
+    @factory = Ruber::World::DocumentFactory.new
+  end
+  
+  describe '#document' do
+    
+    it 'returns a document having the object passed as second argument as parent' do
+      obj = Qt::Object.new
+      doc = @factory.document nil, obj
+      doc.should be_a(Ruber::Document)
+      doc.parent.should == obj
+    end
+    
+    context 'when called with a file or URL as first argument' do
+      
+      it 'returns a new document for the given file, if no other document for it exists' do
+        doc = @factory.document __FILE__
+        doc.path.should == __FILE__
+      end
+      
+      it 'returns an existing document for the same file, if it already exists' do
+        old = @factory.document __FILE__
+        new = @factory.document __FILE__
+        new.should == old
+      end
+      
+      it 'returns the existing file even if of the two calls to document one was passed a string and the other an URL' do
+        old = @factory.document KDE::Url.new(__FILE__)
+        new = @factory.document __FILE__
+        new.should == old
+      end
+      
+      it 'does not attempt to return a document which has been closed' do
+        old = @factory.document __FILE__
+        old.close
+        new = @factory.document __FILE__
+        new.should_not == old
+      end
+      
+      it 'returns an existing document even if it was created without a file and saved with the new name later' do
+        old = @factory.document nil
+        url = KDE::Url.new __FILE__
+        flexmock(old).should_receive(:url).and_return url
+        old.instance_eval{emit document_url_changed(self)}
+        new = @factory.document __FILE__
+        new.should == old
+      end
+      
+      it 'returns an existing document even if it was created for another file then
+      saved with the new name later' do
+        old = @factory.document File.join File.dirname(__FILE__), 'common.rb'
+        url = KDE::Url.new __FILE__
+        flexmock(old).should_receive(:url).and_return url
+        old.instance_eval{emit document_url_changed(self)}
+        new = @factory.document __FILE__
+        new.should == old
+      end
+      
+      it 'doesn\'t return a document which was created for the same file but was saved with another name later' do
+        old = @factory.document __FILE__ 
+        url = KDE::Url.new File.join(File.dirname(__FILE__), 'common.rb')
+        flexmock(old).should_receive(:url).and_return url
+        old.instance_eval{emit document_url_changed(self)}
+        new = @factory.document __FILE__
+        new.should_not == old
+      end
+      
+      it 'returns nil if the file is a local file and it doesn\'t exist' do
+        @factory.document('/xyz').should be_nil
+        @factory.document(KDE::Url.new('/xyz')).should be_nil
+      end
+      
+    end
+    
+    context 'when called with nil as first argument' do
+      
+      it 'always returns a new document' do
+        old = @factory.document nil
+        new = @factory.document nil
+        new.should_not == old
+      end
+      
+    end
+    
+    context 'when creating a new document' do
+      
+      it 'emits the document_created signal passing the document as argument' do
+        docs = [Ruber::Document.new(__FILE__), Ruber::Document.new]
+        flexmock(Ruber::Document).should_receive(:new).with(__FILE__,nil).once.and_return docs[0]
+        flexmock(Ruber::Document).should_receive(:new).with(nil,nil).once.and_return docs[1]
+        mk = flexmock do |m|
+          m.should_receive(:document_created).with(docs[0]).once
+          m.should_receive(:document_created).with(docs[1]).once
+        end
+        @factory.connect(SIGNAL('document_created(QObject*)')){|o| mk.document_created o}
+        doc = @factory.document __FILE__
+        @factory.document nil
+        @factory.document __FILE__
+      end
+      
+    end
+    
+  end
+  
+end