npy 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e3c8389241cfeef0a7685045771b6dbe9f2c3c17f7764ebbb8ea66c2826b495
-  data.tar.gz: bbcc279cef7eb1e28782bf4e6fe61dd1d2ece5f0155fa66686f1dec8e5893918
+  metadata.gz: 81818d5fb5b2ce45fd024806af7f8974d34bcd66c951ea1a22e966c42d767e4f
+  data.tar.gz: 95e10ae07dfac61ee6f8596e53e3600d4efb797ba7998ab1c2ee9cba8551cc3c
 SHA512:
-  metadata.gz: 2b44773ec46777161b07fc19fcb7f221b0e05e72b031082923eef90e2400d3a29eda0e4a02061bcab323fbb894dc4b37f7d6b2f3f8151a6a9024817e9882a44e
-  data.tar.gz: b2336acffd694fb388ba88eef78d22a009f1c97b3e2e7e5a30e308c25e5025719ae39cf9a850677cff18b53e8176937b377503c9ae270df63cd94932ce7a854a
+  metadata.gz: 77ffad380f7e7ce64e9611a50e756203baebc34bd7d649089288c959f1196cdfb2e99d1666204c2f14e8318af7143ffae4dff99f3a6f0f2aad006f444b0819d8
+  data.tar.gz: 0aff2a43fbba4917f13f3c59333bc02814c411f7b25880dc3f1286d98ac36c76c6bfb9ee34d5899c4f3745c816187dd1bf8e77b91cf3f54485c53a9bf13fa2f5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.0 (2026-04-04)
+
+- Switched to `numo-narray-alt`
+- Removed `load_io` and `load_npz_io` methods (use `load` and `load_npz` instead)
+- Dropped support for Ruby < 3.3
+
 ## 0.4.0 (2024-10-23)
 
 - Dropped support for Ruby < 3.1

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2019-2022 Andrew Kane
+Copyright (c) 2019-2026 Andrew Kane
 
 MIT License
 

data/lib/npy/file.rb

@@ -4,8 +4,8 @@ module Npy
       @streams = {}
       Zip::File.open_buffer(io) do |zipfile|
         zipfile.each do |entry|
-          name = entry.name.sub(/\.npy\z/, "")
-          @streams[name] = entry.get_input_stream
+          name = entry.name.delete_suffix(".npy")
+          @streams[name] = entry
         end
       end
       @data = {}
@@ -16,7 +16,7 @@ module Npy
     end
 
     def [](name)
-      @data[name] ||= Npy.load_io(@streams[name]) if @streams[name]
+      @data[name] ||= Npy.load(@streams[name].get_input_stream) if @streams[name]
     end
 
     def to_h

data/lib/npy/version.rb

@@ -1,3 +1,3 @@
 module Npy
-  VERSION = "0.4.0"
+  VERSION = "1.0.0"
 end

data/lib/npy.rb

@@ -1,10 +1,9 @@
 # dependencies
-require "numo/narray"
+require "numo/narray/alt"
 require "zip"
 
 # stdlib
 require "stringio"
-require "tempfile"
 
 # modules
 require_relative "npy/file"
@@ -34,21 +33,19 @@ module Npy
   }
 
   class << self
-    def load(path)
-      case path
-      when IO, StringIO
-        load_io(path)
+    def load(file)
+      if file.respond_to?(:read)
+        load_io(file)
       else
-        load_file(path)
+        load_file(file)
       end
     end
 
-    def load_npz(path)
-      case path
-      when IO, StringIO
-        load_npz_io(path)
+    def load_npz(file)
+      if file.respond_to?(:read)
+        load_npz_io(file)
       else
-        load_npz_file(path)
+        load_npz_file(file)
       end
     end
 
@@ -57,18 +54,35 @@ module Npy
     end
 
     def load_npz_string(byte_str)
