ruber 0.0.8 → 0.0.9

data/spec/document_spec.rb

@@ -25,12 +25,82 @@ describe Ruber::Document do
   include FlexMock::ArgumentTypes
   
   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
+    @doc = Ruber::Document.new nil, @app
+  end
+  
+#   describe '.new' do
+#     
+#     context 'when called with a file name as first argument' do
+#             
+#       it 'returns a new document for the given file if no documents for it exist' do
+#         old = Ruber::Document.new __FILE__
+#         file = File.join( File.dirname(__FILE__), 'common.rb')
+#         new = Ruber::Document.new file
+#         new.should_not == old
+#         new.path.should == file
+#       end
+#       
+#       it 'returns the existing document for the given file instead of creating a new one, if a document for that file already exists' do
+#         old = Ruber::Document.new __FILE__
+#         new = Ruber::Document.new __FILE__
+#         urls = Ruber::Document.instance_variable_get(:@docs).keys
+#         new.should == old
+#       end
+#       
+#       it 'takes into account documents created without a file which have later been saved' do
+#         old = Ruber::Document.new
+#         url = KDE::Url.new(__FILE__)
+#         flexmock(old).should_receive(:url).and_return url
+#         old.instance_eval{emit document_url_changed(url)}
+#         new = Ruber::Document.new __FILE__
+#         new.should == old
+#       end
+#       
+#       it 'takes into account documents which have been saved with another name' do
+#         old = Ruber::Document.new 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(url)}
+#         new = Ruber::Document.new __FILE__
+#         new.should == old
+#       end
+#       
+#       it 'doesn\'t return a document which has been closed' do
+#         old = Ruber::Document.new __FILE__
+#         old_id = old.object_id
+#         old.close
+#         new = Ruber::Document.new __FILE__
+#         new.object_id.should_not == old_id
+#       end
+#       
+#       it 'doesn\'t use documents whose URL have changed for the old url' do
+#         old = Ruber::Document.new __FILE__
+#         new_file = File.join( File.dirname(__FILE__), 'common.rb')
+#         url = KDE::Url.new(new_file)
+#         flexmock(old).should_receive(:url).and_return url
+#         old.instance_eval{emit document_url_changed(url)}
+#         new = Ruber::Document.new __FILE__
+#         new.should_not == old
+#       end
+#       
+#     end
+#     
+#     context 'when called without a file name' do
+#       
+#       it 'always returns a new document' do
+#         old = [Ruber::Document.new(__FILE__), Ruber::Document.new]
+#         new = Ruber::Document.new
+#         old.each{|d| new.should_not == d}
+#       end
+#       
+#     end
+#     
+#   end
   
   describe ', when created' do
 
@@ -47,27 +117,27 @@ describe Ruber::Document do
     end
 
     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 = Ruber::Document.new __FILE__, @app
       doc.text.should == File.read(__FILE__)
       doc.url.path.should == __FILE__
-      doc = Ruber::Document.new @app, KDE::Url.from_path(__FILE__)
+      doc = Ruber::Document.new KDE::Url.from_path(__FILE__), @app
       doc.text.should == File.read(__FILE__)
       doc.url.path.should == __FILE__
     end
     
     it 'creates a document project for itself, after opening the file (if given)' do
-      doc = Ruber::Document.new @app
+      doc = Ruber::Document.new nil, @app
       prj = doc.instance_variable_get(:@project)
       prj.should be_a(Ruber::DocumentProject)
       prj.project_name.should be_empty
-      doc = Ruber::Document.new @app, __FILE__
+      doc = Ruber::Document.new __FILE__, @app
       prj = doc.instance_variable_get(:@project)
       prj.should be_a(Ruber::DocumentProject)
       prj.project_name.should == KDE::Url.new(__FILE__).to_encoded.to_s
     end
     
     it 'isn\'t active' do
-      doc = Ruber::Document.new @app, __FILE__
+      doc = Ruber::Document.new __FILE__, @app
       doc.should_not be_active
     end
     
@@ -78,12 +148,12 @@ describe Ruber::Document 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 = Ruber::Document.new __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 = Ruber::Document.new KDE::Url.new('http://github.com/stcrocco/ruber/raw/master/ruber.gemspec')
         doc.should_not have_file(:local)
       end
       
@@ -97,12 +167,12 @@ describe Ruber::Document do
     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 = Ruber::Document.new __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 = Ruber::Document.new  KDE::Url.new('http://github.com/stcrocco/ruber/raw/master/ruber.gemspec')
         doc.should have_file(:remote)
       end
       
@@ -116,13 +186,13 @@ describe Ruber::Document do
     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 = Ruber::Document.new __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 = Ruber::Document.new  KDE::Url.new('http://github.com/stcrocco/ruber/raw/master/ruber.gemspec')
         doc.should have_file(:any)
         doc.should have_file
       end
@@ -140,7 +210,7 @@ describe Ruber::Document do
   describe '#own_project' do
   
     it 'returns the DocumentProject associated with the document' do
-      doc = Ruber::Document.new @app, __FILE__
+      doc = Ruber::Document.new __FILE__, @app
       doc.own_project.project_name.should == KDE::Url.new(__FILE__).url
     end
 
@@ -151,9 +221,9 @@ describe Ruber::Document do
     before do
       @list = flexmock
       @prj = flexmock(:project_files => @list)
-      @projects = flexmock{|m| m.should_receive(:current).and_return(@prj).by_default}
-      flexmock(Ruber).should_receive(:[]).with(:projects).and_return(@projects)
-      @doc = Ruber::Document.new @app, __FILE__
+      @world = flexmock{|m| m.should_receive(:active_project).and_return(@prj).by_default}
+      flexmock(Ruber).should_receive(:[]).with(:world).and_return(@world)
+      @doc = Ruber::Document.new __FILE__, @app
     end
     
     it 'returns the current project if one exists and the document belongs to it' do
@@ -167,12 +237,12 @@ describe Ruber::Document do
     end
     
     it 'returns the document project if the document isn\'t associated with a file' do
-      @doc = Ruber::Document.new @app
+      @doc = Ruber::Document.new nil, @app
       @doc.project.should be_a(Ruber::DocumentProject)
     end
     
     it 'returns the document project if there isn\'t a project open' do
-      @projects.should_receive(:current).and_return nil
+      @world.should_receive(:active_project).and_return nil
       @doc.project.should be_a(Ruber::DocumentProject)
     end
     
@@ -193,7 +263,7 @@ describe Ruber::Document do
         Tempfile.open('ruber_document_test') do |f|
           f.write 'test'
           f.flush
-          doc = Ruber::Document.new nil, f.path
+          doc = Ruber::Document.new f.path
           flexmock(doc.send :internal).should_receive(:is_read_write).once.and_return false
           flexmock(doc).should_receive(:document_save_as).once
           doc.text += ' added'
@@ -205,7 +275,7 @@ describe Ruber::Document do
         Tempfile.open('ruber_document_test') do |f|
           f.write 'test'
           f.flush
-          doc = Ruber::Document.new nil, f.path
+          doc = Ruber::Document.new f.path
           flexmock(doc.own_project).should_receive(:save).once
           doc.text += ' added'
           doc.save
@@ -216,7 +286,7 @@ describe Ruber::Document do
         Tempfile.open('ruber_document_test') do |f|
           f.write 'test'
           f.flush
-          doc = Ruber::Document.new nil, f.path
+          doc = Ruber::Document.new f.path
           doc.text += ' added'
           doc.save.should be_true
           File.read( f.path ).should == 'test added'
@@ -251,14 +321,14 @@ describe Ruber::Document do
     @doc.mime_type.should == 'application/x-ruby'
   end
 
-  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 '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 'emits the "modified_changed(QObject*, bool)" signal when the modified status changes' do
     m = flexmock
@@ -300,9 +370,10 @@ describe Ruber::Document do
     @doc.should be_pristine
     @doc.text = "a"
     @doc.should_not be_pristine
-    projects = flexmock(:current => nil)
+#     projects = flexmock(:current => nil)
     config = flexmock{|m| m.should_receive(:[]).with(:general, :default_script_directory).and_return ENV['HOME']}
-    flexmock(Ruber).should_receive(:[]).with(:projects).and_return(projects)
+    world = flexmock(:active_project => nil)
+    flexmock(Ruber).should_receive(:[]).with(:world).and_return(world)
     flexmock(Ruber).should_receive(:[]).with(:config).and_return(config)
     flexmock(Ruber).should_receive(:[]).with(:main_window).and_return(Qt::Widget.new)
     Tempfile.open('ruber_document_test') do |f|
@@ -312,7 +383,7 @@ describe Ruber::Document do
       @doc.save
       @doc.should_not be_pristine
     end
-    Ruber::Document.new(nil, __FILE__).should_not be_pristine
+    Ruber::Document.new(__FILE__).should_not be_pristine
   end
 
   ["text_changed(QObject*)", "about_to_close(QObject*)", 'about_to_close(QObject*)', 
@@ -378,7 +449,7 @@ describe Ruber::Document do
   end
 
   it 'should return true when close_url succeeds' do
-    doc = Ruber::Document.new nil, __FILE__
+    doc = Ruber::Document.new __FILE__
     doc.close_url(false).should be_true
   end
   
@@ -405,12 +476,12 @@ describe 'Ruber::Document#close' do
     @w = Qt::Widget.new
     @comp = DocumentSpecComponentManager.new
     flexmock(Ruber).should_receive(:[]).with(:components).and_return(@comp)
-    @doc = Ruber::Document.new @app
+    @doc = Ruber::Document.new nil, @app
     flexmock(@doc.instance_variable_get(:@project)).should_receive(:save).by_default
   end
   
   it 'returns immediately if ask is true and query_close returns false' do
-    doc = Ruber::Document.new nil, __FILE__
+    doc = Ruber::Document.new __FILE__
     exp = doc.object_id
     m = flexmock('test'){|mk| mk.should_receive(:document_closing).never}
     doc.connect(SIGNAL('closing(QObject*)')){|d| m.document_closing d.object_id}
@@ -419,7 +490,7 @@ describe 'Ruber::Document#close' do
   end
   
   it 'calls the save method of the project after emitting the "closing" signal' do
-    @doc = Ruber::Document.new @app, __FILE__
+    @doc = Ruber::Document.new __FILE__, @app
     m = flexmock{|mk| mk.should_receive(:document_closing).once.globally.ordered}
     @doc.connect(SIGNAL('closing(QObject*)')){m.document_closing}
     flexmock(@doc.instance_variable_get(:@project)).should_receive(:save).once.globally.ordered
@@ -432,23 +503,23 @@ describe 'Ruber::Document#close' do
   end
   
   it 'should call the "close_url", if closing is confirmed' do
-    doc = Ruber::Document.new nil, __FILE__
+    doc = Ruber::Document.new __FILE__
     flexmock(doc).should_receive(:close_url).once.with(false)
     doc.close
-    doc = Ruber::Document.new nil, __FILE__
+    doc = Ruber::Document.new __FILE__
     flexmock(doc).should_receive(:close_url).once.with(false)
     doc.close false
   end
   
   it 'should emit the "closing(QObject*)" signal if closing is confirmed' do
-    doc = Ruber::Document.new nil, __FILE__
+    doc = Ruber::Document.new __FILE__
     exp = doc.object_id
     m = flexmock('test'){|mk| mk.should_receive(:document_closing).once.with(exp)}
     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
     doc.close
-    doc = Ruber::Document.new nil, __FILE__
+    doc = Ruber::Document.new __FILE__
     exp1 = doc.object_id
     m.should_receive(:document_closing).with(exp1).once
     flexmock(doc).should_receive(:query_close)
@@ -457,7 +528,7 @@ describe 'Ruber::Document#close' do
   end
   
   it 'closes the views, if any, after emitting the closing signal, if closing is confirmed' do
-    doc = Ruber::Document.new nil, __FILE__
+    doc = Ruber::Document.new __FILE__
     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}
@@ -467,9 +538,9 @@ describe 'Ruber::Document#close' do
     flexmock(doc).should_receive(:query_close).and_return true
     doc.close false
   end
-  
+   
   it 'calls the #save method of the project if the document path is not empty' do
-    doc = Ruber::Document.new nil, __FILE__
+    doc = Ruber::Document.new __FILE__
     exp = doc.object_id
     flexmock(doc).should_receive(:close_url).and_return true
     flexmock(doc.instance_variable_get(:@project)).should_receive(:save).once
@@ -494,7 +565,7 @@ end
 
   
   it 'should disconnect any slot/block connected to it after emitting the closing signal if closing is confirmed' do
-    doc = Ruber::Document.new nil, __FILE__
+    doc = Ruber::Document.new __FILE__
     exp = doc.object_id
     flexmock(doc).should_receive(:close_url).and_return true
     def doc.disconnect *args;end
@@ -505,16 +576,16 @@ end
   end
     
 #   it 'should dispose of itself after emitting the closing signal, if closing is confirmed' do
-#     doc = Ruber::Document.new nil, __FILE__
+#     doc = Ruber::Document.new __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__
+    doc = Ruber::Document.new __FILE__
     flexmock(doc).should_receive(:close_url).once.and_return true
     doc.close( false).should be_true
-    doc = Ruber::Document.new nil, __FILE__
+    doc = Ruber::Document.new __FILE__
     flexmock(doc).should_receive(:close_url).once.and_return false
     doc.close( false).should be_false
     flexmock(doc).should_receive(:query_close).once.and_return false
