rbplusplus 1.0.1 → 1.0.3

data/Rakefile

@@ -1,10 +1,6 @@
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/contrib/sshpublisher'
 
-PROJECT_NAME = "rb++"
-RBPLUSPLUS_VERSION = "1.0.1"
-
 task :default => :test
 
 # We test this way because of what this library does.
@@ -22,7 +18,7 @@ task :test do
     # the exact ruby binary that's linked to the ruby running the Rakefile. Just saying
     # "ruby" will find the system's installed ruby and be worthless
     ruby = File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])
-    sh "#{ruby} -Itest #{file}"
+    sh "#{ruby} -S rspec -Itest #{file}"
   end
 end
 
@@ -58,36 +54,3 @@ namespace :web do
     rm_rf "publish"
   end
 end
-
-spec = Gem::Specification.new do |s|
-  s.name = "rbplusplus"
-  s.version = RBPLUSPLUS_VERSION
-  s.summary = 'Ruby library to generate Rice wrapper code'
-  s.homepage = 'http://rbplusplus.rubyforge.org'
-  s.rubyforge_project = "rbplusplus"
-  s.author = 'Jason Roelofs'
-  s.email = 'jameskilton@gmail.com'
-
-  s.description = <<-END
-Rb++ combines the powerful query interface of rbgccxml and the Rice library to 
-make Ruby wrapping extensions of C++ libraries easier to write than ever.
-  END
-
-  s.add_dependency "rbgccxml", "~> 1.0"
-  s.add_dependency "rice", "~> 1.4.0"
-
-  patterns = [
-    'TODO',
-    'Rakefile',
-    'lib/**/*.rb',
-  ]
-
-  s.files = patterns.map {|p| Dir.glob(p) }.flatten
-
-  s.test_files = [Dir.glob('test/**/*.rb'), Dir.glob('test/headers/**/*')].flatten
-
-  s.require_paths = ['lib']
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-end

data/lib/rbplusplus.rb

@@ -1,6 +1,3 @@
-$:.unshift File.expand_path(File.dirname(__FILE__))
-$:.unshift File.expand_path(File.dirname(__FILE__) + "/rbplusplus")
-
 require 'rubygems'
 require 'rbgccxml'
 

data/lib/rbplusplus/builders/class.rb

@@ -116,8 +116,10 @@ module RbPlusPlus
           next if do_not_wrap?(method)
           next if method_names.include?(method.name)
 
+          arguments = [method.arguments].flatten
+
           # Ignore methods that have non-public arguments anywhere
-          if !method.arguments.empty? && !method.arguments.select {|a| !a.cpp_type.base_type.public?}.empty?
+          if !arguments.empty? && !arguments.select {|a| !a.cpp_type.base_type.public?}.empty?
             Logger.info "Ignoring method #{method.qualified_name} due to non-public argument type(s)"
             next
           end

data/lib/rbplusplus/builders/method_base.rb

@@ -161,8 +161,9 @@ module RbPlusPlus
       # default value. See default_arguments_test and headers/default_arguments.h
       # for an example.
       def fix_enumeration_value(enum, default_value)
+        enum_values = [enum.values].flatten
         found =
-          enum.values.select do |enum_value|
+          enum_values.select do |enum_value|
             enum_value.name == default_value
           end.first
 

data/lib/rbplusplus/extension.rb

@@ -113,7 +113,6 @@ module RbPlusPlus
           next if File.directory?(f)
 
           options[:include_source_files] << f
-          options[:includes] << f if File.extname(f) =~ /hpp/i || File.extname(f) =~ /h/i
         end
       end
 
@@ -141,6 +140,11 @@ module RbPlusPlus
 
       if (files = options.delete(:include_source_files))
         @options[:include_source_files] << files
+        options[:includes] ||= []
+
+        [files].flatten.each do |f|
+          options[:includes] << f if File.extname(f) =~ /hpp/i || File.extname(f) =~ /h/i
+        end
       end
       
       if (flags = options.delete(:includes))

