rack-raw-upload 1.0.8 → 1.0.9

data/lib/rack/raw_upload.rb

@@ -3,7 +3,7 @@ require 'tmpdir' # Needed in 1.8.7 to access Dir::tmpdir
 module Rack
   class RawUpload
 
-    VERSION = '1.0.8'
+    VERSION = '1.0.9'
 
     def initialize(app, opts = {})
       @app = app
@@ -34,7 +34,16 @@ module Rack
         tempfile = env['rack.input']
       else
         tempfile = Tempfile.new('raw-upload.', @tmpdir)
-        tempfile << env['rack.input'].read
+
+        # Can't get to produce a test case for this :-(
+        env['rack.input'].each do |chunk|
+          if chunk.respond_to?(:force_encoding)
+            tempfile << chunk.force_encoding('UTF-8')
+          else
+            tempfile << chunk
+          end
+        end
+
         tempfile.flush
         tempfile.rewind
       end

data/test/apps/undefined_conversion_error/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  # protect_from_forgery
+end

data/test/apps/undefined_conversion_error/app/controllers/test_controller.rb

@@ -0,0 +1,13 @@
+require 'pp'
+
+class TestController < ApplicationController
+
+  def index
+    return unless request.post?
+
+    output = ''
+    PP.pp(params, output)
+    render :text => output
+  end
+
+end

data/test/apps/undefined_conversion_error/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/test/apps/undefined_conversion_error/config/application.rb

@@ -0,0 +1,50 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
+
+module UndefinedConversionError
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
+
+    config.middleware.use 'Rack::RawUpload'
+  end
+end

data/test/apps/undefined_conversion_error/config/boot.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/test/apps/undefined_conversion_error/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+UndefinedConversionError::Application.initialize!

data/test/apps/undefined_conversion_error/config/environments/development.rb

@@ -0,0 +1,30 @@
+UndefinedConversionError::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end

data/test/apps/undefined_conversion_error/config/environments/production.rb

@@ -0,0 +1,60 @@
+UndefinedConversionError::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+
+  # Generate digests for assets URLs
+  config.assets.digest = true
+
+  # Defaults to Rails.root.join("public/assets")
+  # config.assets.manifest = YOUR_PATH
+
+  # Specifies the header that your server uses for sending files
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+end

data/test/apps/undefined_conversion_error/config/environments/test.rb

@@ -0,0 +1,39 @@
+UndefinedConversionError::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Log error messages when you accidentally call methods on nil
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/test/apps/undefined_conversion_error/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!

data/test/apps/undefined_conversion_error/config/initializers/inflections.rb

@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end

data/test/apps/undefined_conversion_error/config/initializers/mime_types.rb

@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

data/test/apps/undefined_conversion_error/config/initializers/secret_token.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+UndefinedConversionError::Application.config.secret_token = '9da07c0b9ed292dcfde28cd3eb326ddf906f9bd53f6dd5ec80566ce87641c8a1e20dcbaa262cb1b9a38019d15a2b3a183d57f07dfc5bd894311883642e78109f'

data/test/apps/undefined_conversion_error/config/initializers/session_store.rb

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+UndefinedConversionError::Application.config.session_store :cookie_store, key: '_undefined_conversion_error_session'
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rails generate session_migration")
+# UndefinedConversionError::Application.config.session_store :active_record_store

data/test/apps/undefined_conversion_error/config/initializers/wrap_parameters.rb

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end

data/test/apps/undefined_conversion_error/config/routes.rb

@@ -0,0 +1,3 @@
+UndefinedConversionError::Application.routes.draw do
+  root :to => 'test#index'
+end

data/test/apps/undefined_conversion_error/db/seeds.rb

@@ -0,0 +1,7 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
+#   Mayor.create(name: 'Emanuel', city: cities.first)

data/test/apps/undefined_conversion_error/test/performance/browsing_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+require 'rails/performance_test_help'
+
+class BrowsingTest < ActionDispatch::PerformanceTest
+  # Refer to the documentation for all available options
+  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
+  #                          :output => 'tmp/performance', :formats => [:flat] }
+
+  def test_homepage
+    get '/'
+  end
+end

data/test/apps/undefined_conversion_error/test/test_helper.rb

@@ -0,0 +1,13 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end

data/test/raw_upload_test.rb

@@ -20,7 +20,7 @@ class RawUploadTest < Test::Unit::TestCase
     @middleware_opts = {}
     @path = File.join(File.dirname(__FILE__), %w{data me-in-shanghai.jpg})
     @filename = File.basename(@path)
-    @file = File.open(@path)
+    @file = File.open(@path) # Maybe use mode 'rb:ASCII-8BIT'? May help with the pending test below. Not doing it for the moment, as it's not supported by Rubinius
   end
 
   def upload(env = {})
@@ -87,7 +87,16 @@ class RawUploadTest < Test::Unit::TestCase
       upload('rack.input' => tempfile)
       assert_file_uploaded
     end
-    
+
+    # Sould be something like this, but I can't get this to fail
+    # when it should. Instead, I'm testing using the example
+    # undefined_conversion_error app for the time being.
+    # should "work when the input is a StringIO" do
+    #   rack_input = StringIO.new(@file.read)
+    #   upload('rack.input' => rack_input)
+    #   assert_file_uploaded
+    # end
+
     should "be forced to perform a file upload if `X-File-Upload: true`" do
       upload('CONTENT_TYPE' => 'multipart/form-data', 'HTTP_X_FILE_UPLOAD' => 'true')
       assert_file_uploaded_as 'multipart/form-data'
@@ -198,7 +207,7 @@ class RawUploadTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "path matcher" do
     should "accept any path by default" do
       rru = Rack::RawUpload.new(nil)
@@ -221,7 +230,7 @@ class RawUploadTest < Test::Unit::TestCase
       assert ! rru.upload_path?('/resourcess.json')
       assert ! rru.upload_path?('/resources.json/blah')
     end
-    
+
     should "accept several entries" do
       rru = Rack::RawUpload.new nil, :paths => ['/resources.*', '/uploads']
       assert rru.upload_path?('/uploads')
@@ -236,7 +245,7 @@ class RawUploadTest < Test::Unit::TestCase
     assert_files_equal file, received[:tempfile]
     assert last_response.ok?
   end
-  
+
   def assert_file_uploaded_as(file_type)
     file = File.open(@path)
     received = last_request.POST["file"]

metadata

@@ -1,102 +1,138 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rack-raw-upload
-version: !ruby/object:Gem::Version
-  version: 1.0.8
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 9
+  version: 1.0.9
 platform: ruby
-authors:
+authors: 
 - Pablo Brasero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-08 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-10-24 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &2153512340 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *2153512340
-- !ruby/object:Gem::Dependency
+  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
-  requirement: &2153511880 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: *2153511880
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: &2153511460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  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
-  version_requirements: *2153511460
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &2153511000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  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
-  version_requirements: *2153511000
-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.
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+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: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.md
-files:
+files: 
 - lib/rack/raw_upload.rb
 - lib/rack-raw-upload.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
 homepage: https://github.com/newbamboo/rack-raw-upload
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rack Raw Upload middleware
-test_files: []
+test_files: 
+- test/apps/undefined_conversion_error/app/controllers/test_controller.rb
+- test/apps/undefined_conversion_error/test/test_helper.rb