webcache 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a57464d31079c5df7d8e63d027b769b9f54a06f5c0e3d66afbe8b80a1ce184e
-  data.tar.gz: bc33a0a17e492d88639ed595c4e1459bfa27b9ceba68b6b1edb92d216f53357a
+  metadata.gz: 451f1821f816e79684155b09d796979d3de00cef291b53820aa60900e58e7c01
+  data.tar.gz: 17b8951b923e7da3b27c5d9c4f168feb3ba9c662d8a5bcfab2f847f3c317a012
 SHA512:
-  metadata.gz: a4bb3e90d6a456249061cfd399757bffa412e6edc8127a9ca5087c7b25725910a7a028fae43ebf7a9d2e3482df2cee144aae97da0bb8d3d37331341b7c210faf
-  data.tar.gz: 58283031d3550aa0f8bc4ca8073a7c104dc33b901e054165fcc570368da0158197addf8f4b1ebd378d7898b860c4d1d5169e81f515e1e0d2a9c9ef91354e014e
+  metadata.gz: 3ab3b897c607b12e869610004a2e2f8fa905b93120052d9479d426d6c1bf969da59e248387ed9aac252a4498ef64793701d63be223af15314872a8e3bd099fd8
+  data.tar.gz: d7bdbb693e586e26e3b8b92f75d8d7ddcf93c0ce26ad7d8d5fbf4c0a4dd267e71165a8130b247a0650484b71eeb14447f493f143080348afa874d2e609ab92be

data/lib/webcache/cache_operations.rb

@@ -3,124 +3,126 @@ require 'fileutils'
 require 'open-uri'
 require 'open_uri_redirections'
 
-module CacheOperations
-  attr_reader :last_error
-  attr_writer :dir
-
-  def initialize(dir: 'cache', life: '1h')
-    @dir = dir
-    @life = life_to_seconds life
-    @enabled = true
-  end
+class WebCache
+  module CacheOperations
+    attr_reader :last_error
+    attr_writer :dir
+
+    def initialize(dir: 'cache', life: '1h')
+      @dir = dir
+      @life = life_to_seconds life
+      @enabled = true
+    end
 
-  def get(url, force: false)
-    return http_get url unless enabled?
+    def get(url, force: false)
+      return http_get url unless enabled?
 
-    path = get_path url
-    clear url if force or stale? path
+      path = get_path url
+      clear url if force or stale? path
 
-    get! path, url
-  end
+      get! path, url
+    end
 
-  def life=(new_life)
-    @life = life_to_seconds new_life
-  end
+    def life
+      @life ||= 3600
+    end
 
-  def dir
-    @dir ||= 'cache'
-  end
+    def life=(new_life)
+      @life = life_to_seconds new_life
+    end
 
-  def life
-    @life ||= 3600
-  end
+    def dir
+      @dir ||= 'cache'
+    end
 
-  def cached?(url)
-    path = get_path url
-    File.exist?(path) and !stale?(path)
-  end
+    def cached?(url)
+      path = get_path url
+      File.exist?(path) and !stale?(path)
+    end
 
-  def enabled?
-    @enabled ||= (@enabled.nil? ? true : @enabled)
-  end
+    def enabled?
+      @enabled ||= (@enabled.nil? ? true : @enabled)
+    end
 
-  def enable
-    @enabled = true
-  end
+    def enable
+      @enabled = true
+    end
 
-  def disable
-    @enabled = false
-  end
+    def disable
+      @enabled = false
+    end
 
-  def clear(url)
-    path = get_path url
-    FileUtils.rm path if File.exist? path
-  end
+    def clear(url)
+      path = get_path url
+      FileUtils.rm path if File.exist? path
+    end
 
-  def flush
-    FileUtils.rm_rf dir if Dir.exist? dir
-  end
+    def flush
+      FileUtils.rm_rf dir if Dir.exist? dir
+    end
 
-  def options
-    @options ||= default_open_uri_options
-  end
+    def options
+      @options ||= default_open_uri_options
+    end
 
-  private
+    private
 
-  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
-  end
+    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
+    end
 
-  def get_path(url)
-    File.join dir, Digest::MD5.hexdigest(url)
-  end
+    def get_path(url)
+      File.join dir, Digest::MD5.hexdigest(url)
+    end
 
-  def load_file_content(path)
-    Marshal.load File.binread(path)
-  end
+    def load_file_content(path)
+      Marshal.load File.binread(path)
+    end
 
-  def save_file_content(path, response)
-    FileUtils.mkdir_p dir
-    File.open path, 'wb' do |f| 
-      f.write Marshal.dump response
+    def save_file_content(path, response)
+      FileUtils.mkdir_p dir
+      File.open path, 'wb' do |f| 
+        f.write Marshal.dump response
+      end
     end
-  end
 
-  def http_get(url)
-    begin
-      Response.new open(url, options)
-    rescue => e
-      Response.new error: e.message, base_uri: url, content: e.message
+    def http_get(url)
+      begin
+        Response.new open(url, options)
+      rescue => e
+        Response.new error: e.message, base_uri: url, content: e.message
+      end
     end
-  end
 
-  def stale?(path)
-    life > 0 and File.exist?(path) and Time.new - File.mtime(path) >= life
-  end
+    def stale?(path)
+      life > 0 and File.exist?(path) and Time.new - File.mtime(path) >= life
+    end
 
-  def life_to_seconds(arg)
-    arg = arg.to_s
+    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
+      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
+      end
     end
-  end
 
-  # Use a less strict URL retrieval:
-  # 1. Allow http to/from https redirects (through the use of the 
-  #    open_uri_redirections gem)
-  # 2. Disable SSL verification, otherwise, some https sites that show 
-  #    properly in the browser, will return an error.
-  def default_open_uri_options
-    {
-      allow_redirections: :all, 
-      ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE
-    }
+    # Use a less strict URL retrieval:
+    # 1. Allow http to/from https redirects (through the use of the 
+    #    open_uri_redirections gem)
+    # 2. Disable SSL verification, otherwise, some https sites that show 
+    #    properly in the browser, will return an error.
+    def default_open_uri_options
+      {
+        allow_redirections: :all, 
+        ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE
+      }
+    end
   end
 end

data/lib/webcache/response.rb

@@ -1,4 +1,4 @@
-module CacheOperations
+class WebCache
   class Response
     attr_accessor :error, :base_uri, :content
 

data/lib/webcache/version.rb

@@ -1,3 +1,3 @@
 class WebCache
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webcache
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2018-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open_uri_redirections