rbgccxml 0.9.1 → 1.0

data/test/structs_test.rb

@@ -1,58 +1,57 @@
 require "test_helper"
 
-context "Querying for structs" do
-  setup do
-    @@structs_source ||= RbGCCXML.parse(full_dir("headers/structs.h")).namespaces("structs")
+describe "Querying for structs" do
+  before(:all) do
+    @structs_source = RbGCCXML.parse(full_dir("headers/structs.h")).namespaces("structs")
   end
 
   specify "can find all structs in a given namespace" do
-    structs = @@structs_source.structs
+    structs = @structs_source.structs
     structs.size.should == 3 
 
-    %w(Test1 Test2 Test3).each do |t|
-      assert structs.detect {|c| c.node == @@structs_source.structs(t).node }, 
-        "unable to find node for #{t}"
-    end
+    @structs_source.structs("Test1").should_not be_nil
+    @structs_source.structs("Test2").should_not be_nil
+    @structs_source.structs("Test3").should_not be_nil
   end
 
   specify "can find structs within structs" do
-    test1 = @@structs_source.structs.find(:name => "Test1")
-    test1.should.not.be.nil
+    test1 = @structs_source.structs.find(:name => "Test1")
+    test1.should_not be_nil
     
     inner1 = test1.structs("Inner1")
-    inner1.should.not.be.nil
+    inner1.should_not be_nil
     
     inner2 = inner1.structs("Inner1")
-    inner2.should.not.be.nil
+    inner2.should_not be_nil
   end
 end
 
-context "Querying for struct constructors" do
-  setup do
-    @@structs_source ||= RbGCCXML.parse(full_dir("headers/structs.h")).namespaces("structs")
+describe "Querying for struct constructors" do
+  before(:all) do
+    @structs_source = RbGCCXML.parse(full_dir("headers/structs.h")).namespaces("structs")
   end
 
   specify "should have a list of constructors" do
-    test1 = @@structs_source.structs.find(:name => "Test1")
+    test1 = @structs_source.structs.find(:name => "Test1")
     test1.constructors.size.should == 2
 
-    test2 = @@structs_source.structs.find(:name => "Test2")
+    test2 = @structs_source.structs.find(:name => "Test2")
     test2.constructors.size.should == 3
   end
 
   specify "constructors should have arguments" do
-    test2 = @@structs_source.structs.find(:name => "Test2")
+    test2 = @structs_source.structs.find(:name => "Test2")
 
     # GCC generated copy constructors
     copy = test2.constructors[0]
-    copy.attributes[:artificial].should == "1"
+    copy.artificial?.should be_true
 
     default = test2.constructors[1]
     default.arguments.size.should == 0
 
     specific = test2.constructors[2]
     specific.arguments.size.should == 1
-    specific.arguments[0].cpp_type.name.should.equal "int"
+    specific.arguments[0].cpp_type.name.should == "int"
   end
 end
 

data/test/test_helper.rb

@@ -1,26 +1,13 @@
-$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 'rspec'
 require 'rbgccxml'
 
-class Test::Unit::TestCase
-
+module FileDirectoryHelpers
   def full_dir(path)
     File.expand_path(File.join(File.dirname(__FILE__), path))
   end
-  
-  def teardown
-    RbGCCXML::XMLParsing.clear_cache
-  end
-  
 end
 
+RSpec.configure do |config|
+  config.include(FileDirectoryHelpers)
+end

data/test/types_test.rb

@@ -1,144 +1,146 @@
 require "test_helper"
 
-context "Proper Type handling" do
+describe "Proper Type handling" do
 
-  setup do
-    @@types_source ||= RbGCCXML.parse(full_dir("headers/types.h")).namespaces("types")
+  before(:all) do
+    @types_source = RbGCCXML.parse(full_dir("headers/types.h")).namespaces("types")
   end
 
   specify "fundamental types" do
-    @@types_source.functions.find(:returns => "int").length.should.equal 2
-    @@types_source.functions.find(:returns => "float").name.should.equal "returnsFloat"
-  end
+    @types_source.functions.find(:returns => "int").length.should == 2
+    @types_source.functions.find(:returns => "float").name.should == "returnsFloat"
 
-  xspecify "unsigned fundamental types" do
+    @types_source.functions("noReturnWithSizeT").arguments[0].to_cpp.should == "::size_t arg"
   end
 
+  specify "unsigned fundamental types"
+
   specify "typedefs" do
-    @@types_source.functions.find(:returns => "myLongType").name.should.equal "returnsLongType"
-    @@types_source.functions.find(:returns => "myShortType").name.should.equal "returnsShortType"
+    @types_source.functions.find(:returns => "myLongType").name.should == "returnsLongType"
+    @types_source.functions.find(:returns => "myShortType").name.should == "returnsShortType"
   end
 
   specify "user defined types (classes / structs)" do
-    @@types_source.functions.find(:returns => "user_type").name.should.equal "returnsUserType"
-    @@types_source.functions.find(:returns => "struct_type").length.should.equal 2
+    @types_source.functions.find(:returns => "user_type").name.should == "returnsUserType"
+    @types_source.functions.find(:returns => "struct_type").length.should == 2
   end
 
   specify "pointers to user defined types" do
-    @@types_source.functions.find(:returns => "user_type*").name.should.equal "returnsUserTypePointer"
-    @@types_source.functions.find(:returns => "struct_type*").name.should.equal "returnsStructTypePointer"
+    @types_source.functions.find(:returns => "user_type*").name.should == "returnsUserTypePointer"
+    @types_source.functions.find(:returns => "struct_type*").name.should == "returnsStructTypePointer"
   end
 
   specify "pointers to fundamental types" do
-    @@types_source.functions.find(:returns => "int*").length.should.equal 2
+    @types_source.functions.find(:returns => "int*").length.should == 2
   end
 
   specify "pointers to typedefs" do
-    @@types_source.functions.find(:returns => "myLongType*").name.should.equal "returnsLongTypePointer"
+    @types_source.functions.find(:returns => "myLongType*").name.should == "returnsLongTypePointer"
   end
 
   specify "reference types" do
-    @@types_source.functions.find(:returns => "struct_type&").name.should.equal "returnStructReference"
+    @types_source.functions.find(:returns => "struct_type&").name.should == "returnStructReference"
   end
 
   specify "const definitions (fundamental types)" do
-    @@types_source.functions.find(:returns => "const int").name.should.equal "returnConstInt"
+    @types_source.functions.find(:returns => "const int").name.should == "returnConstInt"
   end
 
   specify "const definitions (defined types)" do
-    @@types_source.functions.find(:returns => "const struct_type").name.should.equal "returnConstStruct"
+    @types_source.functions.find(:returns => "const struct_type").name.should == "returnConstStruct"
   end
 
   specify "const references" do
-    @@types_source.functions.find(:returns => "const user_type&").name.should.equal "returnConstUserTypeRef"
+    @types_source.functions.find(:returns => "const user_type&").name.should == "returnConstUserTypeRef"
   end
 
   specify "const pointers" do
-    @@types_source.functions.find(:returns => "const int*").name.should.equal "returnConstIntPointer"
+    @types_source.functions.find(:returns => "const int*").name.should == "returnConstIntPointer"
   end
 
   specify "enumerations" do
-    @@types_source.functions.find(:returns => "myEnum").name.should.equal "returnMyEnum"
+    @types_source.functions.find(:returns => "myEnum").name.should == "returnMyEnum"
   end
 
   specify "arrays" do
-    @@types_source.functions.find(:arguments => ["int[4]*"]).name.should.equal "usesIntArray"
+    @types_source.functions.find(:arguments => ["int[4]*"]).name.should == "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"
+    @types_source.functions.find(:arguments => ["Callback"]).name.should == "takesCallback"
+    @types_source.functions.find(:arguments => ["CallbackWithReturn"]).name.should == "takesCallbackWithReturn"
   end
 
 end
 
-context "Printing types" do
+describe "Printing types" do
   
-  setup do
-    @@types_source ||= RbGCCXML.parse(full_dir("headers/types.h")).namespaces("types")
+  before(:all) do
+    @types_source = RbGCCXML.parse(full_dir("headers/types.h")).namespaces("types")
   end
 
   specify "types should print back properly into string format" do
-    @@types_source.functions("returnsInt").return_type.name.should == "int"
-    @@types_source.functions("returnsInt").return_type.to_cpp.should == "int"
+    @types_source.functions("returnsInt").return_type.name.should == "int"
+    @types_source.functions("returnsInt").return_type.to_cpp.should == "int"
 
-    @@types_source.functions("returnsFloat").return_type.name.should == "float"
+    @types_source.functions("returnsFloat").return_type.name.should == "float"
 
     # pointers
-    @@types_source.functions("returnsIntPointer").return_type.to_cpp.should == "int*"
+    @types_source.functions("returnsIntPointer").return_type.to_cpp.should == "int*"
 
     # references
-    @@types_source.functions("returnStructReference").return_type.to_cpp.should == "types::struct_type&"
-    @@types_source.functions("returnStructReference").return_type.to_cpp(false).should == "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("returnsString").return_type.to_cpp.should == "others::string"
-    @@types_source.functions("returnsString").return_type.to_cpp(false).should == "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("returnConstInt").return_type.to_cpp.should == "const int"
+    @types_source.functions("returnConstInt").return_type.to_cpp.should == "const int"
     
     # const pointers
-    @@types_source.functions("returnConstIntPointer").return_type.to_cpp.should == "const int*"
+    @types_source.functions("returnConstIntPointer").return_type.to_cpp.should == "const int*"
 
     # const references
-    @@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&"
+    @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&"
+
+    # const const
+    @types_source.functions("withConstPtrConst").arguments[0].to_cpp.should == "const types::user_type* const arg1"
+    @types_source.functions("withConstPtrConst").arguments[0].to_cpp(false).should == "const user_type* const arg1"
 
     # Enumerations
