rubypython 0.3.1 → 0.3.2

data/spec/conversion_spec.rb

@@ -2,16 +2,20 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 
 include TestConstants
 describe RubyPython::Conversion do
-  include RubyPythonStartStop
 
   subject { RubyPython::Conversion }
 
   before do
+    RubyPython.start
     sys = RubyPython.import 'sys'
     sys.path.append './spec/python_helpers'
     @objects = RubyPython.import 'objects'
   end
 
+  after do
+    RubyPython.stop
+  end
+
   context "when converting from Python to Ruby" do
     [
       ["an int", "an int", AnInt],
@@ -24,13 +28,13 @@ describe RubyPython::Conversion do
       ["python False", "false", false],
       ["python None", "nil", nil]
     ].each do |py_type, rb_type, output|
-      it "should convert #{py_type} to #{rb_type}" do
+      it "converts #{py_type} to #{rb_type}" do
         py_object_ptr = @objects.__send__(py_type.sub(' ', '_')).pObject.pointer
         subject.ptorObject(py_object_ptr).should == output
       end
     end
 
-    it "should return an FFI::Pointer when it cannot convert" do
+    it "returns an FFI::Pointer when it cannot convert" do
       unconvertable = @objects.RubyPythonMockObject.pObject.pointer
       subject.ptorObject(unconvertable).should be_a_kind_of(FFI::Pointer)
     end
@@ -47,20 +51,24 @@ describe RubyPython::Conversion do
       ["a dict", "a hash", AConvertedHash],
       ["python True", "true", true],
       ["python False", "false", false],
-      ["python None", "nil", nil]
-    ].each do |py_type, rb_type, input|
+      ["python None", "nil", nil],
+      ["a function", "a proc", AProc, true]
+    ].each do |py_type, rb_type, input, no_compare|
 
-      it "should convert #{rb_type} to #{py_type}" do
+      it "converts #{rb_type} to #{py_type}" do
         py_object_ptr = subject.rtopObject(input)
-        output = @objects.__send__(rb_type.sub(' ', '_')).pObject.pointer
-        RubyPython::Python.PyObject_Compare(py_object_ptr, output).should == 0
+        unless no_compare
+          output = @objects.__send__(rb_type.sub(' ', '_')).pObject.pointer
+          RubyPython::Python.PyObject_Compare(py_object_ptr, output).should == 0
+        end
       end
     end
 
-    it "should raise an exception when it cannot convert" do
+    it "raises an exception when it cannot convert" do
       lambda { subject.rtopObject(Class) }.should raise_exception(subject::UnsupportedConversion)
     end
 
   end
 
+
 end

data/spec/legacy_spec.rb

@@ -3,7 +3,19 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 include TestConstants
 
 describe 'RubyPython Legacy Mode Module' do
-  include RubyPythonStartStop
+
+  before do
+    RubyPython.start
+    sys = RubyPython.import 'sys'
+    path = sys.path
+    path.push './spec/python_helpers'
+    sys.path = path
+    @objects = RubyPython.import 'objects'
+  end
+
+  after do
+    RubyPython.stop
+  end
 
   before :all do
     require 'rubypython/legacy'
@@ -14,9 +26,36 @@ describe 'RubyPython Legacy Mode Module' do
   end
 
   describe "when required" do
-    it "should enable legacy mode" do
+    it "enables legacy mode" do
       RubyPython.legacy_mode.should == true
     end
+
+    [
+      ["an int", "an int", AnInt],
+      ["a float", "a float", AFloat],
+      ["a string", "a string", AString],
+      ["a list", "an array", AnArray],
+      ["a tuple", "an array", AnArray],
+      ["a dict", "a hash", AConvertedHash],
+      ["python True", "true", true],
+      ["python False", "false", false],
+      ["python None", "nil", nil]
+    ].each do |py_type, rb_type, output|
+      it "implicitly converts #{py_type} to #{rb_type}" do
+        @objects.__send__(py_type.sub(' ', '_')).should == output
+      end
+    end
+
+    [
+      ["proc", AProc],
+      ["method", AMethod]
+    ].each do |rb_type, rb_obj| 
+      it "raises an exception if a #{rb_type} callback is supplied" do
+        lambda do
+          @objects.apply_callback(rb_obj, [1, 1])
+        end.should raise_exception(RubyPython::Conversion::UnsupportedConversion)
+      end
+    end
   end
 
 end

data/spec/pymainclass_spec.rb

@@ -2,23 +2,30 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe RubyPython::PyMainClass do
   include TestConstants
-  include RubyPythonStartStop
+
+  before do
+    RubyPython.start
+  end
+
+  after do
+    RubyPython.stop
+  end
 
   subject { RubyPython::PyMain }
 
-  it "should delegate to builtins" do
+  it "delegates to builtins" do
     subject.float(AnInt).rubify.should == AnInt.to_f
   end
 
-  it "should handle block syntax" do
+  it "handles block syntax" do
     subject.float(AnInt) {|f| f.rubify*2}.should == (AnInt.to_f * 2)
   end
 
-  it "should allow attribute access" do
+  it "allows attribute access" do
     subject.main.__name__.rubify.should == '__main__'
   end
 
-  it "should allow global variable setting" do
+  it "allows global variable modification" do
     subject.x = 2
     subject.x.rubify.should == 2
   end

data/spec/pyobject_spec.rb

@@ -1,9 +1,16 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe RubyPython::PyObject do
-  include RubyPythonStartStop
   include TestConstants
 
+  before do
+    RubyPython.start
+  end
+  
+  after do
+    RubyPython.start
+  end
+
   before do
     @string = RubyPython.import('string').pObject
     @urllib2 = RubyPython.import('urllib2').pObject
@@ -23,7 +30,7 @@ describe RubyPython::PyObject do
       ["a hash", AHash]
     ].each do |title, obj|
 
-      it "should wrap #{title}" do
+      it "wraps #{title}" do
         lambda { described_class.new(obj) }.should_not raise_exception
       end
     end
@@ -34,10 +41,10 @@ describe RubyPython::PyObject do
       "a list",
       "a dict",
       "a tuple"
-    ].each do |title|
-      it "should take #{title} from a Python pointer" do
+    ].each do |type|
+      it "accepts a Python pointer to a #{type}" do
         lambda do
-          py_obj = @objects.__send__(title.gsub(' ','_')).pObject.pointer
+          py_obj = @objects.__send__(type.gsub(' ','_')).pObject.pointer
           described_class.new(py_obj)
         end.should_not raise_exception
       end
@@ -59,7 +66,7 @@ describe RubyPython::PyObject do
       type, input, output = arr
       output ||= input
 
-      it "should faithfully unwrap #{type}" do
+      it "faithfully unwraps #{type}" do
         described_class.new(input).rubify.should == output
       end
 
@@ -68,35 +75,35 @@ describe RubyPython::PyObject do
   end #rubify
 
   describe "#hasAttr" do
-    it "should return true when object has the requested attribute" do
+    it "is true when wrapped object has the requested attribute" do
       @string.hasAttr("ascii_letters").should be_true
     end
 
-    it "should return false when object does not have the requested attribute" do
+    it "is false when wrapped object does not have the requested attribute" do
       @string.hasAttr("nonExistentThing").should be_false
     end
   end
 
   describe "#getAttr" do
-    it "should fetch requested object attribute" do 
+    it "fetchs a pointer to the requested object attribute" do 
       ascii_letters = @string.getAttr "ascii_letters"
       ascii_letters.rubify.should == "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
     end
 
-    it "should return a PyObject instance" do
+    it "returns a PyObject instance" do
       ascii_letters = @string.getAttr "ascii_letters"
       ascii_letters.should be_kind_of(described_class)
     end
   end
 
   describe "#setAttr" do 
-    it "should modify the specified attribute of the object" do
+    it "modifies the specified attribute of the object" do
       pyNewLetters = described_class.new "RbPy"
       @string.setAttr "ascii_letters", pyNewLetters
       @string.getAttr("ascii_letters").rubify.should == pyNewLetters.rubify
     end
 
-    it "should create the requested attribute if it doesn't exist" do 
+    it "creates the requested attribute if it doesn't exist" do 
       pyNewString = described_class.new "python"
       @string.setAttr "ruby", pyNewString
       @string.getAttr("ruby").rubify.should == pyNewString.rubify
@@ -111,36 +118,36 @@ describe RubyPython::PyObject do
       @less_dup = described_class.new 5
     end
 
-    it "should return 0 when objects are equal" do
+    it "returns 0 when objects are equal" do
       @less.cmp(@less_dup).should == 0
     end
 
