httpdisk 0.5.2 → 1.0.1

data/lib/httpdisk/grep/main.rb

@@ -1,5 +1,5 @@
-require 'find'
-require 'json'
+require "find"
+require "json"
 
 module HTTPDisk
   module Grep
@@ -13,25 +13,22 @@ module HTTPDisk
       # Enumerate file paths one at a time. Returns true if matches were found.
       def run
         paths.each do
-          begin
-            run_one(_1)
-          rescue StandardError => e
-            if ENV['HTTPDISK_DEBUG']
-              $stderr.puts
-              $stderr.puts e.class
-              $stderr.puts e.backtrace.join("\n")
-            end
-            raise CliError, "#{e.message[0, 70]} (#{_1})"
+          run_one(_1)
+        rescue => e
+          if ENV["HTTPDISK_DEBUG"]
+            $stderr.puts
+            warn e.class
+            warn e.backtrace.join("\n")
           end
+          raise CliError, "#{e.message[0, 70]} (#{_1})"
         end
         success
       end
 
       def run_one(path)
-        # read payload & body
-        payload = Zlib::GzipReader.open(path, encoding: 'ASCII-8BIT') do
-          Payload.read(_1)
-        end
+        payload = read_payload(path)
+        return if !payload
+
         body = prepare_body(payload)
 
         # collect all_matches
@@ -51,37 +48,48 @@ module HTTPDisk
       def paths
         # roots
         roots = options[:roots]
-        roots = ['.'] if roots.empty?
+        roots = ["."] if roots.empty?
 
         # find files in roots
         paths = roots.flat_map { Find.find(_1).to_a }.sort
         paths = paths.select { File.file?(_1) }
 
         # strip default './'
-        paths = paths.map { _1.gsub(%r{^\./}, '') } if options[:roots].empty?
+        paths = paths.map { _1.gsub(%r{^\./}, "") } if options[:roots].empty?
         paths
       end
 
+      def read_payload(path)
+        if HTTPDisk::Cache.new(compress: true).send(:compressed?, path)
+          Zlib::GzipReader.open(path, encoding: "ASCII-8BIT") { Payload.read(_1) }
+        else
+          File.open(path, "rb") { Payload.read(_1) }
+        end
+      rescue
+        puts "httpdisk: #{path} not in httpdisk format, skipping" if !options[:silent]
+        nil
+      end
+
       # convert raw body into something palatable for pattern matching
       def prepare_body(payload)
         body = payload.body
 
-        if content_type = payload.headers['Content-Type']
+        if (content_type = payload.headers["Content-Type"])
           # Mismatches between Content-Type and body.encoding are fatal, so make
           # an effort to align them.
-          if charset = content_type[/charset=([^;]+)/, 1]
+          if (charset = content_type[/charset=([^;]+)/, 1])
             encoding = begin
               Encoding.find(charset)
-            rescue StandardError
+            rescue
               nil
             end
             if encoding && body.encoding != encoding
-              body.force_encoding(encoding)
+              body = body.dup.force_encoding(encoding)
             end
           end
 
           # pretty print json for easier searching
-          if content_type =~ /\bjson\b/
+          if /\bjson\b/.match?(content_type)
             body = JSON.pretty_generate(JSON.parse(body))
           end
         end
@@ -96,12 +104,11 @@ module HTTPDisk
 
       # printer for output
       def printer
-        @printer ||= case
-        when options[:silent]
+        @printer ||= if options[:silent]
           Grep::SilentPrinter.new
-        when options[:count]
+        elsif options[:count]
           Grep::CountPrinter.new($stdout)
-        when options[:head] || $stdout.tty?
+        elsif options[:head] || $stdout.tty?
           Grep::HeaderPrinter.new($stdout, options[:head])
         else
           Grep::TersePrinter.new($stdout)

data/lib/httpdisk/grep/printer.rb

@@ -1,7 +1,7 @@
 module HTTPDisk
   module Grep
     class Printer
-      GREP_COLOR = '37;45'.freeze
+      GREP_COLOR = "37;45"
 
       attr_reader :output
 
@@ -9,7 +9,8 @@ module HTTPDisk
         @output = output
       end
 
-      def print(path, payload, all_matches); end
+      def print(path, payload, all_matches)
+      end
 
       protected
 
