http_zip 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e045495a2ce12199f65be5bf20671418ad350c81ae91fa59c574229ed20eaa22
-  data.tar.gz: fed79c7c440c3323204e105ba449c92bb26d8a1a8b47b258ef1215865a30d7c2
+  metadata.gz: 19b6d04b94e6807748d28eaa6efd8fea800ffa3954483f6054d9a72ffc33c5d6
+  data.tar.gz: 43616195f5b74a786b384757a5cad9ee0928dc7b9b13ec7f43294abe036a1f33
 SHA512:
-  metadata.gz: 39861993eeb2e36bbbb0e96cf620afcc94935dc11160a676ec9c65657cfca840ab98d0c57ab51fd8272ca10ac1d46c37be6f6d866598410bd13012cba3c0e262
-  data.tar.gz: 348b335d82a78a8b37c075981370996723b977ce3ce68c18db72a1e68f64c6ec100ac922ff7303bbafd885fc6360e7d676a980407e65048d51415bcedd26f6d2
+  metadata.gz: 6b4f9b7fccbefa2a04bb61a7127ac70fad27129f58b0bbe0a7081e4e175359272de6f4db2ec98fc73887adfe34b339823b13606a3f9dc9afe9df7cba932fe4d4
+  data.tar.gz: f280e3fcb4fef1c70a83e80ed09916eea48a6918a3055b41b099b88365dcd2a569e516a1cb86b9b56a9e35ee414b02aece303796f3c4da47e3eef476a03673d0

data/.gitignore

@@ -7,4 +7,6 @@
 /spec/reports/
 /tmp/
 .DS_Store
-Gemfile.lock
+Gemfile.lock
+.devenv
+.direnv

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in http_zip.gemspec
 gemspec

data/Rakefile

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
 task default: :test

data/http_zip.gemspec

@@ -1,34 +1,36 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'http_zip/version'
+require "http_zip/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'http_zip'
-  spec.version       = HttpZip::VERSION
-  spec.authors       = ['Marvin Killing', 'Peter Retzlaff']
-  spec.email         = ['pe.retzlaff@gmail.com']
+  spec.name = "http_zip"
+  spec.version = HttpZip::VERSION
+  spec.authors = ["Marvin Killing", "Peter Retzlaff"]
+  spec.email = ["pe.retzlaff@gmail.com"]
 
-  spec.summary       = 'HttpZip is a gem to extract individual files from a remote ZIP archive, without the need to download the entire file.'
-  spec.homepage      = 'https://github.com/peret/http_zip'
-  spec.license       = 'MIT'
+  spec.summary = "HttpZip is a gem to extract individual files from a remote ZIP archive, without the need to download the entire file."
+  spec.homepage = "https://github.com/peret/http_zip"
+  spec.license = "MIT"
 
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/peret/http_zip'
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/peret/http_zip"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'minitest', '~> 5.15'
-  spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
-  spec.add_development_dependency 'simplecov', '~> 0.21'
-  spec.add_development_dependency 'webmock', '~> 3.14'
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "minitest", "~> 5.15"
+  spec.add_development_dependency "rake", "~> 12.3", ">= 12.3.3"
+  spec.add_development_dependency "simplecov", "~> 0.21"
+  spec.add_development_dependency "webmock", "~> 3.14"
+  spec.add_development_dependency "solargraph", "~> 0.50"
+  spec.add_development_dependency "standard", "~> 1.31.0"
 end

data/lib/http_zip/compression/stored.rb

@@ -7,7 +7,8 @@ module HttpZip
         input
       end
 
-      def finish; end
+      def finish
+      end
     end
   end
 end

data/lib/http_zip/entry.rb

@@ -4,13 +4,14 @@ module HttpZip
   # Describes one entry in an HTTP zip archive
   # @attr_reader [String] name filename of the entry
   class Entry
-    attr_reader :name, :compressed_size
+    attr_reader :name, :compressed_size, :uncompressed_size
 
-    def initialize(url, name, header_offset, central_directory_file_compressed_size)
+    def initialize(url, name, header_offset, central_directory_file_compressed_size, central_directory_file_uncompressed_size)
       @range_request = HttpZip::RangeRequest.new(url)
       @name = name
       @header_offset = header_offset
       @compressed_size = central_directory_file_compressed_size
+      @uncompressed_size = central_directory_file_uncompressed_size
     end
 
     # Get the decompressed content of the file entry
@@ -32,7 +33,7 @@ module HttpZip
       to = @header_offset + header_size + @compressed_size
 
       decompressor = compression_method
-      ::File.open(filename, 'wb') do |out_file|
+      ::File.open(filename, "wb") do |out_file|
         @range_request.get(from, to) do |chunk|
           decompressed = decompressor.decompress(chunk)
           out_file.write(decompressed)
@@ -50,14 +51,14 @@ module HttpZip
 
     def header_size
       # find out where the file contents start and how large the file is
