rbplusplus 0.8 → 0.9

data/test/headers/function_pointers_class.h

@@ -0,0 +1,26 @@
+#ifndef __FUNC_POINTERS_CLASS_H__
+#define __FUNC_POINTERS_CLASS_H__
+
+namespace function_pointers_class {
+  
+  // With argument and returns a value
+  typedef int(*Callback) (int num);
+
+  class PointerTest {
+    public:
+      PointerTest() {}
+
+      void setCallback(Callback cb) {
+        mCallback = cb;
+      }
+
+      int callCallback(int num) {
+        return mCallback(num);
+      }
+
+    private:
+      Callback mCallback;
+  };
+}
+
+#endif

data/test/headers/needs_code.h

@@ -0,0 +1,10 @@
+#ifndef __NEEDS_CODE_H__
+#define __NEEDS_CODE_H__
+
+namespace needs_code {
+  const short getNumber(short in) {
+    return in;
+  }
+}
+
+#endif

data/test/headers/overload.h

@@ -20,9 +20,6 @@ namespace overload {
     }
     void nothing() {}
     void nothing(int x) {}
-    
-    const Mathy &self() const { return *this; }
-    Mathy &self() { return *this; }
   };
 }
 #endif

data/test/headers/subclass.h

@@ -38,5 +38,15 @@ namespace subclass {
     public:
     TemplatePtr() : TemplateSuper<Base*>(new Base()) {}
   };
+
+  class Base2 {
+    public:
+      Base2() {}
+  };
+
+  class Multiple : public Base, public Base2 {
+    public:
+      Multiple() {}
+  };
 }
 #endif

data/test/headers/to_from_ruby.h

@@ -51,6 +51,7 @@ namespace to_from_ruby {
   
   /* template tests */
   
+  /*
   template<class T>
   class TemplateClass {
     T val;
@@ -66,13 +67,14 @@ namespace to_from_ruby {
       }
   };
   
-  inline const TemplateClass<int> &getTemplate() {
-    return *(new TemplateClass<int>(1));
+  inline const TemplateClass<int>* getTemplate() {
+    return new TemplateClass<int>(1);
   }
   
-  inline const TemplateClass<int> &getTemplate(int overload) {
-    return *(new TemplateClass<int>(overload));
+  inline const TemplateClass<int>* getTemplate(int overload) {
+    return new TemplateClass<int>(overload);
   }
+  */
 }
 
 #endif 

data/test/headers/ugly_interface.h

@@ -1,6 +1,8 @@
 #ifndef __UGLY_H__
 #define __UGLY_H__
 
+namespace UI {
+
 /*
 Mapping should work for:
 ruby:
@@ -91,13 +93,6 @@ namespace DMath {
   }
 }
 
-struct C_STRUCT_Quaternion {
-  public:
-    int i() {
-      return -1;
-    }
-};
-
 namespace I_LEARN_C {
     inline int mod(int a, int b) {
       return a%b;
@@ -112,4 +107,6 @@ namespace I_LEARN_C {
     };
 } 
 
+}
+
 #endif

data/test/modules_test.rb

@@ -8,19 +8,24 @@ context "Extension with modules" do
       @@modules_built = true 
       Extension.new "modules" do |e|
         e.sources [
-          full_dir("headers/Adder.h"),
-          full_dir("headers/functions.h"),
-          full_dir("headers/Subtracter.hpp")
-        ]
+            full_dir("headers/Adder.h"),
+            full_dir("headers/functions.h"),
+            full_dir("headers/Subtracter.hpp")
+          ],
+          :include_source_files => [
+            full_dir("headers/Adder.h"),
+            full_dir("headers/Adder.cpp")
+          ]
 
-#        e.writer_mode :single
+        e.writer_mode :single
 
         e.module "Empty" do |m|
         end
 
         # Can use without a block
         wrapper = e.module "Wrapper"
-        wrapper.namespace "classes"
+        node = wrapper.namespace "classes"
+        node.classes("Adder").disable_typedef_lookup
 
         e.module "Functions" do |m|
           m.namespace "functions"

data/test/overloading_test.rb

@@ -6,7 +6,12 @@ context "Extension with overloaded methods" do
     Extension.new "overload" do |e|
       e.sources full_dir("headers/overload.h")
       node = e.namespace "overload"
-      node.classes("Mathy").methods("times")[0].wrap_as("times")
+      mathy = node.classes("Mathy")
+      mathy.methods("times")[0].wrap_as("times")
+
+      mathy.use_constructor(
+        mathy.constructors.find(:arguments => [:int])
+      )
     end
 
     require 'overload'
@@ -28,7 +33,6 @@ context "Extension with overloaded methods" do
     should.not.raise NameError do
       math.nothing_0
       math.nothing_1(1)
-      math.self_0.class.should == math.self_1.class
     end
 
   end

data/test/subclass_test.rb

@@ -5,27 +5,37 @@ context "Extension with class hierachies" do
   specify "should make super classes methods available" do
     Extension.new "subclass" do |e|
       e.sources full_dir("headers/subclass.h")
+
       node = e.namespace "subclass"
-      
       node.classes("SuperSuper").ignore
-      e.module("Sub") do |m|
-        node.classes.each do |c|
-          m.includes c
-        end
-      end
+
+      # Rice doesn't support multiple-inheritance (neither does Ruby), so for now
+      # until we can fake it, force people to specify
+      node.classes("Multiple").use_superclass( node.classes("Base2") )
     end
 
     require 'subclass'
+
+    # Ignored superclasses should not cause problems with wrapped subclasses
     should.not.raise NameError do
-      Sub::Base.new.one.should == Sub::Sub.new.one
-      Sub::Base.new.zero.should == Sub::Sub.new.zero
+      Base.new.one.should == Sub.new.one
+      Base.new.zero.should == Sub.new.zero
     end
+
+    # Template superclasses shouldn't cause problems
     should.not.raise NameError do
-      Sub::TemplateSub.new.zero.should == Sub::TemplateSub.new.custom
+      TemplateSub.new.zero.should == TemplateSub.new.custom
     end
+
     should.not.raise NameError do
-      Sub::TemplatePtr.new.custom
+      TemplatePtr.new.custom
     end
+
+    should.not.raise NameError do
+      Multiple.new
+    end
+
+    Multiple.superclass.should.equal Base2
   end
 
 end

data/test/test_helper.rb

@@ -4,6 +4,7 @@ $:.unshift File.expand_path(File.dirname(__FILE__) + "/generated")
 require 'rubygems'
 require 'test/spec'
 require 'rbplusplus'
+require 'mocha_standalone'
 
 include RbPlusPlus
 
@@ -15,10 +16,14 @@ class Test::Unit::TestCase
 
   def setup
     `rm -rf #{full_dir('generated')}/*`
+    Logger.stubs(:info)
+    Logger.stubs(:warn)
+    Logger.stubs(:error)
+    Logger.stubs(:debug)
   end
 
   def teardown
     RbGCCXML::XMLParsing.clear_cache
-    NodeCache.instance.clear
+    NodeCache.clear
   end
 end

data/test/to_from_ruby_test.rb

@@ -18,7 +18,5 @@ context "Properly build known required to_ruby and from_ruby methods" do
     c = WrappedClass.new
     c.get_my_type(17).value.should == 17
     c.overload_0.class.should == c.overload_1(0).class
-    
-    get_template_0(1).overload_0.should == get_template_1.overload_1(1)
   end
 end

data/test/wrap_as_test.rb

@@ -4,59 +4,52 @@ context "Ugly interfaces cleaner" do
 
   specify "should map functions detailed" do
     node = nil
-    
-    
+
     Extension.new "ui" do |e|
-      e.sources full_dir("headers/ugly_interface_ns.h"),
-                :includes => full_dir("headers/ugly_helper.h")
+      e.sources full_dir("headers/ugly_interface.h")
+
       node = e.namespace("UI")
-    
+
       # test the no export option
       node.functions("uiIgnore").ignore
-        
+
       # static method wrapping
-      node.functions("IlikeVectors").wrap_as("create_vector").calls("newInstanceButBetter")
-          
+      node.functions("IlikeVectors").wrap_as("create_vector")
+
       e.module "UI" do |m|
         m.module "Math" do |m_math|
           #function wrapping
           m_math.includes node.functions("uiAdd").wrap_as("add")
           # Wrap_as changes the name of the node
-          node.functions("add").ignored?.should == false
-          node.functions("add").moved?.should == true
-          
+
           m_math.includes node.functions("ui_Subtract").wrap_as("subtract")
           m_math.includes node.namespaces("DMath").functions("divide")
         end
-        
+
         #class wrapping
         vector = node.classes("C_UIVector").wrap_as("Vector")
         vector.methods("x_").wrap_as("x")
         vector.methods("set_x").wrap_as("x=")
-        
-        # This is ignored because the C function Vector_y is not defined
-        vector.methods("y_").calls("Vector_y").ignore
-        vector.methods("y_").qualified_name.should == "Vector_y"
-        
+
         m.includes vector
-        
+
         #mapping stray functions to singleton methods
         modder = node.namespaces("I_LEARN_C").classes("Modder").wrap_as("Modulus")
         modder.includes node.namespaces("I_LEARN_C").functions("mod")
         modder.includes node.namespaces("I_LEARN_C").functions("mod2").wrap_as("method_mod").as_instance_method
         m.includes modder
-        
+
         nc = node.classes("NoConstructor")
         nc.constructors.each { |c| c.ignore }
-        m.includes nc 
-        
+        m.includes nc
+
         m.includes node.classes("Outside")
         node.classes("Outside").includes node.classes("Inside")
       end
     end
-    
+
     require 'ui'
-    
+
     should.raise NoMethodError do
       ui_ignore()
     end
@@ -72,41 +65,39 @@ context "Ugly interfaces cleaner" do
     should.raise NoMethodError do
       ui_subtract(2,1)
     end
-    
+
     should.not.raise NoMethodError do
       UI::Math::subtract(2,1).should == 1
     end
-    
+
     should.raise NameError do
       C_UIVector.new
     end
-    
+
     should.not.raise NameError do
       v = UI::Vector.new
       v.x = 3
       v.x.should == 3
     end
-    
+
     should.raise NameError do
       UI::DMath::divide(1.0,2.0)
     end
-        
+
     should.not.raise NoMethodError do
-      UI::Modulus.mod(3,2).should == 1
+      UI::Modulus.mod(3,2).should.equal 1
     end
-    
-    should.raise TypeError do
-      UI::Modulus.new.method_mod(2)
-    end
-    
+
+    UI::Modulus.new.method_mod(4, 3).should.equal 1
+
     should.not.raise NoMethodError do
-      UI::Math::divide(2,1).should == 2
+      UI::Math::divide(2,1).should.equal 2
     end
-    
+
     should.raise TypeError do
       UI::NoConstructor.new
     end
-    
+
     should.not.raise NoMethodError do
       UI::Outside::Inside.new
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rbplusplus
 version: !ruby/object:Gem::Version 
-  version: "0.8"
+  version: "0.9"
 platform: ruby
 authors: 
 - Jason Roelofs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-22 00:00:00 -04:00
+date: 2009-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        version: "0.9"
     version: 
 - !ruby/object:Gem::Dependency 
   name: rice
@@ -28,11 +28,14 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.2
+        version: 1.2.0
     version: 
-description: Rb++ combines the powerful query interface of rbgccxml and the Rice library to  make Ruby wrapping extensions easier to write than ever.
+description: |
+  Rb++ combines the powerful query interface of rbgccxml and the Rice library to 
+  make Ruby wrapping extensions easier to write than ever.
+
 email: jameskilton@gmail.com
 executables: []
 
@@ -43,34 +46,50 @@ extra_rdoc_files: []
 files: 
 - TODO
 - Rakefile
-- lib/rbplusplus/extension.rb
-- lib/rbplusplus/module.rb
-- lib/rbplusplus/builders/enumeration.rb
-- lib/rbplusplus/builders/extension.rb
-- lib/rbplusplus/builders/module.rb
-- lib/rbplusplus/builders/types_manager.rb
-- lib/rbplusplus/builders/base.rb
-- lib/rbplusplus/builders/class.rb
-- lib/rbplusplus/rbplusplus.rb
-- lib/rbplusplus/transformers/function.rb
+- lib/rbplusplus.rb
 - lib/rbplusplus/transformers/node_cache.rb
+- lib/rbplusplus/transformers/rbgccxml.rb
+- lib/rbplusplus/transformers/function.rb
 - lib/rbplusplus/transformers/node.rb
-- lib/rbplusplus/transformers/module.rb
-- lib/rbplusplus/transformers/constructor.rb
-- lib/rbplusplus/transformers/node_reference.rb
+- lib/rbplusplus/transformers/namespace.rb
 - lib/rbplusplus/transformers/method.rb
 - lib/rbplusplus/transformers/class.rb
-- lib/rbplusplus/transformers/rbgccxml.rb
-- lib/rbplusplus/writers/extension.rb
+- lib/rbplusplus/rbplusplus.rb
 - lib/rbplusplus/writers/base.rb
-- lib/rbplusplus/writers/single_file_writer.rb
 - lib/rbplusplus/writers/multiple_files_writer.rb
-- lib/jamis.rb
+- lib/rbplusplus/writers/extension.rb
+- lib/rbplusplus/writers/single_file_writer.rb
+- lib/rbplusplus/extension.rb
+- lib/rbplusplus/builders/method_base.rb
+- lib/rbplusplus/builders/allocation_strategy.rb
+- lib/rbplusplus/builders/director_method.rb
+- lib/rbplusplus/builders/module_function.rb
+- lib/rbplusplus/builders/static_method.rb
+- lib/rbplusplus/builders/base.rb
+- lib/rbplusplus/builders/enumeration.rb
+- lib/rbplusplus/builders/const.rb
+- lib/rbplusplus/builders/helpers/enumeration.rb
+- lib/rbplusplus/builders/helpers/module.rb
+- lib/rbplusplus/builders/helpers/class.rb
+- lib/rbplusplus/builders/extension.rb
+- lib/rbplusplus/builders/instance_variable.rb
+- lib/rbplusplus/builders/constructor.rb
+- lib/rbplusplus/builders/director.rb
+- lib/rbplusplus/builders/module.rb
+- lib/rbplusplus/builders/include.rb
+- lib/rbplusplus/builders/method.rb
+- lib/rbplusplus/builders/global_function.rb
+- lib/rbplusplus/builders/const_converter.rb
+- lib/rbplusplus/builders/class.rb
+- lib/rbplusplus/module.rb
+- lib/rbplusplus/logger.rb
 - lib/inflector.rb
 - lib/inflections.rb
-- lib/rbplusplus.rb
-has_rdoc: false
-homepage: http://rbplusplus.rubyforge.org/rbplusplus
+- lib/jamis.rb
+has_rdoc: true
+homepage: http://rbplusplus.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -91,49 +110,62 @@ 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 library to generate Rice wrapper code
 test_files: 
-- test/classes_test.rb
-- test/extension_test.rb
-- test/nested_test.rb
+- test/enumerations_test.rb
 - test/subclass_test.rb
-- test/constructors_test.rb
-- test/overloading_test.rb
-- test/wrap_as_test.rb
-- test/object_persistence_test.rb
+- test/function_pointer_test.rb
 - test/generated/extconf.rb
-- test/class_methods_test.rb
-- test/compiling_test.rb
-- test/to_from_ruby_test.rb
+- test/director_test.rb
 - test/struct_test.rb
-- test/enumerations_test.rb
-- test/modules_test.rb
 - test/functions_test.rb
-- test/test_helper.rb
+- test/class_methods_encapsulate_test.rb
+- test/compiling_test.rb
 - test/file_writers_test.rb
-- test/headers/Subtracter.hpp
-- test/headers/complex_static_methods.h
-- test/headers/ugly_interface.h
+- test/test_helper.rb
+- test/custom_code_test.rb
+- test/modules_test.rb
+- test/allocation_strategies_test.rb
+- test/extension_test.rb
+- test/to_from_ruby_test.rb
+- test/class_methods_test.rb
+- test/constructors_test.rb
+- test/default_arguments_test.rb
+- test/overloading_test.rb
+- test/wrap_as_test.rb
+- test/nested_test.rb
+- test/classes_test.rb
+- test/function_pointers_classes_test.rb
+- test/headers/function_pointers.h
 - test/headers/external_mapping.h
-- test/headers/functions.h
-- test/headers/to_from_ruby_source.cpp
+- test/headers/subclass.h
+- test/headers/complex_static_methods.h
+- test/headers/needs_code.h
+- test/headers/class_methods.h
 - test/headers/empty.h
-- test/headers/enums.h
+- test/headers/functions.h
+- test/headers/function_pointers_class.h
+- test/headers/Adder.h
+- test/headers/director.h
+- test/headers/nested_classes.h
+- test/headers/external_mapping_rice.h
+- test/headers/default_arguments.h
 - test/headers/ugly_interface_ns.h
-- test/headers/nested_struct.h
-- test/headers/subclass.h
 - test/headers/requires_define.h
-- test/headers/class_methods.h
-- test/headers/ugly_helper.h
 - test/headers/constructors.h
-- test/headers/nested_classes.h
-- test/headers/with_includes.h
+- test/headers/code/custom_to_from_ruby.hpp
+- test/headers/code/custom_to_from_ruby.cpp
 - test/headers/to_from_ruby.h
-- test/headers/external_mapping_rice.h
-- test/headers/include
+- test/headers/with_includes.h
 - test/headers/include/helper.h
+- test/headers/enums.h
 - test/headers/overload.h
-- test/headers/Adder.h
+- test/headers/ugly_interface.h
+- test/headers/alloc_strats.h
+- test/headers/Subtracter.hpp
+- test/headers/to_from_ruby_source.cpp
+- test/headers/nested_struct.h
+- test/headers/Adder.cpp