-    @@types_source.functions("returnMyEnum").return_type.name.should == "myEnum"
-    @@types_source.functions("returnMyEnum").return_type.to_cpp.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"
+    @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.name.should == "user_type"
-    @@types_source.functions.find(:returns => "const int*").return_type.base_type.name.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.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"
+    @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
-
+describe "Type comparitors" do
   specify "can tell of a given type is a const" do
-    assert @@types_source.functions("returnConstUserTypeRef").return_type.const?
-    assert @@types_source.functions("returnConstIntPointer").return_type.const?
-    assert !@@types_source.functions("returnsUserType").return_type.const?
+    @types_source ||= RbGCCXML.parse(full_dir("headers/types.h")).namespaces("types")
+    @types_source.functions("returnConstUserTypeRef").return_type.should be_const
+    @types_source.functions("returnConstIntPointer").return_type.should be_const
+    @types_source.functions("returnsUserType").return_type.should_not be_const
 
-    assert !@@types_source.functions("returnsString").return_type.const?
-    assert !@@types_source.functions("returnsInt").return_type.const?
+    @types_source.functions("returnsString").return_type.should_not be_const
+    @types_source.functions("returnsInt").return_type.should_not be_const
   end
 end

data/test/variables_test.rb

@@ -1,26 +1,26 @@
 require "test_helper"
 
-context "Querying for variables" do
+describe "Querying for variables" do
 
-  setup do
-    @@variables_source ||= RbGCCXML.parse(full_dir("headers/classes.h")).namespaces("classes")
+  before(:all) 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
+    @variables_source.variables.length.should == 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")
+    test1 = @variables_source.classes("Test1")
+    test1.variables.length.should == 4
+    test1.variables.find(:access => :public).length.should == 2
+    test1.variables("publicVariable").should_not be_nil
+    test1.variables("publicVariable2").should_not be_nil
   end
 
   specify "can also find constants" do
-    test1 = @@variables_source.classes("Test1")
-    test1.constants.length.should.equal 1
-    assert test1.constants("CONST") 
+    test1 = @variables_source.classes("Test1")
+    test1.constants.length.should == 1
+    test1.constants("CONST").should_not be_nil
   end
 end

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: rbgccxml
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  version: "1.0"
 platform: ruby
 authors: 
 - Jason Roelofs
@@ -9,49 +13,36 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 -05:00
+date: 2010-08-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 0
         version: 1.4.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gccxml_gem
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !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: 
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: gccxml_gem
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
         version: "0.9"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 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
@@ -67,36 +58,38 @@ 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/union.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/pointer_type.rb
-- lib/rbgccxml/nodes/types/fundamental_type.rb
+- lib/rbgccxml/node_cache.rb
 - lib/rbgccxml/nodes/argument.rb
+- lib/rbgccxml/nodes/base.rb
+- lib/rbgccxml/nodes/class.rb
+- lib/rbgccxml/nodes/constructor.rb
+- lib/rbgccxml/nodes/destructor.rb
+- lib/rbgccxml/nodes/enum_value.rb
 - lib/rbgccxml/nodes/enumeration.rb
+- lib/rbgccxml/nodes/field.rb
+- lib/rbgccxml/nodes/file.rb
 - lib/rbgccxml/nodes/function.rb
-- lib/rbgccxml/nodes/enum_value.rb
-- lib/rbgccxml/nodes/variable.rb
+- lib/rbgccxml/nodes/function_type.rb
+- lib/rbgccxml/nodes/method.rb
 - lib/rbgccxml/nodes/namespace.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/types/array_type.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/reference_type.rb
+- lib/rbgccxml/nodes/types/typedef.rb
+- lib/rbgccxml/nodes/union.rb
+- lib/rbgccxml/nodes/variable.rb
+- lib/rbgccxml/parser.rb
+- lib/rbgccxml/query_result.rb
+- lib/rbgccxml/rbgccxml.rb
+- lib/rbgccxml/sax_parser.rb
+- lib/rbgccxml.rb
+- lib/vendor/facets/once.rb
 has_rdoc: true
 homepage: http://rbplusplus.rubyforge.org/rbgccxml
 licenses: []
@@ -110,33 +103,35 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rbplusplus
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby interface to GCCXML
 test_files: 
+- test/arguments_test.rb
+- test/classes_test.rb
 - test/enumerations_test.rb
-- test/query_results_test.rb
+- test/function_pointers_test.rb
+- test/functions_test.rb
 - test/methods_test.rb
 - test/namespaces_test.rb
-- test/parser_test.rb
-- test/variables_test.rb
-- test/arguments_test.rb
-- test/functions_test.rb
-- test/test_helper.rb
 - test/node_test.rb
+- test/parser_test.rb
+- test/query_results_test.rb
 - test/structs_test.rb
+- test/test_helper.rb
 - test/types_test.rb
-- test/classes_test.rb
-- test/function_pointers_test.rb
+- test/variables_test.rb