ffi 1.6.0 → 1.7.0.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4b02011f725689588699c1e191e3d52a77542ac
-  data.tar.gz: 63402428405516ddb0fcbcab3ddc7ce45cffd70e
+  metadata.gz: c8e0e169711bac631dcc3627cd32335671f3e931
+  data.tar.gz: 204499b27f918bb2a373c565c01f3ebb65f77e8b
 SHA512:
-  metadata.gz: d275d0125d4e43a7c8ffd2c1951d271be177b4f691a8c32905739fc3b8ed5954002da1c0a9cb5a2842ff23fd381be6867bd3c30ab6948eac4c23aefa1d3145c7
-  data.tar.gz: e34b9102cd76c2818cfbeffee41e2d972a69d142634fbe2dc9cd497788463e6454464d2cbff61e53d9909d262b2589b043768b2d1d519c3f02ee128dac8d3c51
+  metadata.gz: 6503891a4924031002825708c8b02d04451defa6e958953c038e1e483d7491d2e12db7309d3fd83b75e2d239cc88cc17d101328714da11b4dd77d7a2117526bd
+  data.tar.gz: 9f8bdcf6cdd408fa7690b5c881e801818ed10f8805b38d711f490c3adafca9408a9a957cbe46fe2a70606bdbf718321be857e4db4a667728dc9c61b399c43841

data/ext/ffi_c/MethodHandle.c

@@ -77,7 +77,7 @@ typedef int bool;
 static bool prep_trampoline(void* ctx, void* code, Closure* closure, char* errmsg, size_t errmsgsize);
 static long trampoline_size(void);
 
-#if defined(__x86_64__) && defined(__GNUC__) && !defined(__sun)
+#if defined(__x86_64__) && (defined(__linux__) || defined(__APPLE__))
 # define CUSTOM_TRAMPOLINE 1
 #endif
 

data/ext/ffi_c/Pointer.c

@@ -396,6 +396,16 @@ ptr_free(VALUE self)
     return self;
 }
 
+static VALUE
+ptr_type_size(VALUE self)
+{
+    Pointer* ptr;
+
+    Data_Get_Struct(self, Pointer, ptr);
+    
+    return INT2NUM(ptr->memory.typeSize);
+}
+
 /*
  * call-seq: ptr.autorelease = autorelease
  * @param [Boolean] autorelease
@@ -481,6 +491,7 @@ rbffi_Pointer_Init(VALUE moduleFFI)
     rb_define_method(rbffi_PointerClass, "autorelease=", ptr_autorelease, 1);
     rb_define_method(rbffi_PointerClass, "autorelease?", ptr_autorelease_p, 0);
     rb_define_method(rbffi_PointerClass, "free", ptr_free, 0);
+    rb_define_method(rbffi_PointerClass, "type_size", ptr_type_size, 0);
 
     rbffi_NullPointerSingleton = rb_class_new_instance(1, &rbNullAddress, rbffi_PointerClass);
     /*

data/ffi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'ffi'
-  s.version = '1.6.0'
+  s.version = '1.7.0.dev'
   s.author = 'Wayne Meissner'
   s.email = 'wmeissner@gmail.com'
   s.homepage = 'http://wiki.github.com/ffi/ffi'

data/lib/ffi/autopointer.rb

@@ -64,7 +64,7 @@ module FFI
     #  going to be useful if you subclass {AutoPointer}, and override
     #  #release, which by default does nothing.
     def initialize(ptr, proc=nil, &block)
-      super(ptr)
+      super(ptr.type_size, ptr)
       raise TypeError, "Invalid pointer" if ptr.nil? || !ptr.kind_of?(Pointer) \
         || ptr.kind_of?(MemoryPointer) || ptr.kind_of?(AutoPointer)
 

data/lib/ffi/ffi.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="RVM: jruby-1.6.8" jdkType="JRUBY_SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v10.0.0, RVM: jruby-1.6.8) [gem]" level="application" />
+  </component>
+</module>
+

data/spec/ffi/pointer_spec.rb

@@ -99,6 +99,36 @@ describe "Pointer" do
     end
   end
 
+  it "Pointer.size returns sizeof pointer on platform" do
+    FFI::Pointer.size.should == (FFI::Platform::ADDRESS_SIZE / 8)
+  end
+
+  describe "#slice" do
+    before(:each) do
+      @mptr = FFI::MemoryPointer.new(:char, 12)
+      @mptr.put_uint(0, 0x12345678)
+      @mptr.put_uint(4, 0xdeadbeef)
+    end
+
+    it "contents of sliced pointer matches original pointer at offset" do
+      @mptr.slice(4, 4).get_uint(0).should == 0xdeadbeef
+    end
+
+    it "modifying sliced pointer is reflected in original pointer" do
+      @mptr.slice(4, 4).put_uint(0, 0xfee1dead)
+      @mptr.get_uint(4).should == 0xfee1dead
+    end
+
+    it "access beyond bounds should raise IndexError" do
+      lambda { @mptr.slice(4, 4).get_int(4) }.should raise_error(IndexError)
+    end
+  end
+
+  describe "#type_size" do
+    it "should be same as FFI.type_size(type)" do
+      FFI::MemoryPointer.new(:int, 1).type_size.should == FFI.type_size(:int)
+    end
+  end
 end
 
 describe "AutoPointer" do
@@ -212,5 +242,24 @@ describe "AutoPointer" do
     end
   end
 
+  describe "#type_size" do
+    ptr_class = Class.new(FFI::AutoPointer) do
+      def self.release(ptr); end
+    end
+
+    it "type_size of AutoPointer should match wrapped Pointer" do
+      aptr = ptr_class.new(FFI::Pointer.new(:int, 0xdeadbeef))
+      aptr.type_size.should == FFI.type_size(:int)
+    end
+    
+    it "[] offset should match wrapped Pointer" do
+      mptr = FFI::MemoryPointer.new(:int, 1024)
+      aptr = ptr_class.new(FFI::Pointer.new(:int, mptr))
+      aptr[0].write_uint(0xfee1dead)
+      aptr[1].write_uint(0xcafebabe)
+      mptr[0].read_uint.should == 0xfee1dead
+      mptr[1].read_uint.should == 0xcafebabe
+    end
+  end
 end
 

data/spec/ffi/{Ffi.iml → spec.iml}

@@ -2,8 +2,8 @@
 <module type="RUBY_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+    <content url="file://$MODULE_DIR$/..">
+      <sourceFolder url="file://$MODULE_DIR$/.." isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

data/spec/ffi/struct_by_ref_spec.rb

@@ -0,0 +1,43 @@
+#
+# This file is part of ruby-ffi.
+# For licensing, see LICENSE.SPECS
+#
+
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe FFI::Struct, ' by_ref' do
+  before :all do
+    @struct_class = struct_class = Class.new(FFI::Struct) do
+      layout :a, :pointer
+    end
+
+    @api = Module.new do 
+      extend FFI::Library
+      ffi_lib TestLibrary::PATH
+      fn = FFI::Type::POINTER.size == FFI::Type::LONG.size ? :ret_ulong : ret_uint64_t
+      attach_function :struct_test, fn, [ struct_class.by_ref ], :pointer
+    end
+  end
+
+  it "should accept instances of exact struct class" do
+    s = @struct_class.new
+    @api.struct_test(s).should == s.pointer
+  end
+  
+  it "should accept nil" do
+    @api.struct_test(nil).should == nil
+  end
+
+  it "should reject other types" do
+    lambda { @api.struct_test('test').should == nil }.should raise_error(TypeError)
+  end
+
+  it "should reject instances of other struct classes" do
+    other_class = Class.new(FFI::Struct) do
+      layout :a, :pointer
+    end
+
+    lambda { @api.struct_test(other_class.new) }.should raise_error(TypeError)
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0.dev
 platform: ruby
 authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -76,12 +76,12 @@ files:
 - ext/ffi_c/ClosurePool.c
 - ext/ffi_c/ClosurePool.h
 - ext/ffi_c/compat.h
+- ext/ffi_c/cruby-ext.iml
 - ext/ffi_c/DataConverter.c
 - ext/ffi_c/DynamicLibrary.c
 - ext/ffi_c/DynamicLibrary.h
 - ext/ffi_c/extconf.rb
 - ext/ffi_c/ffi.c
-- ext/ffi_c/Ffi_c.iml
 - ext/ffi_c/Function.c
 - ext/ffi_c/Function.h
 - ext/ffi_c/FunctionInfo.c
@@ -400,6 +400,7 @@ files:
 - lib/ffi/callback.rb
 - lib/ffi/enum.rb
 - lib/ffi/errno.rb
+- lib/ffi/ffi.iml
 - lib/ffi/ffi.rb
 - lib/ffi/io.rb
 - lib/ffi/library.rb
@@ -455,7 +456,6 @@ files:
 - spec/ffi/dup_spec.rb
 - spec/ffi/enum_spec.rb
 - spec/ffi/errno_spec.rb
-- spec/ffi/Ffi.iml
 - spec/ffi/ffi_spec.rb
 - spec/ffi/function_spec.rb
 - spec/ffi/library_spec.rb
@@ -467,9 +467,11 @@ files:
 - spec/ffi/rbx/memory_pointer_spec.rb
 - spec/ffi/rbx/spec_helper.rb
 - spec/ffi/rbx/struct_spec.rb
+- spec/ffi/spec.iml
 - spec/ffi/spec_helper.rb
 - spec/ffi/string_spec.rb
 - spec/ffi/strptr_spec.rb
+- spec/ffi/struct_by_ref_spec.rb
 - spec/ffi/struct_callback_spec.rb
 - spec/ffi/struct_initialize_spec.rb
 - spec/ffi/struct_packed_spec.rb
@@ -512,9 +514,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.0