ffi_dry 0.1.7 → 0.1.8

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.8 / 2010-2-16
+  * Updated for compatability with ffi 0.6.x's new requirement that 
+    libraries be included with 'ffi_lib' even if they are already linked.
+
 === 0.1.7 / 2010-2-05
   * Fixed bugs with FFI::Unions
   * Revamped the dsl_layout builder so that it just wraps layout() instead of

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/ffi_dry.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi_dry}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Monti"]
-  s.date = %q{2010-02-05}
+  s.date = %q{2010-02-16}
   s.description = %q{Provides some useful modules, classes, and methods for FFI bindings  as well as a DSL-like syntax for FFI::Struct layouts}
   s.email = %q{emonti@matasano.com}
   s.extra_rdoc_files = [

data/lib/ffi/dry.rb

@@ -2,6 +2,10 @@ begin; require 'rubygems'; rescue LoadError; end
 
 require 'ffi'
 
+unless defined?(FFI::Library::LIBC)
+  FFI::Library::LIBC = (RUBY_PLATFORM == 'mswin32' ?  'msvcrt' : 'c')
+end
+
 module FFI::DRY
   
   # A module to add syntactic sugar and some nice automatic getter/setter
@@ -233,7 +237,7 @@ module FFI::DRY
     # for the pointer will be returned.
     def p_struct(name, klass, o={})
       unless klass.kind_of?(Class)
-        raise(::ArgumentError, "klass must be a Class")
+        raise(TypeError, "klass must be a Class")
       end
       opts = o.merge(:p_struct => klass)
       offset = opts[:offset]
@@ -269,12 +273,12 @@ module FFI::DRY
       o={}
       if extra.size > 1
         raise(ArgumentError, 
-          "Bad field definition. Use: name :type, {optional extra parameters}")
+          "Bad field syntax. Use: 'name :type, {optional extra parameters}'")
       elsif h=extra.first
         if h.kind_of? Hash
           o=h
         else
-          raise(ArgumentError, "Options must be provided as a hash.")
+          raise(TypeError, "Options must be provided as a hash.")
         end
       end
       opts = o.merge(:name => name, :type => type)
@@ -376,10 +380,8 @@ module FFI::DRY
   module NetEndian
     extend ::FFI::Library
 
-    begin
-      ffi_lib 'wsock32'
-    rescue LoadError
-    end
+    ffi_lib FFI::Library::LIBC
+    begin; ffi_lib 'wsock32'; rescue LoadError; end
 
     attach_function :htons, [:uint16], :uint16
     attach_function :ntohs, [:uint16], :uint16

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ffi_dry
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Eric Monti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 -06:00
+date: 2010-02-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency