shutterbug 0.5.0 → 0.5.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDhhMGNiMWQ4MGY0Yzc3N2FkNWEyYWY4OWMyYjhmOTgzYWE3YjBlYg==
+    Yjg4MjkzMTJhYzExYTVjMWRlMjA3NjJlMzZkOGQwNTRlNGQ1OWVkYg==
   data.tar.gz: !binary |-
-    ZjM4NDMyODcyYWIxNWJjN2FkN2MzZjRjMjA2NDExODBjNGZmODFlOQ==
+    NDYwOGE0ZTM2ZDllOTU4MDVlMTg5N2Y5MzhiMWRiODU3ZDZlZDQ1Ng==
 SHA512:
   metadata.gz: !binary |-
-    YTk4ZTlhOGYxOTBiMGY2OTE0ZDc2YThlMjE4MDI2NzNhZmY1ZmMwYTVhYjE2
-    ZjhjNTUzMzY4MTMzYWQyMWQ4YmM0ZDM2Yzk2NDhlNjk2MjIyNTM3MDRjOWIx
-    ODU2ZWFhMzU5OGVkNDZiMzdhZDA5MDhjNjBmZGVmZDg5ZjA0OWQ=
+    OTcwODhkNGNlZmVhNmY4N2ZkY2RhZWYzYzg1M2EzNWQxOTQyYjIzZjI2ZmEy
+    N2YzMzkwNDk5ZmJlY2MxZmNiNmQ5MDJmZTI0MjgwZDRjYTk4NjU1MWFlNzM2
+    ZjIyYjdiMDUwZjU2NDMxNDBjOWM0Y2NjOGQ1ZjJlOTNjYjQxMDU=
   data.tar.gz: !binary |-
-    NTkwNDc5OTFkNWRiNjMxNzEyMTg2NjRiMTY2MjRiODEwMjcwMmU5NWRlMWJk
-    Zjk0MDE2YTdjN2IyM2Q3M2VhNmIwZTA3YmJmOGYxMjM0ZDUxNmY2ZTM3ODNl
-    ODIyNDAwNjcwNDU3NjdkZWQ4ZTA3MzU2YmU4ZjcyZDJjNDA1NTM=
+    NzA5YWViZWZjOTJhZTQ0YjE5NjM3NjczMjdlM2VlOWM1OTZkYWM3Y2U3Y2Ni
+    MTg4ZjE4ZDY2Y2UwMjg2YjU4Y2VmZjExNDE3NDRlMTAzZWEyYmI0N2JhZGNi
+    YmExY2MyNzQ5NTFlMTk3MjAzMzI2MGI0NzAzNzA3MjYwZTVjNzg=

data/config.ru

@@ -14,6 +14,7 @@ use Shutterbug::Rackapp do |config|
   config.s3_key       = ENV['S3_KEY']
   config.s3_secret    = ENV['S3_SECRET']
   config.s3_bin       = "ccshutterbugtest"
+  # config.skip_direct_upload = true  
 end
 
 app = Rack::Directory.new "demo"

data/lib/shutterbug.rb

@@ -1,5 +1,5 @@
 module Shutterbug
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
   autoload :Rackapp,        "shutterbug/rackapp"
   autoload :Configuration,  "shutterbug/configuration"
   autoload :Storage,        "shutterbug/storage"

data/lib/shutterbug/configuration.rb

@@ -10,6 +10,7 @@ module Shutterbug
     attr_accessor :s3_key
     attr_accessor :s3_secret
     attr_accessor :cache_manager
+    attr_accessor :skip_direct_upload
 
     def self.instance(opts={})
       return @instance || @instance = self.new(opts)
@@ -24,6 +25,7 @@ module Shutterbug
       self.s3_key           = opts[:s3_key]
       self.s3_secret        = opts[:s3_secret]
       self.cache_manager    = opts[:cache_manager]    || Shutterbug::CacheManager::NoCache.new
+      self.skip_direct_upload = opts[:skip_direct_upload]
     end
 
     def fs_path_for(filename)

data/lib/shutterbug/handlers/direct_upload_handler.rb

@@ -6,6 +6,12 @@ module Shutterbug
   module Handlers
     class DirectUploadHandler
 
+      def skip_direct_upload
+        return true if Configuration.instance.skip_direct_upload
+        return true unless Configuration.instance.use_s3?
+        return false
+      end
+
       def self.regex
         /#{Configuration.instance.path_prefix}\/img_upload_url/
       end
@@ -13,17 +19,24 @@ module Shutterbug
       # Returns put_url and get_url for a new file that should be uploaded by the client.
       # Of course get_url will work after file is uploaded.
       def handle(helper, req, env)
-        format = req.GET()['format'] || 'png'
-
-        object_name = "img-#{SecureRandom.uuid}.#{format}"
-        storage = Configuration.instance.storage
-        unless storage.respond_to? :put_url
-          return helper.response('direct upload not available', 'text/plain', 400)
+        if skip_direct_upload
+          not_available_response(helper)
+        else
+          format = req.GET()['format'] || 'png'
+          object_name = "img-#{SecureRandom.uuid}.#{format}"
+          storage = Configuration.instance.storage
+          unless storage.respond_to? :put_url
+            not_available_response(helper)
+          end
+          helper.response({
+            put_url: storage.put_url(object_name),
+            get_url: storage.get_url(object_name),
+          }.to_json, 'application/json')
         end
-        helper.response({
-          put_url: storage.put_url(object_name),
-          get_url: storage.get_url(object_name),
-        }.to_json, 'application/json')
+      end
+
+      def not_available_response(helper)
+        return helper.response('direct upload not available', 'text/plain', 400)
       end
     end
   end

data/shutterbug.gemspec

@@ -6,8 +6,8 @@ require 'shutterbug'
 Gem::Specification.new do |spec|
   spec.name          = "shutterbug"
   spec.version       = Shutterbug::VERSION
-  spec.authors       = ["Noah Paessel"]
-  spec.email         = ["knowuh@gmail.com"]
+  spec.authors       = ["Noah Paessel", "Piotr Janik"]
+  spec.email         = ["knowuh@gmail.com","janikpiotrek@gmail.com"]
 
   spec.description   = %q{
     A rack utility that will create and save images (pngs)

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: shutterbug
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Noah Paessel
+- Piotr Janik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,6 +143,7 @@ description: ! "\n    A rack utility that will create and save images (pngs)\n
   SVG and Canvas elements.\n  "
 email:
 - knowuh@gmail.com
+- janikpiotrek@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []