disk_store 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98a111dc2aa5475b5bb793ca372d18227448eb45
-  data.tar.gz: 72639d803f117138f4202f728b3c7c07775850ac
+  metadata.gz: b80a1438fb5454793cd77e6fa2371638c6055664
+  data.tar.gz: 4c015900c8c3f0db8e7ecd47aab6300ef4348b4c
 SHA512:
-  metadata.gz: 6fe3eb0016349c8a660af8a5be345d6c7d4875c21f558c0b18d2464fbc727e27844d3682f56828c2c6363340087b7d84a104202b26cefcc915e5e1b9aa0d757a
-  data.tar.gz: e55d319d351764d3bb01ae3f27f934b8ed5e49104efae5796c12639f2239d40e78c623e3e1ce7d9dbe99b8b1b3c7f2f4b9b70cc8029e3946cbefea1aacb6d3f1
+  metadata.gz: 6e8c657344f7039344dd09019d44de1d5f75750ea87f29c5fb49f8d16340cba53b6c407db96fcd614bf9676445e2fe9cde2b89fb96bfae2c0a0feccf1e94c98b
+  data.tar.gz: 158f6cedb964548dd86bc52b7bbe52e1cc4ac00325a54b3e313f74f73b86da3cd9577938e532b5c4b003d5245cd8b21947fed7ebed768ddd6b2ac15195b91d03

data/Gemfile.lock

@@ -1,38 +1,26 @@
 PATH
   remote: .
   specs:
-    disk_store (0.2.1)
+    disk_store (0.2.2)
       rake
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
     diff-lcs (1.2.5)
-    multi_json (1.8.4)
-    rake (10.3.1)
+    rake (10.3.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
+    rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    safe_yaml (0.9.7)
-    vcr (2.8.0)
-    webmock (1.13.0)
-      addressable (>= 2.2.7)
-      crack (>= 0.3.2)
+    rspec-mocks (2.14.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   disk_store!
-  multi_json
   rspec
-  vcr
-  webmock

data/disk_store.gemspec

@@ -22,8 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rake"
 
   gem.test_files = Dir.glob("spec/**/*")
-  gem.add_development_dependency "multi_json"
   gem.add_development_dependency "rspec"
-  gem.add_development_dependency "vcr"
-  gem.add_development_dependency "webmock"
 end

data/lib/disk_store/eviction_strategies/lru.rb

@@ -5,11 +5,8 @@ class DiskStore
         # Collect and sort files based on last access time
         sorted_files = files
           .map { |file|
-            data = nil
-            File.new(file, 'rb').tap { |fd|
-              data = { path: file, last_fetch: fd.atime, size: fd.size }
-            }.close
-            data
+            st = File.stat(file)
+            { path: file, last_fetch: st.atime, size: st.size }
           }
           .sort { |a, b| a[:last_fetch] <=> b[:last_fetch] } # Oldest first
 

data/lib/disk_store/reaper.rb

@@ -96,7 +96,7 @@ class DiskStore
     end
 
     def current_cache_size
-      files.map { |file| File.size(file) }.inject { |sum, size| sum + size } || 0
+      files.inject(0) { |sum, file| sum + File.size(file) }
     end
 
     def maximum_cache_size

data/lib/disk_store/version.rb

@@ -1,3 +1,3 @@
 class DiskStore
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/disk_store_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe DiskStore do
   let(:cache) { DiskStore.new @tmpdir }
-  let(:file_contents) { "Hello, Doge" }
+  let(:file_contents) { SecureRandom.random_bytes(8192) }
   let(:file) { Tempfile.new("My Temp File.psd") }
   let(:key) { "doge" }
 
@@ -14,6 +14,7 @@ describe DiskStore do
   end
 
   before(:each) do
+    file.binmode
     file.write file_contents
     file.flush
   end
@@ -44,7 +45,7 @@ describe DiskStore do
       }.to change{ Dir[File.join(@tmpdir, "**/*")].size }.by(3)
 
       file_path = Dir[File.join(@tmpdir, "**/*")].last
-      expect(File.read(file_path)).to eq file_contents
+      expect(File.binread(file_path)).to eq file_contents
     end
   end
 
@@ -66,19 +67,4 @@ describe DiskStore do
       expect(cache.exist?(key)).to be_false
     end
   end
-
-  context "web resources", :vcr do
-    let(:url) { "http://media.giphy.com/media/KXD1pSzGb3Khi/giphy.gif" }
-    let(:key) { "lolololol" }
-
-    it "should cache the result of a web resource in a file" do
-      expect(cache.exist?(key)).to be_false
-
-      cache.fetch(key) do
-        open(url)
-      end
-
-      expect(cache.read(key).read).to eq open(url).read
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -1,32 +1,12 @@
 require File.expand_path './lib/disk_store'
 require 'rspec'
+require 'securerandom'
 require 'tempfile'
 require 'tmpdir'
-require 'vcr'
-
-VCR.configure do |c|
-  c.configure_rspec_metadata!
-
-  c.default_cassette_options = {
-    serialize_with:              :json,
-    preserve_exact_body_bytes:   true,
-    decode_compressed_response:  true,
-    match_requests_on:          [:method]
-  }
-
-  c.cassette_library_dir = 'spec/cassettes'
-  c.hook_into :webmock
-  c.ignore_localhost = true
-end
 
 RSpec.configure do |config|
   config.color_enabled = true
   config.tty = true
 
   config.treat_symbols_as_metadata_keys_with_true_values = true
-
-  config.around(:each, :vcr) do |example|
-    name = example.metadata[:full_description].gsub(/\//, "_").split(/\s+/, 2).join("/").gsub(/[^\w\/]+/, "_").downcase
-    VCR.use_cassette(name) { example.call }
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disk_store
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kelly Sutton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +38,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Cache files the smart way.
 email:
 - kelly@layervault.com
@@ -98,7 +56,6 @@ files:
 - lib/disk_store/eviction_strategies/lru.rb
 - lib/disk_store/reaper.rb
 - lib/disk_store/version.rb
-- spec/cassettes/DiskStore/web_resources/should_cache_the_result_of_a_web_resource_in_a_file.json
 - spec/disk_store_spec.rb
 - spec/reaper_spec.rb
 - spec/spec_helper.rb
@@ -127,7 +84,6 @@ signing_key:
 specification_version: 4
 summary: Cache fiels the smart way.
 test_files:
-- spec/cassettes/DiskStore/web_resources/should_cache_the_result_of_a_web_resource_in_a_file.json
 - spec/disk_store_spec.rb
 - spec/reaper_spec.rb
 - spec/spec_helper.rb