blobsterix 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 549a1162916756237d9df4372dbce37432d2cbb2
-  data.tar.gz: 85b118a8cb57a4140e922dbae3caf6c768b17cd3
+  metadata.gz: 7445c28b6f045636c287259d79540cb33490a6e5
+  data.tar.gz: 301c5d44eba26cb07e3cbe0c8ca24598ecf4c0cb
 SHA512:
-  metadata.gz: 00f4d1abc5b5b64469090a20b5f6c6d303ba13d361a723961f606e79723fb23eb56755d8f5ee91d548d51f69466beabeab8fd6f01f4042b6ec718f621714a773
-  data.tar.gz: c79acbb55211463bb151cc0ed731aa85a7673b8c4936842d839a39a28b8cce7656c3efd8e9b6f829daee35897ecf3d9008260cf964b01eb4fab7aaf988dec342
+  metadata.gz: 79d8ada8a2a3c8fe79c3f26b5f93fda2b97a36e7e6f09f326fa4e92ac55cec620a2099ee50940a7709b0a127027fcad4535c25b869cab3e04f64ca7a85643079
+  data.tar.gz: 0bb50d3e731c1f7868861043c9029155c44f1ac7d0e9c0175a590065b16eeaf0027ac7fc69c1b3fc4d54b02037f2b122b2f704a4d3f2200220cc2912d17ac409

data/lib/blobsterix/exceptions.rb

@@ -2,4 +2,6 @@ module Blosterix
 
   class BlobsertixTransformationError < StandardError; end
 
+  class BlobsterixStorageError < StandardError; end
+
 end

data/lib/blobsterix/storage/file_system.rb

@@ -7,93 +7,151 @@ module Blobsterix
       include Blobsterix::Logable
 
       def initialize(path)
-        logger.info "Create FileSystem at #{path}"
-        @contents = path
-        FileUtils.mkdir_p(@contents) unless Dir.exist?(@contents)
-        FileUtils.touch File.join(@contents,".keep")
+        @contents_path = path
+        @contents = nil
       end
 
       def bucket_exist(bucket="root")
-        Dir.entries(contents).include?(bucket) and File.directory?(File.join(contents,bucket))
+        begin
+          Dir.entries(contents).include?(bucket) and File.directory?(File.join(contents,bucket))
+        rescue => e
+          if e.is_a? ::Blosterix::BlobsterixStorageError
+            raise e
+          else
+            raise ::Blosterix::BlobsterixStorageError.new("Could not check for bucket")
+          end
+        end
       end
 
       def list(bucket="root", opts={})
-        if bucket =~ /root/
-          list_buckets
-        else
-          if bucket_exist(bucket)
-            b = Bucket.new(bucket, time_string_of(bucket))
-            b.marker = opts[:start_path] if opts[:start_path]
-            Blobsterix.wait_for(Proc.new {
-              collect_bucket_entries(bucket, b, opts)
-            })
-            b
+        begin
+          if bucket =~ /root/
+            list_buckets
           else
-            Nokogiri::XML::Builder.new do |xml|
-              xml.Error "no such bucket"
+            if bucket_exist(bucket)
+              b = Bucket.new(bucket, time_string_of(bucket))
+              b.marker = opts[:start_path] if opts[:start_path]
+              Blobsterix.wait_for(Proc.new {
+                collect_bucket_entries(bucket, b, opts)
+              })
+              b
+            else
+              Nokogiri::XML::Builder.new do |xml|
+                xml.Error "no such bucket"
+              end
             end
           end
+        rescue => e
+          if e.is_a? ::Blosterix::BlobsterixStorageError
+            raise e
+          else
+            raise ::Blosterix::BlobsterixStorageError.new("Could not list bucket(s)")
+          end
         end
       end
 
       def get(bucket, key)
-        if (not File.directory?(contents(bucket, key))) # and bucket_files(bucket).include?(key)
-          Blobsterix.storage_read(BlobAccess.new(:bucket => bucket, :id => key))
-          metaData(bucket, key)
-        else
-          Blobsterix.storage_read_fail(BlobAccess.new(:bucket => bucket, :id => key))
-          Blobsterix::Storage::BlobMetaData.new
+        begin
+          if (not File.directory?(contents(bucket, key))) # and bucket_files(bucket).include?(key)
+            Blobsterix.storage_read(BlobAccess.new(:bucket => bucket, :id => key))
+            metaData(bucket, key)
+          else
+            Blobsterix.storage_read_fail(BlobAccess.new(:bucket => bucket, :id => key))
+            Blobsterix::Storage::BlobMetaData.new
+          end
+        rescue => e
+          if e.is_a? ::Blosterix::BlobsterixStorageError
+            raise e
+          else
+            raise ::Blosterix::BlobsterixStorageError.new("Could not get bucket entry: #{@contents_path}")
+          end
         end
       end
 
       def put(bucket, key, value, opts={})
-        Blobsterix.storage_write(BlobAccess.new(:bucket => bucket, :id => key))
+        begin
+          Blobsterix.storage_write(BlobAccess.new(:bucket => bucket, :id => key))
 
-        meta = Blobsterix.wait_for(Proc.new do
-          result = metaData(bucket, key).write() do |f|
-            FileUtils.copy_stream(value, f)
-          end
-          FileUtils.touch File.join(contents(bucket), ".keep")
-          result
-        end)
+          meta = Blobsterix.wait_for(Proc.new do
+            result = metaData(bucket, key).write() do |f|
+              FileUtils.copy_stream(value, f)
+            end
+            FileUtils.touch File.join(contents(bucket), ".keep")
+            result
+          end)
 
-        value.close if opts[:close_after_write]
+          value.close if opts[:close_after_write]
 
-        Blobsterix.wait_for(Proc.new {Blobsterix.cache.invalidate(Blobsterix::BlobAccess.new(:bucket => bucket, :id => key))})
+          Blobsterix.wait_for(Proc.new {Blobsterix.cache.invalidate(Blobsterix::BlobAccess.new(:bucket => bucket, :id => key))})
 
-        meta
+          meta
+        rescue => e
+          if e.is_a? ::Blosterix::BlobsterixStorageError
+            raise e
+          else
+            raise ::Blosterix::BlobsterixStorageError.new("Could not create bucket entry")
+          end
+        end
       end
 
       def create(bucket)
-        logger.info "Storage: create bucket #{contents(bucket)}"
-        FileUtils.mkdir_p(contents(bucket)) unless File.exist?(contents(bucket))
-        FileUtils.touch File.join(contents(bucket), ".keep")
+        begin
+          logger.info "Storage: create bucket #{contents(bucket)}"
+          FileUtils.mkdir_p(contents(bucket)) unless File.exist?(contents(bucket))
+          FileUtils.touch File.join(contents(bucket), ".keep")
 
-        Nokogiri::XML::Builder.new do |xml|
-        end.to_s
+          Nokogiri::XML::Builder.new do |xml|
+          end.to_s
+        rescue => e
+          if e.is_a? ::Blosterix::BlobsterixStorageError
+            raise e
+          else
+            raise ::Blosterix::BlobsterixStorageError.new("Could not create bucket")
+          end
+        end
       end
 
       def delete(bucket)
-        logger.info "Storage: delete bucket #{contents(bucket)}"
-        FileUtils.rm_rf(contents(bucket)) if bucket_exist(bucket) && bucket_empty?(bucket)
-        #Dir.rmdir(contents(bucket)) if bucket_exist(bucket) && bucket_files(bucket).empty?
+        begin
+          logger.info "Storage: delete bucket #{contents(bucket)}"
+          FileUtils.rm_rf(contents(bucket)) if bucket_exist(bucket) && bucket_empty?(bucket)
+        rescue => e
+          if e.is_a? ::Blosterix::BlobsterixStorageError
+            raise e
+          else
+            raise ::Blosterix::BlobsterixStorageError.new("Could not delete bucket")
+          end
+        end
       end
 
       def delete_key(bucket, key)
-        Blobsterix.storage_delete(BlobAccess.new(:bucket => bucket, :id => key))
-        Blobsterix.wait_for(Proc.new {Blobsterix.cache.invalidate(Blobsterix::BlobAccess.new(:bucket => bucket, :id => key))})
+        begin
+          Blobsterix.storage_delete(BlobAccess.new(:bucket => bucket, :id => key))
+          Blobsterix.wait_for(Proc.new {Blobsterix.cache.invalidate(Blobsterix::BlobAccess.new(:bucket => bucket, :id => key))})
+
+          metaData(bucket, key).delete # if bucket_files(bucket).include? key
+        rescue => e
+          if e.is_a? ::Blosterix::BlobsterixStorageError
+            raise e
+          else
+            raise ::Blosterix::BlobsterixStorageError.new("Could not delete bucket key")
+          end
+        end
+      end
 
-        metaData(bucket, key).delete # if bucket_files(bucket).include? key
+      def name
+        @contents_path
       end
 
       private
         def list_buckets
           BucketList.new do |l|
             Dir.entries("#{contents}").each{|dir|
-              l.buckets << Bucket.new(dir, time_string_of(dir)) if File.directory? File.join("#{contents}",dir) and !(dir =='.' || dir == '..') 
+              l.buckets << Bucket.new(dir, time_string_of(dir)) if File.directory? File.join("#{contents}",dir) and !(dir =='.' || dir == '..')
             }
           end
         end
+
         def collect_bucket_entries(bucket, b, opts)
           start_path = map_filename(opts[:start_path].to_s.gsub("/", "\\")) if opts[:start_path]
           current_obj = Blobsterix::DirectoryList.each_limit(contents(bucket), :limit => 20, :start_path => start_path) do |path, file|
@@ -110,7 +168,9 @@ module Blobsterix
             b.truncated=true
           end
         end
+
         def contents(bucket=nil, key=nil)
+          initialize_contents
           if bucket
             key ? File.join(@contents, bucket, map_filename(key.gsub("/", "\\"))) : File.join(@contents, bucket)
           else
@@ -118,6 +178,18 @@ module Blobsterix
           end
         end
 
+        def initialize_contents
+          return if @contents != nil
+          begin
+            logger.info "Create FileSystem at #{@contents_path}"
+            FileUtils.mkdir_p(@contents_path) unless Dir.exist?(@contents_path)
+            FileUtils.touch File.join(@contents_path,".keep")
+            @contents = @contents_path
+          rescue
+            raise ::Blosterix::BlobsterixStorageError.new("Could not connect to FileSystem")
+          end
+        end
+
         def map_filename(filename)
           Murmur.map_filename(filename, filename)
         end

data/lib/blobsterix/storage/file_system_meta_data.rb

@@ -67,7 +67,7 @@ module Blobsterix
       end
 
       def header()
-        {"Etag" => etag, "Content-Type" => mimetype, "Last-Modified" => last_modified.strftime("%Y-%m-%dT%H:%M:%S.000Z"), "Cache-Control" => "max-age=#{60*60*24}", "Expires" => (Time.new+(60*60*24)).strftime("%Y-%m-%dT%H:%M:%S.000Z")}
+        {"Etag" => etag, "Content-Type" => mimetype, "Last-Modified" => last_modified.strftime("%a, %d %b %Y %H:%M:%S GMT"), "Cache-Control" => "max-age=#{60*60*24}", "Expires" => (Time.new+(60*60*24)).strftime("%a, %d %b %Y %H:%M:%S GMT")}
       end
 
       def valid
@@ -79,24 +79,32 @@ module Blobsterix
       end
 
       def write
-        if block_given?
-          delete
-          FileUtils.mkdir_p(File.dirname(path))
-          f = File.open(path, "wb")
-          yield f
-          f.close
+        begin
+          if block_given?
+            delete
+            FileUtils.mkdir_p(File.dirname(path))
+            f = File.open(path, "wb")
+            yield f
+            f.close
+          end
+          save_meta_file
+          self
+        rescue
+          raise ::Blosterix::BlobsterixStorageError.new("Could not create MetaData entry")
         end
-        save_meta_file
-        self
       end
 
       def open
-        if block_given?
-          f = File.open(path, "rb")
-          yield f
-          f.close
-        else
-          File.open(path, "rb")
+        begin
+          if block_given?
+            f = File.open(path, "rb")
+            yield f
+            f.close
+          else
+            File.open(path, "rb")
+          end
+        rescue
+          raise ::Blosterix::BlobsterixStorageError.new("Could not open FilesystemMetaData")
         end
       end
 
@@ -138,8 +146,11 @@ module Blobsterix
         end
         def save_meta_file
           return if not valid
-
-          File.write(meta_path, to_json)
+          begin
+            File.write(meta_path, to_json)
+          rescue
+            raise ::Blosterix::BlobsterixStorageError.new("Could not create MetaData entry")
+          end
         end
         def load_meta_file
           return if not valid

data/lib/blobsterix/storage/storage.rb

@@ -25,6 +25,9 @@ module Blobsterix
       def delete_key(bucket, key)
         nil
       end
+      def name
+        "none"
+      end
     end
   end
 end

data/lib/blobsterix/transformation/transformation_manager.rb

@@ -102,7 +102,7 @@ module Blobsterix::Transformations
         logger.debug "Transformation: done #{blob_access} finish connections"
         running_transformations[blob_access.identifier].each{|fiber|
           fiber.resume(result)
-        }
+        } if running_transformations[blob_access.identifier] # check if there are pending fibers or if the connection was already closed
         uncue_transformation(blob_access)
       end
 
@@ -118,4 +118,4 @@ module Blobsterix::Transformations
         trafos.empty? ? nil : trafos[0]
       end
   end
-end
+end

data/lib/blobsterix/version.rb

@@ -1,3 +1,3 @@
 module Blobsterix
-  VERSION = "0.0.35"
+  VERSION = "0.0.36"
 end

data/templates/storage_template.rb

@@ -25,6 +25,9 @@ module Blobsterix
       def delete_key(bucket, key)
         nil
       end
+      def name
+        "none"
+      end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blobsterix
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - Daniel Sudmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -333,3 +333,4 @@ test_files:
 - spec/lib/storage/cache_spec.rb
 - spec/lib/storage/file_system_spec.rb
 - spec/spec_helper.rb
+has_rdoc: