rbgccxml 0.8 → 0.9

data/test/test_helper.rb

@@ -1,6 +1,14 @@
-$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
+
+begin
+  # 1.9 needs this for test/spec to work
+  gem 'test-unit'
+rescue LoadError
+  # Probably 1.8.x, we're ok
+end
+
 require 'test/spec'
 require 'rbgccxml'
 
@@ -13,6 +21,6 @@ class Test::Unit::TestCase
   def teardown
     RbGCCXML::XMLParsing.clear_cache
   end
-
+  
 end
 

data/test/types_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require "test_helper"
 
 context "Proper Type handling" do
 
@@ -7,59 +7,67 @@ context "Proper Type handling" do
   end
 
   specify "fundamental types" do
-    assert @@types_source.functions.find(:returns => "int") == "returnsInt"
-    assert @@types_source.functions.find(:returns => "float") == "returnsFloat"
+    @@types_source.functions.find(:returns => "int").length.should.equal 2
+    @@types_source.functions.find(:returns => "float").name.should.equal "returnsFloat"
   end
 
   xspecify "unsigned fundamental types" do
   end
 
   specify "typedefs" do
-    assert @@types_source.functions.find(:returns => "myLongType") == "returnsLongType"
-    assert @@types_source.functions.find(:returns => "myShortType") == "returnsShortType"
+    @@types_source.functions.find(:returns => "myLongType").name.should.equal "returnsLongType"
+    @@types_source.functions.find(:returns => "myShortType").name.should.equal "returnsShortType"
   end
 
   specify "user defined types (classes / structs)" do
-    assert @@types_source.functions.find(:returns => "user_type") == "returnsUserType"
-    assert @@types_source.functions.find(:returns => "struct_type") == "returnsStructType"
+    @@types_source.functions.find(:returns => "user_type").name.should.equal "returnsUserType"
+    @@types_source.functions.find(:returns => "struct_type").length.should.equal 2
   end
 
-  # Are these three necessary or can it be just one?
   specify "pointers to user defined types" do
-    assert @@types_source.functions.find(:returns => "user_type*") == "returnsUserTypePointer"
-    assert @@types_source.functions.find(:returns => "struct_type*") == "returnsStructTypePointer"
+    @@types_source.functions.find(:returns => "user_type*").name.should.equal "returnsUserTypePointer"
+    @@types_source.functions.find(:returns => "struct_type*").name.should.equal "returnsStructTypePointer"
   end
 
   specify "pointers to fundamental types" do
-    assert @@types_source.functions.find(:returns => "int*") == "returnsIntPointer"
+    @@types_source.functions.find(:returns => "int*").length.should.equal 2
   end
 
   specify "pointers to typedefs" do
-    assert @@types_source.functions.find(:returns => "myLongType*") == "returnsLongTypePointer"
+    @@types_source.functions.find(:returns => "myLongType*").name.should.equal "returnsLongTypePointer"
   end
 
   specify "reference types" do
-    assert @@types_source.functions.find(:returns => "struct_type&") == "returnStructReference"
+    @@types_source.functions.find(:returns => "struct_type&").name.should.equal "returnStructReference"
   end
 
   specify "const definitions (fundamental types)" do
-    assert @@types_source.functions.find(:returns => "const int") == "returnConstInt"
+    @@types_source.functions.find(:returns => "const int").name.should.equal "returnConstInt"
   end
 
   specify "const definitions (defined types)" do
-    assert @@types_source.functions.find(:returns => "const struct_type") == "returnConstStruct"
+    @@types_source.functions.find(:returns => "const struct_type").name.should.equal "returnConstStruct"
   end
 
   specify "const references" do
-    assert @@types_source.functions.find(:returns => "const user_type&") == "returnConstUserTypeRef"
+    @@types_source.functions.find(:returns => "const user_type&").name.should.equal "returnConstUserTypeRef"
   end
 
   specify "const pointers" do
-    assert @@types_source.functions.find(:returns => "const int*") == "returnConstIntPointer"
+    @@types_source.functions.find(:returns => "const int*").name.should.equal "returnConstIntPointer"
   end
 
   specify "enumerations" do
-    assert @@types_source.functions.find(:returns => "myEnum") == "returnMyEnum"
+    @@types_source.functions.find(:returns => "myEnum").name.should.equal "returnMyEnum"
+  end
+
+  specify "arrays" do
+    @@types_source.functions.find(:arguments => ["int[4]*"]).name.should.equal "usesIntArray"
+  end
+
+  specify "function pointers" do
+    @@types_source.functions.find(:arguments => ["Callback"]).name.should.equal "takesCallback"
+    @@types_source.functions.find(:arguments => ["CallbackWithReturn"]).name.should.equal "takesCallbackWithReturn"
   end
 
 end
