rubypython 0.3.1 → 0.3.2

data/spec/rubypyproxy_spec.rb

@@ -3,7 +3,14 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 
 include TestConstants
 describe RubyPython::RubyPyProxy do
-  include RubyPythonStartStop
+
+  before do
+    RubyPython.start
+  end
+  
+  after do
+    RubyPython.start
+  end
 
   before do
     @a = RubyPython::PyObject.new "a"
@@ -20,7 +27,7 @@ describe RubyPython::RubyPyProxy do
   end
 
   describe "#new" do
-    it "should accept a PyObject instance" do
+    it "accepts a PyObject instance" do
       rbPyObject = RubyPython::PyObject.new AString
       lambda {described_class.new rbPyObject}.should_not raise_exception
     end
@@ -37,7 +44,7 @@ describe RubyPython::RubyPyProxy do
       type, input, output = arr
       output ||= input
 
-      it "should convert #{type} to wrapped pObject" do
+      it "converts #{type} to wrapped pObject" do
         described_class.new(input).pObject.rubify.should == output
       end
 
@@ -53,7 +60,7 @@ describe RubyPython::RubyPyProxy do
       ["a symbol", ASym],
       ["a hash", AHash]
     ].each do |title, obj|
-      it "should faithfully unwrap #{title}" do
+      it "faithfully unwraps #{title}" do
         pyObject = RubyPython::PyObject.new obj
         proxy = described_class.new pyObject
         proxy.rubify.should == pyObject.rubify
@@ -63,57 +70,65 @@ describe RubyPython::RubyPyProxy do
 
   describe "#inspect" do
 
-    it "should return 'repr' of wrapped object" do
+    it "returns 'repr' of wrapped object" do
       @six.inspect.should == '6'
     end
 
-    it "should gracefully handle lack of defined __repr__" do
+    it "gracefully handles 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 "should return 'str' of wrapped object" do
+    it "returns 'str' of wrapped object" do
       @six.to_s.should == '6'
     end
 
-    it "should gracefully handle lack of defined __str__" do
+    it "gracefully handles lack of defined __str__" do
       lambda { @objects.RubyPythonMockObject.to_s }.should_not raise_exception
     end
+
+    it "always tries the 'str' function if __repr__ produces an error" do
+      RubyPython::PyMain.list.to_s.should == run_python_command('print str(list)').chomp
+    end
   end
 
   describe "#to_a" do
-    it "should convert a list to an array of its entries" do
+    it "converts 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 "should convert a tuple to an array of its entries" do
+    it "converts 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 "should convert a dict to an array of keys" do
+    it "converts 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 "should return true for getters" do
+    it "is true for getters" do
       @objects.should respond_to(:RubyPythonMockObject)
     end
 
-    it "should return false for undefined methods" do
+    it "is false for undefined methods" do
       @objects.should_not respond_to(:undefined_attr)
     end
 
-    it "should return true for any setter" do
+    it "is true for any setter" do
       @objects.should respond_to(:any_variable=)
     end
 
-    it "should return true for methods on RubyPyProxy instance" do
+    it "is true for methods on RubyPyProxy instance" do
       @objects.should respond_to(:inspect)
     end
 
@@ -121,45 +136,51 @@ describe RubyPython::RubyPyProxy do
 
   describe "method delegation" do
 
-    it "should refer method calls to wrapped object" do
+    it "refers 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 "should raise NoMethodError when method is undefined" do
+    it "raises NoMethodError when method is undefined" do
       aProxy = described_class.new @a
       lambda {aProxy.wat}.should raise_exception(NoMethodError)
     end
 
-    it "should allow methods to be called with no arguments" do
+    it "raises NoMethodError when boolean method is undefine" do
+      aProxy = described_class.new @a
+      lambda { aProxy.wat? }.should raise_exception(NoMethodError)
+    end
+
+    it "allows methods to be called with no arguments" do
       builtinProxy = described_class.new @builtin
       rbStrClass = builtinProxy.str
       rbStrClass.new.rubify.should == String.new
     end
 
-    it "should fetch attributes when method name is an attribute" do
+    it "fetchs 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 "should set attribute if method call is a setter" do
+    it "sets attribute if method call is a setter" do
       stringProxy = described_class.new @string
       stringProxy.letters = AString
       stringProxy.letters.rubify.should == AString
     end
 
-    it "should create nonexistent attirubte if method call is a setter" do
+    it "creates nonexistent attirubte if method call is a setter" do
       stringProxy = described_class.new @string
       stringProxy.nonExistent = 1
       stringProxy.nonExistent.rubify.should == 1
     end
 
-    it "should return a class as a RubyPyClass" do
+    it "returns a class as a RubyPyClass" do
       urllib2 = RubyPython.import('urllib2')
       urllib2.Request.should be_a(RubyPython::RubyPyClass)
     end
+
   end
 
   describe "when used with an operator" do
@@ -168,7 +189,7 @@ describe RubyPython::RubyPyProxy do
       '+', '-', '/', '*', '&', '^', '%', '**',
       '>>', '<<', '<=>', '|'
     ].each do |op|
-      it "should delegate #{op}" do
+      it "delegates #{op}" do
         @six.__send__(op, @two).rubify.should == 6.__send__(op, 2)
       end
     end
@@ -176,49 +197,49 @@ describe RubyPython::RubyPyProxy do
     [
       '~', '-@', '+@'
     ].each do |op|
-      it "should delegate #{op}" do
+      it "delegates #{op}" do
         @six.__send__(op).rubify.should == 6.__send__(op)
       end
     end
 
     ['==', '<', '>', '<=', '>='].each do |op|
-      it "should delegate #{op}" do
+      it "delegates #{op}" do
         @six.__send__(op, @two).should == 6.__send__(op, 2)
       end
     end
 
     describe "#equal?" do
-      it "be true for proxies representing the same object" do
+      it "is true for proxies representing the same object" do
         obj1 = @objects.RubyPythonMockObject
         obj2 = @objects.RubyPythonMockObject
         obj1.should equal(obj2)
       end
 
-      it "should be false for objects which are different" do
+      it "is false for objects which are different" do
         @two.should_not equal(@six)
       end
 
     end
 
-    it "should allow list indexing" do
+    it "allows list indexing" do
       array = described_class.new(AnArray)
       array[1].rubify.should == AnArray[1]
     end
 
-    it "should allow dict access" do
+    it "allows dict access" do
       dict = described_class.new(AHash)
       key = AConvertedHash.keys[0]
       dict[key].rubify.should == AConvertedHash[key]
     end
 
-    it "should allow list index assignment" do
+    it "allows list index assignment" do
       array = described_class.new(AnArray)
       val = AString*2
       array[1] = val
       array[1].rubify.should == val
     end
 
-    it "should allow dict value modification" do
+    it "allows dict value modification" do
       dict = described_class.new(AHash)
       key = AConvertedHash.keys[0]
       val = AString*2
@@ -226,21 +247,21 @@ describe RubyPython::RubyPyProxy do
       dict[key].rubify.should == val
     end
 
-    it "should allow creation of new dict key-val pair" do
+    it "allows 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 "should allow membership tests with include?" do
+    it "allows membership tests with include?" do
       list = described_class.new(AnArray)
       list.include?(AnArray[0]).should be_true
     end
   end
 
 
-  it "should delegate object equality" do
+  it "delegates object equality" do
     urllib_a = RubyPython.import('urllib')
     urllib_b = RubyPython.import('urllib')
     urllib_a.should == urllib_b

data/spec/rubypython_spec.rb

@@ -1,23 +1,30 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe RubyPython do
-  include RubyPythonStartStop
+
+  before do
+    RubyPython.start
+  end
+  
+  after do
+    RubyPython.start
+  end
 
   describe "#import" do
-    it "should handle multiple imports" do
+    it "handles multiple imports" do
       lambda do
         RubyPython.import 'cPickle'
         RubyPython.import 'urllib'
       end.should_not raise_exception
     end
 
-    it "should propagate Python errors" do
+    it "propagates Python errors" do
       lambda do
         RubyPython.import 'nonExistentModule'
       end.should raise_exception(RubyPython::PythonError)
     end
 
-    it "should return a RubyPyModule" do
+    it "returns a RubyPyModule" do
       RubyPython.import('urllib2').should be_a(RubyPython::RubyPyModule)
     end
   end
@@ -26,14 +33,14 @@ end
 
 describe RubyPython, "#session" do
 
-  it "should start interpreter" do
+  it "starts interpreter" do
     RubyPython.session do
       cPickle = RubyPython.import "cPickle"
       cPickle.loads("(dp1\nS'a'\nS'n'\ns(I1\nS'2'\ntp2\nI4\ns.").rubify.should == {"a"=>"n", [1, "2"]=>4}
     end
   end
 
-  it "should stop the interpreter" do
+  it "stops the interpreter" do
     RubyPython.session do
       cPickle = RubyPython.import "cPickle"
     end
@@ -44,14 +51,14 @@ end
 
 describe RubyPython, "#run" do
 
-  it "should start interpreter" do
+  it "starts interpreter" do
     RubyPython.run do
       cPickle = import "cPickle"
       cPickle.loads("(dp1\nS'a'\nS'n'\ns(I1\nS'2'\ntp2\nI4\ns.").rubify.should == {"a"=>"n", [1, "2"]=>4}
     end
   end
 
-  it "should stop the interpreter" do
+  it "stops the interpreter" do
     RubyPython.run do
       cPickle = import "cPickle"
     end
@@ -60,3 +67,29 @@ describe RubyPython, "#run" do
   end
 
 end
+
+describe RubyPython, '#reload_library', :slow => true do
+  it 'leaves RubyPython in a stable state' do
+    lambda do 
+      RubyPython.instance_eval { reload_library }
+      RubyPython.run {}
+    end.should_not raise_exception
+  end
+
+end
+
+describe RubyPython, '.configure', :slow => true do
+  it 'allows python executable to be specified', :unless => `which python2.6`.empty? do
+    RubyPython.configure :python_exe => 'python2.6'
+    RubyPython.run do
+      sys = RubyPython.import 'sys'
+      sys.version.rubify.to_f.should == 2.6
+    end
+
+  end
+
+  after(:all) do
+    RubyPython.clear_options
+    RubyPython.instance_eval { reload_library }
+  end
+end

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
 begin
-  require 'spec'
+  require 'rspec'
   require 'ffi'
 rescue LoadError
   require 'rubygems' unless ENV['NO_RUBYGEMS']
   gem 'rspec'
-  require 'spec'
+  require 'rspec'
   require 'ffi'
 end
 
@@ -29,6 +29,15 @@ module TestConstants
       key = k.is_a?(Symbol)? k.to_s : k
       [key,v]
     end.flatten]
+
+    AProc = Proc.new { |a1, a2| a1 + a2 }
+
+    def self.a_method(a1, a2)
+      a1 + a2
+    end
+
+    AMethod = method(:a_method)
+
 end
 
 def run_python_command(cmd)
@@ -38,14 +47,3 @@ end
 class RubyPython::RubyPyProxy
   [:should, :should_not, :class].each { |m| reveal(m) }
 end
-
-share_as :RubyPythonStartStop do
-  before do
-    RubyPython.start
-  end
-
-  after do
-    RubyPython.stop
-  end
-end
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubypython
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Zach Raines
@@ -36,7 +36,7 @@ cert_chain:
   cguJMiQCSOlUPZxCWWMkjfZbXvtS5VdzJevSqQ==
   -----END CERTIFICATE-----
 
-date: 2011-01-19 00:00:00 -05:00
+date: 2011-02-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,21 @@ dependencies:
         version: 2.1.2.3
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id003
 description: A bridge between ruby and python
 email: 
 - raineszm+rubypython@gmail.com
@@ -91,30 +106,33 @@ files:
 - PostInstall.txt
 - README.markdown
 - Rakefile
+- .rspec
 - lib/rubypython.rb
 - lib/rubypython/blankobject.rb
+- lib/rubypython/conversion.rb
 - lib/rubypython/core_ext/string.rb
-- lib/rubypython/pythonerror.rb
+- lib/rubypython/legacy.rb
 - lib/rubypython/macros.rb
-- lib/rubypython/conversion.rb
 - lib/rubypython/operators.rb
-- lib/rubypython/pyobject.rb
+- lib/rubypython/options.rb
 - lib/rubypython/pymainclass.rb
+- lib/rubypython/pyobject.rb
 - lib/rubypython/python.rb
+- lib/rubypython/pythonerror.rb
 - lib/rubypython/rubypyproxy.rb
 - lib/rubypython/version.rb
-- lib/rubypython/legacy.rb
+- spec/callback_spec.rb
+- spec/conversion_spec.rb
+- spec/legacy_spec.rb
 - spec/pymainclass_spec.rb
 - spec/pyobject_spec.rb
 - spec/python_helpers/objects.py
+- spec/python_helpers/objects.pyc
 - spec/pythonerror_spec.rb
+- spec/refcnt_spec.rb
 - spec/rubypyclass_spec.rb
 - spec/rubypyproxy_spec.rb
 - spec/rubypython_spec.rb
-- spec/refcnt_spec.rb
-- spec/conversion_spec.rb
-- spec/legacy_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: yard
 homepage: http://bitbucket.org/raineszm/rubypython/

data/spec/spec.opts

@@ -1,2 +0,0 @@
---colour
---format specdoc