@@ -18,7 +19,7 @@ module HTTPDisk
       #
 
       def grep_color
-        @grep_color ||= (ENV['GREP_COLOR'] || GREP_COLOR)
+        @grep_color ||= ENV["GREP_COLOR"] || GREP_COLOR
       end
 
       def print_matches(matches)
@@ -30,7 +31,7 @@ module HTTPDisk
               result << s[ii..._1.begin(0)]
               result << "\e["
               result << grep_color
-              result << 'm'
+              result << "m"
               result << _1[0]
               result << "\e[0m"
               ii = _1.end(0)

data/lib/httpdisk/payload.rb

@@ -1,41 +1,39 @@
 module HTTPDisk
   class Payload
-    class << self
-      def read(f, peek: false)
-        Payload.new.tap do |p|
-          # comment
-          p.comment = f.gets[/^# (.*)/, 1]
-
-          # status line
-          m = f.gets.match(/^HTTPDISK (\d+) (.*)$/)
-          p.status, p.reason_phrase = m[1].to_i, m[2]
-
-          # headers
-          while (line = f.gets.chomp) && !line.empty?
-            key, value = line.split(': ', 2)
-            p.headers[key] = value
-          end
-
-          # body (if not peeking)
-          p.body = f.read if !peek
+    def self.read(f, peek: false)
+      Payload.new.tap do |p|
+        # comment
+        p.comment = f.gets[/^# (.*)/, 1]
+
+        # status line
+        m = f.gets.match(/^HTTPDISK (\d+) (.*)$/)
+        p.status, p.reason_phrase = m[1].to_i, m[2]
+
+        # headers
+        while (line = f.gets.chomp) && !line.empty?
+          key, value = line.split(": ", 2)
+          p.headers[key] = value
         end
+
+        # body (if not peeking)
+        p.body = f.read if !peek
       end
+    end
 
-      def from_response(response)
-        Payload.new.tap do
-          _1.body = response.body
-          _1.headers = response.headers
-          _1.reason_phrase = response.reason_phrase
-          _1.status = response.status
-        end
+    def self.from_response(response)
+      Payload.new.tap do
+        _1.body = response.body
+        _1.headers = response.headers
+        _1.reason_phrase = response.reason_phrase
+        _1.status = response.status
       end
     end
 
     attr_accessor :body, :comment, :headers, :reason_phrase, :status
 
     def initialize
-      @body = ''
-      @comment = ''
+      @body = ""
+      @comment = ""
       @headers = Faraday::Utils::Headers.new
     end
 

data/lib/httpdisk/slop_duration.rb

@@ -1,4 +1,4 @@
-require 'slop'
+require "slop"
 
 module Slop
   # Custom duration type for Slop, used for --expires. Raises aggressively
@@ -11,13 +11,13 @@ module Slop
       d: 24 * 60 * 60,
       w: 7 * 24 * 60 * 60,
       y: 365 * 7 * 24 * 60 * 60,
-    }.freeze
+    }
 
     def call(value)
       m = value.match(/^(\d+)([smhdwy])?$/)
       raise Slop::Error, "invalid --expires #{value.inspect}" if !m
 
-      num, unit = m[1].to_i, (m[2] || 's').to_sym
+      num, unit = m[1].to_i, (m[2] || "s").to_sym
       num * UNITS[unit]
     end
   end

data/lib/httpdisk/sloptions.rb

@@ -32,10 +32,10 @@ module HTTPDisk
 
     %i[array boolean float hash integer string symbol].each do |method|
       define_method(method) do |flag, foptions = {}|
-        on(flag, { type: method }.merge(foptions))
+        on(flag, {type: method}.merge(foptions))
       end
     end
-    alias bool boolean
+    alias_method :bool, :boolean
 
     #
     # return parsed options
@@ -70,9 +70,7 @@ module HTTPDisk
 
     protected
 
-    def defaults
-      flags.map { |flag, foptions| [flag, foptions[:default]] }.to_h.compact
-    end
+    def defaults = flags.transform_values { _1[:default] }.compact
 
     # does value match valid?
     def valid?(value, types)
@@ -96,9 +94,9 @@ module HTTPDisk
     def error_message(flag, value, valid)
       classes = valid.compact.map do
         s = _1.to_s