@@ -71,49 +79,66 @@ context "Printing types" do
   end
 
   specify "types should print back properly into string format" do
-    @@types_source.functions.find(:returns => "int").return_type.to_s.should == "int"
-    @@types_source.functions.find(:returns => "int").return_type.to_s(true).should == "int"
+    @@types_source.functions("returnsInt").return_type.name.should == "int"
+    @@types_source.functions("returnsInt").return_type.to_cpp.should == "int"
 
-    @@types_source.functions.find(:returns => "float").return_type.to_s.should == "float"
+    @@types_source.functions("returnsFloat").return_type.name.should == "float"
 
     # pointers
-    @@types_source.functions.find(:returns => "int*").return_type.to_s.should == "int*"
+    @@types_source.functions("returnsIntPointer").return_type.to_cpp.should == "int*"
 
     # references
-    @@types_source.functions.find(:returns => "struct_type&").return_type.to_s.should == "struct_type&"
-    @@types_source.functions.find(:returns => "struct_type&").return_type.to_s(true).should == "types::struct_type&"
+    @@types_source.functions("returnStructReference").return_type.to_cpp.should == "types::struct_type&"
+    @@types_source.functions("returnStructReference").return_type.to_cpp(false).should == "struct_type&"
     
     # printout full from the global namespace
-    @@types_source.functions.find(:returns => "string").return_type.to_s(true).should == "others::string"
+    @@types_source.functions("returnsString").return_type.to_cpp.should == "others::string"
+    @@types_source.functions("returnsString").return_type.to_cpp(false).should == "string"
 
     # const
-    @@types_source.functions.find(:returns => "const int").return_type.to_s.should == "const int"
+    @@types_source.functions("returnConstInt").return_type.to_cpp.should == "const int"
     
     # const pointers
-    @@types_source.functions.find(:returns => "const int*").return_type.to_s.should == "const int*"
+    @@types_source.functions("returnConstIntPointer").return_type.to_cpp.should == "const int*"
 
     # const references
-    @@types_source.functions.find(:returns => "const user_type&").return_type.to_s.should == "const user_type&"
-    @@types_source.functions.find(:returns => "const user_type&").return_type.to_s(true).should == "const types::user_type&"
+    @@types_source.functions("returnConstUserTypeRef").return_type.to_cpp.should == "const types::user_type&"
+    @@types_source.functions("returnConstUserTypeRef").return_type.to_cpp(false).should == "const user_type&"
 
     # Enumerations
-    @@types_source.functions.find(:returns => "myEnum").return_type.to_s.should == "myEnum"
-    @@types_source.functions.find(:returns => "myEnum").return_type.to_s(true).should == "types::myEnum"
+    @@types_source.functions("returnMyEnum").return_type.name.should == "myEnum"
+    @@types_source.functions("returnMyEnum").return_type.to_cpp.should == "types::myEnum"
+
+    # Array Types
+    @@types_source.functions("usesIntArray").arguments[0].name.should == "input"
+    @@types_source.functions("usesIntArray").arguments[0].to_cpp.should == "int[4]* input"
   end
 
   specify "can get to the base C++ construct of given types" do
-    @@types_source.functions.find(:returns => "const user_type&").return_type.base_type.to_s.should == "user_type"
-    @@types_source.functions.find(:returns => "const int*").return_type.base_type.to_s.should == "int"
+    @@types_source.functions.find(:returns => "const user_type&").return_type.base_type.name.should == "user_type"
+    @@types_source.functions.find(:returns => "const int*").return_type.base_type.name.should == "int"
+  end
+
+  specify "can get types of class ivars" do
+    @@types_source.classes("user_type").variables("var1").cpp_type.name.should == "int"
+    @@types_source.classes("user_type").variables("var2").cpp_type.name.should == "float"
+
+    @@types_source.structs("struct_type").variables("myType").cpp_type.to_cpp.should == "types::user_type"
   end
 
 end
 
 context "Type comparitors" do
+  setup do
+    @@types_source ||= RbGCCXML.parse(full_dir("headers/types.h")).namespaces("types")
+  end
+
   specify "can tell of a given type is a const" do
-    assert @@types_source.functions.find(:returns => "const user_type&").return_type.const?
-    assert @@types_source.functions.find(:returns => "const int*").return_type.const?
-    assert !@@types_source.functions.find(:returns => "user_type").return_type.const?
-    assert !@@types_source.functions.find(:returns => "string").return_type.const?
-    assert !@@types_source.functions.find(:returns => "int").return_type.const?
+    assert @@types_source.functions("returnConstUserTypeRef").return_type.const?
+    assert @@types_source.functions("returnConstIntPointer").return_type.const?
+    assert !@@types_source.functions("returnsUserType").return_type.const?
+
+    assert !@@types_source.functions("returnsString").return_type.const?
+    assert !@@types_source.functions("returnsInt").return_type.const?
   end
 end