@@ -529,7 +600,7 @@ describe 'Ruber::Document#extension' do
     @app = KDE::Application.instance
     @comp = DocumentSpecComponentManager.new
     flexmock(Ruber).should_receive(:[]).with(:components).and_return @comp
-    @doc = Ruber::Document.new @app
+    @doc = Ruber::Document.new nil, @app
   end
 
   it 'calls the extension method of its project' do
@@ -546,7 +617,7 @@ describe 'Ruber::Document#file_type_match?' do
     @app = KDE::Application.instance
     @comp = DocumentSpecComponentManager.new
     flexmock(Ruber).should_receive(:[]).with(:components).and_return( @comp).by_default
-    @doc = Ruber::Document.new @app, __FILE__
+    @doc = Ruber::Document.new __FILE__, @app
   end
   
   it 'should return true if both arguments are empty' do
@@ -583,7 +654,7 @@ describe 'Ruber::Document#file_type_match?' do
   end
   
   it 'should always return false when doing pattern matching if the document is not associated with a file' do
-    @doc = Ruber::Document.new @app
+    @doc = Ruber::Document.new nil, @app
     @doc.file_type_match?([], %w[*.txt *.rb]).should be_false
   end
   
@@ -615,8 +686,8 @@ describe 'Ruber::Document#document_save_as' do
     flexmock(Ruber).should_receive(:[]).with(:main_window).and_return(@w).by_default
     @comp = DocumentSpecComponentManager.new
     flexmock(Ruber).should_receive(:[]).with(:components).and_return(@comp).by_default
-    @projects = flexmock{|m| m.should_receive(:current).and_return(nil).by_default}
-    flexmock(Ruber).should_receive(:[]).with(:projects).and_return(@projects).by_default
+    @world = flexmock{|m| m.should_receive(:active_project).and_return(nil).by_default}
+    flexmock(Ruber).should_receive(:[]).with(:world).and_return(@world).by_default
     @config = flexmock('config')
     @config.should_receive(:[]).with(:general, :default_script_directory).and_return('/').by_default
     flexmock(Ruber).should_receive(:[]).with(:config).and_return(@config).by_default
@@ -645,7 +716,7 @@ describe 'Ruber::Document#document_save_as' do
   
   it 'uses the current project\'s project directory as default directory if there is a current project' do
     prj = flexmock(:project_directory => File.dirname(__FILE__))
-    @projects.should_receive(:current).once.and_return prj
+    @world.should_receive(:active_project).once.and_return prj
     res = OpenStruct.new(:file_names => ['/test.rb'], :encoding => 'UTF-16')
     flexmock(KDE::EncodingFileDialog).should_receive(:get_save_file_name_and_encoding).once.with(String, File.dirname(__FILE__), String, Qt::Widget, String).and_return(res)
     @doc.send :document_save_as
@@ -728,7 +799,7 @@ describe Ruber::Document do
   describe '#save_settings' do
         
     it 'calls the #save method of the project if the document path is not empty' do
-      doc = Ruber::Document.new nil, __FILE__
+      doc = Ruber::Document.new __FILE__
       exp = doc.object_id
       flexmock(doc.own_project).should_receive(:save).once
       doc.save_settings
@@ -885,4 +956,21 @@ describe Ruber::Document do
     
   end
   
+  describe '#views' do
+    
+    before do
+      @doc = Ruber::Document.new
+    end
+    
+    it 'returns a list of all the views associated with the document' do
+      views = 3.times.map{@doc.create_view}
+      @doc.views.should == views
+    end
+    
+    it 'returns an empty list if there\'s no view associated with the document' do
+      @doc.views.should == []
+    end
+    
+  end
+  
 end

data/spec/editor_view_spec.rb

@@ -68,7 +68,7 @@ describe Ruber::EditorView do
     @comp = Qt::Object.new
     flexmock(@comp).should_receive(:each_component)
     flexmock(Ruber).should_receive(:[]).with(:components).and_return @comp
-    @doc = Ruber::Document.new @app
+    @doc = Ruber::Document.new nil, @app
     @view = @doc.create_view @w
   end
   
@@ -200,7 +200,7 @@ describe 'Ruber::EditorView#execute_action' do
     @comp = Qt::Object.new
     flexmock(@comp).should_receive(:each_component)
     flexmock(Ruber).should_receive(:[]).with(:components).and_return @comp
-    @doc = Ruber::Document.new @app
+    @doc = Ruber::Document.new nil, @app
     @view = @doc.create_view @w
   end