ruber 0.0.5 → 0.0.7

data/lib/ruber/application/plugin.yaml

@@ -5,7 +5,7 @@ class: 'Ruber::Application'
 config_options: 
  :general:
    :plugin_dirs: {:default: Ruber::Application::DEFAULT_PLUGIN_PATHS}
-   :plugins: {:default: 'Ruber::Application::DEFAULT_PLUGINS'}
+   :plugins: {:default: Ruber::Application::DEFAULT_PLUGINS}
    :auto_load_project: {:default: false }
 config_widgets:
- - {:caption: General, :pixmap: configure, :code: "w=Qt::CheckBox.new('&Open last project at startup');w.object_name='kcfg_general_auto_load_project';w"}
+ - {:caption: General, :pixmap: configure, :code: "w=Qt::CheckBox.new('&Open last project at startup');w.object_name='kcfg_general_auto_load_project';w"}

data/lib/ruber/document_project.rb

@@ -54,6 +54,7 @@ didn't exist. This means that it will be overwritten when the project is saved.
 The reason for this behaviour is that there should be no user file in the directory
 where document projects are saved.
 =end
+#       $CALLED = 0
       def initialize file
         @old_files = []
         begin super file_for(file)
@@ -127,12 +128,17 @@ will fail with an +ArgumentError+.
 
 If the path of the file associated with the document changes (usually because of
 a "Save As" action), the file associated with the backend is changed automatically
+
+@todo in classes derived from Qt::Object, korundum executes the code in initialize,
+up until the call to super twice. This means that two Backend items will be created.
+See if something can be done to avoid it. I don't know whether this has any bad
+consequence or not.
 =end
     def initialize doc
       @document = doc
-      path = doc.path
+      path = backend_file
       back = Backend.new path
-      back.instance_variable_get(:@data).empty? ? super(doc, back, doc.path) : super(doc, back)
+      !File.exist?(back.file) ? super(doc, back, path) : super(doc, back)
       connect doc, SIGNAL('document_url_changed(QObject*)'), self, SLOT(:change_file)
     end
     
@@ -152,6 +158,8 @@ rule's scope includes +:document+
 =end
     def match_rule? obj
       if !super then false
+      elsif !obj.place.include?(@document.url.local_file? ? :local : :remote) 
+        false
       elsif !@document.file_type_match? obj.mimetype, obj.file_extension then false
       else true
       end
@@ -170,7 +178,7 @@ directory if the document isn't associated with a file.
 =begin rdoc
 Override of <tt>AbstractProject#write</tt> which prevents a Errno::ENOENT exception
 to be raised by the backend if the document isn't associated with a file. If the
-docuement is associated with a file, however, the exception will be raised as usual.
+document is associated with a file, however, the exception will be raised as usual.
 
 The reason for this kind of behaviour is that the backend is expected to raise
 the exception when the document isn't associated with a file: it simply means that
@@ -190,7 +198,12 @@ Override of AbstractProject#files which returns an array with the path of the
 associated document, if it corresponds to a file, and an empty array otherwise
 =end
     def files
-      path = @document.path
+      url =  @document.url
+      if url.local_file?
+        path = url.path
+      else 
+        path = url.to_encoded(Qt::Url::RemoveUserInfo|Qt::Url::RemovePort|Qt::Url::RemoveFragment).to_s
+      end
       path.empty? ? [] : [path] 
     end
     
@@ -201,7 +214,14 @@ Updates the backend so that the associated file reflects the file associated wit
 the document.
 =end
     def change_file
-      @backend.document_path = @document.path
+      @backend.document_path = backend_file
+    end
+    
+    def backend_file
+      if @document.has_file?
+        @document.url.to_encoded(Qt::Url::RemoveUserInfo|Qt::Url::RemovePort|Qt::Url::RemoveFragment).to_s
+      else ''
+      end
     end
     
   end

data/lib/ruber/documents/document_list.rb

@@ -94,9 +94,10 @@ the value of _create_if_needed_ a new document associated with the file or url
 will be created. In this case, the {#document_created} signal will be emitted.
 
 @param [String, KDE::Url] file the file name or URL associated with the document.
-  A relative file name will be expanded with respect to the current directory. If
-  it is a string, it will _always_ be interpreted as a filename. If you want it
-  to be considered an URL, you need to create a @KDE::Url@ for it
+  A relative file name will be expanded with respect to the current directory. A
+  string containing a url will be interpreted as an url, not as a filename. If you
+  need a document with a name which looks like an url, you can create an empty
+  @KDE::Url@, then using @path=@ to set its path
 @param [Boolean] create_if_needed whether or not to create a document associated
   with _file_ if there isn't one
 @return [Document,nil] the document associated with _file_. If no such document
@@ -107,22 +108,17 @@ will be created. In this case, the {#document_created} signal will be emitted.
 =end
     def document file, create_if_needed = true
       if file.is_a? String
-        file = File.expand_path(file)
-        doc = document_for_file file
-        return doc if doc or !create_if_needed
-      elsif file.is_a? KDE::Url 
-        doc = document_for_url file
-        return doc if doc or !create_if_needed
+        url = KDE::Url.new file
+        url.path = File.expand_path(file) if url.relative?
+      else url = file
       end
+      doc = document_for_url file
+      return doc if doc or !create_if_needed
       if !doc and create_if_needed
-        url = KDE::Url.new file
         if url.local_file?
           raise ArgumentError, "File #{url.path} doesn't exist" unless File.exist?(url.path)
         end
-        doc = Document.new Ruber[:main_window], file
-        begin @docs[0].close if @docs.only.pristine?
-        rescue IndexError
-        end
+        doc = Document.new Ruber[:main_window], url
         add_document doc
         emit document_created(doc)
       end
@@ -227,8 +223,8 @@ The {#closing_document} signal is emitted before removing the document.
 @return [nil]
 =end
     def close_document doc
-      emit closing_document(doc)
       @docs.delete doc
+      emit closing_document(doc)
       nil
     end
     private :close_document

data/lib/ruber/editor/document.rb

@@ -40,13 +40,17 @@ module Ruber
     def_delegator :@doc, :documentSave, :save_document
     
     signal_data = { 
-        'text_changed' => ['KTextEditor::Document*', [nil]],
-        'about_to_close' => ['KTextEditor::Document*', [nil]],
-        'about_to_reload' => ['KTextEditor::Document*', [nil]],
-        'highlighting_mode_changed' => ['KTextEditor::Document*', [nil]],
-        'document_url_changed' => ['KTextEditor::Document*', [nil]],
-        'mode_changed' => ['KTextEditor::Document*', [nil]]
-      }
+      'text_changed' => ['KTextEditor::Document*', [nil]],
+      'about_to_close' => ['KTextEditor::Document*', [nil]],
+      'about_to_reload' => ['KTextEditor::Document*', [nil]],
+      'highlighting_mode_changed' => ['KTextEditor::Document*', [nil]],
+      'mode_changed' => ['KTextEditor::Document*', [nil]],
+      'sig_query_close' => ['bool*, bool*', [0,1]],
+      'canceled' => ['QString', [0]],
+      'started' => ['KIO::Job*', [0]],
+      'set_status_bar_text' => ['QString', [0]],
+      'setWindowCaption' => ['QString', [0]]
+    }
     
     @signal_table = KTextEditorWrapper.prepare_wrapper_connections self, signal_data
     
@@ -56,17 +60,24 @@ module Ruber
 'mode_changed(QObject*)', 'text_modified(KTextEditor::Range, KTextEditor::Range, QObject*)',
 'text_inserted(KTextEditor::Range, QObject*)', 'text_removed(KTextEditor::Range, QObject*)',
 'view_created(QObject*, QObject*)', 'closing(QObject*)', :activated, :deactivated,
-'modified_on_disk(QObject*, bool, KTextEditor::ModificationInterface::ModifiedOnDiskReason)'
+'modified_on_disk(QObject*, bool, KTextEditor::ModificationInterface::ModifiedOnDiskReason)',
+'sig_query_close(bool*, bool*)', 'canceled(QString)', 'completed()', 'completed1(bool)',
+'started(KIO::Job*)', 'set_status_bar_text(QString)', 'setWindowCaption(QString)'
     
-    slots :document_save_as, :save
-
 =begin rdoc
-The view associated with the document. If a view hasn't been created, this is *nil*
+Signal emitted before a view associated with the document is closed
+
+When this signal is emitted, the view is still associated with the document, and
+it is still included in the array returned by {#views}
+@param [EditorView] view the view which is being closed
+@param [Document] doc *self*
 =end
-    attr_reader :view
+    signals 'closing_view(QWidget*, QObject*)'
+    
+    slots :document_save_as, :save
     
     def inspect
-      if disposed? then "< #{self.class} #{object_id}DISPOSED >"
+      if disposed? then "< #{self.class} #{object_id} DISPOSED >"
       else super
       end
     end
@@ -79,7 +90,7 @@ Creates a new Ruber::Document.
       @active = false
       @doc = KTextEditor::EditorChooser.editor('katepart').create_document( self)
       initialize_wrapper @doc, self.class.instance_variable_get(:@signal_table)
-      @view = nil
+      @views = []
       @doc.openUrl(file.is_a?(String) ? KDE::Url.from_path(file) : file) if file
       @annotation_model = AnnotationModel.new self
       interface('annotation_interface').annotation_model = @annotation_model
@@ -90,8 +101,21 @@ Creates a new Ruber::Document.
       @doc.connect(SIGNAL('modifiedChanged(KTextEditor::Document*)')) do |doc|
         emit modified_changed(@doc.modified?, self)
       end
-      @doc.connect(SIGNAL('documentNameChanged(KTextEditor::Document*)')) do |doc|
-        Ruber[:components].each_component{|c| c.update_project @project}
+      @doc.connect(SIGNAL('documentUrlChanged(KTextEditor::Document*)')) do |doc|
+        if !doc.url.remote_file?
+          Ruber[:components].each_component{|c| c.update_project @project}
+        end
+        emit document_url_changed self
+      end
+      
+      @doc.connect SIGNAL(:completed) do
+        if @doc.url.remote_file?
+          Ruber[:components].each_component{|c|c.update_project @project}
+        end
+        emit completed
+      end
+      
+      @doc.connect SIGNAL('documentNameChanged(KTextEditor::Document*)') do |doc|
         emit document_name_changed doc.document_name, self
       end
       
@@ -110,9 +134,34 @@ Creates a new Ruber::Document.
         @modified_on_disk = (reason != KTextEditor::ModificationInterface::OnDiskUnmodified)
         emit modified_on_disk(self, mod, reason)
       end
+      connect @doc, SIGNAL('completed(bool)'), self, SIGNAL('completed1(bool)')
 
     end
     
+=begin rdoc
+@return [Array<EditorView>] a list of the views assciated with the document
+=end
+    def views
+      @views.dup
+    end
+    
+=begin rdoc
+@return [Boolean] whether the document has at least one view associated with it
+=end
+    def has_view?
+      !@views.empty?
+    end
+    
+=begin rdoc
+The view which currently has user focus, if any
+@return [EditorView,nil] the view associated with the document which currently has
+  user focus or *nil* if none of the views associated with the document has user
+  focus
+=end
+    def active_view
+      @doc.active_view.parent rescue nil
+    end
+    
 =begin rdoc
 Executes the action with name _name_ contained in document's view's action
 collection. This is made by having the action emit the <tt>triggered()</tt> or
@@ -174,17 +223,39 @@ status of the document.
       if @modified_on_disk then ICONS[:modified_on_disk]
       elsif @doc.modified? then ICONS[:modified]
       else
-        icon_name = KDE::MimeType.mime_type(@doc.mime_type).icon_name
+        if has_file? :remote
+          mime = KDE::MimeType.find_by_content Qt::ByteArray.new(@doc.text)
+        else mime = KDE::MimeType.mime_type(@doc.mime_type)
+        end
+        icon_name = mime.icon_name
         Qt::Icon.new(KDE::IconLoader.load_mime_type_pixmap icon_name)
       end
     end
 
 =begin rdoc
-Tells whether the document is associated with a file, that is if it has been
-saved to file before or not.
+Whether the document is associated with a file
+
+Depending on the value of _which_ this method can also return *true* only if the
+document is associated with a local file or with a remote file. In particular:
+* if it's @:local@ this method will return *true* only if the document is associated
+  with a local file
+* if it's @:remote@, this method will return *true* only if the document is associated
+  with a remote file
+* with any other value, this method will return *true* if the document is associated
+  with any file
+
+@param [Symbol, Object] which the kind of files which are acceptable
+@return [Boolean] *true* if the document is associated with a file of the kind
+  matching _which_ and *false* otherwise
 =end
-    def has_file?
-      !@doc.url.empty?
+    def has_file? which = :any
+      u = url
+      return false if u.empty?
+      case which
+      when :local then url.local_file?
+      when :remote then !url.local_file?
+      else true
+      end
     end
 
 =begin rdoc
@@ -221,13 +292,6 @@ This method is associated with the Save menu entry
         @project.save
         res
       end
-#       unless url.empty? then save_document
-#       else document_save_as
-#         res = KDE::FileDialog.get_save_file_name KDE::Url.new, "*.rb|Ruby files (*.rb)\n*|All files", nil,
-#           KDE::i18n("Save \"#{@doc.document_name}\" as")
-#         return false unless res
-#         save_as KDE::Url.from_path(res)
-#       end
     end
 
 =begin rdoc
@@ -235,20 +299,22 @@ Creats a view for the document. _parent_ is the view's parent widget. Raises
 +RuntimeError+ if the document already has a view.
 =end
     def create_view parent = nil
-      raise "Can't create a second view for this document" if @view
-      @doc.create_view nil
-      @view = EditorView.new self, @doc.views.first, parent
-      @view.connect(SIGNAL('closing()')){@view = nil}
-      @view.connect(SIGNAL('destroyed(QObject*)')){@view = nil}
-      gui = @view.send(:internal)
+      inner_view = @doc.create_view nil
+      view = EditorView.new self, inner_view, parent
+      @views << view
+      gui = view.send(:internal)
       action = gui.action_collection.action('file_save_as')
       disconnect action, SIGNAL(:triggered), @doc, SLOT('documentSaveAs()')
       connect action, SIGNAL(:triggered), self, SLOT(:document_save_as)
       action = gui.action_collection.action('file_save')
       disconnect action, SIGNAL(:triggered), @doc, SLOT('documentSave()')
       connect action, SIGNAL(:triggered), self, SLOT(:save)
-      emit view_created(@view, self)
-      @view
+      view.connect(SIGNAL('closing(QWidget*)')) do |v| 
+        emit closing_view v, self
+        @views.delete v
+      end
+      emit view_created(view, self)
+      view
     end
     
 =begin rdoc
@@ -261,7 +327,7 @@ Return the project with wider scope the document belongs to. This is:
     def project
       prj = Ruber[:projects].current
       return @project if path.empty? or !prj
-      prj.project_files.file_in_project?(path) ? prj : @project
+      prj.project_files.file_in_project?(url.to_encoded.to_s) ? prj : @project
     end
     
 =begin rdoc
@@ -324,26 +390,16 @@ TODO: maybe remove the argument, since this method is not called anymore at
       if !ask || query_close
         emit closing(self)
         @project.save unless path.empty?
-        @view.close if @doc.views.size > 0
+        @views.dup.each{|v| v.close}
         return false unless close_url false
         @project.close false
+        delete_later
         self.disconnect
-        dispose
         true
       else false
       end
     end
-    
-=begin rdoc
-Closes the view _view_ associated with the document.
-
-Currently, the _view_ parameter is unused, as a document can only have one view,
-and all this method does is to call the <tt>close</tt> method with _ask_ as argument.
-=end
-    def close_view view, ask = true
-      close ask
-    end
-    
+        
 =begin rdoc
 The <tt>KParts::Part</tt> associated with the document
 =end

data/lib/ruber/editor/editor_view.rb

@@ -42,7 +42,7 @@ module Ruber
     
     @signal_table = KTextEditorWrapper.prepare_wrapper_connections self, signal_data
     
-    signals 'closing()', 'cursor_position_changed(KTextEditor::Cursor, QWidget*)', 
+    signals 'closing(QWidget*)', 'cursor_position_changed(KTextEditor::Cursor, QWidget*)', 
     'view_mode_changed(QString, QWidget*)', 'edit_mode_changed(KTextEditor::View::EditMode, QWidget*)',
     'selection_mode_changed(bool, QWidget*)', 'mouse_position_changed(KTextEditor::Cursor, QWidget*)',
     'selection_changed(QWidget*)'
@@ -71,6 +71,7 @@ module Ruber
     alias_method :document, :doc
     def initialize doc, internal, parent = nil
       super parent
+      set_attribute Qt::WA_DeleteOnClose, true
       @block_selection = false
       @doc = doc
       @view = internal
@@ -124,8 +125,9 @@ module Ruber
     end
 
     def close
-      emit closing
+      emit closing self
       super
+#       delete_later
     end
 
     def set_annotation_border_visible vis

data/lib/ruber/external_program_plugin.rb

@@ -265,6 +265,9 @@ want to call *super*)
 _lines_ is an array where each entry corresponds to a line of output from the
 program. If buffering is on, each entry is a complete line (or should be considered
 such). If buffering is off, you'll have to take care of newlines by yourself.
+
+@param [Array<String>] lines the output lines
+@return [nil]
 =end
     def process_standard_output lines
       return unless @output_widget
@@ -276,6 +279,7 @@ such). If buffering is off, you'll have to take care of newlines by yourself.
         mod.set_data idx, Qt::Variant.new(l)
         @output_widget.set_output_type idx, :output
       end
+      nil
     end
  
 =begin rdoc
@@ -290,6 +294,9 @@ want to call *super*)
 _lines_ is an array where each entry corresponds to a line of output from the
 program. If buffering is on, each entry is a complete line (or should be considered
 such). If buffering is off, you'll have to take care of newlines by yourself.
