ndav 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d1ffc6b4d3e19aa1f6abab6aa9e16c03cb9078c4567fa7451305523d2b5f660
-  data.tar.gz: f4a8be1e3d8981870385e027f4b665fe305858dce2d38119b3222e98a3770bbb
+  metadata.gz: 443c009b1751ab850206b12f6ae175989fef5bb3e9dfd6094d069b338262474a
+  data.tar.gz: fc5ef147dcbe89690add67f9aca9ed11a71a56ed2d801284936753066da2be2c
 SHA512:
-  metadata.gz: d5acded105c270841b4d107ab8ceaed11624ec4c79cfeeded5039ca9e4336a33d33c9c0a8d5d640a9e841084895a715e914c60e3f16d0e7b7bd64dfa0b2f0447
-  data.tar.gz: ec9c3d18e521385acab9c156cf36e74f2271735759d8ce3b00bb351682187e4900382d01611ebe498e38488be868898969ec48186e7106267105495424e94cd5
+  metadata.gz: 7ce73fa38eba65d0c1933cef3e787a6a770854847f7946098ca4ff7e26ba0e588ee6d5a1d79e469abb27a0c303722f69e9030943a73b5295e7a422c73dee96f5
+  data.tar.gz: 917725d70d4a3269da345d389b93562d54bec9b0911e88229a469a98d79203026ab37bbe834039aded9b1635c827d6723b5b82f23dcacd3864e9df0908dcab20

data/lib/ndav/converter.rb

@@ -3,6 +3,29 @@ class NDAV
     alias from_memory_view new
     alias from_fiddle_memory_view new
     alias from_fiddle_pointer new
+
+    def register(cls, mdl, name:)
+      if mdl.const_defined?(:FromNDAV)
+        cls.extend mdl::FromNDAV
+
+        define_method "to_#{name}" do |*args, **kwargs|
+          cls.from_ndav(self, *args, **kwargs)
+        end
+      end
+
+      if mdl.const_defined?(:ToNDAV)
+        cls.include mdl::ToNDAV
+
+        define_singleton_method "from_#{name}" do |array, *args, **kwargs|
+          array.to_ndav(*args, **kwargs)
+        end
+      end
+
+      if mdl.const_defined?(:Converter)
+        Converter.prepend mdl::Converter
+        Converter.singleton_class.prepend mdl::Converter
+      end
+    end
   end
 
   module Converter

data/lib/ndav/ffi.rb

@@ -18,17 +18,24 @@ class NDAV
       end
 
       module ToNDAV
-        def to_ndav(format: nil, lifetime: nil, **)
-          ::NDAV.from_ffi_memory_pointer(self, shape: [size / type_size], format: format || TYPE_SIZE_TO_FORMAT[type_size], lifetime: lifetime || self, **)
+        def to_ndav(format: TYPE_SIZE_TO_FORMAT[type_size], lifetime: self, **)
+          shape = [size / type_size]
+          byte_size = shape.reduce(ITEM_SIZES[format], :*)
+          ptr = ::Fiddle::Pointer.new(address, byte_size)
+          ::NDAV.new(ptr, shape:, format:, lifetime:, **)
         end
       end
 
       module Converter
-        def NDAV(array, *, **)
-          if array.kind_of? ::FFI::MemoryPointer
-            array.to_ndav(**)
+        def FFIMemoryPointer(array, *, **)
+          if ::FFI::MemoryPointer === array
+            array
+          elsif array.respond_to? :to_ffi_memory_pointer
+            array.to_ffi_memory_pointer(*, **)
+          elsif array.respond_to? :to_ndav
+            array.to_ndav(*, **).to_ffi_memory_pointer
           else
-            super
+            ::NDAV.new(array, *, **).to_ffi_memory_pointer
           end
         end
       end
@@ -41,53 +48,31 @@ class NDAV
         end
       end
 
-      module ToDAV
-        def to_ndav(format: nil, lifetime: nil, **)
-          ::NDAV.from_ffi_pointer(self, shape: [size / type_size], format: format || TYPE_SIZE_TO_FORMAT[type_size], lifetime: lifetime || self, **)
+      module ToNDAV
+        def to_ndav(shape:, format: TYPE_SIZE_TO_FORMAT[type_size], lifetime: self, **)
+          byte_size = shape.reduce(ITEM_SIZES[format], :*)
+          ptr = ::Fiddle::Pointer.new(address, byte_size)
+          ::NDAV.new(ptr, shape:, format:, lifetime:, **)
         end
       end
 
       module Converter
-        def NDAV(array, *, **)
-          # use instance_of? instead of kind_of? because MemoryPointer < Pointer
+        def FFIPointer(array, *, **)
+          # use instance_of? instead of kind_of? beacuase MemoryPointer is subclass of Pointer
           if array.instance_of? ::FFI::Pointer
-            array.to_ndav(**)
+            array
+          elsif array.respond_to? :to_ffi_pointer
+            array.to_ffi_pointer(*, **)
+          elsif array.respond_to? :to_ndav
+            array.to_ndav(*, **).to_ffi_pointer
           else
-            super
+            ::NDAV.new(array, *, **).to_ffi_pointer
           end
         end
       end
     end
 
-    module FromFFI
-      def from_ffi_memory_pointer(array, shape:, format:, **)
-        byte_size = shape.reduce(ITEM_SIZES[format], :*)
-        ptr = ::Fiddle::Pointer.new(array.address, byte_size)
-        new(ptr, shape:, format:, **)
-      end
-
-      def from_ffi_pointer(array, lifetime:, **)
-        from_ffi_memory_pointer(array, lifetime:, **)
-      end
-    end
-
-    module ToFFI
-      def to_ffi_memory_pointer
-        ::FFI::MemoryPointer.from_ndav(self)
-      end
-
-      def to_ffi_pointer
-        ::FFI::Pointer.from_ndav(self)
-      end
-    end
-
-    ::FFI::MemoryPointer.extend MemoryPointer::FromNDAV
-    ::FFI::MemoryPointer.include MemoryPointer::ToNDAV
-    ::FFI::Pointer.extend Pointer::FromNDAV
-    ::FFI::Pointer.include Pointer::ToDAV
-    ::NDAV.extend FromFFI
-    ::NDAV.include ToFFI
-    ::NDAV::Converter.singleton_class.prepend Pointer::Converter
-    ::NDAV::Converter.singleton_class.prepend MemoryPointer::Converter
+    ::NDAV.register ::FFI::MemoryPointer, MemoryPointer, name: :ffi_memory_pointer
+    ::NDAV.register ::FFI::Pointer, Pointer, name: :ffi_pointer
   end
 end

data/ndav.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ndav"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.summary = "N-Dimensional Array View"
   s.authors = ["Kitaiti Makoto"]
   s.licenses = ["BSD-2-Clause"]

data/test/test_ffi.rb

@@ -57,6 +57,26 @@ class TestFFI < TestBase
       assert_int_array ndav
     end
 
+    def test_ffi_memory_pointer_from_ndav
+      ndav = ::NDAV.new(Arrow::Int16Array.new([1, 2, 3]))
+
+      assert_instance_of ::FFI::MemoryPointer, ::NDAV::Converter::FFIMemoryPointer(ndav)
+    end
+
+    def test_FFIMemoryPointer
+      c = Class.new {
+        include ::NDAV::Converter
+
+        def to_ffi_memory_pointer(ndav)
+          FFIMemoryPointer(ndav)
+        end
+      }
+
+      ndav = ::NDAV.new(Arrow::Int16Array.new([1, 2, 3]))
+
+      assert_instance_of ::FFI::MemoryPointer, c.new.to_ffi_memory_pointer(ndav)
+    end
+
     def test_ndav_from_ffi_pointer
       str = [1, 2, 3].pack("s*")
       address = ::Fiddle::Pointer[str].to_i
@@ -65,5 +85,25 @@ class TestFFI < TestBase
 
       assert_int_array ndav
     end
+
+    def test_ffi_pointer_from_ndav
+      ndav = ::NDAV.new(Arrow::Int16Array.new([1, 2, 3]))
+
+      assert_instance_of ::FFI::Pointer, ::NDAV::Converter::FFIPointer(ndav)
+    end
+
+    def test_FFIPointer
+      c = Class.new {
+        include ::NDAV::Converter
+
+        def to_ffi_pointer(ndav)
+          FFIPointer(ndav)
+        end
+      }
+
+      ndav = ::NDAV.new(Arrow::Int16Array.new([1, 2, 3]))
+
+      assert_instance_of ::FFI::Pointer, c.new.to_ffi_pointer(ndav)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ndav
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kitaiti Makoto