fiddley 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf2d272d2170487e17fb8f3c96e70076228361f6
-  data.tar.gz: c1a3515ec44871af8a51f0e482f1bcc0352903f0
+  metadata.gz: 89adacb7382de9ea109dda5d0a9aa9a0126a3198
+  data.tar.gz: f8e12868b55cddad59d0981a01690d41b23888dc
 SHA512:
-  metadata.gz: 8679a00557727ed2d2590f82f7d85f9977c415f5001338d4463653f28d407b0270dbd24b6e51a20a42ee4139e2cfa7c8de197a4b371b519cabd49a1e1e88b270
-  data.tar.gz: 538b0728b44e29d737fbfb6a3f0d8ff0f572049853ed45a2a4cdd554eaec1ddc95528659b648dde7a8d65b5e6a4cee1d4e321631801b879cff6159b978067fb5
+  metadata.gz: 1e455169f82ace8c779056efe3c6eda4f88ab6a5d13012a9d3bea5c59246876278e9cabccd73f72dab79e7151687a9af96493f7f97bc55bbcd45d922c8d8b829
+  data.tar.gz: 03bc837b03cf53ccbe543efe6432596a34e158646bf91894ac7282c392cb14401cddc8f7f3c9516ede054a6194891ed3cc7d347bc5f61fc36c503fad30dc034d

data/lib/fiddley.rb

@@ -1,5 +1,5 @@
 module Fiddley
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end
 
 require "fiddley/function"

data/lib/fiddley/library.rb

@@ -1,4 +1,5 @@
 require "fiddle/import"
+require "fiddley/struct"
 require "fiddley/utils"
 
 module Fiddley
@@ -45,13 +46,12 @@ module Fiddley
         cname = rname
       end
       extern "#{type2str(ret)} #{cname}(#{params.map{|e| type2str(e)}.join(', ')})", @convention
-      if ret == :string
-        tname = (cname.to_s + '+').to_sym
-        instance_eval <<-end
-          alias #{tname.inspect} #{cname.inspect}
-        end
-        define_singleton_method(cname) do |*args|
-          __send__(tname, *args).to_s
+      case ret
+      when :string
+        wrap_function(cname, &:to_s)
+      when :pointer
+        wrap_function(cname) do |result|
+          Fiddley::MemoryPointer.new(ret, result)
         end
       end
       if cname != rname
@@ -61,6 +61,16 @@ module Fiddley
       end
     end
 
+    private def wrap_function(cname, &blk)
+      tname = (cname.to_s + '+').to_sym
+      instance_eval <<-end
+        alias #{tname.inspect} #{cname.inspect}
+      end
+      define_singleton_method(cname) do |*args|
+        blk.call(__send__(tname, *args))
+      end
+    end
+
     case RUBY_PLATFORM
     when /cygwin/
       libprefix = "cyg"

data/lib/fiddley/memory_pointer.rb

@@ -10,8 +10,13 @@ module Fiddley
     include Fiddley::Utils
 
     def initialize(type, num = 1, clear = true)
-      @size = type2size(type) * num
-      @ptr = Fiddle::Pointer.malloc(@size)
+      if num.is_a?(Fiddle::Pointer)
+        @ptr = num
+        @size = @ptr.size
+      else
+        @size = type2size(type) * num
+        @ptr = Fiddle::Pointer.malloc(@size)
+      end
     end
 
     attr_reader :size
@@ -90,12 +95,12 @@ module Fiddley
       end
     end
 
-    def put_bytes(offset, str, len = nil)
-      @ptr[offset, len ? len : str.bytesize] = len ? str[0, len] : str
+    def put_bytes(offset, str, idx = 0, len = str.bytesize - idx)
+      @ptr[offset, len] = str[idx, len]
     end
 
-    def write_bytes(str, len = nil)
-      put_bytes(0, str, len)
+    def write_bytes(str, idx = 0, len = nil)
+      put_bytes(0, str, idx, len)
     end
 
     def get_bytes(offset, len)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fiddley
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - U.Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-01 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies: []
 description: Use Fiddle instead of Ruby-FFI !!!
 email: