rupy 0.4.1 → 0.4.2

data/Rakefile

@@ -1,21 +1,21 @@
-require 'rake'
-require 'rspec/rake/spectask'
-require 'yard'
-
-desc "Run all examples"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-desc "Run all examples with RCov"
-Spec::Rake::SpecTask.new('spec:rcov') do |t|
-  t.spec_files = FileList['spec/**/*.rb']
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec']
-end
-
-YARD::Rake::YardocTask.new do |t|
-  t.options = [ '--markup','markdown', '--title', 'RubyPython Documentation' ]
-end
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+require 'rake'
+require 'rspec/rake/spectask'
+require 'yard'
+
+desc "Run all examples"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+desc "Run all examples with RCov"
+Spec::Rake::SpecTask.new('spec:rcov') do |t|
+  t.spec_files = FileList['spec/**/*.rb']
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec']
+end
+
+YARD::Rake::YardocTask.new do |t|
+  t.options = [ '--markup','markdown', '--title', 'RubyPython Documentation' ]
+end
+
+Dir['tasks/**/*.rake'].each { |rake| load rake }

data/lib/rupy/conversion.rb

@@ -172,7 +172,12 @@ module Rupy
 
         def self.rtopFunction(rObj)
             proc = FFI::Function.new(:pointer, [:pointer, :pointer]) do |p_self, p_args|
-                PyObject.new(rObj.call(*ptorTuple(p_args))).pointer
+                retval = rObj.call(*ptorTuple(p_args))
+                pObject = retval.is_a?(RubyPyProxy) ? retval.pObject : PyObject.new(retval)
+
+                # make sure the refcount is >1 when pObject is destroyed
+                pObject.xIncref
+                pObject.pointer
             end
 
             defn = Python::PyMethodDef.new
@@ -184,11 +189,6 @@ module Rupy
             return Python.PyCFunction_New(defn, nil)
         end
 
-        def self.rtopGenerator(rObj)
-
-        end
-
-
         #Converts a pointer to a Python object into a native ruby type, if
         #possible. Otherwise raises an error.
         #@param [FFI::Pointer] pObj a pointer to a Python object

data/lib/rupy/pygenerator.rb

@@ -38,13 +38,16 @@ def rupy_generator(callback):
         end
 
         def generator
-            fib = Fiber.new do
-                yield
-                Python.PyErr_SetNone(Python.PyExc_StopIteration)
-                FFI::Pointer::NULL
+            return lambda do |*args|
+                fib = Fiber.new do
+                    yield *args
+                    Python.PyErr_SetNone(Python.PyExc_StopIteration)
+                    FFI::Pointer::NULL
+                end
+                generator_type.__call__(lambda do
+                    fib.resume
+                end)
             end
-
-            return lambda { generator_type.__call__(lambda { fib.resume }).pObject.pointer }
         end
 
         def yield(*args)

data/lib/rupy/version.rb

@@ -3,7 +3,7 @@ module Rupy
     module VERSION
         MAJOR = 0
         MINOR = 4
-        TINY  = 1
+        TINY  = 2
         STRING = [MAJOR, MINOR, TINY].join('.')
     end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Steeve Morin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +01:00
+date: 2011-01-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency