rubypython 0.3.2 → 0.5.0

data/spec/python_helpers/basics.py

@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+
+def iterate_list():
+  for item in [ 1, 2, 3 ]:
+    yield item
+
+def identity(object):
+  return object
+
+def simple_callback(callback, value):
+  return callback(value)
+
+def simple_generator(callback):
+  output = []
+  for i in callback():
+    output.append(i)
+  return output
+
+def named_args(arg1, arg2):
+  return [arg1, arg2]

data/spec/python_helpers/objects.py

@@ -1,43 +1,47 @@
 #!/usr/bin/env python
 
 def identity(object):
-    return object
+  return object
 
 def apply_callback(callback, args):
     return callback(*args)
 
+def named_args(arg1, arg2):
+  return [arg2*2, arg1*2]
+
 class RubyPythonMockObject:
-    STRING = "STRING"
-    STRING_LIST = ["STRING1", "STRING2"]
-    INT = 1
-    INT_LIST = [1,1]
-    FLOAT = 1.0
-    FLOAT_LIST = [1.0,1.0]
+  STRING = "STRING"
+  STRING_LIST = ["STRING1", "STRING2"]
+  INT = 1
+  INT_LIST = [1,1]
+  FLOAT = 1.0
+  FLOAT_LIST = [1.0,1.0]
 
-    def square_elements(self, aList):
-        return [x**2 for x in aList]
+  def square_elements(self, aList):
+    return [x**2 for x in aList]
 
-    def sum_elements(self, aList):
-        return sum(aList)
+  def sum_elements(self, aList):
+    return sum(aList)
 
-    def __eq__(self, other):
-        if type(self) == type(other):
-            return True
-        else:
-            return False
+  def __eq__(self, other):
+    if type(self) == type(other):
+      return True
+    else:
+      return False
 
 class NewStyleClass(object):
-    def a_method(self):
-        pass
+  def a_method(self):
+    pass
 
 an_int = 1
 a_char = 'a'
 a_float = 1.0
 a_symbol = 'sym'
 a_string = "STRING"
+a_string_with_nulls = "STRING\0WITH\0NULLS"
 an_array = a_list = [an_int, a_char, a_float, a_string]
-a_hash = a_dict = { an_int: an_int, a_char: a_char, a_symbol: a_float, a_string:
-        a_string}
+a_hash = a_dict = { an_int: an_int, a_char: a_char, a_symbol: a_float,
+    a_string: a_string }
 true = python_True = True
 false = python_False = False
 nil = python_None = None

data/spec/pythonerror_spec.rb

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

data/spec/refcnt_spec.rb

@@ -15,7 +15,6 @@ end
 include TestConstants
 
 describe 'Reference Counting' do
-
   before :all do
     RubyPython.start
     @sys = RubyPython.import 'sys'
@@ -27,12 +26,12 @@ describe 'Reference Counting' do
     RubyPython.stop
   end
 
-  it "is one for a new object" do
+  it "should be one given a new object" do
     pyObj = @objects.RubyPythonMockObject.new
     get_refcnt(pyObj).should == 1
   end
 
-  it "increases when a new reference is passed into Ruby" do
+  it "should increase when a new reference is passed into Ruby" do
     pyObj = @objects.RubyPythonMockObject
     refcnt = get_refcnt(pyObj)
     pyObj2 = @objects.RubyPythonMockObject
@@ -40,9 +39,8 @@ describe 'Reference Counting' do
   end
 
   describe RubyPython::PyObject do
-
     describe "#xIncref" do
-      it "increases the reference count" do
+      it "should increase the reference count" do
         pyObj = @objects.RubyPythonMockObject.new
         refcnt = get_refcnt(pyObj)
         pyObj.pObject.xIncref
@@ -51,7 +49,7 @@ describe 'Reference Counting' do
     end
 
     describe "#xDecref" do
-      it "decreases the reference count" do
+      it "should decrease the reference count" do
         pyObj = @objects.RubyPythonMockObject.new
         pyObj.pObject.xIncref
         refcnt = get_refcnt(pyObj)
@@ -60,9 +58,5 @@ describe 'Reference Counting' do
         get_refcnt(pointer).should == refcnt - 1
       end
     end
-
   end
-
-
 end
-

data/spec/rubypyclass_spec.rb

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

data/spec/rubypyproxy_spec.rb

@@ -1,17 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-
 include TestConstants
 describe RubyPython::RubyPyProxy do
-
-  before do
-    RubyPython.start
-  end
-  
-  after do
-    RubyPython.start
-  end
-
   before do
     @a = RubyPython::PyObject.new "a"
     @b = RubyPython::PyObject.new "b"
