ruber 0.0.5 → 0.0.7

data/plugins/state/ui/config_widget.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'config_widget.ui'
 **
-** Created: ven ott 29 17:39:04 2010
+** Created: mar nov 16 11:52:49 2010
 **      by: Qt User Interface Compiler version 4.7.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/spec/common.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'yaml'
 require 'flexmock/argument_types'
 require 'korundum4'
+# require 'ktexteditor'
 require 'kio'
 require 'ostruct'
 require 'facets/kernel/require_relative'
@@ -97,11 +98,11 @@ RSPEC::Matchers.define :have_entries do |hash|
   match do |obj|
     if obj.respond_to? :[]
       hash.each_pair do |k, v|
-        return false unless obj[k] == v
+         break false unless obj[k] == v
       end
     else
       hash.each_pair do |k, v|
-        return false unless obj.send(k) == v
+        break false unless obj.send(k) == v
       end
     end
   end
@@ -114,6 +115,13 @@ end
 
 data = KDE::AboutData.new "test", "", KDE::ki18n("test"), "0.0.0"
 KDE::CmdLineArgs.init [], data
-KDE::Application.new
+opts = KDE::CmdLineOptions.new
+opts.add("+[FILES]", KDE.ki18n("Open FILES. Files with extension .krprj will "\
+                               "be opened as projects. Only the more recent "\
+                              "project will be used"))
+KDE::CmdLineArgs.add_cmd_line_options opts
+if defined? init_ruber_core then init_ruber_core
+else KDE::Application.new
+end
 at_exit{Qt::Internal.application_terminated = true}
 GC.disable

data/spec/document_list_spec.rb

@@ -511,14 +511,6 @@ describe Ruber::DocumentList do
           @keeper.document __FILE__
         end
         
-        it 'closes the already-existing document when called with a path and the only existing document is pristine' do
-          old = @keeper.new_document
-          Qt::Object.connect old, SIGNAL('closing(QObject*)'), @keeper, SLOT('close_document(QObject*)')
-          doc = @keeper.document __FILE__
-          @keeper[0].should == doc
-          @keeper.size.should == 1
-        end
-        
       end
       
     end
@@ -529,6 +521,14 @@ describe Ruber::DocumentList do
       # this is necessary because otherwise the 'after' block fails (because the document list contains nil)
       @keeper.instance_variable_get(:@docs).clear
     end
+    
+    it 'treats strings containing URLs as URLs rather than as relative files' do
+      url_str = 'http://xyz/abc.rb'
+      flexmock(Ruber::Document).should_receive(:new).with(@mw, KDE::Url.new(url_str))
+      doc = @keeper.document url_str
+      # this is necessary because otherwise the 'after' block fails (because the document list contains nil)
+      @keeper.instance_variable_get(:@docs).clear
+    end
 
   end
 

data/spec/document_project_spec.rb

@@ -194,12 +194,24 @@ describe Ruber::DocumentProject do
     Ruber::DocumentProject.ancestors.should include(Ruber::AbstractProject)
   end
   
-  def create_doc path
+  def create_doc url, path = nil
     doc = Qt::Object.new
     class << doc
       attr_accessor :path
+      attr_reader :url
+      
+      def has_file?
+        !path.empty?
+      end
+      
+      def url= url
+        @url = KDE::Url.new url
+        @path = @url.empty? ? '' : @url.path
+      end
+      
     end
-    doc.path = path
+    doc.url = url
+    doc.path = path if path
     doc
   end
   
@@ -223,29 +235,61 @@ describe Ruber::DocumentProject do
       prj.parent.should equal(doc)
     end
     
-    it 'uses Ruber::DocumentProject::Backend as backend and the file associated with the document as project name, if needed' do
+    it 'uses Ruber::DocumentProject::Backend as backend' do
       doc = create_doc __FILE__
       prj = Ruber::DocumentProject.new doc
       prj.instance_variable_get(:@backend).should be_a(Ruber::DocumentProject::Backend)
-      prj.project_name.should == __FILE__
-      file = '/home/stefano/xyz/document_project_spec_data_.rb'
-      md5 = Digest::MD5.new
-      md5 << file
-      data_path = File.join ENV['HOME'], '.kde4/share/apps/test/documents', md5.hexdigest
-      File.open(data_path, 'w'){|f| YAML.dump( {:general => {:project_name => file}}, f)}
-      doc = create_doc file
-      prj = Ruber::DocumentProject.new doc
-      prj.project_name.should == file
-      FileUtils.rm_rf data_path
     end
     
-    it 'doesn\'t raise an error if the document isn\'t associated with a file' do
-      doc = create_doc ''
-      prj = nil
-      lambda{prj = Ruber::DocumentProject.new doc}.should_not raise_error
-      prj.project_name.should be_empty
+    context 'if the document is associated with a file' do
+      
+      before do
+        @dir = File.dirname(__FILE__)
+        @file = File.join @dir, 'x y ^ z'
+        @encoded_url = "file://#{@dir}/x%20y%20%5E%20z"
+      end
+      
+      it 'uses an encoded form of the document\'s URL as project name' do
+        doc = create_doc @file
+        prj = Ruber::DocumentProject.new doc
+        prj.project_name.should == @encoded_url
+      end
+      
+      it 'passes the project name as argument to the backend' do
+        back = Ruber::DocumentProject::Backend.new @encoded_url
+        doc = create_doc @file
+        #twice because korundum executes the code before the initialize body twice,
+        #until the call to super
+        flexmock(Ruber::DocumentProject::Backend).should_receive(:new).twice.with(@encoded_url).and_return back
+        prj = Ruber::DocumentProject.new doc
+      end
+
     end
     
+    context 'if the document is not associated with a file' do
+      
+      it 'uses an empty string as project name' do
+        doc = create_doc ''
+        prj = Ruber::DocumentProject.new doc
+        prj.project_name.should == ''
+      end
+      
+      it 'passes an empty string as argument to the backend' do
+        back = Ruber::DocumentProject::Backend.new ''
+        doc = create_doc ''
+        #twice because korundum executes the code before the initialize body twice,
+        #until the call to super
+        flexmock(Ruber::DocumentProject::Backend).should_receive(:new).twice.with('').and_return back
+        prj = Ruber::DocumentProject.new doc
+      end
+      
+      it 'doesn\'t raise an error if the document isn\'t associated with a file' do
+        doc = create_doc ''
+        lambda{Ruber::DocumentProject.new doc}.should_not raise_error
+      end
+      
+    end
+        
     it 'connects the document\s "document_url_changed(QObject*)" signal with its "change_file()" slot' do
       doc = create_doc File.join(ENV['HOME'], 'test.rb')
       prj = Ruber::DocumentProject.new doc
@@ -269,7 +313,7 @@ describe Ruber::DocumentProject do
     it 'returns false if the rule\'s scope doesn\'t include :document' do
       doc = create_doc __FILE__
       prj = Ruber::DocumentProject.new doc
-      o1 = OS.new(:file_extension => [], :scope => [:global], :mimetype => [])
+      o1 = OS.new(:file_extension => [], :scope => [:global], :mimetype => [], :place => [:local])
       flexmock(doc).should_receive(:file_type_match?).with([], []).and_return true
       prj.match_rule?(o1).should be_false
     end
@@ -277,17 +321,38 @@ describe Ruber::DocumentProject do
     it 'returns false if the document\'s file_type_match? method returns false' do
       doc = create_doc __FILE__
       prj = Ruber::DocumentProject.new doc
-      o1 = OS.new(:file_extension => ['*.rb'], :scope => [:document], :mimetype => [])
+      o1 = OS.new(:file_extension => ['*.rb'], :scope => [:document], :mimetype => [], :place => [:local])
       flexmock(doc).should_receive(:file_type_match?).once.with([], ['*.rb']).and_return false
       prj.match_rule?(o1).should be_false
     end
     
