doxyparser 1.2 → 1.3

data/lib/doxyparser.rb

@@ -1,5 +1,4 @@
 require "rubygems"
-require "bundler/setup"
 
 require 'nokogiri'
 require 'fileutils'
@@ -45,21 +44,31 @@ module Doxyparser
       Doxyparser::HFile.new :name => basename, :dir => xml_dir
     end
     
-    def gen_xml_docs src_dir, xml_dir, recursive = nil, include_dirs = nil, generate_html = nil
+    def gen_xml_docs source_dirs, xml_dir, recursive = nil, include_dirs = nil, generate_html = nil
     	
     	if include_dirs.nil? || include_dirs.empty?
     		inc_dirs = ''
     	else
-    		inc_dirs = include_dirs.join(', ')
+    		if include_dirs.is_a? Array
+    			inc_dirs = include_dirs.join(' ')
+    		else
+    			inc_dirs = include_dirs
+    		end
+    	end
+    	if source_dirs.is_a? Array
+    		proj_name = File.basename(source_dirs[0])
+    		src_dirs = source_dirs.join(' ')
+    	else
+    		proj_name = File.basename(source_dirs)
+    		src_dirs = source_dirs
     	end
-    	recursive = recursive ? 'YES' : 'NO'
     	
+    	recursive = recursive ? 'YES' : 'NO'    	
     	home_dir = Doxyparser::Util.home_dir
     	gen_html = generate_html ? 'YES' : 'NO'
-    	proj_name = File.basename src_dir
       doxyfile =  "# Doxyfile 1.7.6.1\n\n"
       doxyfile << "# Project related configuration options\n\n"
-      doxyfile << %Q{PROJECT_NAME\t\t= "#{proj_name}"\nINPUT\t\t\t\t= #{src_dir}\nGENERATE_HTML\t\t= #{gen_html}\n}
+      doxyfile << %Q{PROJECT_NAME\t\t= "#{proj_name}"\nINPUT\t\t\t\t= #{src_dirs}\nGENERATE_HTML\t\t= #{gen_html}\n}
       doxyfile << %Q{RECURSIVE\t\t\t= #{recursive}\nINCLUDE_PATH\t\t= #{inc_dirs}\n\n}
       doxyfile << "# Default doxygen configuration options\n\n"
       doxyfile << Doxyparser::Util.read_file(home_dir+'/resources/Doxyfile')

data/lib/nodes/class.rb

@@ -1,13 +1,13 @@
 module Doxyparser
 
-	class Class < Struct
+  class Class < Struct
 
-		private
+    private
 
-		def compute_path
-			aux = escape_class_name @name
-			@xml_path = %Q{#{@dir}/class#{aux}.xml}
-		end
+    def compute_path
+      aux = escape_class_name(@name)
+      @xml_path = %Q{#{@dir}/class#{aux}.xml}
+    end
 
-	end
+  end
 end

data/lib/nodes/compound.rb

@@ -1,42 +1,42 @@
 module Doxyparser
 
-	class Compound < Node
-
-		attr_reader :xml_path
-
-		def new_unnamed
-			@unnamed += 1
-		end
-		
-		private
-
-		def init_attributes
-			super
-			@unnamed = 0
-			if @node
-				@xml_path = %Q{#{@dir}/#{self.refid}.xml}
-			else
-				compute_path
-			end
-		end
-
-		def find_name
-			@node.child.content
-		end
-
-		def doc
-			if @doc.nil?
-				parse
-			end
-			@doc
-		end
-
-		def parse
-			raise "No file found at this location: #{@xml_path} for node #{self.class.name} #{@name}" unless File.exists? @xml_path
-			File.open(@xml_path) { |xml_doc|
-				@doc=Nokogiri::XML(xml_doc)
-			}
-			self
-		end
-	end
+  class Compound < Node
+
+    attr_reader :xml_path
+
+    def new_unnamed
+      @unnamed += 1
+    end
+
+    private
+
+    def init_attributes
+      super
+      @unnamed = 0
+      if @node && !@node['refid'].nil?
+        @xml_path = "#{@dir}/#{self.refid}.xml"
+      else
+        compute_path
+      end
+    end
+
+    def find_name
+      @node.child.content
+    end
+
+    def doc
+      if @doc.nil?
+        parse
+      end
+      @doc
+    end
+
+    def parse
+      raise "No file found at this location: #{@xml_path} for node #{self.class.name} #{@name}" unless File.exists? @xml_path
+      File.open(@xml_path) { |xml_doc|
+        @doc=Nokogiri::XML(xml_doc)
+      }
+      self
+    end
+  end
 end

data/lib/nodes/enum.rb

@@ -1,20 +1,20 @@
 module Doxyparser
 
-	class Enum < Member
+  class Enum < Member
 
-		def values
-			ret=[]
-			xpath("enumvalue/name").each { |v| ret << v.child.content }
-			ret
-		end
+    def values
+      ret=[]
+      xpath("enumvalue/name").each { |v| ret << v.child.content }
+      ret
+    end
 
-		private
+    private
 
-		def find_name
-			super.gsub(/@\d*/) {
-				num = parent.new_unnamed
-				'_Enum' +  (num == 1 ? '' : num.to_s)
-			}
-		end
-	end
+    def find_name
+      super.gsub(/@\d*/) {
+        num = parent.new_unnamed
+        '_Enum' +  (num == 1 ? '' : num.to_s)
+      }
+    end
+  end
 end

data/lib/nodes/friend.rb

@@ -1,20 +1,20 @@
 module Doxyparser
 
-	class Friend < Member
+  class Friend < Member
 
-		def is_class?
-			args.nil? || args == ""
-		end
+    def is_class?
+      args.nil? || args == ""
+    end
 
-		def is_qualified?
-			basename.include? '::'
-		end
-		
-		private 
-		
-		def find_name
-			@basename = @node.xpath("name")[0].child.content
-			@parent.name + '::' + @basename
-		end
-	end
+    def is_qualified?
+      basename.include? '::'
+    end
+
+    private
+
+    def find_name
+      @basename = @node.xpath("name")[0].child.content
+      @parent.name + '::' + @basename
+    end
+  end
 end

data/lib/nodes/function.rb

@@ -1,54 +1,60 @@
 module Doxyparser
 
-	class Function < Member
-
-		def == another
-			super
-			self.args == another.args
-		end
-
-		def eql? another
-			super
-			self.args == another.args
-		end
-
-		def to_str
-			super + @args
-		end
-
-		def to_s
-			super + @args
-		end
-
-		def constructor?
-			@basename==parent.basename
-		end
-
-		def destructor?
-			@basename.start_with? %Q{~}
-		end
-
-		def getter_for
-			if @params.empty? || (@params.size == 1 && @params[0].type.name =~ /\s*void\s*/)
-				if @basename.start_with?('get') || @basename.start_with?('Get')
-					return @basename.gsub(/get[_]?(\w)/i){|match| $1.downcase}
-				end
-				if @type.name == 'bool'
-					if @basename.start_with?('is') || @basename.start_with?('Is')
-						return @basename.gsub(/is[_]?(\w)/i){|match| $1.downcase}
-					end
-				end
-			end
-			return nil
-		end
-
-		def setter_for
-			if @type.name == 'void'
-				if @basename.start_with?('set') || @basename.start_with?('Set')
-					return @basename.gsub(/set[_]?(\w)/i){|match| $1.downcase}
-				end
-			end
-			return nil
-		end
-	end
+  class Function < Member
+
+    def == another
+      super
+      self.args == another.args
+    end
+
+    def eql?(another)
+      super
+      self.args == another.args
+    end
+
+    def to_str
+      super + @args
+    end
+
+    def to_s
+      super + @args
+    end
+
+    def constructor?
+      @basename == parent.basename
+    end
+
+    def destructor?
+      @basename.start_with? %Q{~}
+    end
+
+    def getter_for
+      if @params.empty? || (@params.size == 1 && @params[0].type.name =~ /\s*void\s*/)
+        if @basename.start_with?('get') || @basename.start_with?('Get')
+          ret = @basename.gsub(/^get[_]?(\w)/i) { |match| $1.downcase }
+          ret.prepend('_') if ret =~ %r{^\d}
+          return ret
+        end
+        if @type.name == 'bool'
+          if @basename.start_with?('is') || @basename.start_with?('Is')
+            ret = @basename.gsub(/^is[_]?(\w)/i) { |match| $1.downcase }
+            ret.prepend('_') if ret =~ %r{^\d}
+          	return ret
+          end
+        end
+      end
+      return nil
+    end
+
+    def setter_for
+      if (@type.name == 'void') && (@params.size == 1)
+        if @basename.start_with?('set') || @basename.start_with?('Set')
+          ret = @basename.gsub(/^set[_]?(\w)/i) { |match| $1.downcase }
+          ret.prepend('_') if ret =~ %r{^\d}
+          return ret
+        end
+      end
+      return nil
+    end
+  end
 end

data/lib/nodes/group.rb

@@ -1,6 +1,6 @@
 module Doxyparser
 
   class Group < Compound
-    
+
   end
 end

data/lib/nodes/hfile.rb

@@ -1,73 +1,83 @@
 module Doxyparser
 
-	class HFile < Compound
+  class HFile < Compound
 
-		def list_included
-			lst=doc.xpath(%Q{/doxygen/compounddef/includes})
-			lst.map { |f| f.child.content }
-		end
+    def list_included
+      lst=doc.xpath(%Q{/doxygen/compounddef/includes})
+      lst.map { |f| f.child.content }
+    end
 
-		def list_including
-			lst=doc.xpath(%Q{/doxygen/compounddef/includedby})
-			lst.map { |f| f[:refid].nil? ? f.child.content : escape_file_name(f[:refid]) }
-		end
+    def list_including
+      lst=doc.xpath(%Q{/doxygen/compounddef/includedby})
+      lst.map { |f| f[:refid].nil? ? f.child.content : escape_file_name(f[:refid]) }
+    end
 
-		def files_included
-			lst=doc.xpath(%Q{/doxygen/compounddef/includes[@local="yes"]})
-			lst.map { |f| Doxyparser::HFile.new(dir: @dir, node: f) }
-		end
+    def files_included
+      lst=doc.xpath(%Q{/doxygen/compounddef/includes[@local="yes"]})
+      lst.map { |f| 
+      	Doxyparser::HFile.new(dir: @dir, node: f) 
+      }
+    end
 
-		def files_including
-			lst=doc.xpath(%Q{/doxygen/compounddef/includedby[@local="yes"]})
-			lst.map { |f| Doxyparser::HFile.new(dir: @dir, node: f) }
-		end
+    def files_including
+      lst=doc.xpath(%Q{/doxygen/compounddef/includedby[@local="yes"]})
+      lst.map { |f| Doxyparser::HFile.new(dir: @dir, node: f) }
+    end
 
-		def structs
-			lst=doc.xpath(%Q{/doxygen/compounddef/innerclass})
-			lst = lst.select { |c| c["refid"].start_with?("struct") }
-			lst.map { |node| Doxyparser::Struct.new(dir: @dir, node: node) }
-		end
+    def structs
+      lst=doc.xpath(%Q{/doxygen/compounddef/innerclass})
+      lst = lst.select { |c| c["refid"].start_with?("struct") }
+      lst.map { |node| Doxyparser::Struct.new(dir: @dir, node: node) }
+    end
 
-		def classes
-			lst=doc.xpath(%Q{/doxygen/compounddef/innerclass})
-			lst = lst.select { |c| c["refid"].start_with?("class") }
-			lst.map { |node| Doxyparser::Class.new(dir: @dir, node: node) }
-		end
+    def classes
+      lst=doc.xpath(%Q{/doxygen/compounddef/innerclass})
+      lst = lst.select { |c| c["refid"].start_with?("class") }
+      lst.map { |node| Doxyparser::Class.new(dir: @dir, node: node) }
+    end
 
-		def namespaces
-			lst=doc.xpath(%Q{/doxygen/compounddef/innernamespace})
-			lst.map { |node| Doxyparser::Namespace.new(dir: @dir, node: node) }
-		end
+    def namespaces
+      lst=doc.xpath(%Q{/doxygen/compounddef/innernamespace})
+      lst.map { |node| Doxyparser::Namespace.new(dir: @dir, node: node) }
+    end
 
-		def functions
-			lst=doc.xpath(%Q{/doxygen/compounddef/sectiondef[@kind="func"]/memberdef[@kind="function"]})
-			lst.map { |node| Doxyparser::Function.new(parent: self, node: node) }
-		end
+    def functions
+      lst=doc.xpath(%Q{/doxygen/compounddef/sectiondef[@kind="func"]/memberdef[@kind="function"]})
+      lst.map { |node| Doxyparser::Function.new(parent: self, node: node) }
+    end
 
-		def variables
-			lst=doc.xpath(%Q{/doxygen/compounddef/sectiondef[@kind="var"]/memberdef[@kind="variable"]})
-			lst.map { |node| Doxyparser::Variable.new(parent: self, node: node) }
-		end
+    def variables
+      lst=doc.xpath(%Q{/doxygen/compounddef/sectiondef[@kind="var"]/memberdef[@kind="variable"]})
+      lst.map { |node| Doxyparser::Variable.new(parent: self, node: node) }
+    end
 
-		def enums
-			lst=doc.xpath(%Q{/doxygen/compounddef/sectiondef[@kind="enum"]/memberdef[@kind="enum"]})
-			lst.map { |node| Doxyparser::Enum.new(parent: self, node: node) }
-		end
+    def enums
+      lst=doc.xpath(%Q{/doxygen/compounddef/sectiondef[@kind="enum"]/memberdef[@kind="enum"]})
+      lst.map { |node| Doxyparser::Enum.new(parent: self, node: node) }
+    end
 
-		def typedefs
-			lst=doc.xpath(%Q{/doxygen/compounddef/sectiondef[@kind="typedef"]/memberdef[@kind="typedef"]})
-			lst.map { |node| Doxyparser::Typedef.new(parent: self, node: node) }
-		end
+    def typedefs
+      lst=doc.xpath(%Q{/doxygen/compounddef/sectiondef[@kind="typedef"]/memberdef[@kind="typedef"]})
+      lst.map { |node| Doxyparser::Typedef.new(parent: self, node: node) }
+    end
 
-		private
-		
-		def find_name
-			escape_file_name self.refid
-		end
+    private
 
-		def compute_path
-			aux= escape_file_name @name
-			@xml_path = %Q{#{@dir}/#{aux}.xml}
-		end
-	end
+    def find_name
+    	if @node['refid'].nil?
+    		@node.child.content
+    	else
+      	escape_file_name(self.refid)
+    	end
+    end
+    
+    def del_prefix_for(str)
+      del_prefix_file(str)
+    end
+
+    def compute_path
+      aux= escape_file_name(@name)
+      @xml_path = %Q{#{@dir}/#{aux}.xml}
+    end
+  end
 end