-        s = s.downcase if s =~ /\b(Array|Float|Hash|Integer|String|Symbol)\b/
+        s = s.downcase if /\b(Array|Float|Hash|Integer|String|Symbol)\b/.match?(s)
         s
-      end.join('/')
+      end.join("/")
       "expected :#{flag} to be #{classes}, not #{value.inspect}"
     end
   end

data/lib/httpdisk/version.rb

@@ -1,3 +1,3 @@
 module HTTPDisk
-  VERSION = '0.5.2'.freeze
+  VERSION = "1.0.1"
 end

data/lib/httpdisk.rb

@@ -1,17 +1,17 @@
-require 'httpdisk/cache_key'
-require 'httpdisk/cache'
-require 'httpdisk/client'
-require 'httpdisk/error'
-require 'httpdisk/payload'
-require 'httpdisk/slop_duration'
-require 'httpdisk/sloptions'
-require 'httpdisk/version'
+require "httpdisk/cache_key"
+require "httpdisk/cache"
+require "httpdisk/client"
+require "httpdisk/error"
+require "httpdisk/payload"
+require "httpdisk/slop_duration"
+require "httpdisk/sloptions"
+require "httpdisk/version"
 
 # cli
-require 'httpdisk/cli/args'
-require 'httpdisk/cli/main'
+require "httpdisk/cli/args"
+require "httpdisk/cli/main"
 
 # grep
-require 'httpdisk/grep/args'
-require 'httpdisk/grep/main'
-require 'httpdisk/grep/printer'
+require "httpdisk/grep/args"
+require "httpdisk/grep/main"
+require "httpdisk/grep/printer"

data/mise.toml

@@ -0,0 +1,9 @@
+[env]
+_.path = ['{{config_root}}/bin']
+
+[hooks]
+postinstall = ['bundle install']
+
+[tools]
+just = "latest"
+ruby = "3.4"

metadata

@@ -1,15 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: httpdisk
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Doppelt
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2026-04-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: cgi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: content-type
   requirement: !ruby/object:Gem::Requirement
@@ -30,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: faraday-cookie_jar
   requirement: !ruby/object:Gem::Requirement
@@ -53,33 +80,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-follow_redirects
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '4.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '4.10'
 description: httpdisk works with faraday to aggressively cache responses on disk.
 email: amd@gurge.com
 executables:
@@ -90,9 +131,10 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/test.yml"
 - ".gitignore"
+- ".justfile"
 - ".rubocop.yml"
+- AGENTS.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -115,11 +157,12 @@ files:
 - lib/httpdisk/sloptions.rb
 - lib/httpdisk/version.rb
 - logo.svg
+- mise.toml
 homepage: http://github.com/gurgeous/httpdisk
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -127,15 +170,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: httpdisk - disk cache for faraday
 test_files: []

data/Gemfile.lock

@@ -1,101 +0,0 @@
-PATH
-  remote: .
-  specs:
-    httpdisk (0.5.2)
-      content-type (~> 0.0)
-      faraday (~> 1.4)
-      faraday-cookie_jar (~> 0.0)
-      faraday_middleware (~> 1.0)
-      slop (~> 4.8)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.2)
-    coderay (1.1.3)
-    content-type (0.0.1)
-      parslet (~> 1.5)
-    crack (0.4.5)
-      rexml
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    faraday (1.5.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
-      faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
-    faraday-patron (1.0.0)
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
-    hashdiff (1.0.1)
-    http-cookie (1.0.4)
-      domain_name (~> 0.5)
-    method_source (1.0.0)
-    minitest (5.14.4)
-    mocha (1.11.2)
-    multipart-post (2.1.1)
-    parallel (1.20.1)
-    parser (3.0.1.1)
-      ast (~> 2.4.1)
-    parslet (1.8.2)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    public_suffix (4.0.6)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
-    rubocop (1.13.0)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
-      parser (>= 3.0.1.1)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
-    slop (4.9.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (2.0.0)
-    webmock (3.12.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  httpdisk!
-  minitest
-  mocha
-  pry
-  rake
-  rubocop (~> 1.13.0)
-  webmock
-
-BUNDLED WITH
-   2.1.4