rbgccxml 1.0.1 → 1.0.2

data/Rakefile

@@ -1,12 +1,8 @@
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/contrib/sshpublisher'
-require 'rake/gempackagetask'
 
 require 'rspec/core/rake_task'
 
-PROJECT_NAME = "rbgccxml"
-RBGCCXML_VERSION = "1.0.1"
-
 task :default => :spec
 
 desc "Run all specs"
@@ -35,7 +31,7 @@ namespace :web do
   end
 
   # As part of the rbplusplus project, this just goes in a subfolder
-  desc "Update the website" 
+  desc "Update the website"
   task :upload => "web:build"  do |t|
     Rake::SshDirPublisher.new("#{RUBYFORGE_USERNAME}@rubyforge.org", PROJECT_WEB_PATH, "publish").upload
   end
@@ -45,37 +41,3 @@ namespace :web do
     rm_rf "publish"
   end
 end
-
-spec = Gem::Specification.new do |s|
-  s.name = PROJECT_NAME
-  s.version = RBGCCXML_VERSION
-  s.summary = 'Ruby interface to GCCXML'
-  s.homepage = 'http://rbplusplus.rubyforge.org/rbgccxml'
-  s.rubyforge_project = "rbplusplus"
-  s.author = 'Jason Roelofs'
-  s.email = 'jameskilton@gmail.com'
-  
-  s.add_dependency "nokogiri", "~> 1.4.0"
-  s.add_dependency "gccxml_gem", "~> 0.9"
-
-  s.description = <<-END
-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
-  END
-
-  patterns = [
-    'TODO',
-    'Rakefile',
-    'lib/**/*.rb',
-  ]
-
-  s.files = patterns.map {|p| Dir.glob(p) }.flatten
-
-  s.test_files = Dir.glob('spec/**/*.rb')
-
-  s.require_paths = ['lib']
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-end

data/lib/rbgccxml/nodes/class.rb

@@ -43,11 +43,13 @@ module RbGCCXML
     # Like #superclass above, this will find all superclasses for this class.
     # Functions the same as #superclass except this method always returns a QueryResult
     def superclasses(access_type = nil)
-      [
-        NodeCache.find_children_of_type(self, "Base").select do |base|
-          access_type.nil? ? true : base.send("#{access_type}?")
-        end
-      ].flatten.map {|base| base.cpp_type }
+      QueryResult.new(
+        [
+          NodeCache.find_children_of_type(self, "Base").select do |base|
+            access_type.nil? ? true : base.send("#{access_type}?")
+          end
+        ].flatten.map {|base| base.cpp_type }
+      )
     end
 
     # Find all methods for this class. See Node#namespaces

data/lib/rbgccxml/nodes/enumeration.rb

@@ -6,7 +6,7 @@ module RbGCCXML
 
     # Get the list of EnumValues for this enumeration
     def values
-      children
+      QueryResult.new children
     end
 
     # Is this enumeration anonymous? As in, does it have a name or is

data/lib/rbgccxml/nodes/function.rb

@@ -3,17 +3,17 @@ module RbGCCXML
   # Represents a <Function> node, a global or namespaced function
   # or static class functions.
   class Function < Node
-    
+
     # First of all, no more querying once you're this far in
     %w(classes namespaces functions).each do |f|
       define_method(f) do
         raise NotQueryableException.new("Cannot query for #{f} while in a Function")
       end
     end
-    
+
     # Get the list of Arguments for this Function.
     def arguments
-      children
+      QueryResult.new children
     end
 
     # Get the Node representing this Function's return type

data/spec/arguments_test.rb

@@ -25,5 +25,10 @@ describe "Function and Method Arguments" do
     rockin = @arguments_source.functions("rockin")
     rockin.arguments[1].value.should == "functions::test()"
   end
+
+  specify "should be a QueryResult" do
+    test = @arguments_source.functions("test1")
+    test.arguments.should be_a_kind_of(RbGCCXML::QueryResult)
+  end
 end
 

data/spec/classes_test.rb

@@ -163,6 +163,7 @@ describe "Query inheritance heirarchy" do
   specify "can query for multiple inheritance" do
     multi = @source.classes("MultiBase")
     multi.superclasses.length.should == 2
+    multi.superclasses.should be_a_kind_of(RbGCCXML::QueryResult)
     multi.superclasses.select {|sp| sp.name == "ParentClass"}.should_not be_nil
     multi.superclasses.select {|sp| sp.name == "Parent2"}.should_not be_nil
   end

data/spec/enumerations_test.rb

@@ -46,5 +46,10 @@ describe "Querying for enumerations" do
     found.values[2].value.should == 2
   end
 
+  specify "should be a QueryResult" do
+    enum = @enum_source.enumerations("TestEnum")
+    enum.values.length.should == 3
+    enum.values.should be_a_kind_of(RbGCCXML::QueryResult)
+  end
 end
 

metadata

@@ -1,67 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rbgccxml
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
+version: !ruby/object:Gem::Version
+  version: 1.0.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jason Roelofs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-17 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-06 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &6465030 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: gccxml_gem
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *6465030
+- !ruby/object:Gem::Dependency
+  name: gccxml_gem
+  requirement: &6464790 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
-  version_requirements: *id002
-description: |
-  Rbgccxml is a library that parses out GCCXML (http://www.gccxml.org) output
+  prerelease: false
+  version_requirements: *6464790
+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: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - TODO
 - Rakefile
 - lib/jamis.rb
@@ -112,41 +96,31 @@ files:
 - spec/test_helper.rb
 - spec/types_test.rb
 - spec/variables_test.rb
-has_rdoc: true
 homepage: http://rbplusplus.rubyforge.org/rbgccxml
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rbplusplus
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Ruby interface to GCCXML
-test_files: 
+test_files:
 - spec/arguments_test.rb
 - spec/classes_test.rb
 - spec/enumerations_test.rb