-      file_name_length = header[26...28].unpack1('v')
-      extra_field_length = header[28...30].unpack1('v')
+      file_name_length = header[26...28].unpack1("v")
+      extra_field_length = header[28...30].unpack1("v")
       30 + file_name_length + extra_field_length
     end
 
     def compression_method
       # which compression method is used?
-      algorithm = header[8...10].unpack1('v')
+      algorithm = header[8...10].unpack1("v")
 
       case algorithm
       when 0
@@ -66,7 +67,7 @@ module HttpZip
         HttpZip::Compression::Deflate.new
       else
         raise HttpZip::ZipError,
-              "Unsupported compression method #{algorithm}. HttpZip only supports compression methods 0 (STORED) and 8 (DEFLATE)."
+          "Unsupported compression method #{algorithm}. HttpZip only supports compression methods 0 (STORED) and 8 (DEFLATE)."
       end
     end
   end

data/lib/http_zip/errors.rb

@@ -2,7 +2,10 @@
 
 module HttpZip
   class Error < StandardError; end
+
   class RequestError < Error; end
+
   class ContentRangeError < RequestError; end
+
   class ZipError < Error; end
 end

data/lib/http_zip/file.rb

@@ -42,7 +42,8 @@ module HttpZip
           @url,
           file_header.file_name,
           file_header.header_offset,
-          file_header.compressed_size
+          file_header.compressed_size,
+          file_header.uncompressed_size
         )
 
         # skip ahead to next file entry

data/lib/http_zip/parser/central_directory.rb

@@ -25,10 +25,10 @@ module HttpZip
       # @raise [ZipError] if the byte stream does not contain a valid EOCD64 block
       def parse_eocd64!(eocd64_block)
         unless eocd64_block.start_with?(EOCD64_BLOCK_IDENTIFER)
-          raise ZipError, 'EOCD64 record not found'
+          raise ZipError, "EOCD64 record not found"
         end
 
-        @size, @offset = eocd64_block[40..-1].unpack('Q<Q<')
+        @size, @offset = eocd64_block[40..-1].unpack("Q<Q<")
       end
 
       private
@@ -40,20 +40,20 @@ module HttpZip
       def parse!
         eocd_block_index = get_eocd_block_index(@bytes)
         eocd_block = @bytes[eocd_block_index..-1]
-        @size, @offset = eocd_block[12...20].unpack('VV')
+        @size, @offset = eocd_block[12...20].unpack("VV")
         return if @size != 0xFFFFFFFF && @offset != 0xFFFFFFFF
 
         # there will be a zip64 EOCD locator block before the EOCD block
         # parse the EOCD locator to find out where the EOCD64 block starts
         eocd64_locator_block = @bytes[(eocd_block_index - 20)..eocd_block_index]
         unless eocd64_locator_block.start_with?(EOCD64_LOCATOR_BLOCK_IDENTIFER)
-          raise ZipError, 'Could not locate the EOCD64 locator block'
+          raise ZipError, "Could not locate the EOCD64 locator block"
         end
 
-        @eocd64_offset, total_num_disks = eocd64_locator_block[8..-1].unpack('Q<V')
+        @eocd64_offset, total_num_disks = eocd64_locator_block[8..-1].unpack("Q<V")
         return if total_num_disks == 1
 
-        raise ZipError, 'Multi-disk archives are not supported'
+        raise ZipError, "Multi-disk archives are not supported"
       end
 
       # In order to find the central directory, we have to first find the EOCD block.
@@ -70,13 +70,13 @@ module HttpZip
         search_end_position = candidate_eocd_block.length
         loop do
           eocd_block_start_index = candidate_eocd_block.rindex(EOCD_BLOCK_IDENTIFIER,
-                                                               search_end_position)
+            search_end_position)
 
-          raise ZipError, 'Could not locate valid EOCD block' if eocd_block_start_index.nil?
+          raise ZipError, "Could not locate valid EOCD block" if eocd_block_start_index.nil?
 
           # we have a candidate, verify that we found the actual eocd block start by
           # checking whether its position + length matches the end of the file
-          comment_length = candidate_eocd_block[(eocd_block_start_index + 20)...(eocd_block_start_index + 22)].unpack1('v')
+          comment_length = candidate_eocd_block[(eocd_block_start_index + 20)...(eocd_block_start_index + 22)].unpack1("v")
           if (eocd_block_start_index + 22 + comment_length) == candidate_eocd_block.length
             # we found it
             break

data/lib/http_zip/parser/central_directory_file_header.rb

@@ -28,7 +28,7 @@ module HttpZip
       def initialize(file_header_bytes)
         @bytes = file_header_bytes
         unless @bytes.start_with?(CENTRAL_DIRECTORY_FILE_HEADER_IDENTIFIER)
-          raise ZipError, 'Central Directory File Header seems to be corrupt'
+          raise ZipError, "Central Directory File Header seems to be corrupt"
         end
 
         parse!
@@ -47,7 +47,7 @@ module HttpZip
           @disk_number,
           @internal_file_attributes,
           @external_file_attributes,
