fragmenter 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 492790d602b011f85a9c59b2e7730e897b50b4c2
-  data.tar.gz: 15ce8668a07766801e7d1fbfa946e0a51f8481f2
+  metadata.gz: 47da89395cc7747e68ee8637b95d00521d6f178c
+  data.tar.gz: 57ed043a01301542570ad439ff58cb599826a06c
 SHA512:
-  metadata.gz: 5c5961781e29d00c847b1683e87f50daf5bff5998db3eb92c0acc61065c9a8a657c4a178b695f2002ae3fcc99a81db81e8047f5679403d058554ebb3d9e213f3
-  data.tar.gz: afe3e60454e3b2e304cd351562befcad35168fddc5d0624c4ca4c4284b174a0c318323bdecf09c6e631fb9d6f92b483ba77322bffd6e9099baea8073a3d8eb4e
+  metadata.gz: 328381ad1ca0c4eb144f83f47ac337dc4b9ee42d140572cf348550ebb345bc008f4526e2d71d8b63ce07699d814441c3f6540eacbd71bcce7d8d4d49aac8d2d2
+  data.tar.gz: a3958527cc97cd7855442975843fdaa9dced8648bf1f96dadaa4ad9796d314d7e7ff6b001cbef8db90ecc626a2ec333c6082b58b60710908e0ad79282971cca0

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 services:
   - redis-server
 script: bundle exec rspec spec

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.0.1
+
+* Create a new uploader instance per request, avoiding unexpected caching
+  behavior.
+
 # 1.0.0
 
 * Provide a convenience IO wrapper for rebuilt data with `Wrapper#to_io`.

data/README.md

@@ -20,13 +20,25 @@ pieces is the simplest workaround.
 
 Fragments are intended to be rather small, anywhere from 10-50k depending on
 the underlying data size. There is a balance between connection overhead from
-repeated server calls, being connection error tollerant, and not blocking the
+repeated server calls, being connection error tolerant, and not blocking the
 server from handling other connections.
 
+## Heroku
+
+Due to the way the service queues requests we do **not** recommend using
+Fragmenter for apps on Heroku. Fragmenter is designed to make uploads from slow
+mobile clients easier and fault tolerant. Heroku kills all requests after 30
+seconds from the point where the request started, not from the point where it
+was handed to your application. Fragmenting uploads uses a fair number of
+additional requests and can cause rampant timeout errors (H12 on Heroku).
+
+That isn't to say that Fragmenter just doesn't work on Heroku, it is just
+sub-optimal—particularly when compared to a properly configured Nginx proxy.
+
 ## Requirements
 
-Fragmenter is tested on Ruby 2.0, but any ruby implementation with 1.9 syntax
-should be supported.
+Fragmenter is tested on Ruby 1.9.3, 2.0, and 2.1. However, any ruby
+implementation with 1.9 syntax will be supported.
 
 Redis 2.0 or greater is required and version 2.6 is recommended.
 

data/fragmenter.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'redis', '~> 3.0.0'
   gem.add_development_dependency 'rspec',     '~> 2.14.0'
+  gem.add_development_dependency 'rack',      '~> 1.5.2'
   gem.add_development_dependency 'rack-test', '~> 0.6.2'
-  gem.add_development_dependency 'sinatra',   '~> 1.4.3'
 end

data/lib/fragmenter/rails/controller.rb

@@ -6,8 +6,10 @@ module Fragmenter
       end
 
       def update
+        uploader = request_uploader
+
         if uploader.store
-          render json: fragmenter.as_json, status: update_status
+          render json: fragmenter.as_json, status: update_status(uploader)
         else
           render json: {
             message: 'Upload of part failed.', errors: uploader.errors
@@ -31,8 +33,8 @@ module Fragmenter
         [Fragmenter::Validators::ChecksumValidator]
       end
 
-      def uploader
-        @uploader ||= Fragmenter::Services::Uploader.new(
+      def request_uploader
+        Fragmenter::Services::Uploader.new(
           Fragmenter::Request.new(
             resource:   resource,
             fragmenter: fragmenter,
@@ -42,7 +44,7 @@ module Fragmenter
         )
       end
 
-      def update_status
+      def update_status(uploader)
         uploader.complete? ? 202 : 200
       end
     end

data/lib/fragmenter/version.rb

@@ -1,3 +1,3 @@
 module Fragmenter
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/fragmenter/rails/controller_spec.rb

@@ -6,7 +6,7 @@ describe Fragmenter::Rails::Controller do
     include Fragmenter::Rails::Controller
   end
 
-  Resource = Struct.new(:id) do
+  resource_class = Struct.new(:id) do
     def fragmenter
       @fragmenter ||= Fragmenter::Wrapper.new(self)
     end
@@ -14,7 +14,7 @@ describe Fragmenter::Rails::Controller do
 
   describe '#show' do
     it 'renders the JSON representation of the associated fragmenter' do
-      resource   = Resource.new(100)
+      resource   = resource_class.new(100)
       controller = UploadController.new(resource)
 
       controller.stub(:render)
@@ -30,7 +30,7 @@ describe Fragmenter::Rails::Controller do
 
   describe '#destroy' do
     it 'commands the fragmenter to clean' do
-      resource   = Resource.new(100)
+      resource   = resource_class.new(100)
       controller = UploadController.new(resource)
 
       controller.stub(:render)
@@ -48,12 +48,11 @@ describe Fragmenter::Rails::Controller do
 
   describe '#update' do
     it 'stores the request body' do
-      resource   = Resource.new(100)
+      resource   = resource_class.new(100)
       controller = UploadController.new(resource)
       uploader   = double(:uploader, store: true, complete?: false)
 
-      controller.stub(:render)
-      controller.stub(uploader: uploader)
+      controller.stub(render: true, request_uploader: uploader)
 
       controller.update
 
@@ -65,12 +64,11 @@ describe Fragmenter::Rails::Controller do
     end
 
     it 'renders error messages if storage fails' do
-      resource   = Resource.new(100)
+      resource   = resource_class.new(100)
       controller = UploadController.new(resource)
       uploader   = double(:uploader, store: false, errors: [], complete?: false)
 
-      controller.stub(:render)
-      controller.stub(uploader: uploader)
+      controller.stub(render: true, request_uploader: uploader)
 
       controller.update
 

data/spec/requests/uploading_fragments_spec.rb

@@ -7,17 +7,14 @@ require 'support/uploads_app'
 describe 'Uploading Fragments' do
   include Rack::Test::Methods
 
-  let(:app)      { UploadsApp }
   let(:resource) { Resource.new(200) }
+  let(:app)      { UploadsApp.new(resource) }
 
   around do |example|
-    UploadsApp.resource = resource
-    Fragmenter.logger   = Logger.new('/dev/null')
-
+    resource.fragmenter.clean!
+    Fragmenter.logger = Logger.new('/dev/null')
     example.run
-
-    Fragmenter.logger   = nil
-    UploadsApp.resource = nil
+    Fragmenter.logger = nil
   end
 
   it 'Lists uploaded fragments' do

data/spec/support/uploads_app.rb

@@ -1,30 +1,37 @@
 require 'fragmenter/rails/controller'
-require 'sinatra/base'
+require 'rack/request'
+require 'rack/response'
 
-class UploadsApp < Sinatra::Base
+class UploadsApp
   include Fragmenter::Rails::Controller
 
-  class << self
-    attr_accessor :resource
-  end
+  attr_reader :request, :resource
 
-  get('/')    { show }
-  put('/')    { update }
-  delete('/') { destroy }
+  def initialize(resource)
+    @resource = resource
+  end
 
-  private
+  def call(env)
+    @request = Rack::Request.new(env)
 
-  def resource
-    self.class.resource
+    case request.request_method
+    when 'GET'    then show
+    when 'PUT'    then update
+    when 'DELETE' then destroy
+    end
   end
 
+  private
+
   def render(options)
     body = if options[:json]
       JSON.dump(options[:json])
     else
-      nil
+      ''
     end
 
-    [options[:status], body]
+    Rack::Response.new(body, options[:status], {}).finish do
+      @uploader = nil
+    end
   end
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: fragmenter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 0.6.2
 description: Fragmentize and rebuild data
 email:
 - parker@sorentwo.com
@@ -73,9 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -123,17 +123,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Multipart upload support backed by Redis. Fragmenter handles storing multiple