@@ -27,12 +17,11 @@ describe RubyPython::RubyPyProxy do
   end
 
   describe "#new" do
-    it "accepts a PyObject instance" do
+    it "should accept a PyObject instance" do
       rbPyObject = RubyPython::PyObject.new AString
       lambda {described_class.new rbPyObject}.should_not raise_exception
     end
 
-
     [
       ["a string", AString],
       ["an int", AnInt],
@@ -44,10 +33,9 @@ describe RubyPython::RubyPyProxy do
       type, input, output = arr
       output ||= input
 
-      it "converts #{type} to wrapped pObject" do
+      it "should convert #{type} to wrapped pObject" do
         described_class.new(input).pObject.rubify.should == output
       end
-
     end
   end
 
@@ -60,7 +48,7 @@ describe RubyPython::RubyPyProxy do
       ["a symbol", ASym],
       ["a hash", AHash]
     ].each do |title, obj|
-      it "faithfully unwraps #{title}" do
+      it "should faithfully unwrap #{title}" do
         pyObject = RubyPython::PyObject.new obj
         proxy = described_class.new pyObject
         proxy.rubify.should == pyObject.rubify
@@ -69,27 +57,25 @@ describe RubyPython::RubyPyProxy do
   end
 
   describe "#inspect" do
-
-    it "returns 'repr' of wrapped object" do
+    it "should return 'repr' of wrapped object" do
       @six.inspect.should == '6'
     end
 
-    it "gracefully handles lack of defined __repr__" do
+    it "should gracefully handle lack of defined __repr__" do
       lambda { @objects.RubyPythonMockObject.inspect }.should_not raise_exception
     end
 
     it "always tries the 'repr' function if __repr__ produces an error" do
       RubyPython::PyMain.list.inspect.should == run_python_command('print repr(list)').chomp
     end
-
   end
 
   describe "#to_s" do
-    it "returns 'str' of wrapped object" do
+    it "should return 'str' of wrapped object" do
       @six.to_s.should == '6'
     end
 
-    it "gracefully handles lack of defined __str__" do
+    it "should gracefully handle lack of defined __str__" do
       lambda { @objects.RubyPythonMockObject.to_s }.should_not raise_exception
     end
 
@@ -99,97 +85,105 @@ describe RubyPython::RubyPyProxy do
   end
 
   describe "#to_a" do
-    it "converts a list to an array of its entries" do
+    it "should convert a list to an array of its entries" do
       list = @objects.a_list
       list.to_a.should == AnArray.map { |x| described_class.new(x) }
     end
 
-    it "converts a tuple to an array of its entries" do
+    it "should convert a tuple to an array of its entries" do
       tuple = @objects.a_tuple
       tuple.to_a.should == AnArray.map { |x| described_class.new(x) }
     end
 
-    it "converts a dict to an array of keys" do
+    it "should convert a dict to an array of keys" do
       dict = @objects.a_dict
       dict.to_a.sort.should == AConvertedHash.keys.map {|x| described_class.new(x)}.sort
     end
   end
 
   describe "#respond_to?" do
-    it "is true for getters" do
+    it "should return true given getters" do
       @objects.should respond_to(:RubyPythonMockObject)
     end
 
-    it "is false for undefined methods" do
+    it "should return false given undefined methods" do
       @objects.should_not respond_to(:undefined_attr)
     end
 
-    it "is true for any setter" do
+    it "should return true given any setter" do
       @objects.should respond_to(:any_variable=)
     end
 
-    it "is true for methods on RubyPyProxy instance" do
+    it "should return true given methods on RubyPyProxy instance" do
       @objects.should respond_to(:inspect)
     end
-
   end
 
   describe "method delegation" do
-
-    it "refers method calls to wrapped object" do
+    it "should refer method calls to wrapped object" do
       aProxy = described_class.new(@a)
       bProxy = described_class.new(@b)
       aProxy.__add__(bProxy).rubify.should == (@a.rubify + @b.rubify)
     end
 
-    it "raises NoMethodError when method is undefined" do
+    it "should raise NoMethodError when method is undefined" do
       aProxy = described_class.new @a
       lambda {aProxy.wat}.should raise_exception(NoMethodError)
     end
 
-    it "raises NoMethodError when boolean method is undefine" do
+    it "raises NoMethodError when boolean method is undefined" do
       aProxy = described_class.new @a
       lambda { aProxy.wat? }.should raise_exception(NoMethodError)
     end
 
-    it "allows methods to be called with no arguments" do
+    it "should allow methods to be called with no arguments" do
       builtinProxy = described_class.new @builtin
       rbStrClass = builtinProxy.str
       rbStrClass.new.rubify.should == String.new
     end
 
-    it "fetchs attributes when method name is an attribute" do
+    it "should fetch attributes when method name is an attribute" do
       pyLetters = @string.getAttr "ascii_letters"
       stringProxy = described_class.new @string
       stringProxy.ascii_letters.rubify.should == pyLetters.rubify
     end
 
-    it "sets attribute if method call is a setter" do
+    it "should set attribute if method call is a setter" do
       stringProxy = described_class.new @string
       stringProxy.letters = AString
       stringProxy.letters.rubify.should == AString
     end
 
-    it "creates nonexistent attirubte if method call is a setter" do
+    it "should create nonexistent attirubte if method call is a setter" do
       stringProxy = described_class.new @string
       stringProxy.nonExistent = 1
       stringProxy.nonExistent.rubify.should == 1
     end
 
-    it "returns a class as a RubyPyClass" do
+    it "should return a class as a RubyPyClass" do
       urllib2 = RubyPython.import('urllib2')
       urllib2.Request.should be_a(RubyPython::RubyPyClass)
     end
 
+    it "should pass named args via bang method" do
+      @objects.named_args!(:arg2 => 2, :arg1 => 1).rubify.should == [4,2]
+    end
+
+    it "should pass through keyword arguments via bang method" do
+      builtinProxy = described_class.new @builtin
+      builtinProxy.dict!({'dict'=>'val'}, :keyword=>true).rubify.should == {
+        'dict' => 'val',
+        'keyword' => true
+      }
+    end
   end
 
   describe "when used with an operator" do
-
     [
       '+', '-', '/', '*', '&', '^', '%', '**',
       '>>', '<<', '<=>', '|'
     ].each do |op|
-      it "delegates #{op}" do
+      it "should delegate #{op}" do
         @six.__send__(op, @two).rubify.should == 6.__send__(op, 2)
       end
     end
@@ -197,49 +191,48 @@ describe RubyPython::RubyPyProxy do
     [
       '~', '-@', '+@'
     ].each do |op|
-      it "delegates #{op}" do
+      it "should delegate #{op}" do
         @six.__send__(op).rubify.should == 6.__send__(op)
       end
     end
 
     ['==', '<', '>', '<=', '>='].each do |op|
-      it "delegates #{op}" do
+      it "should delegate #{op}" do
         @six.__send__(op, @two).should == 6.__send__(op, 2)
       end
     end
 
     describe "#equal?" do
-      it "is true for proxies representing the same object" do
+      it "be true given proxies representing the same object" do
         obj1 = @objects.RubyPythonMockObject
         obj2 = @objects.RubyPythonMockObject
         obj1.should equal(obj2)
       end
 
-      it "is false for objects which are different" do
+      it "should be false given objects which are different" do
         @two.should_not equal(@six)
       end
-
     end
 
-    it "allows list indexing" do
+    it "should allow list indexing" do
       array = described_class.new(AnArray)
       array[1].rubify.should == AnArray[1]
     end
 
-    it "allows dict access" do
+    it "should allow dict access" do
       dict = described_class.new(AHash)
       key = AConvertedHash.keys[0]
       dict[key].rubify.should == AConvertedHash[key]
     end
 
-    it "allows list index assignment" do
+    it "should allow list index assignment" do
       array = described_class.new(AnArray)
       val = AString*2
       array[1] = val
       array[1].rubify.should == val
     end
 
-    it "allows dict value modification" do
+    it "should allow dict value modification" do
       dict = described_class.new(AHash)
       key = AConvertedHash.keys[0]
       val = AString*2
@@ -247,24 +240,22 @@ describe RubyPython::RubyPyProxy do
       dict[key].rubify.should == val
     end
 
-    it "allows creation of new dict key-val pair" do
+    it "should allow creation of new dict key-val pair" do
       dict = described_class.new(AHash)
       key = AString*2
       dict[key] = AString
       dict[key].rubify.should == AString
     end
 
-    it "allows membership tests with include?" do
+    it "should allow membership tests with include?" do
       list = described_class.new(AnArray)
       list.include?(AnArray[0]).should be_true
     end
   end
 
-
-  it "delegates object equality" do
+  it "should delegate object equality" do
     urllib_a = RubyPython.import('urllib')
     urllib_b = RubyPython.import('urllib')
     urllib_a.should == urllib_b
   end
-
 end