+
+@param [Array<String>] lines the lines on standard error
+@return [nil]
 =end
     def process_standard_error lines
       return unless @output_widget
@@ -301,6 +308,7 @@ such). If buffering is off, you'll have to take care of newlines by yourself.
         mod.set_data idx, Qt::Variant.new(l)
         @output_widget.set_output_type idx, :error
       end
+      nil
     end
     
 =begin rdoc

data/lib/ruber/kde_config_option_backend.rb

@@ -89,8 +89,12 @@ default value will be returned
       return opt.default.deep_copy unless grp.has_key(humanize(opt.name))
       if @yaml_options.include? [opt.group, opt.name] or !recognized_value?(opt.default)
         YAML.load grp.read_entry humanize(opt.name), ''
-#       else res = grp.read_entry humanize(opt.name), opt.default
-      else (grp.read_entry humanize(opt.name), Qt::Variant.from_value(opt.default)).value
+      else
+#Uncomment the following lines if the state/open_projects is read as a string
+#         begin grp.read_entry humanize(opt.name), opt.default
+#         rescue ArgumentError
+        (grp.read_entry humanize(opt.name), Qt::Variant.from_value(opt.default)).value
+#         end
       end
     end
 
@@ -114,8 +118,12 @@ and on file.
         elsif need_yaml? opt, value
           @config.group(humanize(opt.group)).write_entry(humanize(opt.name), YAML.dump(value))
           @yaml_options << [opt.group, opt.name]
-#         else @config.group(humanize(opt.group)).write_entry(humanize(opt.name), value)
-        else @config.group(humanize(opt.group)).write_entry(humanize(opt.name), Qt::Variant.from_value(value))
+        else
+#Uncomment the following lines if the state/open_projects is written as a string
+#           begin @config.group(humanize(opt.group)).write_entry(humanize(opt.name), value)
+#           rescue ArgumentError
+          @config.group(humanize(opt.group)).write_entry(humanize(opt.name), Qt::Variant.from_value(value))
+#           end
         end
       end
       @yaml_options.uniq!