shutterbug 0.2.5 → 0.4.3

data/spec/shutterbug/direct_upload_handler_spec.rb

@@ -0,0 +1,7 @@
+require 'shared_examples_for_handlers'
+
+describe Shutterbug::Handlers::DirectUploadHandler do
+  it_behaves_like "a request handler" do
+    let(:req) { mock(:GET => {}) }
+  end
+end

data/spec/shutterbug/file_handler_spec.rb

@@ -0,0 +1,7 @@
+require 'shared_examples_for_handlers'
+
+describe Shutterbug::Handlers::FileHandler do
+  it_behaves_like "a request handler" do
+    let(:req) { mock(:path => "/shutterbug/get_file/foobar.png") }
+  end
+end

data/spec/shutterbug/file_storage_spec.rb

@@ -1,5 +1,6 @@
 require 'shared_examples_for_storage'
+
 describe Shutterbug::Storage::FileStorage do
   it_behaves_like "a storage provider" do
   end
-end
+end

data/spec/shutterbug/js_file_handler_spec.rb

@@ -1,4 +1,5 @@
 require 'shared_examples_for_handlers'
+
 describe Shutterbug::Handlers::JsFileHandler do
   it_behaves_like "a request handler"
-end
+end

data/spec/shutterbug/rackapp_spec.rb

@@ -16,8 +16,6 @@ end
 describe Shutterbug::Rackapp do
   include Rack::Test::Methods
 
-  let(:config)    { Shutterbug::Configuration.instance }
-
   let(:post_data) do
     {
       'content'  => "<div class='foo'>foo!</div>",
@@ -29,31 +27,31 @@ describe Shutterbug::Rackapp do
   end
 
   let(:app) do
-    Shutterbug::Rackapp.new  do |config|
-      config.uri_prefix   = "http://localhost:9292"
-      config.path_prefix  = "/shutterbug"
+    Shutterbug::Rackapp.new do |config|
+      config.uri_prefix  = "http://localhost:9292"
+      config.path_prefix = "/shutterbug"
     end
   end
 
-  let(:filename)  { "filename" }
-  let(:url)       { "url_to_file" }
+  let(:filename) { "filename" }
+  let(:url)      { "url_to_file" }
 
-  let(:mock_file)  do
+  let(:mock_file) do
     mock({
       :get_content => "content",
+      :mime_type => "image/png",
       :filename => filename,
       :url => url
     })
   end
 
-  let(:test_storage) { mock({ :new => mock_file         })}
+  let(:test_storage) { mock({ :new => mock_file })}
 
   before(:each) do
-    config.stub!(:storage => test_storage)
+    Shutterbug::Configuration.instance.stub!(:storage => test_storage)
   end
 
   describe "routing requests in #call" do
-
     describe "do_convert route" do
       it "should return a valid image url" do
         get "/shutterbug/make_snapshot/", post_data
@@ -63,32 +61,20 @@ describe Shutterbug::Rackapp do
       end
     end
 
-    describe "get png route" do
-      it "should route #do_get_png" do
-        Shutterbug::Configuration.instance.stub!(:storage => test_storage)
-        get "/shutterbug/get_png/filename.png"
+    describe "get file route" do
+      it "should return without errors" do
+        get "/shutterbug/get_file/foobar.png"
         last_response.should be_ok
         last_response.headers['Content-Type'].should match 'image/png'
       end
     end
 
-    describe "get html route" do
-      it "should route #do_get_html" do
-
-        get "/shutterbug/get_html/filename.html"
-        last_response.should be_ok
-        last_response.headers['Content-Type'].should match 'text/html'
-      end
-    end
-
     describe "get shutterbug.js javascipt route" do
-      it "should route #do_get_shutterbug" do
+      it "should return js file" do
         get "/shutterbug/shutterbug.js"
         last_response.should be_ok
         last_response.headers['Content-Type'].should match 'application/javascript'
       end
     end
-
   end
-
-end
+end

data/spec/shutterbug/s3_storage_spec.rb

@@ -9,4 +9,4 @@ describe Shutterbug::Storage::S3Storage do
 
   it_behaves_like "a storage provider" do
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shutterbug
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.4.3
 platform: ruby
 authors:
 - Noah Paessel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,6 +158,8 @@ files:
 - Rakefile
 - bower.json
 - config.ru
+- demo/The_Scream.jpg
+- demo/canvas_example.html
 - demo/iframe.html
 - demo/iframe2.html
 - demo/iframe3.html
@@ -180,10 +182,8 @@ files:
 - lib/shutterbug/configuration.rb
 - lib/shutterbug/handlers.rb
 - lib/shutterbug/handlers/convert_handler.rb
-- lib/shutterbug/handlers/file_handlers.rb
-- lib/shutterbug/handlers/file_handlers/base.rb
-- lib/shutterbug/handlers/file_handlers/html_file.rb
-- lib/shutterbug/handlers/file_handlers/png_file.rb
+- lib/shutterbug/handlers/direct_upload_handler.rb
+- lib/shutterbug/handlers/file_handler.rb
 - lib/shutterbug/handlers/js_file_handler.rb
 - lib/shutterbug/handlers/shutterbug.js
 - lib/shutterbug/phantom_job.rb
@@ -193,15 +193,14 @@ files:
 - lib/shutterbug/storage/file_storage.rb
 - lib/shutterbug/storage/s3_storage.rb
 - shutterbug.gemspec
-- spec/shared_examples_for_file_handlers.rb
 - spec/shared_examples_for_handlers.rb
 - spec/shared_examples_for_storage.rb
 - spec/shutterbug/configuration_spec.rb
 - spec/shutterbug/convert_handler_spec.rb
+- spec/shutterbug/direct_upload_handler_spec.rb
+- spec/shutterbug/file_handler_spec.rb
 - spec/shutterbug/file_storage_spec.rb
-- spec/shutterbug/html_file_handler_spec.rb
 - spec/shutterbug/js_file_handler_spec.rb
-- spec/shutterbug/png_file_handler_spec.rb
 - spec/shutterbug/rackapp_spec.rb
 - spec/shutterbug/s3_storage_spec.rb
 - spec/spec_helper.rb
@@ -230,15 +229,14 @@ signing_key:
 specification_version: 4
 summary: use Shutterbug::Rackapp
 test_files:
-- spec/shared_examples_for_file_handlers.rb
 - spec/shared_examples_for_handlers.rb
 - spec/shared_examples_for_storage.rb
 - spec/shutterbug/configuration_spec.rb
 - spec/shutterbug/convert_handler_spec.rb
+- spec/shutterbug/direct_upload_handler_spec.rb
+- spec/shutterbug/file_handler_spec.rb
 - spec/shutterbug/file_storage_spec.rb
-- spec/shutterbug/html_file_handler_spec.rb
 - spec/shutterbug/js_file_handler_spec.rb
-- spec/shutterbug/png_file_handler_spec.rb
 - spec/shutterbug/rackapp_spec.rb
 - spec/shutterbug/s3_storage_spec.rb
 - spec/spec_helper.rb

data/lib/shutterbug/handlers/file_handlers.rb

@@ -1,9 +0,0 @@
-module Shutterbug
-  module Handlers
-    module FileHandlers
-      require "shutterbug/handlers/file_handlers/base"
-      require "shutterbug/handlers/file_handlers/html_file"
-      require "shutterbug/handlers/file_handlers/png_file"
-    end
-  end
-end

data/lib/shutterbug/handlers/file_handlers/base.rb

@@ -1,39 +0,0 @@
-require 'tmpdir'
-module Shutterbug
-  module Handlers
-    module FileHandlers
-      class Base
-        attr_accessor :config
-
-        def self.instance
-          return @instance || self.new
-        end
-
-        def initialize(_config = Configuration.instance)
-          self.config = _config
-        end
-
-        def urlify(name)
-          "#{self.config.uri_prefix}#{self.path_prefix}/#{name}"
-        end
-
-        def path_prefix
-          "#{self.config.path_prefix}/get_#{file_extension}"
-        end
-
-        def filename_matcher
-          "(([^\/|\.]+)\.?([^\/]+))?"
-        end
-
-        def regex
-          /#{path_prefix}\/#{filename_matcher}/
-        end
-
-        def filename(base)
-          "#{base}.#{file_extension}"
-        end
-
-      end
-    end
-  end
-end

data/lib/shutterbug/handlers/file_handlers/html_file.rb

@@ -1,22 +0,0 @@
-module Shutterbug
-  module Handlers
-    module FileHandlers
-      class HtmlFile < Base
-
-        def file_extension
-          "html"
-        end
-
-        def mime_type
-          "text/html"
-        end
-
-        def handle(helper, req, env)
-          sha  = regex.match(req.path)[1]
-          file = @config.storage.new(filename(sha),self)
-          helper.good_response(file.get_content, self.mime_type)
-        end
-      end
-    end
-  end
-end

data/lib/shutterbug/handlers/file_handlers/png_file.rb

@@ -1,23 +0,0 @@
-module Shutterbug
-  module Handlers
-    module FileHandlers
-      class PngFile < Base
-
-        def file_extension
-          "png"
-        end
-
-        def mime_type
-          "image/png"
-        end
-
-        def handle(helper, req, env)
-          local_filename  = regex.match(req.path)[1]
-          file = @config.storage.new(local_filename,self)
-          helper.good_response(file.get_content, self.mime_type)
-        end
-      end
-    end
-  end
-
-end

data/spec/shared_examples_for_file_handlers.rb

@@ -1,16 +0,0 @@
-require 'shared_examples_for_handlers'
-shared_examples "a file handler" do
-  let(:config)  { Shutterbug::Configuration.instance}
-  let(:rackapp) { mock }
-  let(:req)     { mock }
-  let(:env)     { mock }
-  let(:handler) { described_class.new(config) }
-
-
-  it "should have a file extension" do
-    handler.should respond_to :file_extension
-  end
-  it "should have a mime type" do
-    handler.should respond_to :mime_type
-  end
-end

data/spec/shutterbug/html_file_handler_spec.rb

@@ -1,10 +0,0 @@
-require 'shared_examples_for_file_handlers'
-require 'shared_examples_for_handlers'
-describe Shutterbug::Handlers::FileHandlers::HtmlFile do
-  it_behaves_like "a file handler" do
-    let(:req) { mock(:path => "/shutterbug/get_html/foobar.html") }
-  end
-  it_behaves_like "a request handler" do
-    let(:req) { mock(:path => "/shutterbug/get_html/foobar.html") }
-  end
-end

data/spec/shutterbug/png_file_handler_spec.rb

@@ -1,10 +0,0 @@
-require 'shared_examples_for_file_handlers'
-require 'shared_examples_for_handlers'
-describe Shutterbug::Handlers::FileHandlers::PngFile do
-  it_behaves_like "a file handler" do
-    let(:req) { mock(:path => "/shutterbug/get_png/foobar.png") }
-  end
-  it_behaves_like "a request handler" do
-    let(:req) { mock(:path => "/shutterbug/get_png/foobar.png") }
-  end
-end