rack-raw-upload 1.1.0 → 1.1.1

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'json'
+gem 'multi_json'
 
 group :development, :test do
   gem 'rake'

data/Gemfile.lock

@@ -1,8 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    json (1.4.6)
-    json (1.4.6-java)
+    multi_json (1.3.2)
     rack (1.2.1)
     rack-test (0.5.6)
       rack (>= 1.0)
@@ -15,7 +14,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  json
+  multi_json
   rack-test
   rake
   rr

data/lib/rack/raw_upload.rb

@@ -1,9 +1,10 @@
 require 'tmpdir' # Needed in 1.8.7 to access Dir::tmpdir
+require 'multi_json'
 
 module Rack
   class RawUpload
 
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
 
     def initialize(app, opts = {})
       @app = app
@@ -43,6 +44,7 @@ module Rack
             tempfile << chunk
           end
         end
+        env['rack.input'].rewind
 
         tempfile.flush
         tempfile.rewind
@@ -107,8 +109,7 @@ module Rack
     end
 
     def inject_json_params!(env, params)
-      require 'json'
-      hsh = JSON.parse(params)
+      hsh = MultiJson.load(params)
       env['rack.request.form_hash'].merge!(hsh)
       env['rack.request.query_hash'].merge!(hsh)
     end

data/test/apps/example/lib/simple_app.rb

@@ -1,17 +1,44 @@
 require 'pp'
 require 'sinatra/base'
+require 'multi_json'
 
 class SimpleApp < Sinatra::Base
 
   set :root, APP_ROOT
   set :static, true
+  set :public_folder, Proc.new{ File.join(root, 'public') }
+  set :upload_dir, Proc.new{ File.join(public_folder, 'uploads') }
+
+  configure do
+    FileUtils.mkdir_p(settings.upload_dir)
+  end
 
   get '/' do
     erb :index
   end
 
   post '/' do
-    Rack::Utils.escape_html(PP.pp(params, ''))
+    content_type :json
+    dump = Rack::Utils.escape_html(PP.pp(params, ''))
+    download_url = file_url(store_file(params[:file]))
+    MultiJson.dump({
+      :dump => dump,
+      :download_url => download_url,
+    })
+  end
+
+
+  private
+
+  def store_file(file_param)
+    dirpath = Dir.mktmpdir(nil, settings.upload_dir)
+    filepath = File.join(dirpath, file_param[:filename])
+    FileUtils.mv(file_param[:tempfile], filepath)
+    filepath
+  end
+
+  def file_url(path)
+    path.gsub(Regexp.new('^' + settings.public_folder), '').tap{|x| pp x}
   end
 
 end

data/test/raw_upload_test.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rack/test'
 require 'shoulda'
 require 'rack-raw-upload'
-require 'json'
+require 'multi_json'
 require 'digest'
 require 'rr'
 
@@ -120,6 +120,11 @@ class RawUploadTest < Test::Unit::TestCase
       assert_successful_non_upload
     end
 
+    should "leave rack.input in a state readable by other middlewares" do
+      upload
+      assert !last_request.env['rack.input'].eof?, "rack.input should be rewind'd"
+    end
+
     context "when garbage collection runs (Ruby 1.9)" do
       context "and the file is received as a Tempfile" do
         should "ensure that the uploaded file remains" do
@@ -198,7 +203,7 @@ class RawUploadTest < Test::Unit::TestCase
 
     context "with JSON parameters" do
       setup do
-        upload('HTTP_X_JSON_PARAMS' => JSON.generate({
+        upload('HTTP_X_JSON_PARAMS' => MultiJson.dump({
           :argument => 'value1',
           'argument with spaces' => 'value 2'
         }))
@@ -223,7 +228,7 @@ class RawUploadTest < Test::Unit::TestCase
 
     context "with query parameters, deprecated style" do
       setup do
-        json_params = JSON.generate({
+        json_params = MultiJson.dump({
           :argument => 'value1',
           'argument with spaces' => 'value 2'
         })

metadata

@@ -1,70 +1,72 @@
 --- !ruby/object:Gem::Specification 
 name: rack-raw-upload
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+  prerelease: 
+  version: 1.1.1
 platform: ruby
 authors: 
-- Pablo Brasero
+  - Pablo Brasero
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-04-24 00:00:00 +01:00
-default_executable: 
+date: 2013-01-06 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack-test
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: multi_json
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rack-test
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: shoulda
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: rr
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id005
 description: Middleware that converts files uploaded with mimetype application/octet-stream into normal form input, so Rack applications can read these as normal, rather than as raw input.
 email: pablobm@gmail.com
 executables: []
@@ -72,70 +74,66 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
-- README.md
+  - LICENSE
+  - README.md
 files: 
-- lib/rack/raw_upload.rb
-- lib/rack-raw-upload.rb
-- test/apps/example/app.rb
-- test/apps/example/lib/simple_app.rb
-- test/apps/example/lib/tfl_countdown.rb
-- test/apps/undefined_conversion_error/app/controllers/application_controller.rb
-- test/apps/undefined_conversion_error/app/controllers/test_controller.rb
-- test/apps/undefined_conversion_error/app/helpers/application_helper.rb
-- test/apps/undefined_conversion_error/config/application.rb
-- test/apps/undefined_conversion_error/config/boot.rb
-- test/apps/undefined_conversion_error/config/environment.rb
-- test/apps/undefined_conversion_error/config/environments/development.rb
-- test/apps/undefined_conversion_error/config/environments/production.rb
-- test/apps/undefined_conversion_error/config/environments/test.rb
-- test/apps/undefined_conversion_error/config/initializers/backtrace_silencers.rb
-- test/apps/undefined_conversion_error/config/initializers/inflections.rb
-- test/apps/undefined_conversion_error/config/initializers/mime_types.rb
-- test/apps/undefined_conversion_error/config/initializers/secret_token.rb
-- test/apps/undefined_conversion_error/config/initializers/session_store.rb
-- test/apps/undefined_conversion_error/config/initializers/wrap_parameters.rb
-- test/apps/undefined_conversion_error/config/routes.rb
-- test/apps/undefined_conversion_error/db/seeds.rb
-- test/apps/undefined_conversion_error/test/performance/browsing_test.rb
-- test/apps/undefined_conversion_error/test/test_helper.rb
-- test/raw_upload_test.rb
-- LICENSE
-- README.md
-- Gemfile
-- Gemfile.lock
-has_rdoc: true
+  - lib/rack-raw-upload.rb
+  - lib/rack/raw_upload.rb
+  - test/raw_upload_test.rb
+  - test/apps/example/app.rb
+  - test/apps/example/lib/simple_app.rb
+  - test/apps/undefined_conversion_error/app/controllers/application_controller.rb
+  - test/apps/undefined_conversion_error/app/controllers/test_controller.rb
+  - test/apps/undefined_conversion_error/app/helpers/application_helper.rb
+  - test/apps/undefined_conversion_error/config/application.rb
+  - test/apps/undefined_conversion_error/config/boot.rb
+  - test/apps/undefined_conversion_error/config/environment.rb
+  - test/apps/undefined_conversion_error/config/routes.rb
+  - test/apps/undefined_conversion_error/config/environments/development.rb
+  - test/apps/undefined_conversion_error/config/environments/production.rb
+  - test/apps/undefined_conversion_error/config/environments/test.rb
+  - test/apps/undefined_conversion_error/config/initializers/backtrace_silencers.rb
+  - test/apps/undefined_conversion_error/config/initializers/inflections.rb
+  - test/apps/undefined_conversion_error/config/initializers/mime_types.rb
+  - test/apps/undefined_conversion_error/config/initializers/secret_token.rb
+  - test/apps/undefined_conversion_error/config/initializers/session_store.rb
+  - test/apps/undefined_conversion_error/config/initializers/wrap_parameters.rb
+  - test/apps/undefined_conversion_error/db/seeds.rb
+  - test/apps/undefined_conversion_error/test/test_helper.rb
+  - test/apps/undefined_conversion_error/test/performance/browsing_test.rb
+  - LICENSE
+  - README.md
+  - Gemfile
+  - Gemfile.lock
 homepage: https://github.com/newbamboo/rack-raw-upload
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
-- --main
-- README.rdoc
+  - --charset=UTF-8
+  - --main
+  - README.rdoc
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Rack Raw Upload middleware
 test_files: 
-- test/apps/undefined_conversion_error/app/controllers/test_controller.rb
-- test/apps/undefined_conversion_error/test/test_helper.rb
+  - test/apps/undefined_conversion_error/app/controllers/test_controller.rb
+  - test/apps/undefined_conversion_error/test/test_helper.rb

data/test/apps/example/lib/tfl_countdown.rb

@@ -1,44 +0,0 @@
-require 'httparty'
-
-class TflCountdown
-  include HTTParty
-  base_uri 'http://countdown.tfl.gov.uk'
-
-  def initialize(status = {})
-    @cookies = status['cookies'] if status['cookies']
-  end
-
-  def search(q)
-    get_json('/search', 'searchTerm' => q)
-  end
-
-  def markers(swlat, swlng, nelat, nelng)
-    path = "/markers/swLat/#{swlat}/swLng/#{swlng}/neLat/#{nelat}/neLng/#{nelng}/"
-    get_json(path)
-  end
-
-
-  def get_json(path, query = {})
-    query_params = {
-      '_dc' => Time.now.to_i,
-    }.merge(query)
-
-    headers = {
-      'X-Requested-With' => 'XMLHttpRequest',
-      'Referer' => 'http://countdown.tfl.gov.uk/',
-      'User-Agent' => 'Pablito\'s own',
-    }
-    headers['Cookie'] = @cookies if @cookies
-
-    res = self.class.get(path, :query => query_params, :headers => headers, :format => :json)
-    @cookies = res.headers['set-cookie']
-    res.body
-  end
-
-  def to_hash
-    ret = {}
-    ret['cookies'] = @cookies if @cookies
-    ret
-  end
-
-end