+    it 'returns false if the document is associated with a remote file and the rule\'s place entry doesn\'t include :remote' do
+      doc = create_doc 'http:///xyz/abc.rb'
+      prj = Ruber::DocumentProject.new doc
+      o1 = OS.new(:file_extension => [], :scope => [:document], :mimetype => [], :place => [:local])
+      flexmock(doc).should_receive(:file_type_match?).with([], []).and_return true
+      prj.match_rule?(o1).should be_false
+    end
+    
+    it 'returns false if the document is associated with a local file and the rule\'s place entry doesn\'t include :local' do
+      doc = create_doc __FILE__
+      prj = Ruber::DocumentProject.new doc
+      o1 = OS.new(:file_extension => [], :scope => [:document], :mimetype => [], :place => [:remote])
+      flexmock(doc).should_receive(:file_type_match?).with([], []).and_return true
+      prj.match_rule?(o1).should be_false
+    end
+    
     it 'returns true if both the mimetype and the file extension of the rule match those of the document and the rule\'s scope include :document' do
       doc = create_doc __FILE__
       prj = Ruber::DocumentProject.new doc
-      o1 = OS.new(:file_extension => ['*.rb'], :scope => [:document], :mimetype => [])
+      o1 = OS.new(:file_extension => ['*.rb'], :scope => [:document], :mimetype => [], :place => [:local])
       flexmock(doc).should_receive(:file_type_match?).once.with([], ['*.rb']).and_return true
       prj.match_rule?(o1).should be_true
+      doc = create_doc 'http:///xyz/abc.rb'
+      prj = Ruber::DocumentProject.new doc
+      o2 = OS.new(:file_extension => ['*.rb'], :scope => [:document], :mimetype => [], :place => [:remote])
+      flexmock(doc).should_receive(:file_type_match?).once.with([], ['*.rb']).and_return true
+      prj.match_rule?(o2).should be_true
     end
     
   end
@@ -295,12 +360,14 @@ describe Ruber::DocumentProject do
   describe '#change_file' do
     
     it 'changes the filename associated with the backend' do
-      file = File.join ENV['HOME'], 'test.rb'
-      new_file = File.join ENV['HOME'], 'test.rb1'
+      dir = File.join '/', 'home', 'user'
+      file = File.join dir, 'test.rb'
+      new_file = File.join dir, 'nuovo test.rb'
+      enc_url = 'file://' + File.join(dir, 'nuovo%20test.rb')
       doc = create_doc file
       prj = Ruber::DocumentProject.new doc
-      flexmock(prj.instance_variable_get(:@backend)).should_receive(:document_path=).once.with new_file
-      doc.path = new_file
+      flexmock(prj.instance_variable_get(:@backend)).should_receive(:document_path=).once.with enc_url
+      doc.url = new_file
       prj.send :change_file
     end
     
@@ -362,6 +429,12 @@ describe Ruber::DocumentProject do
       prj.files.should == [__FILE__]
     end
     
+    it 'returns the encoded URL if the document is associated with a remote file' do
+      doc = create_doc 'http://xyz/a bc.rb'
+      prj = Ruber::DocumentProject.new doc
+      prj.files.should == ['http://xyz/a%20bc.rb']
+    end
+    
     it 'returns an empty array if the document isn\'t associated with a path' do
       doc = create_doc ''
       prj = Ruber::DocumentProject.new doc

data/spec/document_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/common'
+require './spec/common'
 
 require 'tempfile'
 require 'fileutils'
@@ -34,7 +34,7 @@ describe Ruber::Document do
   
   describe ', when created' do
 
-    it 'should load a KTextEditor::Document' do
+    it 'loads a KTextEditor::Document' do
       @doc.instance_variable_get(:@doc).should be_instance_of(KTextEditor::Document)
     end
 
@@ -42,11 +42,11 @@ describe Ruber::Document do
       @doc.interface('annotation_interface').annotation_model.should_not be_nil
     end
     
-    it 'should not have a view' do
-      @doc.view.should be_nil
+    it 'doesn\'t have a view' do
+      @doc.views.should be_empty
     end
 
-    it 'should open a given file if new is called with a string or KDE::Url second argument' do
+    it 'opens a given file if new is called with a string or KDE::Url second argument' do
       doc = Ruber::Document.new @app, __FILE__
       doc.text.should == File.read(__FILE__)
       doc.url.path.should == __FILE__
@@ -63,22 +63,85 @@ describe Ruber::Document do
       doc = Ruber::Document.new @app, __FILE__
       prj = doc.instance_variable_get(:@project)
       prj.should be_a(Ruber::DocumentProject)
-      prj.project_name.should == __FILE__
+      prj.project_name.should == KDE::Url.new(__FILE__).to_encoded.to_s
     end
     
-    
-    it 'should not be active' do
+    it 'isn\'t active' do
       doc = Ruber::Document.new @app, __FILE__
       doc.should_not be_active
     end
     
   end
   
+  describe "#has_file?" do
+    
+    context 'when called with :local' do
+      
+      it 'returns true if the document is associated with a local file' do
+        doc = Ruber::Document.new nil, __FILE__
+        doc.should have_file(:local)
+      end
+      
+      it 'returns false if the document is associated with a remote file' do
+        doc = Ruber::Document.new nil, KDE::Url.new('http://github.com/stcrocco/ruber/raw/master/ruber.gemspec')
+        doc.should_not have_file(:local)
+      end
+      
+      it 'returns false if the document isn\'t associated with any file' do
+        doc = Ruber::Document.new
+        doc.should_not have_file(:local)
+      end
+      
+    end
+    
+    context 'when called with :remote' do
+      
+      it 'returns false if the document is associated with a local file' do
+        doc = Ruber::Document.new nil, __FILE__
+        doc.should_not have_file(:remote)
+      end
+      
+      it 'returns true if the document is associated with a remote file' do
+        doc = Ruber::Document.new nil, KDE::Url.new('http://github.com/stcrocco/ruber/raw/master/ruber.gemspec')
+        doc.should have_file(:remote)
+      end
+      
+      it 'returns false if the document isn\'t associated with any file' do
+        doc = Ruber::Document.new
+        doc.should_not have_file(:remote)
+      end
+      
+    end
+    
+    context 'when called with :any or no arguments' do
+      
+      it 'returns true if the document is associated with a local file' do
+        doc = Ruber::Document.new nil, __FILE__
+        doc.should have_file(:any)
+        doc.should have_file
+      end
+      
+      it 'returns true if the document is associated with a remote file' do
+        doc = Ruber::Document.new nil, KDE::Url.new('http://github.com/stcrocco/ruber/raw/master/ruber.gemspec')
+        doc.should have_file(:any)
+        doc.should have_file
+      end
+      
+      it 'returns false if the document isn\'t associated with any file' do
+        doc = Ruber::Document.new
+        doc.should_not have_file(:any)
+        doc.should_not have_file
+      end
+      
+    end
+    
+  end
+  
   describe '#own_project' do
   
     it 'returns the DocumentProject associated with the document' do
       doc = Ruber::Document.new @app, __FILE__
-      doc.own_project.project_name.should == __FILE__
+      doc.own_project.project_name.should == KDE::Url.new(__FILE__).url
     end
 
   end
@@ -94,12 +157,12 @@ describe Ruber::Document do
     end
     
     it 'returns the current project if one exists and the document belongs to it' do
-      flexmock(@list).should_receive(:file_in_project?).with(__FILE__).and_return true
+      flexmock(@list).should_receive(:file_in_project?).with("file://#{__FILE__}").and_return true
       @doc.project.should == @prj
     end
     
     it 'returns the document project if the file associated with the document doesn\'t belong to the current project' do
-      flexmock(@list).should_receive(:file_in_project?).with(__FILE__).and_return false
+      flexmock(@list).should_receive(:file_in_project?).with("file://#{__FILE__}").and_return false
       @doc.project.should be_a(Ruber::DocumentProject)
     end
     
@@ -122,14 +185,6 @@ describe Ruber::Document do
       flexmock(@doc).should_receive(:document_save_as).once.and_return(false)
       @doc.save.should be_true
       @doc.save.should be_false
-      #     tmp_file = File.join Dir.tmpdir, "ruber_document_test" + 3.times.map{rand(10)}.join.to_s
-      #     flexmock(KDE::FileDialog).should_receive(:get_save_file_name).times(2).and_return(nil, tmp_file)
-      #     @doc.text = 'test'
-      #     @doc.save.should be_false
-      #     @doc.save.should be_true
-      #     File.exists?(tmp_file).should be_true
-      #     File.read(tmp_file).should == 'test'
-      #     FileUtils.rm tmp_file
     end
     
     describe ', when the document is associated with a file' do
@@ -172,35 +227,40 @@ describe Ruber::Document do
 
   end
   
-  it 'should allow to create a view if none exists' do
-    @doc.create_view(Qt::Widget.new).should_not be_nil
+  it 'allows to create a view if none exists' do
+    view = @doc.create_view(Qt::Widget.new)
+    view.should be_a(Ruber::EditorView)
+    @doc.views[0].should == view
   end
-
-  it 'should not allow to create a view if one already exists' do
-    @doc.create_view(Qt::Widget.new)
-    lambda{@doc.create_view(Qt::Widget.new)}.should raise_error(RuntimeError)
+  
+  it 'allows to create a view if other views already exist' do
+    old_view = @doc.create_view
+    new_view = @doc.create_view
+    @doc.views.should == [old_view, new_view]
   end
 
-  it 'should allow to get and change the text' do
+  it 'allows to get and change the text' do
     txt="test text"
     lambda{@doc.text="test text"}.should_not raise_error
     @doc.text.should == txt
   end
 
-  it 'should return the mimetype of the document' do
+  it 'returns the mimetype of the document' do
     @doc.mime_type.should == 'text/plain'
     @doc.open_url KDE::Url.from_path(__FILE__)
     @doc.mime_type.should == 'application/x-ruby'
   end
 
-  it 'should return the view attached to it (or nil) with the view method' do
-    @doc.view.should be_nil
-    @doc.create_view nil
-    @doc.view.should be_instance_of Ruber::EditorView
-    @doc.view.close
+  it 'returns a list of the views associated with it' do
+    @doc.views.should be_empty
+    old_view = @doc.create_view nil
+    @doc.views[0].should == old_view
+    new_view = @doc.create_view nil
+    @doc.views[1].should == new_view
+    @doc.views.should == [old_view, new_view]
   end
 
-  it 'should emit the "modified_changed(QObject*, bool)" signal when the modified status changes' do
+  it 'emits the "modified_changed(QObject*, bool)" signal when the modified status changes' do
     m = flexmock
     m.should_receive(:test).ordered.with(true, @doc)
     m.should_receive(:test).ordered.with(false, @doc)
@@ -215,9 +275,9 @@ describe Ruber::Document do
 
   end
 
-  it 'should emit the "document_name_changed(QString, QObject*)" signal when the document name changes' do
+  it 'emits the "document_name_changed(QString, QObject*)" signal when the document name changes' do
     m = flexmock
-    m.should_receive(:document_name_changed).twice
+    m.should_receive(:document_name_changed).once
     @doc.connect(SIGNAL('document_name_changed(QString, QObject*)')) do |str, obj|
       obj.should == @doc
       str.should == @doc.document_name
@@ -226,22 +286,17 @@ describe Ruber::Document do
     @doc.open_url KDE::Url.from_path( __FILE__)
   end
 
-  it 'should return the path of the file usgin the "path" method or an empty string if the document is not associated with a file' do
+  it 'returns the path of the file usgin the "path" method or an empty string if the document is not associated with a file' do
     @doc.path.should == ''
     @doc.open_url KDE::Url.from_path( __FILE__ )
     @doc.path.should == __FILE__
   end
 
-  it 'should return an empty string if the document is empty' do
+  it 'returns an empty string if the document is empty' do
     @doc.text.should_not be_nil
   end
 
-  it 'should tell whether it\'s associated with a file or not' do
-    @doc.should_not have_file
-    Ruber::Document.new(nil, __FILE__).should have_file
-  end
-
-  it 'should tell whether it\'s a pristine document' do
+  it 'tells whether it\'s a pristine document' do
     @doc.should be_pristine
     @doc.text = "a"
     @doc.should_not be_pristine
@@ -265,7 +320,7 @@ describe Ruber::Document do
     sig_name = sig[0...sig.index('(')]
     o_sig_name = sig_name.camelcase(false)
     o_sig = sig.camelcase(false).sub('(QObject*','(KTextEditor::Document*')
-    it "should emit the \"#{sig}\" signal in response to the underlying KTextEditor::Document \"#{o_sig}\" signal" do
+    it "emits the \"#{sig}\" signal in response to the underlying KTextEditor::Document \"#{o_sig}\" signal" do
     m = flexmock
     m.should_receive( sig_name.to_sym).once.with(@doc.object_id)
     @doc.connect(SIGNAL(sig)){|o| m.send(sig_name.to_sym, o.object_id)}
@@ -274,21 +329,21 @@ describe Ruber::Document do
     end
   end
 
-  it 'should emit the "mode_changed(QObject*)" signal in response to the underlying KTextEditor::Document "modeChanged(KTextEditor::Document)" signal' do
+  it 'emits the "mode_changed(QObject*)" signal in response to the underlying KTextEditor::Document "modeChanged(KTextEditor::Document)" signal' do
     m = flexmock
     m.should_receive( :mode_changed).once.with(@doc.object_id)
     @doc.connect(SIGNAL('mode_changed(QObject*)')){|o| m.mode_changed o.object_id}
     @doc.mode = "Ruby"
   end
 
-  it 'should emit the "highlighting_mode_changed(QObject*)" signal in response to the underlying KTextEditor::Document "highlightingModeChanged(KTextEditor::Document)" signal' do
+  it 'emits the "highlighting_mode_changed(QObject*)" signal in response to the underlying KTextEditor::Document "highlightingModeChanged(KTextEditor::Document)" signal' do
     m = flexmock
     m.should_receive( :h_mode_changed).once.with(@doc.object_id)
     @doc.connect(SIGNAL('highlighting_mode_changed(QObject*)')){|o| m.h_mode_changed o.object_id}
     @doc.highlighting_mode = "Ruby"
   end
 
-  it 'should emit the "text_modified(KTextEditor::Range, KTextEditor::Range, QObject*)" signal in response to the underlying KTextEditor::Document "textChanged(KTextEditor::Document*, KTextEditor::Range, KTextEditor::Range)" signal' do
+  it 'emits the "text_modified(KTextEditor::Range, KTextEditor::Range, QObject*)" signal in response to the underlying KTextEditor::Document "textChanged(KTextEditor::Document*, KTextEditor::Range, KTextEditor::Range)" signal' do
     m = flexmock
     m.should_receive( :text_modified).once.with(@doc.object_id)
     @doc.connect(SIGNAL('text_modified(KTextEditor::Range, KTextEditor::Range, QObject*)')){|_r1, _r2, o| m.text_modified o.object_id}
@@ -304,7 +359,7 @@ describe Ruber::Document do
     d.instance_eval{emit textInserted(self, KTextEditor::Range.new(0,0,0,5))}
   end
 
-  it 'should emit the "text_removed(KTextEditor::Range, QObject*)" signal in response to the underlying KTextEditor::Document "textRemoved(KTextEditor::Document*, KTextEditor::Range)" signal' do
+  it 'emits the "text_removed(KTextEditor::Range, QObject*)" signal in response to the underlying KTextEditor::Document "textRemoved(KTextEditor::Document*, KTextEditor::Range)" signal' do
     m = flexmock
     m.should_receive( :text_removed).once.with(@doc.object_id)
     @doc.connect(SIGNAL('text_removed(KTextEditor::Range, QObject*)')){|_, o| m.text_removed o.object_id}
@@ -314,19 +369,12 @@ describe Ruber::Document do
 
   it 'emits the "view_created(QObject*, QObject*)" signal after creating a view' do
     m = flexmock
-    m.should_receive( :view_created).once.with(@doc.object_id)
+    m.should_receive(:view_created).once.with(@doc.object_id)
     @doc.connect(SIGNAL('view_created(QObject*, QObject*)'))do |_, o| 
       m.view_created o.object_id
-      @doc.view.should be_a(Ruber::EditorView)
+      @doc.views[0].should be_a(Ruber::EditorView)
     end
     @doc.create_view nil
-    @doc.view.close
-  end
-
-  it 'should return nil with the view method when a view has been closed' do
-    view = @doc.create_view
-    view.close
-    @doc.view.should be_nil
   end
 
   it 'should return true when close_url succeeds' do
@@ -334,16 +382,16 @@ describe Ruber::Document do
     doc.close_url(false).should be_true
   end
   
-  it 'should call the update_project method of each component, passing it its project, when the name of the document changes, but before emitting the document_name_changed signal' do
+  it 'should call the update_project method of each component, passing it its project, when the url of the document changes, but before emitting the document_url_changed signal' do
     3.times{@comp << flexmock{|m| m.should_receive(:update_project).once.with(Ruber::DocumentProject).globally.ordered} }
-    name_changed_rec = flexmock{|m| m.should_receive(:name_changed).once.globally.ordered}
+    url_changed_rec = flexmock{|m| m.should_receive(:url_changed).once.globally.ordered}
     internal = @doc.send :internal
-    @doc.connect(SIGNAL('document_name_changed(QString,QObject*)')){name_changed_rec.name_changed}
-    internal.instance_eval{emit documentNameChanged(self)}
+    @doc.connect(SIGNAL('document_url_changed(QObject*)')){url_changed_rec.url_changed}
+    internal.instance_eval{emit documentUrlChanged(self)}
   end
 
   after do
-    @doc.view.close if @doc.view
+    @doc.views.each{|v| v.close}
     @doc.instance_variable_get(:@doc).closeUrl false
     @doc.dispose
   end
@@ -361,7 +409,7 @@ describe 'Ruber::Document#close' do
     flexmock(@doc.instance_variable_get(:@project)).should_receive(:save).by_default
   end
   
-  it 'should return immediately if ask is true and query_close returns false' do
+  it 'returns immediately if ask is true and query_close returns false' do
     doc = Ruber::Document.new nil, __FILE__
     exp = doc.object_id
     m = flexmock('test'){|mk| mk.should_receive(:document_closing).never}
@@ -408,12 +456,12 @@ describe 'Ruber::Document#close' do
     doc.close false
   end
   
-  it 'should close the view, if there\'s one, after emitting the closing signal, if closing is confirmed' do
+  it 'closes the views, if any, after emitting the closing signal, if closing is confirmed' do
     doc = Ruber::Document.new nil, __FILE__
-    v = doc.create_view
+    views = 3.times.map{doc.create_view}
     exp = doc.object_id
     m = flexmock('test'){|mk| mk.should_receive(:document_closing).once.with(exp).globally.ordered}
-    flexmock(v).should_receive(:close).once.globally.ordered
+    views.each{|v| flexmock(v).should_receive(:close).once.globally.ordered}
     flexmock(doc).should_receive(:close_url).and_return true
     doc.connect(SIGNAL('closing(QObject*)')){|d| m.document_closing d.object_id}
     flexmock(doc).should_receive(:query_close).and_return true
@@ -456,11 +504,11 @@ end
     doc.close false
   end
     
-  it 'should dispose of itself after emitting the closing signal, if closing is confirmed' do
-    doc = Ruber::Document.new nil, __FILE__
-    doc.close false
-    doc.should be_disposed
-  end
+#   it 'should dispose of itself after emitting the closing signal, if closing is confirmed' do
+#     doc = Ruber::Document.new nil, __FILE__
+#     doc.close false
+#     doc.should be_disposed
+#   end
   
   it 'should return true, if closing is confirmed and successful and false otherwise' do
     doc = Ruber::Document.new nil, __FILE__
@@ -475,27 +523,6 @@ end
   
 end
 
-describe 'Ruber::Document#close_view' do
-  
-  before do
-    @app = KDE::Application.instance
-    @w = Qt::Widget.new
-    @comp = DocumentSpecComponentManager.new
-    flexmock(Ruber).should_receive(:[]).with(:components).and_return(@comp)
-    @doc = Ruber::Document.new @app
-    @view = @doc.create_view
-  end
-  
-  it 'should call the "close" method' do
-    flexmock(@doc).should_receive(:close).once.with(true)
-    flexmock(@doc).should_receive(:close).once.with(false)
-    @doc.close_view @view, true
-    @doc.close_view @view, false
-  end
-  
-end
-
-
 describe 'Ruber::Document#extension' do
   
   before do
@@ -715,65 +742,64 @@ describe Ruber::Document do
     
   end
   
