filecache 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3476b99d5e717fbec070540e3227bbdb9d5e4b6c
-  data.tar.gz: d144dc736511955e3f47196da3be61150f5d938a
+SHA256:
+  metadata.gz: 828ce5557d7b60a0deab1418bff56079058fbe6cd2247b50425e0b0b0116b556
+  data.tar.gz: f4abea1b5f90fef451168e652ced7a42862d3b21fbb38d5b6b3945f6344fcd57
 SHA512:
-  metadata.gz: 54373883d9a35330c6c1a9ff958490b5314629a6cbad2531aac102c6a7de9075c6de17ad74d19657236d29dc331430aded2f5b9c503b9fca78ddce36be45d942
-  data.tar.gz: 7ab4a33c3cbbdb41c70e16b0596a0dddb5c54f8b59248dd687a8e7ef441975080054019a8c08e2bc7d2e910c78d2bb5b82e6c9b211307ab073cafcc351a4540a
+  metadata.gz: 558a813bcbd87351a1826bb0dcd0dd70367d205c8dd7c85238fb95a0499e4e17fc94bfdbdc2fadf4595be0c907c6f4d11b659c38da34580e827cb12cca738898
+  data.tar.gz: 5002ed7ed240491bf64b4313dc75a87537b0f5da8bd8a307ab738394eeb773d7f6e8d344dd7953d43ad1c2e810498a65021edf59944a7a1b4c1ea590e849c56b

data/lib/filecache.rb

@@ -1,13 +1,13 @@
 require 'digest/md5'
 require 'fileutils'
 
-# A file-based caching library. It uses Marshal::dump and Marshal::load 
+# A file-based caching library. It uses Marshal::dump and Marshal::load
 # to serialize/deserialize cache values - so you should be OK to cache
 # object values.
 class FileCache
-  
+
   MAX_DEPTH = 32
-  
+
   # Create a new reference to a file cache system.
   # domain:: A string that uniquely identifies this caching
   #          system on the given host
@@ -25,7 +25,7 @@ class FileCache
     @depth   = depth > MAX_DEPTH ? MAX_DEPTH : depth
     FileUtils.mkdir_p(get_root)
   end
-  
+
   # Set a cache value for the given key. If the cache contains an existing value for
   # the key it will be overwritten.
   def set(key, value)
@@ -33,18 +33,18 @@ class FileCache
     Marshal.dump(value, f)
     f.close
   end
-  
+
   # Return the value for the specified key from the cache. Returns nil if
   # the value isn't found.
   def get(key)
     path = get_path(key)
 
     # expire
-    if @expiry > 0 && File.exists?(path) && Time.new - File.new(path).mtime >= @expiry
+    if @expiry > 0 && File.exist?(path) && Time.new - File.new(path).mtime >= @expiry
       FileUtils.rm(path)
     end
-    
-    if File.exists?(path)
+
+    if File.exist?(path)
       f = File.open(path, "r")
       result = Marshal.load(f)
       f.close
@@ -53,7 +53,7 @@ class FileCache
       return nil
     end
   end
-  
+
   # Return the value for the specified key from the cache if the key exists in the
   # cache, otherwise set the value returned by the block. Returns the value if found
   # or the value from calling the block that was set.
@@ -72,12 +72,12 @@ class FileCache
 
   # Delete ALL data from the cache, regardless of expiry time
   def clear
-    if File.exists?(get_root)
+    if File.exist?(get_root)
       FileUtils.rm_r(get_root)
       FileUtils.mkdir_p(get_root)
     end
   end
-  
+
   # Delete all expired data from the cache
   def purge
     @t_purge = Time.new
@@ -85,27 +85,27 @@ class FileCache
   end
 
 #-------- private methods ---------------------------------
-private  
+private
   def get_path(key)
     md5 = Digest::MD5.hexdigest(key.to_s).to_s
-    
+
     dir = File.join(get_root, md5.split(//)[0..@depth - 1])
     FileUtils.mkdir_p(dir)
     return File.join(dir, md5)
   end
-  
+
   def get_root
     if @root == nil
       @root = File.join(@root_dir, @domain)
     end
     return @root
   end
-  
+
   def purge_dir(dir)
     Dir.foreach(dir) do |f|
       next if f =~ /^\.\.?$/
       path = File.join(dir, f)
-      if File.directory?(path) 
+      if File.directory?(path)
         purge_dir(path)
       elsif @t_purge - File.new(path).mtime >= @expiry
         # Ignore files starting with . - we didn't create those
@@ -113,7 +113,7 @@ private
         FileUtils.rm(path)
       end
     end
-    
+
     # Delete empty directories
     if Dir.entries(dir).delete_if{|e| e =~ /^\.\.?$/}.empty?
       Dir.delete(dir)

data/tests/{test_filecache.rb → filecache_test.rb}

@@ -1,11 +1,7 @@
-#!/usr/bin/env ruby
-
-$:.push(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 require 'filecache'
 require 'test/unit'
 
-class TestFileCache < Test::Unit::TestCase
+class FileCacheTest < Test::Unit::TestCase
   KEY1 = "key1"
   VALUE1 = "value1"
   VALUE2 = "value2"
@@ -16,6 +12,25 @@ class TestFileCache < Test::Unit::TestCase
     f.set(KEY1, VALUE1)
     assert_equal(f.get(KEY1), VALUE1, "set/get")
     
+    f.delete(KEY1)
+    assert_nil(f.get(KEY1), "delete")
+    
+    assert_equal(
+      f.get_or_set(KEY1) do
+        VALUE1
+      end,
+      VALUE1,
+      "set_or_get"
+    )
+    
+    assert_equal(
+      f.get_or_set(KEY1) do
+        VALUE2
+      end,
+      VALUE1,
+      "set_or_get"
+    )
+
     f.delete(KEY1)
     assert_nil(f.get(KEY1), "delete")
 

metadata

@@ -1,46 +1,106 @@
 --- !ruby/object:Gem::Specification
 name: filecache
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Simon Whitaker
-autorequire: 
+- Leigh McCulloch
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
-dependencies: []
-description: 
-email: sw@netcetera.org
+date: 2023-01-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '11'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3'
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/filecache.rb
-- tests/test_filecache.rb
-homepage: 
+- tests/filecache_test.rb
+homepage: https://github.com/leighmcculloch/filecache-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: filecache
-rubygems_version: 2.0.14.1
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: A file-based caching library
 test_files:
-- tests/test_filecache.rb
+- tests/filecache_test.rb