jsoncache 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a291a1c95f4e30071bf0dbe8c3a8c13d77cc49fa
-  data.tar.gz: c2aa9b52113bcf806f782f60784badff07bcb4c7
+  metadata.gz: 451ecce81c2292abf00ea4b993b08ac32236b592
+  data.tar.gz: 10f0b235b42b7b291db910eeee69d25f29687fc9
 SHA512:
-  metadata.gz: 09dae7a27fe8c8536d7fb83fbbac47920f5e916e04b77bc1f6c3e6dfa5ce4b408b45a1381375f72dadf02dbb9612d54f483f40a9d961e440ee50ef2fdddc0337
-  data.tar.gz: c6f8c8cadaa65cbd5ded4962c419f15f06d7c198c0a3551f438b46bbe417d7a913f0f56a29c24016121c0fc8f9214fa9e0d1e7a8f0aa8b97409aeb36cd62e77c
+  metadata.gz: 9002060bd1ef998f9ffbb8ed10243d024ea9da6ca9407cbe10cdc3da3f966514a074a1b8cc0a91334c53c3a54275bf26a4c702e964a05078a0e3deed28423daa
+  data.tar.gz: e6814adf6f6d8fba88c676c6eaa6dcacf64a85690cad8f21db0154e319bcc7fbe9bb7db89fd3cd1066fa2e3d75d93bb12f26832bc4fdfb9b1df429edb1cce019

data/lib/jsoncache.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'pp'
 
 # JSONCache is a simple interface to cache JSON based API calls
 #
@@ -25,16 +26,17 @@ module JSONCache
   #
   # +:symbolize+:: +Boolean+ Symbolize keys while parsing JSON.
   # +:cache_directory+:: +String+ The folder name in /tmp to use as the cache.
-  # +:delta+:: +Fixnum+ The validity time of the cache in seconds.
+  # +:expiry+:: +Fixnum+ The validity time of the cache in seconds.
   #
   # ==== Examples
   #
   #   def get_response(uri)
-  #     JSONCache.cache(uri_to_key(uri), delta: 120) do
+  #     JSONCache.cache(uri_to_key(uri), expiry: 120) do
   #       query_some_json_api(uri)
   #     end
   #   end
   def cache(key, options = {})
+    options = defaults.merge(options)
     return retrieve_cache(key, options) if cached?(key, options)
     result = yield
     cache_file(key, result, options)
@@ -54,14 +56,15 @@ module JSONCache
   # +key+:: +String+ The key in which to check for cached data.
   # +options+:: +Hash+ A hash of the parameters to use when caching.
   def cached?(key, options = {})
+    options = defaults.merge(options)
     timestamp = timestamp_from_key(key, options[:cache_directory])
-    delta = options[:delta] || 0
+    expiry = options[:expiry]
     if timestamp.zero?
       false
-    elsif delta.zero?
+    elsif expiry.zero?
       true
     else
-      (Time.now.to_i - timestamp) < delta
+      (Time.now.to_i - timestamp) < expiry
     end
   end
 
@@ -73,12 +76,12 @@ module JSONCache
   # +data+:: +Hash+ The data to cache.
   # +options+:: +Hash+ A hash of the parameters to use when caching.
   def cache_file(key, data, options = {})
-    content =
-      if data.class == Array
-        data.to_a
-      elsif data.respond_to?(:to_h)
-        data.to_h
-      end
+    options = defaults.merge(options)
+    begin
+      content = JSON.generate(data)
+    rescue
+      return
+    end
 
     cache_path = cache_dir(options[:cache_directory])
     existing_file = filename_from_key(key, options[:cache_directory])
@@ -87,7 +90,7 @@ module JSONCache
     File.delete(last_path) if existing_file && File.exist?(last_path)
     File.write(
       "#{cache_path}/#{key}#{Time.now.to_i}.json",
-      JSON.generate(content))
+      content)
   end
 
   # Retrieves a cached value from a key
@@ -97,13 +100,13 @@ module JSONCache
   # +key+:: +String+ The key in which to check for cached data.
   # +options+:: +Hash+ A hash of the parameters to use when caching.
   def retrieve_cache(key, options = {})
+    options = defaults.merge(options)
     directory = options[:cache_directory]
     filename = filename_from_key(key, directory)
     return nil if filename.nil?
-    symbolize = options[:symbolize] || false
     JSON.parse(
       File.read("#{cache_dir(directory)}/#{filename}"),
-      symbolize_names: symbolize)
+      symbolize_names: options[:symbolize])
   end
 
   ########################################################################
@@ -116,7 +119,7 @@ module JSONCache
   #
   # +directory+:: +String+ The name of the cache directory.
   def cache_dir(directory)
-    directory ||= 'jsoncache'
+    directory ||= defaults[:cache_directory]
     cache_path = File.join('/tmp', directory)
     Dir.mkdir(cache_path) unless Dir.exist?(cache_path)
     cache_path
@@ -129,7 +132,6 @@ module JSONCache
   # +key+:: +String+ The key in which to check for cached data.
   # +directory+:: +String+ The name of the cache directory.
   def filename_from_key(key, directory)
-    directory ||= 'jsoncache'
     Dir.foreach(cache_dir(directory)) do |filename|
       next unless filename.include?(key)
       return filename
@@ -150,4 +152,8 @@ module JSONCache
       .chomp('.json')
       .to_i
   end
+
+  def defaults
+    { symbolize: false, cache_directory: 'jsoncache', expiry: 0 }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsoncache
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Derek Stride
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec