Fix bug in #arity due to a misbehaviour in facets/orderedhash

where OrderedHash#include? does not work like #has_key? which is the case with class Hash.
mneumann · Mar 31, 2008 · db3f535 · db3f535
1 parent f22e0e3
commit db3f535
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cplus2ruby.gemspec b/cplus2ruby.gemspec
@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name = "cplus2ruby"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
   s.summary = "Gluing C++ and Ruby together in an OO manner"
   s.files = Dir['**/*']
   s.add_dependency('facets', '>= 2.3.0')

diff --git a/lib/cplus2ruby/code_generator.rb b/lib/cplus2ruby/code_generator.rb
@@ -46,7 +46,9 @@ def args_convertable?(args)
   end
 
   def arity(args)
-    args.size - (args.include?(:returns) ? 1 : 0)
+    # FIXME: Facets 2.3.0 has a bug in OrderedHash#include?
+    # (it behaves differently than Hash)
+    args.size - ((args.has_key?('returns') || args.has_key?(:returns)) ? 1 : 0)
   end 
 
 end