ruber 0.0.5 → 0.0.7

data/spec/kde_sugar_spec.rb

@@ -4,26 +4,93 @@ require 'ruber/kde_sugar'
 
 describe 'KDE::Url' do
   
-  it 'should be serializable using YAML' do
+  it 'is serializable using YAML' do
     u = KDE::Url.new 'http:///xyz.org/a%20file%20with%20spaces.txt'
     res = YAML.load(YAML.dump(u))
     res.should == u
     res.should_not equal(u)
   end
   
-  it 'should be marshallable' do
+  it 'is marshallable' do
     u = KDE::Url.new 'http:///xyz.org/a%20file%20with%20spaces.txt'
     res = Marshal.load(Marshal.dump(u))
     res.should == u
     res.should_not equal(u)
   end
   
+  describe '.file_url?' do
+    
+    it 'returns false if the first argument doesn\'t start with a scheme followed by //' do
+      KDE::Url.file_url?('http:xyz/abc', true).should be_false
+      KDE::Url.file_url?('http:xyz/abc', false).should be_false
+      KDE::Url.file_url?('http:/xyz/abc', true).should be_false
+      KDE::Url.file_url?('http:/xyz/abc', false).should be_false
+    end
+    
+    context 'when the second argument is true' do
+    
+      it 'returns true if the first argument looks like an absolute URL with authority' do
+        KDE::Url.file_url?('http:///xyz/abc', true).should be_true
+      end
+      
+      it 'returns false if the path isn\'t absolute' do
+        KDE::Url.file_url?('http://xyz/abc', true).should be_false
+      end
+      
+    end
+    
+    context 'when the second argument is false or missing' do
+      
+      it 'returns true if the first argument looks like an absolute URL with authority' do
+        KDE::Url.file_url?('http:///xyz/abc', false).should be_true
+        KDE::Url.file_url?('http:///xyz/abc').should be_true
+      end
+      
+      it 'returns true if the first argument looks like a relative URL with authority' do
+        KDE::Url.file_url?('http://xyz/abc', false).should be_true
+        KDE::Url.file_url?('http://xyz/abc').should be_true
+      end
+
+
+    end
+    
+  end
+  
   describe '#local_file?' do
-    it "calls is_local_file" do
-      u = KDE::Url.new 'http://www.kde.org'
-      flexmock(u).should_receive(:is_local_file).once
-      u.local_file?
+    
+    it 'returns true for urls with file: scheme representing absolute paths' do
+      KDE::Url.new('file:///xyz').should be_local_file
     end
+    
+    it 'returns true for urls with file: scheme representing relative paths' do
+      KDE::Url.new('file://xyz').should be_local_file
+    end
+    
+    it 'returns false for urls without scheme' do
+      KDE::Url.new('xyz').should_not be_local_file
+    end
+    
+    it 'returns false for urls whose scheme is different from file:' do
+      KDE::Url.new('http://xyz').should_not be_local_file
+    end
+    
+  end
+  
+  describe '#remote_file?' do
+    
+    it 'returns false if the url has file: scheme' do
+      KDE::Url.new('file:///xyz').should_not be_remote_file
+      KDE::Url.new('file://xyz').should_not be_remote_file
+    end
+    
+    it 'returns false if the url has no scheme' do
+      KDE::Url.new('xyz').should_not be_remote_file
+    end
+    
+    it 'returns true for urls whose scheme is different from file:' do
+      KDE::Url.new('http://yxz').should be_remote_file
+    end
+    
   end
   
 end

data/spec/output_widget_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/common'
+require './spec/common'
 require 'ruber/output_widget'
 
 describe Ruber::OutputWidget::ActionList do
@@ -1039,25 +1039,33 @@ describe Ruber::OutputWidget do
       @ow.send :find_filename_in_index, @mod.index(0,0)
     end
     
-    describe ', when the string or the first element of the array returned by find_filename_in_string is not an absolute path' do
+    describe ', when the string or the first element of the array returned by find_filename_in_string is not an absolute path and not an url' do
       
       it 'considers the path relative to the working_dir and transforms it into an absolute path' do
         @ow.working_dir = File.dirname(__FILE__)
         flexmock(@ow).should_receive(:find_filename_in_string).once.with('').and_return [File.basename(__FILE__), 6]
         flexmock(@ow).should_receive(:find_filename_in_string).once.with('').and_return [File.basename(__FILE__)]
         flexmock(@ow).should_receive(:find_filename_in_string).once.with('').and_return File.basename(__FILE__)
+        url = 'http:///xyz/abc.rb'
+        flexmock(@ow).should_receive(:find_filename_in_string).once.with('').and_return [url]
         @ow.send(:find_filename_in_index, @mod.index(0,0)).should == [__FILE__, 6]
         @ow.send(:find_filename_in_index, @mod.index(0,0)).should == [__FILE__, 0]
         @ow.send(:find_filename_in_index, @mod.index(0,0)).should == [__FILE__, 0]
+        @ow.send(:find_filename_in_index, @mod.index(0,0)).should == [url, 0]
       end
       
     end
     
-    it 'returns nil if the file doesn\'t exist' do
+    it 'returns nil if the file is a local file which doesn\'t exist' do
       flexmock(@ow).should_receive(:find_filename_in_string).once.with('').and_return '/' + random_string
       @ow.send(:find_filename_in_index, @mod.index(0,0)).should be_nil
     end
     
+    it 'returns the pair [url, line] even if the url doesn\'t exist when it represents a remote file' do
+      flexmock(@ow).should_receive(:find_filename_in_string).once.with('').and_return ['http://xyz/abc', 12]
+      @ow.send(:find_filename_in_index, @mod.index(0,0)).should == ['http://xyz/abc', 12]
+    end
+    
     it 'returns nil if the file is a directory' do
       flexmock(@ow).should_receive(:find_filename_in_string).once.with('').and_return File.dirname(__FILE__)
       @ow.send(:find_filename_in_index, @mod.index(0,0)).should be_nil
@@ -1067,159 +1075,167 @@ describe Ruber::OutputWidget do
   
   describe '#find_filename_in_string' do
     
+    module FindFilenameInStringMacros
+      
+      def recognizes_file file, line = nil, exp_file = file, &blk
+        
+        it "recognizes the file when it is the whole line" do
+          instance_eval &blk if blk
+          str = line ? "#{file}:#{line}" : file 
+          res = @ow.send :find_filename_in_string, str
+          res.should == (line ? [exp_file, line] : [exp_file])
+        end
+        
+        it 'recognizes the file at the end of the line' do
+          instance_eval &blk if blk
+          str = "#{random_string 5} #{line ? "#{file}:#{line}" : file }"
+          res = @ow.send :find_filename_in_string, str
+          res.should == (line ? [exp_file, line] : [exp_file])
+        end
+        
+        it 'recognizes the file at the beginning of the line' do
+          instance_eval &blk if blk
+          str = "#{line ? "#{file}:#{line}" : file } #{random_string 5}"
+          res = @ow.send :find_filename_in_string, str
+          res.should == (line ? [exp_file, line] : [exp_file])
+        end
+        
+        it 'recognizes the file in the middle of the line' do
+          instance_eval &blk if blk
+          str = "#{random_string 5} #{line ? "#{file}:#{line}" : file } #{random_string 5}"
+          res = @ow.send :find_filename_in_string, str
+          res.should == (line ? [exp_file, line] : [exp_file])
+        end
+        
+        it 'recognizes the file when it\'s quoted' do
+          instance_eval &blk if blk
+          str = "#{random_string 5} <#{line ? "#{file}:#{line}" : file }> #{random_string 5}"
+          res = @ow.send :find_filename_in_string, str
+          res.should == (line ? [exp_file, line] : [exp_file])
+        end
+        
+      end
+      
+      def does_not_recognize_file cond, file, line = nil
+        
+        it "doesn't recognize the file if #{cond}" do
+          str = line ? "#{file}:#{line}" : file 
+          res = @ow.send :find_filename_in_string, str
+          res.should be_nil
+        end
+        
+      end
+      
+    end
+    
     before do
       @ow = Ruber::OutputWidget.new
     end
     
-    it 'recognizes an absolute path without line numbers' do
-      str = random_string( 1 + rand(10))+ " #{__FILE__} " + random_string(1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == __FILE__
-      str = random_string( 1 + rand(10))+ " #{__FILE__}"
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == __FILE__
-      str = "#{__FILE__} " + random_string( 1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == __FILE__
-    end
-    
-    it 'recognizes and expands an absolute path starting with ~/ without line numbers' do
-      file = '/test/yxz.rb'
-      exp = File.join ENV['HOME'], file
-      str = random_string( 1 + rand(10))+ " ~#{file} " + random_string(1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == exp
-      str = random_string( 1 + rand(10))+ " ~#{file}"
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == exp
-      str = "~#{file} " + random_string( 1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == exp
-    end
-    
-    it 'recognizes and expands an absolute path starting with ~user/ without line numbers' do
-      file = '/test/yxz.rb'
-      exp = File.join ENV['HOME'], file
-      str = random_string( 1 + rand(10))+ " ~#{ENV['USER']}#{file} " + random_string(1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == exp
-      str = random_string( 1 + rand(10))+ " ~#{ENV['USER']}#{file}"
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == exp
-      str = "~#{ENV['USER']}#{file} " + random_string( 1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == exp
-    end
-    
-    it 'recognizes a relative path starting with a single dot and doesn\'t expand it' do
-      str = random_string( 1 + rand(10))+ " .#{__FILE__} " + random_string(1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == '.' + __FILE__
-      str = random_string( 1 + rand(10))+ " .#{__FILE__}"
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == '.' + __FILE__
-      str = ".#{__FILE__} " + random_string( 1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == '.' + __FILE__
-    end
-    
-    it 'recognizes a relative path starting with two dots and doesn\'t expand it' do
-      str = random_string( 1 + rand(10))+ " ..#{__FILE__} " + random_string(1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == '..' + __FILE__
-      str = random_string( 1 + rand(10))+ " ..#{__FILE__}"
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == '..' + __FILE__
-      str = "..#{__FILE__} " + random_string( 1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == '..' + __FILE__
-    end
-    
-    it 'recognizes a relative path not starting with a dot but containing slashes' do
-      file = "test/xyz"
-      str = random_string( 1 + rand(10))+ " #{file} " + random_string(1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == file
-      str = random_string( 1 + rand(10))+ " #{file}"
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == file
-      str = "#{file} " + random_string( 1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res[0].should == file
-    end
-    
-    it 'doesn\'t recognize sequences ending with a slash' do
-      strs = ["#{__FILE__}/", "~#{__FILE__}/", "~#{ENV['USER']}#{__FILE__}/", ".#{__FILE__}/", "..#{__FILE__}/"]
-      strs.map!{|s| random_string(rand(10)) + ' ' + s + ' ' + random_string(rand(10))}
-      strs.each{|s| res = @ow.send(:find_filename_in_string, s).should be_nil}
-    end
-    
-    it 'recognizes filenames ending in a colon followd by digits, which are interpreted as line numbers' do
-      strs = ["#{__FILE__}", "~#{__FILE__}", "~#{ENV['USER']}#{__FILE__}", ".#{__FILE__}", "..#{__FILE__}"]
-      strs.map!{|s| random_string(rand(10)) + ' ' + s + ":10#{rand > 0.5 ? ' ' : ''}" + random_string(rand(10))}
-      @ow.send(:find_filename_in_string, strs[0]).should == [__FILE__, 10]
-      @ow.send(:find_filename_in_string, strs[1]).should == [File.join(ENV['HOME'], __FILE__), 10]
-      @ow.send(:find_filename_in_string, strs[2]).should == [File.join(ENV['HOME'], __FILE__), 10]
-      @ow.send(:find_filename_in_string, strs[3]).should == ['.' + __FILE__, 10]
-      @ow.send(:find_filename_in_string, strs[4]).should == ['..' + __FILE__, 10]
-    end
-    
-    it 'recognizes any string not containing spaces and ending in a slash followed by a colon and digits, which are interpreted as line numbers' do
-      file = 'xyz'
-      str = random_string( 1 + rand(10))+ " #{file}:16 " + random_string(1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res.should == [file, 16]
-      str = random_string( 1 + rand(10))+ " #{file}:16"
-      res = @ow.send :find_filename_in_string, str
-      res.should == [file, 16]
-      str = "#{file}:16 " + random_string( 1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res.should == [file, 16]
-      #In the following tests, there's no space between the last digit and the following character
-      str = random_string( 1 + rand(10))+ " #{file}:16" + random_string(1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res.should == [file, 16]
-      str = "#{file}:16" + random_string( 1 + rand(10))
-      res = @ow.send :find_filename_in_string, str
-      res.should == [file, 16]
-    end
-    
-    it 'recognizes the file names enclosed in quotes, double quotes, backticks, all brackets and angular brackets' do
-      quotes = %w|' " ` ( [ { < |
-      quotes.each do |q|
-        @ow.send(:find_filename_in_string, random_string( 1 + rand(10))+ ' ' + q + "#{__FILE__}").should == [__FILE__]
-        @ow.send(:find_filename_in_string, random_string( 1 + rand(10))+ ' ' + q + "~#{__FILE__}").should == [File.join(ENV['HOME'], __FILE__)]
-        @ow.send(:find_filename_in_string, random_string( 1 + rand(10))+ ' ' + q + "~#{ENV['USER']}#{__FILE__}").should == [File.join(ENV['HOME'], __FILE__)]
-        @ow.send(:find_filename_in_string, random_string( 1 + rand(10))+ ' ' + q + ".#{__FILE__}").should == [File.join('.', __FILE__)]
-        @ow.send(:find_filename_in_string, random_string( 1 + rand(10))+ ' ' + q + "..#{__FILE__}").should == [File.join('..', __FILE__)]
-        @ow.send(:find_filename_in_string, random_string( 1 + rand(10))+ ' ' + q + "abc/xyz").should == ['abc/xyz']
-        @ow.send(:find_filename_in_string, random_string( 1 + rand(10))+ ' ' + q + "abc:12").should == ['abc', 12]
-      end
+    extend FindFilenameInStringMacros
+    
+    context 'when the line contains an absolute path without line number' do
+      recognizes_file '/abc/def/ghi.rb'
+    end
+      
+    context 'when the line contains an absolute path with line number' do
+      recognizes_file '/abc/def/ghi.rb', 45
     end
     
-    it 'only considers the first match' do
-      str = "#{__FILE__.upcase} #{__FILE__}"
-      @ow.send(:find_filename_in_string, str).should == [__FILE__.upcase]
+    context 'when the line contains an absolute path referring to the user\'s home directory without line numbers' do
+      recognizes_file '~/abc/def/ghi.rb', nil, "#{ENV['HOME']}/abc/def/ghi.rb"
+    end
+    
+    context 'when the line contains an absolute path referring to the user\'s home directory with line numbers' do
+      recognizes_file '~/abc/def/ghi.rb', 45, "#{ENV['HOME']}/abc/def/ghi.rb"
     end
 
-  end
-  
-  describe '#keyReleaseEvent' do
+    context 'when the line contains an absolute path referring to another user\'s home directory and no line numbers' do
+      prc = proc{flexmock(File).should_receive(:expand_path).with('~xyz/abc/def/ghi.rb').and_return('/home/xyz/abc/def/ghi.rb')}
+      recognizes_file '~xyz/abc/def/ghi.rb', nil, "/home/xyz/abc/def/ghi.rb", &prc
+    end
+    
+    context 'when the line contains an absolute path referring to another user\'s home directory with line numbers' do
+      prc = proc{flexmock(File).should_receive(:expand_path).with('~xyz/abc/def/ghi.rb').and_return('/home/xyz/abc/def/ghi.rb')}
+      recognizes_file '~xyz/abc/def/ghi.rb', 45, "/home/xyz/abc/def/ghi.rb", &prc
+    end
 
-    before do
-      @ow = Ruber::OutputWidget.new
-      @mw = flexmock('main window'){|m| m.should_ignore_missing}
-      @ev = Qt::KeyEvent.new Qt::Event::KeyRelease, Qt::Key_A, Qt::NoModifier, 'a'
-      flexmock(Ruber).should_receive(:[]).with(:main_window).and_return(@mw).by_default
+    context 'when the line contains a filename starting with ./ and no line numbers' do
+      recognizes_file './abc/def/ghi.rb'
+    end
+    
+    context 'when the line contains a filename starting with ./ and line numbers' do
+      recognizes_file './abc/def/ghi.rb', 12
+    end
+    
+    context 'when the line contains a filename starting with ../ and no line numbers' do
+      recognizes_file '../abc/def/ghi.rb'
     end
     
-    it 'gives focus to the current editor' do
-      ed = flexmock('editor'){|m| m.should_receive(:set_focus).once}
-      ed.should_ignore_missing
-      @mw.should_receive(:active_editor).once.and_return ed
-      @ow.send :keyReleaseEvent, @ev
+    context 'when the line contains a filename starting with ../ and line numbers' do
+      recognizes_file '../abc/def/ghi.rb', 12
     end
     
+    context 'when the line contains a filename starting with a dot not followed by a slash and no numbers' do
+      recognizes_file '.abc/def/ghi.rb'
+    end
+    
+    context 'when the line contains a filename starting with a dot not followed by a slash and line numbers' do
+      recognizes_file '.abc/def/ghi.rb', 34
+    end
+    
+    context 'when the line contains a relative path not starting with ./ and containing slashes with no line numbers' do
+      recognizes_file 'abc/def/ghi.rb'
+    end
+    
+    context 'when the line contains a relative path not starting with ./ and containing slashes with line numbers' do
+      recognizes_file 'abc/def/ghi.rb', 29
+    end    
+
+    context 'when the line contains a relative filename without slash or leading dots with line numbers' do
+      recognizes_file 'abc.rb', 132
+    end
+    
+    context 'when the line contains an URL representing a relative file with no line numbers' do
+      recognizes_file 'http://abc/def/ghi.rb'
+    end    
+    
+    context 'when the line contains an URL representing a relative file with line numbers' do
+      recognizes_file 'http://abc/def/ghi.rb', 456
+    end    
+    
+
+    context 'when the line contains an absolute URL with no line numbers' do
+      recognizes_file 'http:///abc/def/ghi.rb'
+    end    
+    
+    context 'when the line contains an absolute URL with line numbers' do
+      recognizes_file 'http:///abc/def/ghi.rb', 456
+    end    
+    
+    it 'only considers the first match' do
+      str = "#{__FILE__.upcase} #{__FILE__}"
+      @ow.send(:find_filename_in_string, str).should == [__FILE__.upcase]
+    end
+
+  end
+  
+#   describe '#keyReleaseEvent' do
+# 
+#     before do
+#       @ow = Ruber::OutputWidget.new
+#       @mw = flexmock('main window'){|m| m.should_ignore_missing}
+#       @ev = Qt::KeyEvent.new Qt::Event::KeyRelease, Qt::Key_A, Qt::NoModifier, 'a'
+#       flexmock(Ruber).should_receive(:[]).with(:main_window).and_return(@mw).by_default
+#     end
+#     
+#     it 'gives focus to the current editor' do
+#       ed = flexmock('editor'){|m| m.should_receive(:set_focus).once}
+#       ed.should_ignore_missing
+#       @mw.should_receive(:active_editor).once.and_return ed
+#       @ow.send :keyReleaseEvent, @ev
+#     end
+#     
 #     it 'inserts the text corresponding to the released key in the editor' do
 #       ed = flexmock('editor'){|m| m.should_receive(:insert_text).once.with('a')}
 #       ed.should_ignore_missing
@@ -1227,21 +1243,21 @@ describe Ruber::OutputWidget do
 #       @ow.send :keyReleaseEvent, @ev
 #     end
     
-    it 'does nothing if there\'s no active editor' do
-      @mw.should_receive(:active_editor).once.and_return nil
-      lambda{@ow.send :keyReleaseEvent, @ev}.should_not raise_error
-    end
-    
-    it 'returns nil' do
+#     it 'does nothing if there\'s no active editor' do
+#       @mw.should_receive(:active_editor).once.and_return nil
+#       lambda{@ow.send :keyReleaseEvent, @ev}.should_not raise_error
+#     end
+#     
+#     it 'returns nil' do
 #       ed = flexmock('editor'){|m| m.should_receive(:insert_text).once.with('a')}
-      ed = flexmock('editor'){|m| m.should_ignore_missing}
-      @mw.should_receive(:active_editor).once.and_return ed
-      @mw.should_receive(:active_editor).once.and_return nil
-      @ow.send(:keyReleaseEvent, @ev).should be_nil
-      @ow.send(:keyReleaseEvent, @ev).should be_nil
-    end
+#       ed = flexmock('editor'){|m| m.should_ignore_missing}
+#       @mw.should_receive(:active_editor).once.and_return ed
+#       @mw.should_receive(:active_editor).once.and_return nil
+#       @ow.send(:keyReleaseEvent, @ev).should be_nil
+#       @ow.send(:keyReleaseEvent, @ev).should be_nil
+#     end
     
-  end
+#   end
   
 end