webcache 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8aa8d4fedb7deea8b440e70002a01a8d5a7bc70fd6f4ea487cbf8db18fdad54
-  data.tar.gz: 38a5bcd708f9f09db88b3f4ffa1622ac92e9eeea7be08db57a89d841db446fcf
+  metadata.gz: 25153a99b8c66cf0ced7058588431c1609861557c8b6078b35c95aa2ee3910bd
+  data.tar.gz: ad2729b1be7a35c41cbe4e5353587b8bf6633b557694b36ac32da2d1de1e481b
 SHA512:
-  metadata.gz: b16642f53af90f51903abe71e27b7019a2de8df23e69a3d78b5827a9bb3496c6bc0a9361c197ec2304e4e840d4d26dbad907e6bdadf8c9e501c1a1bd78921e80
-  data.tar.gz: c8c6300945a4057a8356073c0ccff91e09c69f8ae57279797bead0bc92578f181f475826061fd43c75d8848d0f4240efb5a0d108f34535a9b75283dd44dbb597
+  metadata.gz: 170441dab3662f413d130de99f79d9a778a1feaf85913aaccb0f117275b65540dfaee631c643f11846bae8d776ce8ecf1419863555c9da93075b56aa4224f93b
+  data.tar.gz: a1b2f766439bbf2a2afe5d6818f5a174c7172fa912cba66d4e3114d2f9f0cf6f6782ea95f624343f64274698478366e67d97c05ef9e5b9956cb1c6df50fb4723

data/README.md

@@ -59,12 +59,13 @@ puts response.base_uri    # => "http://example.com/"
 ```
 
 By default, the cached objects are stored in the `./cache` directory, and
-expire after 60 minutes. The cache directory will be created as needed.
+expire after 60 minutes. The cache directory will be created as needed, and
+the permissions of the cached files can be specified if needed.
 
 You can change these settings on initialization:
 
 ```ruby
-cache = WebCache.new dir: 'tmp/my_cache', life: '3d'
+cache = WebCache.new dir: 'tmp/my_cache', life: '3d', permissions: 0o640
 response = cache.get 'http://example.com'
 ```
 
@@ -74,6 +75,7 @@ Or later:
 cache = WebCache.new
 cache.dir = 'tmp/my_cache'
 cache.life = '4h'
+cache.permissions = 0o640
 response = cache.get 'http://example.com'
 ```
 

data/lib/webcache/cache_operations.rb

@@ -4,21 +4,23 @@ require 'http'
 
 class WebCache
   module CacheOperations
+    attr_accessor :permissions
     attr_reader :last_error, :user, :pass, :auth
     attr_writer :dir
 
-    def initialize(dir: 'cache', life: '1h', auth: nil)
+    def initialize(dir: 'cache', life: '1h', auth: nil, permissions: nil)
       @dir = dir
       @life = life_to_seconds life
       @enabled = true
       @auth = convert_auth auth
+      @permissions = permissions
     end
 
     def get(url, force: false)
       return http_get url unless enabled?
 
       path = get_path url
-      clear url if force or stale? path
+      clear url if force || stale?(path)
 
       get! path, url
     end
@@ -69,6 +71,7 @@ class WebCache
 
     def get!(path, url)
       return load_file_content path if File.exist? path
+
       response = http_get url
       save_file_content path, response unless !response || response.error
       response
@@ -84,8 +87,8 @@ class WebCache
 
     def save_file_content(path, response)
       FileUtils.mkdir_p dir
-      File.open path, 'wb' do |f| 
-        f.write Marshal.dump response
+      File.open path, 'wb', permissions do |file|
+        file.write Marshal.dump(response)
       end
     end
 
@@ -111,31 +114,32 @@ class WebCache
     end
 
     def stale?(path)
-      life > 0 and File.exist?(path) and Time.new - File.mtime(path) >= life
+      life.positive? and File.exist?(path) and Time.new - File.mtime(path) >= life
     end
 
     def life_to_seconds(arg)
       arg = arg.to_s
 
       case arg[-1]
-      when 's'; arg[0..-1].to_i
-      when 'm'; arg[0..-1].to_i * 60
-      when 'h'; arg[0..-1].to_i * 60 * 60
-      when 'd'; arg[0..-1].to_i * 60 * 60 * 24
-      else;     arg.to_i
+      when 's' then arg[0..].to_i
+      when 'm' then arg[0..].to_i * 60
+      when 'h' then arg[0..].to_i * 60 * 60
+      when 'd' then arg[0..].to_i * 60 * 60 * 24
+      else; arg.to_i
       end
     end
 
     def convert_auth(opts)
-      @user, @pass, @auth = nil, nil, nil
+      @user = nil
+      @pass = nil
+      @auth = nil
 
-      if opts.respond_to?(:has_key?) and opts.has_key?(:user) and opts.has_key?(:pass)
+      if opts.respond_to?(:has_key?) && opts.has_key?(:user) && opts.has_key?(:pass)
         @user = opts[:user]
         @pass = opts[:pass]
       else
         @auth = opts
       end
     end
-
   end
 end

data/lib/webcache/response.rb

@@ -2,11 +2,10 @@ class WebCache
   class Response
     attr_accessor :error, :base_uri, :content, :code
 
-    def initialize(opts={})
-      if opts.is_a? HTTP::Response
-        init_with_http_response opts
-      elsif opts.is_a? Hash
-        init_with_hash opts
+    def initialize(opts = {})
+      case opts
+      when HTTP::Response then init_with_http_response opts
+      when Hash           then init_with_hash opts
       end
     end
 

data/lib/webcache/version.rb

@@ -1,3 +1,3 @@
 class WebCache
-  VERSION = "0.8.0"
-end
+  VERSION = '0.9.0'
+end

data/lib/webcache.rb

@@ -1,6 +1,5 @@
 require 'openssl'
 
-require 'webcache/polyfills'
 require 'webcache/cache_operations'
 require 'webcache/response'
 require 'webcache/web_cache'
@@ -9,4 +8,3 @@ if ENV['BYEBUG']
   require 'byebug'
   require 'lp'
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webcache
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -33,14 +33,14 @@ files:
 - README.md
 - lib/webcache.rb
 - lib/webcache/cache_operations.rb
-- lib/webcache/polyfills.rb
 - lib/webcache/response.rb
 - lib/webcache/version.rb
 - lib/webcache/web_cache.rb
 homepage: https://github.com/DannyBen/webcache
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -49,14 +49,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Hassle-free caching for HTTP download

data/lib/webcache/polyfills.rb

@@ -1,10 +0,0 @@
-# :nocov:
-
-# Required for Ruby < 2.4
-if !Dir.respond_to? :empty?
-  class Dir
-    def self.empty?(path_name)
-      exist?(path_name) && (entries(path_name) - ['.', '..']).empty?
-    end
-  end
-end