-          @header_offset = @bytes[20...46].unpack('VVvvvvvVV')
+          @header_offset = @bytes[20...46].unpack("VVvvvvvVV")
 
         file_name_end = 46 + file_name_length
         @file_name = @bytes[46...file_name_end]
@@ -72,7 +72,7 @@ module HttpZip
           # so we need to abort if there’s nothing of value in the extra fields
           break if remaining_extra_field_bytes.delete("\0").empty?
 
-          record_length = remaining_extra_field_bytes[2...4].unpack1('v')
+          record_length = remaining_extra_field_bytes[2...4].unpack1("v")
 
           # did we find the Zip64 extra field?
           if remaining_extra_field_bytes.start_with?(ZIP64_EXTRA_FIELD_HEADER_ID)
@@ -95,19 +95,19 @@ module HttpZip
         # so only the values too large for the non-zip64 file header will be stored here
         ptr = 2 # ignore the size field, since it seems to be incorrect in some cases
         if @uncompressed_size == 0xFFFFFFFF
-          @uncompressed_size = extra_field_bytes[ptr...(ptr + 8)].unpack1('Q<')
+          @uncompressed_size = extra_field_bytes[ptr...(ptr + 8)].unpack1("Q<")
           ptr += 8
         end
         if @compressed_size == 0xFFFFFFFF
-          @compressed_size = extra_field_bytes[ptr...(ptr + 8)].unpack1('Q<')
+          @compressed_size = extra_field_bytes[ptr...(ptr + 8)].unpack1("Q<")
           ptr += 8
         end
         if @header_offset == 0xFFFFFFFF
-          @header_offset = extra_field_bytes[ptr...(ptr + 8)].unpack1('Q<')
+          @header_offset = extra_field_bytes[ptr...(ptr + 8)].unpack1("Q<")
           ptr += 8
         end
         if @disk_number == 0xFFFF
-          @disk_number = extra_field_bytes[ptr...(ptr + 4)].unpack1('V')
+          @disk_number = extra_field_bytes[ptr...(ptr + 4)].unpack1("V")
         end
       end
     end

data/lib/http_zip/range_request.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'net/http'
+require "net/http"
 
 module HttpZip
   # Class to make Range requests to a HTTP server
@@ -11,7 +11,7 @@ module HttpZip
     def initialize(url)
       @uri = URI(url)
       @connection = Net::HTTP.new(@uri.host, @uri.port)
-      @connection.use_ssl = true if @uri.scheme == 'https'
+      @connection.use_ssl = true if @uri.scheme == "https"
     end
 
     # Request a partial object via HTTP. If a block is given, yields the response body in chunks.
@@ -22,7 +22,7 @@ module HttpZip
     # @raise [ContentRangeError] if the server responds with anything other than 206 Partial Content
     def get(from, to, &block)
       request = Net::HTTP::Get.new(@uri)
-      request['Range'] = "bytes=#{from}-#{to - 1}"
+      request["Range"] = "bytes=#{from}-#{to - 1}"
       make_request(request, &block)
     end
 
@@ -32,7 +32,7 @@ module HttpZip
     # @raise [ContentRangeError] if the server responds with anything other than 206 Partial Content
     def last(num_bytes)
       request = Net::HTTP::Get.new(@uri)
-      request['Range'] = "bytes=-#{num_bytes}"
+      request["Range"] = "bytes=-#{num_bytes}"
       make_request(request)
     end
 
@@ -45,7 +45,7 @@ module HttpZip
           res.read_body(&block)
         end
 
-        response.body unless block_given?
+        response.body unless block
       end
     end
 
@@ -55,7 +55,7 @@ module HttpZip
       end
       return if response.is_a?(Net::HTTPPartialContent)
 
-      raise ContentRangeError, 'Server does not support the Range header'
+      raise ContentRangeError, "Server does not support the Range header"
     end
   end
 end

data/lib/http_zip/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HttpZip
-  VERSION = '2.0.0'
+  VERSION = "2.1.0"
 end

data/lib/http_zip.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'http_zip/version'
-require 'http_zip/errors'
-require 'http_zip/range_request'
-require 'http_zip/entry'
-require 'http_zip/file'
-require 'http_zip/parser/central_directory_file_header'
-require 'http_zip/parser/central_directory'
-require 'http_zip/compression/stored'
-require 'http_zip/compression/deflate'
+require "http_zip/version"
+require "http_zip/errors"
+require "http_zip/range_request"
+require "http_zip/entry"
+require "http_zip/file"
+require "http_zip/parser/central_directory_file_header"
+require "http_zip/parser/central_directory"
+require "http_zip/compression/stored"
+require "http_zip/compression/deflate"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_zip
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Marvin Killing
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.14'
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.50'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.50'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.31.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.31.0
 description:
 email:
 - pe.retzlaff@gmail.com
@@ -135,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: HttpZip is a gem to extract individual files from a remote ZIP archive, without