-    it "should change sign under interchange of arguments" do 
+    it "changes sign under interchange of arguments" do 
       @less.cmp(@greater).should == -@greater.cmp(@less)
     end
 
-    it "should return -1 when first object is less than the second" do
+    it "returns -1 when first object is less than the second" do
       @less.cmp(@greater).should == -1
     end
     
-    it "should return 1 when first object is greater than the second" do
+    it "returns 1 when first object is greater than the second" do
       @greater.cmp(@less).should == 1
     end
   end
 
   describe "#makeTuple" do
-    it "should wrap single arguments in a tuple" do
+    it "wraps single arguments in a tuple" do
       arg = described_class.new AString
       described_class.makeTuple(arg).rubify.should == [AString]
     end
 
-    it "should turn a Python list into a tuple" do
+    it "turns a Python list into a tuple" do
       arg = @objects.a_list.pObject
       converted = described_class.makeTuple(arg)
       converted.rubify.should == AnArray
     end
 
-    it "should return the given argument if it is a tuple" do
+    it "returns the given argument if it is a tuple" do
       arg = @objects.a_tuple.pObject
       converted = described_class.makeTuple(arg)
       converted.pointer.address.should == arg.pointer.address
@@ -150,7 +157,7 @@ describe RubyPython::PyObject do
 
   describe "#callObject" do
     #Expand coverage types
-    it "should execute wrapped object with supplied arguments" do
+    it "executes wrapped object with supplied arguments" do
       arg = described_class.new AnInt
       argt = described_class.buildArgTuple arg
 
@@ -161,7 +168,7 @@ describe RubyPython::PyObject do
   end
 
   describe "#newList" do
-    it "should wrap supplied args in a Python list" do
+    it "wraps supplied args in a Python list" do
       args = AnArray.map do |obj|
         described_class.new obj
       end
@@ -171,21 +178,21 @@ describe RubyPython::PyObject do
 
   describe "#function_or_method?" do
 
-    it "should be true for a method" do
+    it "is true for a method" do
       mockObjClass = @objects.RubyPythonMockObject.pObject
       mockObjClass.getAttr('square_elements').should be_a_function_or_method
     end
 
-    it "should be true for a function" do
+    it "is true for a function" do
       @objects.pObject.getAttr('identity').should be_a_function_or_method
     end
 
-    xit "should return true for a builtin function" do
+    it "is true for a builtin function" do
       any = @builtin.pObject.getAttr('any')
       any.should be_a_function_or_method
     end
 
-    it "should return false for a class" do
+    it "is false for a class" do
       @objects.RubyPythonMockObject.pObject.should_not be_a_function_or_method
     end
 
@@ -193,20 +200,20 @@ describe RubyPython::PyObject do
 
   describe "#class?" do
 
-    it "should return true if wrapped object is an old style class" do
+    it "is true if wrapped object is an old style class" do
       @objects.RubyPythonMockObject.pObject.should be_a_class
     end
 
-    it "should return true if wrapped object is an new style class" do
+    it "is true if wrapped object is an new style class" do
       @objects.NewStyleClass.pObject.should be_a_class
     end
 
-    it "should return true if wrapped object is a builtin class" do
+    it "is true if wrapped object is a builtin class" do
       strClass = @builtin.pObject.getAttr('str')
       strClass.should be_a_class
     end
 
-    it "should return false for an object instance" do
+    it "is false for an object instance" do
       @objects.RubyPythonMockObject.new.pObject.should_not be_a_class
     end
 
@@ -214,25 +221,25 @@ describe RubyPython::PyObject do
 
   describe "#callable?" do
 
-    it "should be true for a method" do
+    it "is true for a method" do
       mockObjClass = @objects.RubyPythonMockObject.pObject
       mockObjClass.getAttr('square_elements').should be_callable
     end
 
-    it "should be true for a function" do
+    it "is true for a function" do
       @objects.pObject.getAttr('identity').should be_callable
     end
 
-    it "should return true for a builtin function" do
+    it "is true for a builtin function" do
       any = @builtin.pObject.getAttr('any')
       any.should be_callable
     end
 
-    it "should return true for a class" do
+    it "is true for a class" do
       @objects.RubyPythonMockObject.pObject.should be_callable
     end
 
