rbgccxml 0.9 → 0.9.1

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/contrib/sshpublisher'
 require 'rake/gempackagetask'
 
 PROJECT_NAME = "rbgccxml"
-RBGCCXML_VERSION = "0.9"
+RBGCCXML_VERSION = "0.9.1"
 
 task :default => :test
 
@@ -55,8 +55,11 @@ spec = Gem::Specification.new do |s|
   s.author = 'Jason Roelofs'
   s.email = 'jameskilton@gmail.com'
   
-  s.add_dependency "libxml-ruby", "~>1.1"
-  s.add_dependency "gccxml_gem", "~>0.9"
+  s.add_dependency "nokogiri", "~> 1.4.0"
+  s.add_dependency "gccxml_gem", "~> 0.9"
+
+  s.add_development_dependency "test-unit", "1.2.3"
+  s.add_development_dependency "mocha", "~> 0.9"
 
   s.description = <<-END
 Rbgccxml is a library that parses out GCCXML (http://www.gccxml.org) output
@@ -78,6 +81,4 @@ what you want out of the C++ source code
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
 end

data/lib/rbgccxml/node.rb

@@ -13,7 +13,7 @@ module RbGCCXML
   # attempt to will throw a NotQueryableException.
   class Node 
 
-    # The underlying libxml node for this Node.
+    # The underlying xml node for this Node.
     attr_reader :node
 
     # Initialize this node according to the XML element passed in
@@ -26,15 +26,15 @@ module RbGCCXML
 
     # Get the C++ name of this node
     def name
-      @node.attributes['name']
+      @node['name']
     end
     
     # Get the fully qualified (demangled) C++ name of this node.
     def qualified_name
-      if @node.attributes["demangled"]
+      if @node["demangled"]
         # The 'demangled' attribute of the node for methods / functions is the 
         # full signature, so cut that part out.
-        @node.attributes["demangled"].split(/\(/)[0]
+        @node["demangled"].split(/\(/)[0]
       else
         parent ? "#{parent.qualified_name}::#{name}" : name
       end
@@ -42,27 +42,32 @@ module RbGCCXML
 
     # Is this node const qualified?
     def const?
-      @node.attributes["const"] ? @node.attributes["const"] == "1" : false
+      @node["const"] ? @node["const"] == "1" : false
     end
 
     # Does this node have public access?
     def public?
-     @node.attributes["access"] ? @node.attributes["access"] == "public" : true
+     @node["access"] ? @node["access"] == "public" : true
     end
 
     # Does this node have protected access?
     def protected?
-     @node.attributes["access"] ? @node.attributes["access"] == "protected" : false
+     @node["access"] ? @node["access"] == "protected" : false
     end
 
     # Does this node have private access?
     def private?
-     @node.attributes["access"] ? @node.attributes["access"] == "private" : false
+     @node["access"] ? @node["access"] == "private" : false
     end
 
-    # Access to the underlying libxml node's attributes
+    # Access to the underlying xml node's attributes.
     def attributes
-      @node.attributes
+      @node
+    end
+
+    # Access indivitual attributes directly
+    def [](val)
+      @node[val]
     end
 
     # Some C++ nodes are actually wrappers around other nodes. For example, 
@@ -78,7 +83,7 @@ module RbGCCXML
     # Returns the full path to the file this node is found in.
     # Returns nil if no File node is found for this node
     def file
-      file_id = @node.attributes["file"]
+      file_id = @node["file"]
       file_node = XMLParsing.find(:node_type => "File", :id => file_id) if file_id
       file_node ? file_node.attributes["name"] : nil
     end
@@ -86,8 +91,8 @@ module RbGCCXML
     # Returns the parent node of this node. e.g. function.parent will get the class
     # the function is contained in.
     def parent
-      return nil if @node.attributes["context"].nil? || @node.attributes["context"] == "_1"
-      XMLParsing.find(:id => @node.attributes["context"])
+      return nil if @node["context"].nil? || @node["context"] == "_1"
+      XMLParsing.find(:id => @node["context"])
     end
 
     # This is a unified search routine for finding nested nodes. It

data/lib/rbgccxml/nodes/argument.rb

@@ -10,7 +10,7 @@ module RbGCCXML
 
     # Get any default value for this argument
     def value
-      attributes["default"]
+      self["default"]
     end
 
     # See Node#to_cpp, prints out C++ code for this argument

data/lib/rbgccxml/nodes/class.rb

@@ -9,7 +9,7 @@ module RbGCCXML
 
     # Is this class pure virtual?
     def pure_virtual?
-      @node.attributes["abstract"] ? @node.attributes["abstract"] == "1" : false
+      @node["abstract"] ? @node["abstract"] == "1" : false
     end
 
     # Find all the constructors for this class. 

data/lib/rbgccxml/nodes/enum_value.rb

@@ -8,7 +8,7 @@ module RbGCCXML
 
     # Get the defined value of this EnumValue
     def value
-      node.attributes["init"].to_i
+      node["init"].to_i
     end
 
     # The qualified name of an EnumValue doesn't

data/lib/rbgccxml/nodes/method.rb

@@ -5,17 +5,17 @@ module RbGCCXML
 
     # Is this method static?
     def static?
-      @node.attributes["static"] == "1"
+      @node["static"] == "1"
     end
 
     # Is this a virtual method?
     def virtual?
-      @node.attributes["virtual"] == "1"
+      @node["virtual"] == "1"
     end
 
     # Is this a pure virtual method? A purely virtual method has no body.
     def purely_virtual?
-      @node.attributes["pure_virtual"] == "1"
+      @node["pure_virtual"] == "1"
     end
 
   end

data/lib/rbgccxml/nodes/types/array_type.rb

@@ -21,7 +21,7 @@ module RbGCCXML
     # See Node#to_cpp
     def to_cpp(qualified = true)
       type = XMLParsing.find_type_of(self.node, "type")
-      "#{type.to_cpp(qualified)}[#{self.node.attributes["max"].gsub(/[^\d]/, '').to_i + 1}]"
+      "#{type.to_cpp(qualified)}[#{self.node["max"].gsub(/[^\d]/, '').to_i + 1}]"
     end
 
   end

data/lib/rbgccxml/nodes/types/cv_qualified_type.rb

@@ -16,7 +16,7 @@ module RbGCCXML
 
     # Is this node const?
     def const?
-      self.node.attributes["const"].to_i == 1
+      self.node["const"].to_i == 1
     end
 
   end

data/lib/rbgccxml/nodes/union.rb

@@ -0,0 +1,7 @@
+module RbGCCXML
+
+  # Represents a <Union> node
+  class Union < Node
+  end
+
+end

data/lib/rbgccxml/parser.rb

@@ -1,4 +1,4 @@
-require 'libxml'
+require 'nokogiri'
 
 module RbGCCXML
 
@@ -58,10 +58,9 @@ module RbGCCXML
         xml_file = @xml_file
       end
 
-      document = LibXML::XML::Document.file(xml_file)
-      root = document.root
+      document = Nokogiri::XML(::File.read(xml_file))
       # Everything starts at the :: Namespace
-      global_ns = root.find("//Namespace[@name='::']")[0]
+      global_ns = document.search("//Namespace[@name='::']")[0]
       XMLParsing.doc_root = document
       Namespace.new global_ns
     end

data/lib/rbgccxml/query_result.rb

@@ -125,7 +125,7 @@ module RbGCCXML
         # Access type
         if access
           found[:access] ||= []
-          found[:access] << node if node.attributes["access"] == access.to_s
+          found[:access] << node if node["access"] == access.to_s
         end
       end
 

data/lib/rbgccxml/xml_parsing.rb

@@ -40,7 +40,7 @@ module RbGCCXML
       attrs = options.map {|key, value| "[@#{key}='#{value}']"}.join
       xpath = "//#{type || '*'}#{attrs}"
       
-      got = @@doc_root.find(xpath).first
+      got = @@doc_root.search(xpath).first
 
       if got
         result = build_type(type || got.name, got)
@@ -73,9 +73,9 @@ module RbGCCXML
       type = options.delete(:node_type)
       attrs = options.map {|key, value| "[@#{key}='#{value}']"}.join
 
-      xpath = "//#{type}#{attrs}"
+      xpath = "//#{type || "*"}#{attrs}"
       
-      found = @@doc_root.find(xpath)
+      found = @@doc_root.search(xpath)
       
       if found
         found.each do |got|
@@ -91,7 +91,7 @@ module RbGCCXML
     #
     # Returns a QueryResult with the findings.
     def self.find_nested_nodes_of_type(node, node_type)
-      self.find_all(:node_type => node_type, :context => node.attributes["id"])
+      self.find_all(:node_type => node_type, :context => node["id"])
     end
 
     # Arguments are a special case in gccxml as they are actual children of
@@ -107,7 +107,7 @@ module RbGCCXML
       bases = get_children_nodes_of_type(node, "Base")
 
       if access_type
-        bases = bases.select {|b| b.attributes["access"] == access_type.to_s }
+        bases = bases.select {|b| b["access"] == access_type.to_s }
       end
 
       bases.map {|b| b.cpp_type }
@@ -138,7 +138,7 @@ module RbGCCXML
     #   +find_type_of(func_node, "returns")+ could return "std::string" node, "int" node, etc
     #
     def self.find_type_of(node, attr)
-      self.find(:id => node.attributes[attr])
+      self.find(:id => node[attr])
     end
 
     private

data/lib/rbgccxml.rb

@@ -27,6 +27,8 @@ module RbGCCXML
   autoload :Struct,           "rbgccxml/nodes/struct" 
   autoload :Variable,         "rbgccxml/nodes/variable" 
 
+  autoload :Union,            "rbgccxml/nodes/union"
+
   # Type Management
   autoload :Type,             "rbgccxml/nodes/type"
   autoload :Typedef,          "rbgccxml/nodes/types/typedef" 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rbgccxml
 version: !ruby/object:Gem::Version 
-  version: "0.9"
+  version: 0.9.1
 platform: ruby
 authors: 
 - Jason Roelofs
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 -04:00
+date: 2009-12-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: libxml-ruby
+  name: nokogiri
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.1"
+        version: 1.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: gccxml_gem
@@ -32,6 +32,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.9"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.2.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.9"
+    version: 
 description: |
   Rbgccxml is a library that parses out GCCXML (http://www.gccxml.org) output
   and provides a simple but very powerful querying API for finding exactly
@@ -58,6 +78,7 @@ files:
 - lib/rbgccxml/nodes/field.rb
 - lib/rbgccxml/nodes/file.rb
 - lib/rbgccxml/nodes/base.rb
+- lib/rbgccxml/nodes/union.rb
 - lib/rbgccxml/nodes/types/reference_type.rb
 - lib/rbgccxml/nodes/types/array_type.rb
 - lib/rbgccxml/nodes/types/typedef.rb