data/lib/rbplusplus/writers/multiple_files_writer.rb

@@ -76,7 +76,7 @@ module RbPlusPlus
         # Write out from the bottom up, makes sure that children file writers
         # update their parents as needed
         @file_writers.each do |fw|
-          fw.write(@build_dir)
+          fw.write(@build_dir, self.builder.additional_includes)
         end
       end
 
@@ -151,8 +151,9 @@ module RbPlusPlus
           @nodes << node
         end
 
-        def write(build_dir)
+        def write(build_dir, custom_includes = [])
           @build_dir = build_dir
+          @custom_includes = custom_includes.flatten
 
           build_source
           write_header if @header
@@ -227,7 +228,12 @@ module RbPlusPlus
         def write_source
           File.open(File.join(@build_dir, @source), "w+") do |cpp|
             if (incls = @includes.flatten.compact).any?
-              cpp.puts "", incls.uniq.sort.reverse.join("\n"), ""
+              incl_output = incls.uniq.sort.reverse.join("\n")
+              cpp.puts "", incl_output, ""
+            end
+
+            @custom_includes.each do |incl|
+              cpp.puts "#include \"#{incl}\"" unless incl_output =~ %r{#{incl}}
             end
 
             if @register_method

data/test/classes_test.rb

@@ -35,7 +35,7 @@ describe "Extension with wrapped classes" do
     # Wrapped method names default to underscore'd
     adder = Adder.new
     adder.add_integers(1,2).should == 3
-    adder.add_floats(1.0, 2.0).should be_close(3.0, 0.001)
+    adder.add_floats(1.0, 2.0).should be_within(0.001).of(3.0)
     adder.add_strings("Hello", "World").should == "HelloWorld"
     adder.get_class_name.should == "Adder"
   end
@@ -73,7 +73,7 @@ describe "Extension with wrapped classes" do
     a.should_be_transformed = "TRANSFORM"
 
     a.value1.should == 10
-    a.value2.should be_close(15.5, 0.01)
+    a.value2.should be_within(0.01).of(15.5)
     a.value3.should == "This is a value!"
 
     a.should_be_transformed.should == "TRANSFORM"

data/test/compiling_test.rb

@@ -160,17 +160,4 @@ describe "Compiler settings" do
     # is a symbol lookup failure and death to the Ruby VM
     needs_to_ruby(3).value.should == 3
   end
-
-  specify "can specify a directory containing code to be included into compilation process" do
-    Extension.new "code_dir" do |e|
-      e.sources full_dir("headers/needs_code.h"),
-        :include_source_dir => full_dir("headers/code")
-
-      e.namespace "needs_code"
-    end
-
-    require 'code_dir'
-
-    get_number(2).should == 2
-  end
 end

data/test/default_arguments_test.rb

@@ -76,6 +76,11 @@ describe "Default arguments properly exposed" do
     modify2(1, Ops::REMOVE).should == 1
   end
 
+  specify "function calls" do
+    default_with_function.should == 3
+    default_with_function(CustomType.new(5)).should == 5
+  end
+
   specify "should properly handle argument type qualifiers like refs and consts" # do
 #    build_strings("I'd ").should == "I'd kick-it"
 #    build_strings("You won't", " do it").should == "You won't do it"

data/test/enumerations_test.rb

@@ -30,7 +30,7 @@ describe "Wrapping enumerations" do
   end
 
   specify "should wrap up enumerations at proper nesting" do
-    lambda { Tester::TestEnum }.should_not raise_error(NameError)
+    lambda { Tester::MyEnum }.should_not raise_error(NameError)
 
     Tester::MyEnum::I_LIKE_MONEY.to_i.should == 3
     Tester::MyEnum::YOU_LIKE_MONEY_TOO.to_i.should == 4
@@ -85,4 +85,8 @@ describe "Wrapping enumerations" do
     FOURTY_TWO.should == 42
     SEPERATE_OUTER_VALUE.should == 14
   end
+
+  specify "works with single element enumerations" do
+    Tester::SINGLE_VALUE.to_i.should == 12
+  end
 end

data/test/functions_test.rb

@@ -12,7 +12,7 @@ describe "Extension with globally available functions" do
 
     lambda { test1 }.should_not raise_error(NameError)
 
-    test2(2.0).should be_close(1.0, 0.001)
+    test2(2.0).should be_within(0.001).of(1.0)
 
     test3(2, 4.2).should == 2
   end

data/test/headers/code/custom_to_from_ruby.cpp

@@ -1,11 +1,13 @@
 #include "custom_to_from_ruby.hpp"
 
 template<>
-Rice::Object to_ruby<short int>(short int const & a) {
-  return INT2NUM(a);
+Rice::Object to_ruby<MyType>(const MyType & a) {
+  return INT2NUM(a.value());
 }
 
 template<>
-short int from_ruby<short int>(Rice::Object x) {
-  return FIX2INT(x.value());
+MyType from_ruby<MyType>(Rice::Object x) {
+  MyType my;
+  my.setValue(FIX2INT(x.value()));
+  return my;
 }

data/test/headers/code/custom_to_from_ruby.hpp

@@ -4,10 +4,12 @@
 #include <rice/Object.hpp>
 #include <rice/to_from_ruby.hpp>
 
+#include "my_type.hpp"
+
 template<>
-Rice::Object to_ruby<short int>(short int const & a);
+Rice::Object to_ruby<MyType>(MyType const & a);
 
 template<>
-short int from_ruby<short int>(Rice::Object x);
+MyType from_ruby<MyType>(Rice::Object x);
 
 #endif

data/test/headers/code/my_type.hpp

@@ -0,0 +1,16 @@
+#ifndef __MY_TYPE_H__
+#define __MY_TYPE_H__
+
+class MyType {
+  int myValue;
+
+  public:
+  MyType() { myValue = 0; }
+
+  // Exposing attributes not implemented yet
+  int value() const { return myValue; }
+
+  void setValue(int value) { myValue = value; }
+};
+
+#endif

data/test/headers/default_arguments.h

@@ -76,6 +76,18 @@ namespace default_args {
     return value;
   }
 
+  class CustomType {
+    public:
+      CustomType(int value) { theValue = value; };
+      int theValue;
+
+      // Function calls
+      static CustomType someValue() { return CustomType(3); }
+  };
+
+  int defaultWithFunction(CustomType x = CustomType::someValue()) {
+    return x.theValue;
+  }
 
 }
 

data/test/headers/enums.h

@@ -15,6 +15,10 @@ namespace enums {
     VALUE3
   };
 
+  enum {
+    SINGLE_VALUE = 12
+  };
+
   enum {
     OUTER_ANON_1,
     OUTER_ANON_2,

data/test/headers/needs_code.h

@@ -1,10 +1,30 @@
 #ifndef __NEEDS_CODE_H__
 #define __NEEDS_CODE_H__
 
+#include "code/my_type.hpp"
+
 namespace needs_code {
-  const short getNumber(short in) {
-    return in;
-  }
+
+  class NeedCode1 {
+    public:
+      const int getNumber(MyType in) {
+        return in.value();
+      }
+  };
+
+  class NeedCode2 {
+    public:
+      const int getNumber(MyType in) {
+        return in.value();
+      }
+  };
+
+  class NeedCode3 {
+    public:
+      const int getNumber(MyType in) {
+        return in.value();
+      }
+  };
 }
 
 #endif

data/test/include_source_dir_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+describe "Using include_source_dir" do
+
+  specify "can specify a directory containing code to be included into compilation process" do
+    Extension.new "code_dir" do |e|
+      e.sources full_dir("headers/needs_code.h"),
+        :include_source_dir => full_dir("headers/code")
+
+      e.namespace "needs_code"
+    end
+
+    require 'code_dir'
+
+    NeedCode1.new.get_number(2).should == 2
+  end
+
+end

data/test/include_source_files_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+describe "Using multiple include source files" do
+
+  before(:each) do
+    test_setup
+  end
+
+  specify "can specify individual files to be pulled into the compilation" do
+    Extension.new "code_dir" do |e|
+      e.sources full_dir("headers/needs_code.h"),
+        :include_source_files => [
+          full_dir("headers/code/my_type.hpp"),
+          full_dir("headers/code/custom_to_from_ruby.hpp"),
+          full_dir("headers/code/custom_to_from_ruby.cpp")
+        ]
+
+      e.namespace "needs_code"
+    end
+
+    require 'code_dir'
+
+    NeedCode1.new.get_number(2).should == 2
+    NeedCode2.new.get_number(2).should == 2
+    NeedCode3.new.get_number(2).should == 2
+  end
+
+end

data/test/modules_test.rb

@@ -57,7 +57,7 @@ describe "Extension with modules" do
 
   specify "should wrap up C++ functions in the module" do
     lambda { Functions }.should_not raise_error(NameError)
-    Functions::test2(2).should be_close(1.0, 0.001)
+    Functions::test2(2).should be_within(0.001).of(1.0)
     Functions::test3(4, 6).should == 4
   end
 

metadata

@@ -1,66 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rbplusplus
-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.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jason Roelofs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-26 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rbgccxml
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rice
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rice
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
-  version_requirements: *id002
-description: |
-  Rb++ combines the powerful query interface of rbgccxml and the Rice library to 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+description: ! 'Rb++ combines the powerful query interface of rbgccxml and the Rice
+  library to
+
   make Ruby wrapping extensions of C++ libraries easier to write than ever.
 
+'
 email: jameskilton@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - TODO
 - Rakefile
 - lib/inflections.rb
@@ -122,6 +115,8 @@ files:
 - test/functions_test.rb
 - test/generated/extconf.rb
 - test/implicit_cast_test.rb
+- test/include_source_dir_test.rb
+- test/include_source_files_test.rb
 - test/modules_test.rb
 - test/nested_test.rb
 - test/overloading_test.rb
@@ -136,6 +131,7 @@ files:
 - test/headers/class_methods.h
 - test/headers/code/custom_to_from_ruby.cpp
 - test/headers/code/custom_to_from_ruby.hpp
+- test/headers/code/my_type.hpp
 - test/headers/complex_static_methods.h
 - test/headers/constructors.h
 - test/headers/default_arguments.h
@@ -161,41 +157,31 @@ files:
 - test/headers/ugly_interface.h
 - test/headers/ugly_interface_ns.h
 - test/headers/with_includes.h
-has_rdoc: true
 homepage: http://rbplusplus.rubyforge.org
 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.18
 signing_key: 
 specification_version: 3
 summary: Ruby library to generate Rice wrapper code
-test_files: 
+test_files:
 - test/allocation_strategies_test.rb
 - test/class_methods_encapsulate_test.rb
 - test/class_methods_test.rb
@@ -213,6 +199,8 @@ test_files:
 - test/functions_test.rb
 - test/generated/extconf.rb
 - test/implicit_cast_test.rb
+- test/include_source_dir_test.rb
+- test/include_source_files_test.rb
 - test/modules_test.rb
 - test/nested_test.rb
 - test/overloading_test.rb
@@ -227,6 +215,7 @@ test_files:
 - test/headers/class_methods.h
 - test/headers/code/custom_to_from_ruby.cpp
 - test/headers/code/custom_to_from_ruby.hpp
+- test/headers/code/my_type.hpp
 - test/headers/complex_static_methods.h
 - test/headers/constructors.h
 - test/headers/default_arguments.h