-    it "should return false for a non-callable instance" do
+    it "is false for a non-callable instance" do
       @objects.RubyPythonMockObject.new.pObject.should_not be_callable
     end
 
@@ -242,17 +249,17 @@ describe RubyPython::PyObject do
 
   describe ".convert" do
 
-    it "should not modify PyObjects passed to it" do
+    it "does not modify PyObjects passed to it" do
       args = AnArray.map { |x| described_class.new(x) }
       described_class.convert(*args).should == args
     end
 
-    it "should pull PyObjects out of RubyPyProxy instances" do
+    it "pulls PyObjects out of RubyPyProxy instances" do
       args = @objects.an_array.to_a
       described_class.convert(*args).should == args.map {|x| x.pObject}
     end
 
-    it "should create new PyObject instances of simple Ruby types" do
+    it "creates new PyObject instances of simple Ruby types" do
       described_class.convert(*AnArray).each do |x|
         x.should be_a_kind_of described_class
       end

data/spec/python_helpers/objects.py

@@ -3,6 +3,9 @@
 def identity(object):
     return object
 
+def apply_callback(callback, args):
+    return callback(*args)
+
 class RubyPythonMockObject:
     STRING = "STRING"
     STRING_LIST = ["STRING1", "STRING2"]

data/spec/pythonerror_spec.rb

@@ -1,38 +1,45 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe RubyPython::PythonError do
-  include RubyPythonStartStop
+
+  before do
+    RubyPython.start
+  end
+  
+  after do
+    RubyPython.start
+  end
 
   def cause_error
     RubyPython::Python.PyImport_ImportModule("wat")
   end
 
   describe "#error?" do
-    it "should return false when no error has occured" do
+    it "is false when no error has occured" do
       described_class.error?.should be_false
     end
 
-    it "should return true when an error has occured" do
+    it "is true when an error has occured" do
       cause_error
       described_class.error?.should be_true
     end
   end
 
   describe "#clear" do
-    it "should reset the Python error flag" do
+    it "resets the Python error flag" do
       cause_error
       described_class.clear
       described_class.error?.should be_false
     end
 
-    it "should not barf when there is no error" do
+    it "doesn't barf when there is no error" do
       lambda {described_class.clear}.should_not raise_exception
     end
   end
 
 
   describe "#fetch" do
-    it "should make availible Python error type" do
+    it "makes availible Python error type" do
       cause_error
       rbType, rbValue, rbTraceback = described_class.fetch
       rbType.getAttr("__name__").rubify.should == "ImportError"

data/spec/refcnt_spec.rb

@@ -27,12 +27,12 @@ describe 'Reference Counting' do
     RubyPython.stop
   end
 
-  it "should be one for a new object" do
+  it "is one for a new object" do
     pyObj = @objects.RubyPythonMockObject.new
     get_refcnt(pyObj).should == 1
   end
 
-  it "should increase when a new reference is passed into Ruby" do
+  it "increases when a new reference is passed into Ruby" do
     pyObj = @objects.RubyPythonMockObject
     refcnt = get_refcnt(pyObj)
     pyObj2 = @objects.RubyPythonMockObject
@@ -42,7 +42,7 @@ describe 'Reference Counting' do
   describe RubyPython::PyObject do
 
     describe "#xIncref" do
-      it "should increase the reference count" do
+      it "increases the reference count" do
         pyObj = @objects.RubyPythonMockObject.new
         refcnt = get_refcnt(pyObj)
         pyObj.pObject.xIncref
@@ -51,7 +51,7 @@ describe 'Reference Counting' do
     end
 
     describe "#xDecref" do
-      it "should decrease the reference count" do
+      it "decreases the reference count" do
         pyObj = @objects.RubyPythonMockObject.new
         pyObj.pObject.xIncref
         refcnt = get_refcnt(pyObj)

data/spec/rubypyclass_spec.rb

@@ -1,10 +1,17 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe RubyPython::RubyPyClass do
-  include RubyPythonStartStop
+
+  before do
+    RubyPython.start
+  end
+  
+  after do
+    RubyPython.start
+  end
 
   describe "#new" do
-    it "should return a RubyPyInstance" do
+    it "returns a RubyPyInstance" do
       urllib2 = RubyPython.import 'urllib2'
       urllib2.Request.new('google.com').should be_a(RubyPython::RubyPyInstance)
     end