blobsterix 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29dfaa5cb3dda50826724e03e737914de1a359db
-  data.tar.gz: eefb565bd322f7fab35de1cb7fcb76024d7a763c
+  metadata.gz: a1b4e9b58a1661c708d9ac142fc024e6d8a9ade4
+  data.tar.gz: 65864bd8e7ba85eea992a657c6dac5278e733e21
 SHA512:
-  metadata.gz: 0efb1c4cede08902253ad65ed0754716d19ae6735fc46c73e95983c447d415b18a271cf03061540b6ec865b7f0541d5d24e53fc8f0751d12fcf937eff3a7fd08
-  data.tar.gz: e4e594eb8a6b542c82331a1deea6f475b6ee2396e860ea98a604caff9864de35eff7b41a4105b35c88348cdcba312f4d49de36b7b7392617881018d600c7d8ad
+  metadata.gz: 7a093e1ba033c6ccc930bd12196c8dacc378840a669e8fcf7cacf7cda92bdeda9eeb41a0b39a6a465cb9e1c3b30745053c923258f17cace08af72481495940df
+  data.tar.gz: 101beace4d57ba6454d8937144250db5ed97b21e22e35b3cbb284ae7da0f662e31f655ea1b2c7d120a5dc7d93bd98ae626b714af9dbf5c4469bf7c61f5b71211

data/CHANGELOG.txt

@@ -1,3 +1,6 @@
+= 0.0.31
+  * changed the cache invalidation call to use a meta_data object as well as blobaccess
+  * brakes current cache_checker implementations!
 = 0.0.29
   * changed some standard transformations
 = 0.0.28

data/lib/blobsterix/storage/cache.rb

@@ -5,11 +5,14 @@ module Blobsterix
 
       def invalidation
         each_meta_file do |meta_file|
+          meta_data = Blobsterix::SimpleProxy.new(Proc.new {
+            FileSystemMetaData.new(meta_file)
+          })
           blob_access = Blobsterix::SimpleProxy.new(Proc.new {
             meta_to_blob_access(FileSystemMetaData.new(meta_file))
           })
-          if Blobsterix.cache_checker.call(blob_access,File.atime(meta_file),File.ctime(meta_file))
-            invalidate(blob_access, true)
+          if Blobsterix.cache_checker.call(blob_access, meta_data, File.atime(meta_file), File.ctime(meta_file))
+            meta_data.delete
           end
         end
       end

data/lib/blobsterix/storage/file_system_meta_data.rb

@@ -147,13 +147,17 @@ module Blobsterix
           if not File.exists?(meta_path)
             save_meta_file
           else
-            data = JSON.load File.read(meta_path)
-            @mimetype = data["mimetype"]
-            @mediatype = data["mediatype"]
-            @etag = data["etag"]
-            @size = data["size"]
-            @payload = JSON.load(data["payload"]) || {}
-            @mimeclass = MimeMagic.new(@mimetype)
+            begin
+              data = JSON.load(File.read(meta_path)) || {}
+              @mimetype = data["mimetype"]
+              @mediatype = data["mediatype"]
+              @etag = data["etag"]
+              @size = data["size"]
+              @payload = JSON.load(data["payload"]) || {}
+              @mimeclass = @mimetype ? MimeMagic.new(@mimetype) : nil
+            rescue JSON::ParserError => e
+              save_meta_file
+            end
           end
         end
     end

data/lib/blobsterix/version.rb

@@ -1,3 +1,3 @@
 module Blobsterix
-  VERSION = "0.0.30"
+  VERSION = "0.0.31"
 end

data/lib/blobsterix.rb

@@ -196,7 +196,7 @@ module Blobsterix
   end
 
   def self.cache_checker
-     @@cache_checker||=lambda{|blob_access, last_accessed_at, created_at|
+     @@cache_checker||=lambda{|blob_access, meta_data, last_accessed_at, created_at|
         false
      }
   end

data/spec/lib/storage/cache_spec.rb

@@ -26,13 +26,13 @@ describe Blobsterix::Storage::Cache do
 
     after :each do
       clear_cache
-      Blobsterix.cache_checker=lambda{|blob_access, last_accessed_at, created_at|
+      Blobsterix.cache_checker=lambda{|blob_access, meta_data, last_accessed_at, created_at|
         false
       }
     end
 
     it "should follow invalidation structure" do
-      Blobsterix.cache_checker=lambda{|blob_access_, last_accessed_at, created_at|
+      Blobsterix.cache_checker=lambda{|blob_access_, meta_data, last_accessed_at, created_at|
         blob_access_1.equals?(blob_access_) || blob_access_3.equals?(blob_access_)
       }
       Blobsterix.cache.invalidation
@@ -43,7 +43,7 @@ describe Blobsterix::Storage::Cache do
     end
 
     it "should invalidate all" do
-      Blobsterix.cache_checker=lambda{|blob_access_, last_accessed_at, created_at|
+      Blobsterix.cache_checker=lambda{|blob_access_, meta_data, last_accessed_at, created_at|
         true
       }
       Blobsterix.cache.invalidation

data/templates/app/config/environments/development.rb

@@ -24,7 +24,7 @@
 # }
 
 # # Use a specific cache checker for invalidation
-# Blobsterix.cache_checker= lambda { |blob_access, last_accessed_at, created_at|
+# Blobsterix.cache_checker= lambda { |blob_access, meta_data, last_accessed_at, created_at|
 #   false # return true to invalidate the cache entry
 # }
 

data/templates/app/config/environments/production.rb

@@ -24,7 +24,7 @@
 # }
 
 # # Use a specific cache checker for invalidation
-# Blobsterix.cache_checker= lambda { |blob_access, last_accessed_at, created_at|
+# Blobsterix.cache_checker= lambda { |blob_access, meta_data, last_accessed_at, created_at|
 #   false # return true to invalidate the cache entry
 # }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blobsterix
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Daniel Sudmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json