rubypython 0.6.2 → 0.6.3

data/spec/basic_spec.rb

@@ -8,7 +8,7 @@ describe "RubyPython" do
     string = cPickle.dumps("Testing RubyPython.")
     string.should_not be_a_kind_of String
     string.rubify.should be_a_kind_of String
-    string.rubify.should == "S'Testing RubyPython.'\np1\n."
+    string.rubify.should ~ /S'Testing RubyPython.'\n/
   end
 
   it "can import and use a pure Python extension like pickle" do
@@ -16,7 +16,7 @@ describe "RubyPython" do
     string = pickle.dumps("Testing RubyPython.")
     string.should_not be_a_kind_of String
     string.rubify.should be_a_kind_of String
-    string.rubify.should == "S'Testing RubyPython.'\np0\n."
+    string.rubify.should ~ /S'Testing RubyPython.'\n/
   end
 
   it "can use iterators from Python" do

data/spec/pyobject_spec.rb

@@ -120,24 +120,6 @@ describe RubyPython::PyObject do
     end
   end
 
-  describe "#makeTuple" do
-    it "should wrap 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
-      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
-      arg = @objects.a_tuple.pObject
-      converted = described_class.makeTuple(arg)
-      converted.pointer.address.should == arg.pointer.address
-    end
-  end
 
   describe "#callObject" do
     #Expand coverage types
@@ -151,15 +133,6 @@ describe RubyPython::PyObject do
     end
   end
 
-  describe "#newList" do
-    it "should wrap supplied args in a Python list" do
-      args = AnArray.map do |obj|
-        described_class.new obj
-      end
-      described_class.newList(*args).rubify.should == AnArray
-    end
-  end
-
   describe "#function_or_method?" do
     it "should be true given a method" do
       mockObjClass = @objects.RubyPythonMockObject.pObject
@@ -226,21 +199,4 @@ describe RubyPython::PyObject do
 
   end
 
-  describe ".convert" do
-    it "should 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
-      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
-      described_class.convert(*AnArray).each do |x|
-        x.should be_a_kind_of described_class
-      end
-    end
-  end
 end

data/spec/refcnt_spec.rb

@@ -8,8 +8,7 @@ def get_refcnt(pobject)
   elsif pobject.kind_of? RubyPython::PyObject
     pobject = pobject.pointer
   end
-  struct = RubyPython::Python::PyObjectStruct.new pobject
-  struct[:ob_refcnt]
+  RubyPython::Macros.Py_REFCNT pobject
 end
 
 include TestConstants
@@ -59,4 +58,41 @@ describe 'Reference Counting' do
       end
     end
   end
+
+  describe RubyPython::Conversion do
+    describe ".rtopArrayToList" do
+      it "should incref any wrapped objects in the array" do
+        int = RubyPython::PyObject.new AnInt
+        refcnt = get_refcnt(int)
+        arr = [int]
+        pyArr = subject.rtopArrayToList(arr)
+        get_refcnt(int).should == refcnt + 1
+      end
+
+    end
+
+    describe ".rtopObject" do
+      [
+        ["string", AString],
+        ["float", AFloat],
+        ["array", AnArray],
+        #["symbol", ASym],
+        ["hash", AHash]
+      ].each do |arr|
+        type, input = arr
+
+        it "should return a refcnt of 1 for newly created #{type}" do
+          pyObj = subject.rtopObject(input)
+          get_refcnt(pyObj).should == 1
+        end
+
+        it "should increment the refcnt each time the same #{type} is passed in" do
+          pyObj = RubyPython::PyObject.new subject.rtopObject(input)
+          refcnt = get_refcnt(pyObj)
+          pyObj2 = subject.rtopObject(pyObj)
+          get_refcnt(pyObj2).should == refcnt + 1
+        end
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -52,7 +52,7 @@ RSpec.configure do |config|
     end
   end
 
-  config.before(:all, :self_start => nil) do
+  config.before(:all) do
     RubyPython.start
 
     @sys = RubyPython.import 'sys'
@@ -61,6 +61,10 @@ RSpec.configure do |config|
     @basics = RubyPython.import 'basics'
   end
 
+  config.before(:all, :self_start => true) do 
+    RubyPython.stop
+  end
+
   config.after(:all) do
     RubyPython.stop
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubypython
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -39,22 +39,22 @@ cert_chain:
   OWdkQjNqVmViN0puVExZK1dsSFd0MnJGVmJlcXY3S3RKbHA3KzR1V01La3pU
   YlcvdWpkRwpjZ3VKTWlRQ1NPbFVQWnhDV1dNa2pmWmJYdnRTNVZkekpldlNx
   UT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70207972655700 !ruby/object:Gem::Requirement
+  requirement: &70104953559200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70207972655700
+  version_requirements: *70104953559200
 - !ruby/object:Gem::Dependency
   name: blankslate
-  requirement: &70207972655080 !ruby/object:Gem::Requirement
+  requirement: &70104953558540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +62,10 @@ dependencies:
         version: 2.1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70207972655080
+  version_requirements: *70104953558540
 - !ruby/object:Gem::Dependency
   name: rubyforge
-  requirement: &70207972653860 !ruby/object:Gem::Requirement
+  requirement: &70104953557840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,10 +73,10 @@ dependencies:
         version: 2.0.4
   type: :development
   prerelease: false
-  version_requirements: *70207972653860
+  version_requirements: *70104953557840
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70207972652560 !ruby/object:Gem::Requirement
+  requirement: &70104953557080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -84,10 +84,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70207972652560
+  version_requirements: *70104953557080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70207972651440 !ruby/object:Gem::Requirement
+  requirement: &70104953556240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -95,10 +95,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70207972651440
+  version_requirements: *70104953556240
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70207972649980 !ruby/object:Gem::Requirement
+  requirement: &70104953555580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -106,10 +106,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70207972649980
+  version_requirements: *70104953555580
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70207972648560 !ruby/object:Gem::Requirement
+  requirement: &70104953570780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,7 +117,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70207972648560
+  version_requirements: *70104953570780
 description: ! 'RubyPython is a bridge between the Ruby and Python interpreters. It
   embeds a
 
@@ -166,7 +166,6 @@ files:
 - 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/pygenerator.rb
@@ -180,7 +179,6 @@ files:
 - spec/basic_spec.rb
 - spec/callback_spec.rb
 - spec/conversion_spec.rb
-- spec/legacy_spec.rb
 - spec/pymainclass_spec.rb
 - spec/pyobject_spec.rb
 - spec/python_helpers/basics.py

data/lib/rubypython/legacy.rb

@@ -1,18 +0,0 @@
-require 'rubypython'
-
-# A quick way to activate <em>Legacy Mode</em> for a project. Requiring
-# +'rubypython/legacy' automatically activates +RubyPython.legacy_mode+ on
-# the project. This mode is deprecated and will be removed.
-module RubyPython::LegacyMode
-  # Enables +RubyPython.legacy_mode+.
-  def self.setup_legacy
-    RubyPython.legacy_mode = true
-  end
-
-  # Disables +RubyPython.legacy_mode+.
-  def self.teardown_legacy
-    RubyPython.legacy_mode = false
-  end
-end
-
-RubyPython::LegacyMode.setup_legacy

data/spec/legacy_spec.rb

@@ -1,46 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
-include TestConstants
-
-describe 'RubyPython Legacy Mode Module' do
-  before :all do
-    require 'rubypython/legacy'
-  end
-
-  after :all do
-    RubyPython::LegacyMode.teardown_legacy
-  end
-
-  describe "when required" do
-    it "should enable 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