data/test/variables_test.rb

@@ -0,0 +1,26 @@
+require "test_helper"
+
+context "Querying for variables" do
+
+  setup do
+    @@variables_source ||= RbGCCXML.parse(full_dir("headers/classes.h")).namespaces("classes")
+  end
+
+  specify "find global variables and constants" do
+    @@variables_source.variables.length.should.equal 2
+  end
+
+  specify "find class variables" do
+    test1 = @@variables_source.classes("Test1")
+    test1.variables.length.should.equal 4
+    test1.variables.find(:access => :public).length.should.equal 2
+    assert test1.variables("publicVariable")
+    assert test1.variables("publicVariable2")
+  end
+
+  specify "can also find constants" do
+    test1 = @@variables_source.classes("Test1")
+    test1.constants.length.should.equal 1
+    assert test1.constants("CONST") 
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rbgccxml
 version: !ruby/object:Gem::Version 
-  version: "0.8"
+  version: "0.9"
 platform: ruby
 authors: 
 - Jason Roelofs
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-22 00:00:00 -04:00
+date: 2009-10-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: libxml-ruby
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.6"
+        version: "1.1"
     version: 
 - !ruby/object:Gem::Dependency 
   name: gccxml_gem
@@ -28,11 +28,15 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.1
+        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 what you want out of the C++ source code
+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
+  what you want out of the C++ source code
+
 email: jameskilton@gmail.com
 executables: []
 
@@ -43,31 +47,39 @@ extra_rdoc_files: []
 files: 
 - TODO
 - Rakefile
+- lib/rbgccxml.rb
+- lib/jamis.rb
+- lib/rbgccxml/rbgccxml.rb
 - lib/rbgccxml/parser.rb
+- lib/rbgccxml/query_result.rb
+- lib/rbgccxml/node.rb
+- lib/rbgccxml/xml_parsing.rb
+- lib/rbgccxml/nodes/function_type.rb
+- lib/rbgccxml/nodes/field.rb
+- lib/rbgccxml/nodes/file.rb
+- lib/rbgccxml/nodes/base.rb
 - lib/rbgccxml/nodes/types/reference_type.rb
+- lib/rbgccxml/nodes/types/array_type.rb
+- lib/rbgccxml/nodes/types/typedef.rb
 - lib/rbgccxml/nodes/types/cv_qualified_type.rb
-- lib/rbgccxml/nodes/types/fundamental_type.rb
 - lib/rbgccxml/nodes/types/pointer_type.rb
-- lib/rbgccxml/nodes/types/typedef.rb
-- lib/rbgccxml/nodes/struct.rb
-- lib/rbgccxml/nodes/function.rb
-- lib/rbgccxml/nodes/file.rb
+- lib/rbgccxml/nodes/types/fundamental_type.rb
+- lib/rbgccxml/nodes/argument.rb
 - lib/rbgccxml/nodes/enumeration.rb
+- lib/rbgccxml/nodes/function.rb
+- lib/rbgccxml/nodes/enum_value.rb
+- lib/rbgccxml/nodes/variable.rb
 - lib/rbgccxml/nodes/namespace.rb
-- lib/rbgccxml/nodes/argument.rb
-- lib/rbgccxml/nodes/type.rb
+- lib/rbgccxml/nodes/destructor.rb
+- lib/rbgccxml/nodes/struct.rb
 - lib/rbgccxml/nodes/constructor.rb
 - lib/rbgccxml/nodes/method.rb
+- lib/rbgccxml/nodes/type.rb
 - lib/rbgccxml/nodes/class.rb
-- lib/rbgccxml/nodes/enum_value.rb
-- lib/rbgccxml/query_result.rb
-- lib/rbgccxml/xml_parsing.rb
-- lib/rbgccxml/node.rb
-- lib/rbgccxml/rbgccxml.rb
-- lib/jamis.rb
-- lib/rbgccxml.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://rbplusplus.rubyforge.org/rbgccxml
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -88,19 +100,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rbplusplus
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby interface to GCCXML
 test_files: 
-- test/classes_test.rb
-- test/node_test.rb
+- test/enumerations_test.rb
+- test/query_results_test.rb
 - test/methods_test.rb
-- test/structs_test.rb
+- test/namespaces_test.rb
 - test/parser_test.rb
-- test/enumerations_test.rb
+- test/variables_test.rb
+- test/arguments_test.rb
 - test/functions_test.rb
 - test/test_helper.rb
+- test/node_test.rb
+- test/structs_test.rb
 - test/types_test.rb
-- test/query_results_test.rb
-- test/namespaces_test.rb
+- test/classes_test.rb
+- test/function_pointers_test.rb