-#   describe '#shutdown' do
-#     
-#     before do
-#       @app = KDE::Application.instance
-#       @w = Qt::Widget.new
-#       @comp = DocumentSpecComponentManager.new
-#       flexmock(Ruber).should_receive(:[]).with(:components).and_return(@comp)
-#       @doc = Ruber::Document.new @app
-#     end
-#     
-#     it 'calls the close_url method passing false' do
-#       doc = Ruber::Document.new nil, __FILE__
-#       flexmock(doc).should_receive(:close_url).once.with(false)
-#       doc.shutdown
-#     end
-#     
-#     it 'emits the "closing(QObject*)" signal' do
-#       doc = Ruber::Document.new nil, __FILE__
-#       exp = doc.object_id
-#       m = flexmock('test'){|mk| mk.should_receive(:document_closing).once.with(exp)}
-#       doc.connect(SIGNAL('closing(QObject*)')){|d| m.document_closing d.object_id}
-#       doc.shutdown
-#     end
-#     
-#     it 'closes the view, if there\'s one, after emitting the closing signal' do
-#       doc = Ruber::Document.new nil, __FILE__
-#       v = doc.create_view
-#       exp = doc.object_id
-#       m = flexmock('test'){|mk| mk.should_receive(:document_closing).once.with(exp).ordered}
-#       flexmock(v).should_receive(:close).once.globally.ordered
-#       doc.connect(SIGNAL('closing(QObject*)')){|d| m.document_closing d.object_id}
-#       doc.shutdown
-#     end
-#     
-#     it 'calls the #shutdown method of the project' do
-#       doc = Ruber::Document.new nil
-#       exp = doc.object_id
-#       flexmock(doc).should_receive(:close_url)
-#       flexmock(doc.own_project).should_receive(:shutdown).once
-#       doc.shutdown
-#     end
-# 
-#     
-#     it 'disconnects any slot/block connected to it after emitting the closing signal' do
-#       doc = Ruber::Document.new nil, __FILE__
-#       exp = doc.object_id
-#       def doc.disconnect *args;end
-#       m = flexmock{|mk| mk.should_receive(:document_closing).with(exp).once.ordered}
-#       doc.connect(SIGNAL('closing(QObject*)')){|d| m.document_closing d.object_id}
-#       flexmock(doc).should_receive(:disconnect).with_no_args.once.ordered
-#       doc.shutdown
-#     end
-#       
-#     it 'disposes of itself after emitting the closing signal' do
-#       doc = Ruber::Document.new nil, __FILE__
-#       doc.shutdown
-#       doc.should be_disposed
-#     end
-#     
-#   end
+  describe 'when a view is closed' do
+    
+    it 'removes the view from the list' do
+      doc = Ruber::Document.new nil
+      views = 3.times.map{doc.create_view}
+      views[1].close
+      new_views = doc.views
+      new_views.size.should == 2
+      new_views.should == [views[0], views[2]]
+    end
+    
+    it 'emits the closing_view(QWidget*, QObject*) signal before removing the view from the list' do
+      doc = Ruber::Document.new nil
+      views = 3.times.map{doc.create_view}
+      test = flexmock{|m| m.should_receive(:closing_view).once.with(doc, views[1])}
+      doc.connect(SIGNAL('closing_view(QWidget*, QObject*)')) do |v, d| 
+        test.closing_view d, v
+        doc.views.should include(views[1])
+      end
+      views[1].close
+    end
+    
+  end
+  
+  describe '#has_view?' do
+    
+    it 'returns true if there\'s at least one view associated with the document' do
+      doc = Ruber::Document.new nil
+      doc.create_view
+      doc.should have_view
+      doc.create_view
+      doc.should have_view
+    end
+    
+    it 'returns false if there are no views associated with the document' do
+      doc = Ruber::Document.new nil
+      doc.should_not have_view
+    end
+    
+  end
+  
+  describe '#active_view' do
+    
+    it 'returns the active view if any' do
+      doc = Ruber::Document.new
+      views = 3.times.map{doc.create_view}
+      flexmock(doc.send(:internal)).should_receive(:active_view).once.and_return(views[2].send(:internal))
+      doc.active_view.should == views[2]
+    end
+    
+    it 'returns nil if there isn\'t an active view associated with the document' do
+      doc = Ruber::Document.new
+      doc.active_view.should be_nil
+      views = 3.times.map{doc.create_view}
+      flexmock(doc.send(:internal)).should_receive(:active_view).once.and_return(nil)
+      doc.active_view.should be_nil
+    end
+    
+  end
   
 end