-      # not playing nicely with StringIO
-      file = Tempfile.new("npy")
-      begin
-        file.write(byte_str)
-        load_npz_io(file)
-      ensure
-        file.close
-        file.unlink
+      load_npz_io(StringIO.new(byte_str))
+    end
+
+    def save(file, arr)
+      if file.respond_to?(:write)
+        save_io(file, arr)
+      else
+        save_file(file, arr)
+      end
+      true
+    end
+
+    def save_npz(file, arrs)
+      if file.respond_to?(:write)
+        save_npz_io(file, arrs)
+      else
+        save_npz_file(file, arrs)
+      end
+      true
+    end
+
+    private
+
+    def load_file(path)
+      with_file(path, "rb") do |f|
+        load_io(f)
       end
     end
 
-    # TODO make private
     def load_io(io)
       magic = io.read(6)
       raise Error, "Invalid npy format" unless magic&.b == MAGIC_STR
@@ -91,46 +105,11 @@ module Npy
       klass = TYPE_MAP[descr]
       raise Error, "Type not supported: #{descr}" unless klass
 
-      # use from_string instead of from_binary for max compatibility
-      # from_binary introduced in 0.9.0.4
       # numo from_string can't handle rank0
       if shape.empty?
         klass.cast(klass.from_string(io.read, [1])[0])
       else
-        klass.from_string(io.read, shape)
-      end
-    end
-
-    # TODO make private
-    def load_npz_io(io)
-      File.new(io)
-    end
-
-    def save(path, arr)
-      case path
-      when IO, StringIO
-        save_io(path, arr)
-      else
-        save_file(path, arr)
-      end
-      true
-    end
-
-    def save_npz(path, arrs)
-      case path
-      when IO, StringIO
-        save_npz_io(path, arrs)
-      else
-        save_npz_file(path, arrs)
-      end
-      true
-    end
-
-    private
-
-    def load_file(path)
-      with_file(path, "rb") do |f|
-        load_io(f)
+        klass.from_binary(io.read, shape)
       end
     end
 
@@ -140,13 +119,17 @@ module Npy
       end
     end
 
+    def load_npz_io(io)
+      File.new(io)
+    end
+
     def save_file(path, arr)
       with_file(path, "wb") do |f|
         save_io(f, arr)
       end
     end
 
-    def save_io(f, arr)
+    def save_io(io, arr)
       unless arr.is_a?(Numo::NArray)
         begin
           arr = Numo::NArray.cast(arr)
@@ -168,11 +151,11 @@ module Npy
       padding = "\x20".b * padding_len
       header = "#{header}#{padding}\n"
 
-      f.write(MAGIC_STR)
-      f.write("\x01\x00".b)
-      f.write([header.bytesize].pack("S<"))
-      f.write(header)
-      f.write(arr.to_string)
+      io.write(MAGIC_STR)
+      io.write("\x01\x00".b)
+      io.write([header.bytesize].pack("S<"))
+      io.write(header)
+      io.write(arr.to_binary)
     end
 
     def save_npz_file(path, arrs)
@@ -181,12 +164,11 @@ module Npy
       end
     end
 
-    def save_npz_io(f, arrs)
-      # TODO change to create: true for rubyzip 3
-      Zip::File.open(f, true) do |zipfile|
+    def save_npz_io(io, arrs)
+      Zip::File.open(io, create: true) do |zipfile|
         arrs.each do |k, v|
-          zipfile.get_output_stream("#{k}.npy") do |f2|
-            save_io(f2, v)
+          zipfile.get_output_stream("#{k}.npy") do |f|
+            save_io(f, v)
           end
         end
       end

metadata

@@ -1,44 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: npy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Andrew Kane
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: numo-narray
+  name: numo-narray-alt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
-description:
+        version: '3'
 email: andrew@ankane.org
 executables: []
 extensions: []
@@ -54,7 +52,6 @@ homepage: https://github.com/ankane/npy
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -62,15 +59,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Save and load NumPy npy and npz files in Ruby
 test_files: []