doxyparser 1.2 → 1.3

data/lib/nodes/type.rb

@@ -1,29 +1,48 @@
 module Doxyparser
 
-	class Type < Node
-		
-		def nested_local_types
-			refs = @node.xpath("ref")
-			return [] if refs.nil? || refs.empty?
-			refs.map { |r| Type.new(node: r, dir: @dir) }
-		end
-		
-		def nested_typenames
-			splitted = @name.split(%r{[<,>]}).map{|s| s.strip}.reject!{|s| s.nil? || !(s =~ /^\D[\w:]*\w$/)}
-		end
-		
-		def template?
-			@name.include? '<'
-		end
-		
-		private
-
-		def init_attributes
-			@basename = @name
-		end
-		
-		def find_name
-    		@node.content
-    	end
-	end
+  class Type < Node
+
+    def nested_local_types
+      return [] if @node.nil?
+      refs = @node.xpath("ref")
+      return [] if refs.nil? || refs.empty?
+      refs.map { |r| Type.new(node: r, dir: @dir) }
+    end
+
+    def nested_typenames
+      Type.nested_typenames(@name)
+    end
+
+    def self.nested_typenames(typename)
+      typename.split(%r{[<,>]}).map{ |s|
+      	 s.gsub(/^ *const /,'').gsub(/ +(const)* *[&*] *(const)* *$/,'').strip 
+      }.reject { |s| 
+      		s.nil? || !valid_type?(s) 
+      	}
+    end
+
+    def template?
+      Type.template?(@name)
+    end
+
+    def self.template?(typename)
+      typename.include? '<'
+    end
+
+    private
+
+    def init_attributes
+      @basename = @name
+    end
+
+    def find_name
+      return '' if @node.nil?
+      @node.content
+    end
+
+    def self.valid_type?(str)
+      str =~ /^\D[\w_ :*&]*$/
+    end
+
+  end
 end

data/lib/util.rb

@@ -1,69 +1,74 @@
 module Doxyparser
 
-	module Util
+  module Util
 
-		def self.home_dir
-			File.expand_path('..', File.dirname(__FILE__))
-		end
+    def self.home_dir
+      File.expand_path('..', File.dirname(__FILE__))
+    end
 
-		def del_spaces n
-			n.gsub(/\s+/, "")
-		end
+    def del_spaces(n)
+      n.gsub(/\s+/, "")
+    end
 
-		def del_prefix n
-			n.gsub(%r{.*[:/]}, "")
-		end
+    def del_prefix_class(n)
+	     n.gsub(%r{^[^<]*[:]}, "")
+    end
+    
+    def del_prefix_file(n)
+	     n.gsub(%r{/$}, "")
+	     n.gsub(%r{.*[/]}, "")
+    end
 
-		def escape_file_name filename
-			if filename =~ %r{[\./]}
-				return filename.gsub('.', '_8').gsub('/', '_2')
-			else
-				return filename.gsub('_8', '.').gsub('_2', '/')
-			end
-		end
+    def escape_file_name(filename)
+      if filename =~ %r{[\./]}
+        return filename.gsub('.', '_8').gsub('/', '_2')
+      else
+        return filename.gsub('_8', '.').gsub('_2', '/')
+      end
+    end
 
-		def escape_class_name filename
-			if filename.include? '::'
-				return filename.gsub('::','_1_1')
-			else
-				return filename.gsub('_1_1','::')
-			end
-		end
+    def escape_class_name(filename)
+      if filename.include? '::'
+        return filename.gsub('::','_1_1')
+      else
+        return filename.gsub('_1_1','::')
+      end
+    end
 
-		def self.read_file file_name
-			file = File.open(file_name, "r")
-			data = file.read
-			file.close
-			return data
-		end
+    def self.read_file(file_name)
+      file = File.open(file_name, "r")
+      data = file.read
+      file.close
+      return data
+    end
 
-		def self.write_file file_name, data
-			file = File.open(file_name, "w")
-			count = file.write(data)
-			file.close
-			return count
-		end
+    def self.write_file(file_name, data)
+      file = File.open(file_name, "w")
+      count = file.write(data)
+      file.close
+      return count
+    end
 
-		def do_filter filter, lst, clazz
-			if filter
-				filtered_lst = []
-				filter.each { |val|
-					found = lst.select { |node| match(val, yield(node)) }
-					raise "The object: #{val} #{clazz} could not be found while parsing" if found.nil? || found.empty?
-					filtered_lst.push(*found)
-				}
-			else
-			filtered_lst=lst
-			end
-			filtered_lst.map { |node| clazz.new(parent: self, node: node) }
-		end
+    def do_filter(filter, lst, clazz)
+      if filter
+        filtered_lst = []
+        filter.each { |val|
+          found = lst.select { |node| match(val, yield(node)) }
+          raise "The object: #{val} #{clazz} could not be found while parsing" if found.nil? || found.empty?
+          filtered_lst.push(*found)
+        }
+      else
+      filtered_lst=lst
+      end
+      filtered_lst.map { |node| clazz.new(parent: self, node: node) }
+    end
 
-		def match val, aux_name
-			if val.is_a? Regexp
-			return aux_name =~ val
-			else
-			return aux_name == val
-			end
-		end
-	end
+    def match(val, aux_name)
+      if val.is_a?(Regexp)
+      return aux_name =~ val
+      else
+      return aux_name == val
+      end
+    end
+  end
 end

data/spec/file_spec.rb

@@ -64,7 +64,7 @@ describe "Doxyparser::HFile" do
 	end
 	
 	it "should create the right namespaces" do
-		expected_namespaces=['MyNamespace', "MyNamespace::MyInnerNamespace", "MyNamespace::MyInnerNamespace::MyMostInnerNamespace", "std"]
+		expected_namespaces=['MyNamespace', "MyNamespace::MyInnerNamespace", "MyNamespace::MyInnerNamespace::MyMostInnerNamespace"]
 		file_namespaces = @file.namespaces
 		file_namespaces.size.should eql expected_namespaces.size
 

data/spec/method_spec.rb

@@ -11,7 +11,7 @@ describe "Doxyparser::Method" do
 		end
 
 		it "should create consistently methods" do
-			method = @class.methods(:private, nil, ['isBoolProp'])
+			method = @class.methods(:private, nil, ['isBoolPropis'])
 			method.size.should eql 1
 			method = method[0]
 			method.type.name.should eql 'bool'
@@ -20,39 +20,39 @@ describe "Doxyparser::Method" do
 			method.file.basename.should eql 'test2.h'
 			method.params.should be_empty
 			method.static.should be_nil
-			method.definition.should eql 'bool AccessorsClass::isBoolProp'
+			method.definition.should eql 'bool AccessorsClass::isBoolPropis'
 		end
 		
 		it "should create standard getters and setters" do
-			getter = @class.methods(:private, nil, ['getProp'])[0]
-			getter.getter_for.should eql 'prop'
+			getter = @class.methods(:private, nil, ['getPropget'])[0]
+			getter.getter_for.should eql 'propget'
 			getter.setter_for.should be_nil
-			setter = @class.methods(:private, nil, ['setProp'])[0]
-			setter.setter_for.should eql 'prop'
+			setter = @class.methods(:private, nil, ['setPropset'])[0]
+			setter.setter_for.should eql 'propset'
 			setter.getter_for.should be_nil
 			setter.static.should be_nil
 			
-			getter = @class.methods(:private, nil, ['isBoolProp'])[0]
-			getter.getter_for.should eql 'boolProp'
+			getter = @class.methods(:private, nil, ['isBoolPropis'])[0]
+			getter.getter_for.should eql 'boolPropis'
 			getter.setter_for.should be_nil
 		end
 		
 		it "should create non standard getters and setters" do
-			getter = @class.methods(:private, nil, ['get_Prop2'])[0]
-			getter.getter_for.should eql 'prop2'
+			getter = @class.methods(:private, nil, ['get_Prop2get_'])[0]
+			getter.getter_for.should eql 'prop2get_'
 			getter.setter_for.should be_nil
-			setter = @class.methods(:private, nil, ['set_Prop2'])[0]
-			setter.setter_for.should eql 'prop2'
+			setter = @class.methods(:private, nil, ['set_Prop2set_2'])[0]
+			setter.setter_for.should eql 'prop2set_2'
 			setter.getter_for.should be_nil
 			setter.static.should be_nil
 		end
 		
 		it "should create standard Uppercase getters and setters" do
-			getter = @class.methods(:private, nil, ['GetProp3'])[0]
-			getter.getter_for.should eql 'prop3'
+			getter = @class.methods(:private, nil, ['Get3DProp3'])[0]
+			getter.getter_for.should eql '_3DProp3'
 			getter.setter_for.should be_nil
-			setter = @class.methods(:private, nil, ['SetProp3'])[0]
-			setter.setter_for.should eql 'prop3'
+			setter = @class.methods(:private, nil, ['Set3DProp3'])[0]
+			setter.setter_for.should eql '_3DProp3'
 			setter.getter_for.should be_nil
 			setter.static.should be_nil
 		end

data/spec/type_spec.rb

@@ -18,14 +18,14 @@ describe "Doxyparser::Type" do
 		
 		typedef = @class.typedefs(:public, ['VectorMapShortVectorInt'])[0]
 		type = typedef.type
-		type.name.should eql 'std::vector< MapShortVectorInt >'
+		type.name.should eql 'std::vector< MapShortVectorInt & >'
 		type.should be_template
 	end
 	
 	it "should create consistently complex types" do
 		typedef = @class.typedefs(:private, ['privateTypedef'])[0]
 		type = typedef.type
-		type.name.should eql 'std::map< MyMostInnerClass, TemplateClass< OuterStruct,::noNsClass, 8 > >'
+		type.name.should eql 'std::map< MyMostInnerClass *, TemplateClass< const OuterStruct &,::noNsClass, 8 > >'
 		type.should be_template
 		type.nested_local_types.map{|t| t.name}.should eql ['MyMostInnerClass', 'TemplateClass', 'OuterStruct', 'noNsClass']
 		type.nested_typenames.should eql ['std::map', 'MyMostInnerClass' , 'TemplateClass', 'OuterStruct', '::noNsClass']

metadata

@@ -1,20 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: doxyparser
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
+  prerelease: 
 platform: ruby
 authors:
 - David Fuenmayor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies: []
-description: |
-  Ruby Gem for parsing C++ header files.
-  This library is based on Nokogiri (http://nokogiri.org) and takes as input the xml files generated by Doxygen (www.doxygen.org).
-  Parsing with Doxygen allows us to parse even a set of non-compilable include files. This is very useful in case you need to parse only a subset of a big library which won't normally compile because of being incomplete or needing further build configuration (e.g Makefiles, VS, SCons, etc).
-  By using other tools which rely on a real C/C++ processor like gccxml or swig, you would normally get lots of compilation-related errors (which is undesired because we don't want to compile anything!!). Doxyparser is, in such cases, the lean alternative.
+description: ! 'Ruby Gem for parsing C++ header files.
+
+  This library is based on Nokogiri (http://nokogiri.org) and takes as input the xml
+  files generated by Doxygen (www.doxygen.org).
+
+  Parsing with Doxygen allows us to parse even a set of non-compilable include files.
+  This is very useful in case you need to parse only a subset of a big library which
+  won''t normally compile because of being incomplete or needing further build configuration
+  (e.g Makefiles, VS, SCons, etc).
+
+  By using other tools which rely on a real C/C++ processor like gccxml or swig, you
+  would normally get lots of compilation-related errors (which is undesired because
+  we don''t want to compile anything!!). Doxyparser is, in such cases, the lean alternative.
+
+'
 email:
 - davfuenmayor@gmail.com
 executables: []
@@ -51,26 +62,27 @@ files:
 homepage: https://github.com/davfuenmayor/ruby-doxygen-parser
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Library for parsing C++ header files
 test_files:
 - spec/namespace_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 529b48f43c4fd9b2bbc9acb11ab140d9e6150e09
-  data.tar.gz: df41fcf999c92693df3cf2f9dfee73f1b1b095ce
-SHA512:
-  metadata.gz: 9a22858cbfdfe61b3d7248736ccbdc7f8ca22f03c415e6f30905e10ea3a820ce1dbb2db4e51e6fb0f307463422aa154eb24194bf8458fa4ac8cd7d5da6bcbc94
-  data.tar.gz: 8bec965f048166cc90ac92dcd2fb7beede9ea6a9e1b0e5cee343d6c1753918d9305971ca2b3c8fcc6613199d51089faedb61f7497a14047befb4958804b6cf8d