blobsterix 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5377ce878e40d72b97327de2e0164016c87d09ae
-  data.tar.gz: bb0e8f0e5beb71ab33092e119d8d579786ceda9c
+  metadata.gz: 5d6c5d8753eb7b819ab4fb8f8eda41051891141c
+  data.tar.gz: fafd4b138061ae869bc6c7f6fafd7efaf86a27f4
 SHA512:
-  metadata.gz: 5399a5373e515cee0546bfd946f59ba2eaa3a2d4ef6da42e3c8d6f47307c9aa00af86d9ffc45f10076620d71f670dc0b73b0abe1de9436b772c7dff4fb62e3f7
-  data.tar.gz: d72731cb475cb077adc0b45f8c36162c7b0ed0c9f8e04f6c91d0d9e81be8e5a610e4d4c1899c0d3f03c5b73c082c2dcff1c902d21196447fc48316f6df2ca60e
+  metadata.gz: bd9a45bf0dfbca62e2deccd780c5e24b919f46d4939669b2f0e5e9ac9ca7115d258a2934834cea4a608c356dea1156cf97792fc519f62a55c6657b31553cd870
+  data.tar.gz: c87a7318aef732db856b14381c95becae98181f217ddce68c1980abbfbf78f1a3f414996367eb7b46610bdcda3d5989c2d5674f8ca0e191d6b4b0e7bd3d3eb29

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+script: "bundle exec rake spec"
+rvm:
+  - 2.0.0
+  - 2.1.1
+notifications:
+  recipients:
+    - peter.schrammel@experteer.com
+branches:
+  only:
+    - master
+

data/CHANGELOG.txt

@@ -1,3 +1,7 @@
+= 0.0.11
+  * changed naming schemas of cached files and tmp files
+  * fixing x-send file
+  * fixing empty accept_type crashes
 = 0.0.10
   * Adding ruby dependency to gemfile
 = 0.0.9

data/README.md

@@ -1,5 +1,8 @@
 # Blobsterix
 
