tupper 1.0.3 → 1.1.0

data/lib/tupper.rb

@@ -1,25 +1,34 @@
 # -*- coding: utf-8 -*-
-require "tupper/version"
+require_relative "tupper/version"
+require_relative "tupper/errors"
 require 'json'
 
 class Tupper
-  DEFAULT_TMP_DIR = File.join(%w{ / tmp tupper })
+  DEFAULT_TMP_DIR   = File.join(%w{ / tmp tupper })
+  DEFAULT_MAX_SIZE  = 8         # MB
   SESSION_STORE_KEY = 'tupper_file_info'
 
-  attr_reader :file_info
+  attr_reader   :temp_dir, :file_info
+  attr_accessor :max_size
 
   def initialize session
-    @session = session
+    @max_size = DEFAULT_MAX_SIZE
+    @session  = session
     unless ((json = @session.fetch(SESSION_STORE_KEY, '')).empty?)
       begin
         @file_info = JSON.parse(json)
       rescue
         @session.delete(SESSION_STORE_KEY)
-        raise RuntimeError.new('invalid session data')
+        raise Tupper::SessionError.new('invalid session data')
       end
     end
   end
 
+  def configure &block
+    yield self
+    self
+  end
+
   def temp_dir= temp_dir
     FileUtils.mkdir_p temp_dir
     @temp_dir = temp_dir
@@ -38,9 +47,14 @@ class Tupper
       self.temp_dir = DEFAULT_TMP_DIR
     end
 
+    if (file_size = File.size(file_info[:tempfile])) > max_size * 1024 * 1024
+      cleanup
+      raise FileSizeError.new("Uploaded file was too large. uploaded_size: #{file_size} bytes / max_size: #{max_size} MB")
+    end
+
     file_hash = "#{Time.now.to_i}_#{Digest::MD5.hexdigest(file_info[:filename]).slice(0, 8)}"
     uploaded_file = File.join(temp_dir, file_hash + File.extname(file_info[:filename]))
-    FileUtils.copy(file_info[:tempfile], uploaded_file)
+    FileUtils.cp(file_info[:tempfile], uploaded_file)
     @file_info = {
       'uploaded_file' => uploaded_file,
       'original_file' => file_info[:filename],

data/lib/tupper/errors.rb

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+class Tupper
+  class SessionError  < StandardError ; end
+  class FileSizeError < StandardError ; end
+end

data/lib/tupper/version.rb

@@ -1,3 +1,3 @@
 class Tupper
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/sample/sample.rb

@@ -10,7 +10,11 @@ class Sample < Sinatra::Base
 
   post '/upload' do
     tupper = Tupper.new session
-    tupper.upload params[:dummy_file]
+    begin
+      tupper.upload params[:dummy_file]
+    rescue Tupper::FileSizeError
+      halt 500, 'uploaded file is too large.'
+    end
     redirect '/', 302
   end
 

data/sample/views/form.erb

@@ -7,6 +7,7 @@
     <% if tupper.has_uploaded_file? %>
       <hr>
       <p>file <%= tupper.uploaded_file %> is uploaded.</p>
+      <p>original filename was <%= tupper.original_file %>.</p>
       <p><a href="show_size">show size</a></p>
       <form method="POST" action="/cleanup">
         <input type="submit" value="cleanup">

data/spec/tupper_spec.rb

@@ -3,6 +3,7 @@ require 'bundler'
 Bundler.setup(:default, :test)
 require 'fakefs/spec_helpers'
 require 'tupper'
+require 'tupper/errors'
 
 describe Tupper do
   include FakeFS::SpecHelpers
@@ -21,10 +22,16 @@ describe Tupper do
         Dir.exists?(@tupper.temp_dir).should be_true
         @tupper.temp_dir.should == '/tmp/tupper'
       end
+      it "should initialize max_size by default" do
+        @tupper.max_size.should == 8
+      end
     end
 
     context 'with invalid session data' do
-      specify { expect { Tupper.new(Tupper::SESSION_STORE_KEY.to_s => 'invalid json') }.to raise_error RuntimeError }
+      specify {
+        expect { Tupper.new(Tupper::SESSION_STORE_KEY.to_s => 'invalid json') }
+          .to raise_error Tupper::SessionError
+      }
     end
 
     context 'with valid session data' do
@@ -33,6 +40,18 @@ describe Tupper do
     end
   end
 
+  describe '#configure' do
+    subject {
+      Tupper.new({}).configure do |tupper|
+        tupper.max_size = 16
+        tupper.temp_dir = '/tmp/hoge/piyo'
+      end
+    }
+    its(:max_size) { should == 16 }
+    its(:temp_dir) { should == '/tmp/hoge/piyo' }
+    specify { Dir.exists? '/tmp/hoge/piyo' }
+  end
+
   describe '#temp_dir=' do
     before do
       @tupper = Tupper.new({})
@@ -52,6 +71,33 @@ describe Tupper do
     end
   end
 
+  describe '#upload' do
+    let(:test_dir)  { '/tmp' }
+    let(:test_file) { File.join(test_dir, 'test_file') }
+    before do
+      @tupper = Tupper.new({}).configure { |t| t.max_size = 1 }
+      FileUtils.mkdir_p(test_dir)
+    end
+
+    context 'file that smaller than or equal max size was uploaded' do
+      before do
+        File.open(test_file, 'w') { |f| f.write('*' * 1024 * 1024) }
+        @tupper.upload(tempfile: test_file, filename: 'dummy.txt')
+      end
+      specify { @tupper.should have_uploaded_file }
+    end
+
+    context 'file that lager than max size was uploaded' do
+      before do
+        File.open(test_file, 'w') { |f| f.write('*' * 1024 * (1024 + 1)) }
+      end
+      specify {
+        expect { @tupper.upload(tempfile: test_file, filename: 'too_large_file.txt') }
+          .to raise_error Tupper::FileSizeError
+      }
+    end
+  end
+
   describe '#has_uploaded_file?' do
     context 'before upload' do
       subject { Tupper.new({}) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tupper
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70105249702040 !ruby/object:Gem::Requirement
+  requirement: &70092750614260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70105249702040
+  version_requirements: *70092750614260
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70105249701620 !ruby/object:Gem::Requirement
+  requirement: &70092750613820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70105249701620
+  version_requirements: *70092750613820
 description: Tupper is a helper for processing uploaded file via web form.
 email:
 - kwappa.856@gmail.com
@@ -46,6 +46,7 @@ files:
 - README.md
 - Rakefile
 - lib/tupper.rb
+- lib/tupper/errors.rb
 - lib/tupper/version.rb
 - sample/Gemfile
 - sample/config.ru
@@ -67,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 568310382185945559
+      hash: -4287074134393921615
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -76,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 568310382185945559
+      hash: -4287074134393921615
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10