rubypython 0.5.3 → 0.6.0

data/lib/rubypython/rubypyproxy.rb

@@ -96,7 +96,7 @@ module RubyPython
     def _wrap(pyobject)
       if pyobject.class?
         RubyPyClass.new(pyobject)
-      elsif RubyPython.legacy_mode
+      elsif RubyPython.__send__ :legacy_mode?
         pyobject.rubify
       else
         RubyPyProxy.new(pyobject)

data/lib/rubypython/tuple.rb

@@ -0,0 +1,10 @@
+module RubyPython
+  # A subclass of ::Array that will convert to a Python Tuple automatically.
+  class Tuple < ::Array
+    def self.tuple(array)
+      value = self.new
+      value.replace(array.dup)
+      value
+    end
+  end
+end

data/spec/conversion_spec.rb

@@ -12,7 +12,7 @@ describe RubyPython::Conversion do
       ["a string", "a string", AString],
       ["a string_with_nulls", "a string_with_nulls", AStringWithNULLs],
       ["a list", "an array", AnArray],
-      ["a tuple", "an array", AnArray],
+      ["a tuple", "a tuple", ATuple],
       ["a dict", "a hash", AConvertedHash],
       ["python True", "true", true],
       ["python False", "false", false],
@@ -20,7 +20,9 @@ describe RubyPython::Conversion do
     ].each do |py_type, rb_type, output|
       it "should convert #{py_type} to #{rb_type}" do
         py_object_ptr = @objects.__send__(py_type.sub(' ', '_')).pObject.pointer
-        subject.ptorObject(py_object_ptr).should == output
+        obj = subject.ptorObject(py_object_ptr)
+        obj.should == output
+        obj.class.should == output.class
       end
     end
 
@@ -38,6 +40,7 @@ describe RubyPython::Conversion do
       ["a string_with_nulls", "a string_with_nulls", AStringWithNULLs],
       ["a string", "a symbol", ASym],
       ["a list", "an array", AnArray],
+      ["a tuple", "a tuple", ATuple ],
       ["a dict", "a hash", AConvertedHash],
       ["python True", "true", true],
       ["python False", "false", false],
@@ -56,5 +59,10 @@ describe RubyPython::Conversion do
     it "should raise an exception when it cannot convert" do
       lambda { subject.rtopObject(Class) }.should raise_exception(subject::UnsupportedConversion)
     end
+
+    it "should convert a tuple correctly" do
+      @basics.expects_tuple(AnArray).should == false
+      @basics.expects_tuple(RubyPython::Tuple.tuple(AnArray)).should == true
+    end
   end
 end

data/spec/python_helpers/basics.py

@@ -18,3 +18,6 @@ def simple_generator(callback):
 
 def named_args(arg1, arg2):
   return [arg1, arg2]
+
+def expects_tuple(tvalue):
+  return isinstance(tvalue, tuple)

data/spec/rubypython_spec.rb

@@ -56,28 +56,4 @@ describe RubyPython, :self_start => true do
       RubyPython.stop.should be_false
     end
   end
-
-  describe '#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 '.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
 end

data/spec/spec_helper.rb

@@ -17,6 +17,8 @@ module TestConstants
   AChar = 'a'
   AFloat = 1.0
   AnArray = [AnInt, AChar, AFloat, AString]
+  ATuple = RubyPython::Tuple.tuple(AnArray)
+# ATuple << AnInt << AChar << AFloat << AString
   ASym = :sym
   AHash = {
     AnInt => AnInt,

metadata

@@ -1,150 +1,158 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubypython
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 3
-  version: 0.5.3
 platform: ruby
-authors: 
+authors:
 - Steeve Morin
 - Austin Ziegler
 - Zach Raines
 autorequire: 
 bindir: bin
-cert_chain: []
-
-date: 2011-10-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURTRENDQWpDZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREJLTVJ3d0dnWURWUVFEREJOeVlX
+  bHUKWlhONmJWOXlkV0o1Y0hsMGFHOXVNUlV3RXdZS0NaSW1pWlB5TEdRQkdS
+  WUZaMjFoYVd3eEV6QVJCZ29Ka2lhSgprL0lzWkFFWkZnTmpiMjB3SGhjTk1U
+  QXdPREE0TURJME5UTXdXaGNOTVRFd09EQTRNREkwTlRNd1dqQktNUnd3Ckdn
+  WURWUVFEREJOeVlXbHVaWE42YlY5eWRXSjVjSGwwYUc5dU1SVXdFd1lLQ1pJ
+  bWlaUHlMR1FCR1JZRloyMWgKYVd3eEV6QVJCZ29Ka2lhSmsvSXNaQUVaRmdO
+  amIyMHdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBdwpnZ0VLQW9J
+  QkFRRFBTbW14WXFXV041M1hyRDRidFowOHR3aXBSejVwcmlURnR3bUtMMDFX
+  ZmhIYTY2T2hEb1YyCk9QdFcwUm9XZWdaNWd0aS9nSjY3UDZJVmwxeUJla2ZW
+  NTgxeUhzWnFWN1ZxY09rRGJUOTNGM0h1VExIMTJkMUMKdy9PaEhvR1pVVVJl
+  ZE5lU01qS21NU2xDQ0Q0cnpDZlhUZUFFVTZFM3JYaDN1MkFEN2tRZmVZY1pB
+  L3UwWWdyRApsUzNjMm9YM0d2SkhqZDRoVjVoSUdnT0dYRHhjZ0g1UzFpTzY1
+  ODhTQnhMTit4ZFlDODJ3MDllNXIwOXRCdm8zCkJYWmxzRXJ3dVdSSThIYTd5
+  NnRoYnJCMjhHUzVqSTM3OGV3NGtTVVMvMVQ5U3o0RWNQbWh5aHlDZVh2dnNk
+  Q20KNEJ2TlBNQmwveVAyZmhjdWJNRC9RMHQ5SWE5Y2hWYzNBZ01CQUFHak9U
+  QTNNQWtHQTFVZEV3UUNNQUF3SFFZRApWUjBPQkJZRUZOTG5jVS9LajFSUnNq
+  YjVibEFoaWswaGd2S0NNQXNHQTFVZER3UUVBd0lFc0RBTkJna3Foa2lHCjl3
+  MEJBUVVGQUFPQ0FRRUFqOHoxa1JTLzFzSFUyeVJab3RoS3Jnc09Mb0R4RjEr
+  dVlxOTA5clMyZDZGcU9KYnQKVjA4SmFPaWwvZU1sVGpQazduQlVVOU9abE5t
+  YjhvRDBXdDJMZ3Y5R0ZNSkptMG1jaDc2N05rM2gxdDlxaUpKQwp2NElkYTdl
+  NitBckFjSEV4UXgvbHVsMmpKQ1dlemdJVnh6OVQ5dW5PZnZ5bE95WHdBSFY0
+  RUVLNDdFZVUxVFpWClQ0Y01sMkp5eXRCdGpDUHlkVkpHZmlyeGxNN2FUTU9a
+  NkZ2VWJDaUZ2SGF5bUFnb09WWm1tN05wRTZHc01UN2cKMWIxVWNRcXZMcXlw
+  OWdkQjNqVmViN0puVExZK1dsSFd0MnJGVmJlcXY3S3RKbHA3KzR1V01La3pU
+  YlcvdWpkRwpjZ3VKTWlRQ1NPbFVQWnhDV1dNa2pmWmJYdnRTNVZkekpldlNx
+  UT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+date: 2012-04-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70222401734660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 0
-        - 7
+      - !ruby/object:Gem::Version
         version: 1.0.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: blankslate
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70222401734660
+- !ruby/object:Gem::Dependency
+  name: blankslate
+  requirement: &70222401749300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 105
-        segments: 
-        - 2
-        - 1
-        - 2
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.2.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70222401749300
+- !ruby/object:Gem::Dependency
+  name: rubyforge
+  requirement: &70222401748780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.4
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70222401748780
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70222401748240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: *70222401748240
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70222401747560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: tilt
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70222401747560
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: &70222401746580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70222401746580
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &70222401745800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 12
-        version: "2.12"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id006
-description: |-
-  RubyPython is a bridge between the Ruby and Python interpreters. It embeds a
-  running Python interpreter in the Ruby application's process using FFI and
+  prerelease: false
+  version_requirements: *70222401745800
+description: ! 'RubyPython is a bridge between the Ruby and Python interpreters. It
+  embeds a
+
+  running Python interpreter in the Ruby application''s process using FFI and
+
   provides a means for wrapping, converting, and calling Python objects and
+
   methods.
-  
+
+
   RubyPython uses FFI to marshal the data between the Ruby and Python VMs and
+
   make Python calls. You can:
-  
+
+
   * Inherit from Python classes.
+
   * Configure callbacks from Python.
-  * Run Python generators (on Ruby 1.9.2 or later).
-email: 
+
+  * Run Python generators (on Ruby 1.9.2 or later).'
+email:
 - swiuzzz+rubypython@gmail.com
 - austin@rubyforge.org
 - raineszm+rubypython@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- Manifest.txt
-- PostInstall.txt
+extra_rdoc_files:
 - Contributors.rdoc
 - History.rdoc
 - License.rdoc
+- Manifest.txt
+- PostInstall.txt
 - README.rdoc
-files: 
+files:
 - .autotest
-- .gitignore
-- .hgignore
-- .hgtags
 - .rspec
 - Contributors.rdoc
 - History.rdoc
@@ -157,17 +165,17 @@ files:
 - lib/rubypython.rb
 - lib/rubypython/blankobject.rb
 - lib/rubypython/conversion.rb
+- lib/rubypython/interpreter.rb
 - lib/rubypython/legacy.rb
 - lib/rubypython/macros.rb
 - lib/rubypython/operators.rb
-- lib/rubypython/options.rb
 - lib/rubypython/pygenerator.rb
 - lib/rubypython/pymainclass.rb
 - lib/rubypython/pyobject.rb
 - lib/rubypython/python.rb
 - lib/rubypython/pythonerror.rb
-- lib/rubypython/pythonexec.rb
 - lib/rubypython/rubypyproxy.rb
+- lib/rubypython/tuple.rb
 - lib/rubypython/type.rb
 - spec/basic_spec.rb
 - spec/callback_spec.rb
@@ -187,37 +195,29 @@ files:
 - .gemtest
 homepage: 
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - Python, ~> 2.4
 rubyforge_project: rubypython
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: RubyPython is a bridge between the Ruby and Python interpreters
 test_files: []
-

data/.gitignore

@@ -1,13 +0,0 @@
-spec/ldap.yml
-.rvmrc
-pkg/
-*.swp
-*.pyc
-html/
-doc/
-publish/
-coverage/
-coverage.info
-.rake_tasks~
-.DS_Store
-website/index.html