+[![Gem Version](https://badge.fury.io/rb/blobsterix.png)](http://badge.fury.io/rb/blobsterix)
+[![Build Status](https://travis-ci.org/experteer/blobsterix.svg?branch=master)](https://travis-ci.org/experteer/blobsterix)
+[![Code Climate](https://codeclimate.com/github/experteer/blobsterix.png)](https://codeclimate.com/github/experteer/blobsterix)
 
 # What's this?
 

data/Rakefile

@@ -1,5 +1,6 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
 
 desc "Simple cov"
@@ -10,4 +11,10 @@ task :simplecov do
   end
   require "blobsterix"
   `rspec`
-end
+end
+
+
+
+RSpec::Core::RakeTask.new do |t|
+
+end

data/blobsterix.gemspec

@@ -2,11 +2,10 @@
 require File.expand_path('../lib/blobsterix/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.required_ruby_version = '>= 2.0.0.p451'
   gem.authors       = ["Daniel Sudmann"]
   gem.email         = ["suddani@googlemail.com"]
-  gem.description   = "BlobServer"
-  gem.summary       = "BlobServer"
+  gem.description   = "Blobsterix is a transcoding, caching, storage server that can transform your blobs (images, pdf, ...) at request time."
+  gem.summary       = "Blobsterix is a transcoding, caching, storage server."
   gem.homepage      = "https://github.com/experteer/blobsterix"
   gem.license       = "MIT License"
 
@@ -32,9 +31,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency "ruby-webp",   "~> 0.1.0"
   gem.add_dependency "mini_magick", "~> 3.5.0"
 
-  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rake","~> 0.9.6"
+  gem.add_development_dependency "rspec", "~> 2.14.0"
   gem.add_development_dependency "rspec-core"
   gem.add_development_dependency "rspec-expectations"
   gem.add_development_dependency "rspec-mocks"
   gem.add_development_dependency "pry"
 end
+

data/lib/blobsterix/helper/accept_type.rb

@@ -45,10 +45,12 @@ module Blobsterix
     end
 
     def is? other_type
+      return false unless other_type
       mediatype === other_type.mediatype || mediatype === "*" || other_type.mediatype === "*"
     end
 
     def equal? other_type
+      return false unless other_type
       mediatype === other_type.mediatype and subtype === other_type.subtype# and factor == other_type.factor
     end
 

data/lib/blobsterix/helper/data_response.rb

@@ -14,7 +14,7 @@ module Blobsterix
         if not meta.valid
           Http.NotFound()
         elsif xfile and etag != meta.etag
-          [200, meta.header.merge({"X-Sendfile" => meta.path}), ""]
+          [200, meta.header.merge({"X-Sendfile" => meta.path.to_s}), ""]
         elsif etag != meta.etag
           if env != nil && meta.size > 30000 && allow_chunks
             chunkresponse

data/lib/blobsterix/storage/cache.rb

@@ -43,7 +43,8 @@ module Blobsterix
         else
           cache_path(blob_access).entries.each {|cache_file|
             unless cache_file.to_s.match(/\.meta$/) || cache_file.directory?
-              FileSystemMetaData.new(cache_path(blob_access).join(cache_file)).delete if cache_file.to_s.match(blob_access.identifier)
+              base_name = cache_file.to_s.split("_")[0..1].join("_")
+              FileSystemMetaData.new(cache_path(blob_access).join(cache_file)).delete if base_name.match(cache_file_base(blob_access))
             end
           } if Dir.exist?(cache_path(blob_access))
         end
@@ -66,11 +67,19 @@ module Blobsterix
       end
 
       def cache_file_path(blob_access)
-        cache_path(blob_access).join(blob_access.identifier)
+        cache_path(blob_access).join(cache_file_name(blob_access))
+      end
+
+      def cache_file_name(blob_access)
+        [cache_file_base(blob_access), Murmur.Hash64B(blob_access.identifier).to_s()].join("_")
+      end
+
+      def cache_file_base(blob_access)
+        "#{blob_access.bucket}_#{blob_access.id.gsub("/","_")}"
       end
 
       def cache_path(blob_access)
-        @path.join(hash_filename("#{blob_access.bucket}_#{blob_access.id.gsub("/","_")}"))
+        @path.join(hash_filename(cache_file_base(blob_access)))
       end
 
       def hash_filename(filename)

data/lib/blobsterix/transformation/transformation_chain.rb

@@ -63,7 +63,7 @@ module Blobsterix::Transformations
 
     def with_tempfiles
       tmpFiles = @transformations.size.times.map{|index|
-        Tempfile.new("#{@blob_access.identifier}_#{index}")
+        Tempfile.new("blobsterix_#{Thread.current.object_id}_#{index}")
       }
       keys = tmpFiles.map{|f| f.path }
 

data/lib/blobsterix/version.rb

@@ -1,3 +1,3 @@
 module Blobsterix
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/templates/app/config.rb

@@ -2,9 +2,9 @@ module Blobsterix
 
   # # If this function is uncommented it should return an environment
   # # this env will override the one supplied from the command line
-  # def self.env()
-  #   :development or :production or :test
-  # end
+  def self.env()
+    :development # or :production or :test
+  end
 
   # # Use this method to set the port. (standard is 9000)
   # def self.port()
@@ -46,7 +46,7 @@ module Blobsterix
   # # For a different way check the environments files
   # # The return should be in format of: trafoName_value,trafoName_value,....
   # # Example: scale_2,rotate_20
-  # def self.decrypt_trafo(trafo_string,logger)
+  # def self.decrypt_trafo(blobaccess, trafo_string, logger)
   #   trafo_string
   # end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blobsterix
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Daniel Sudmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -94,20 +94,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +178,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: BlobServer
+description: Blobsterix is a transcoding, caching, storage server that can transform
+  your blobs (images, pdf, ...) at request time.
 email:
 - suddani@googlemail.com
 executables:
@@ -173,6 +188,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.txt
 - Gemfile
 - LICENSE
@@ -277,7 +293,7 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: BlobServer
+summary: Blobsterix is a transcoding, caching, storage server.
 test_files:
 - spec/lib/blob/blob_api_spec.rb
 - spec/lib/helper/blob_access_spec.rb
@@ -287,3 +303,4 @@ test_files:
 - spec/lib/storage/cache_spec.rb
 - spec/lib/storage/file_system_spec.rb
 - spec/spec_helper.rb
+has_rdoc: