jgm-cloudlib 0.3.2 → 0.3.3

data/bin/cloudlib-web

@@ -44,6 +44,7 @@ post '/' do
 end
 
 get '/upload' do
+  @error = params[:error]
   haml :upload
 end
 
@@ -51,11 +52,16 @@ post '/upload' do
   tempfile = params[:fileToUpload][:tempfile]
   tempfilepath = tempfile.path
   tempfile.close
-  entry = Cloudlib::Entry.from_file(tempfilepath, params[:fileToUpload][:filename])
-  FileUtils.rm tempfilepath
-  set_attributes_from_form(entry)
-  entry.save
-  redirect "/"
+  origname = params[:fileToUpload][:filename] || ""
+  if origname == ""
+    redirect "/upload?error=Please+select+a+file+to+upload."
+  else
+    entry = Cloudlib::Entry.from_file(tempfilepath, params[:fileToUpload][:filename])
+    FileUtils.rm tempfilepath
+    set_attributes_from_form(entry)
+    entry.save
+    redirect "/"
+  end
 end
 
 get '/*/bibtex' do
@@ -148,6 +154,8 @@ __END__
 
 @@ upload
 %form{:method => 'POST', :action => '/upload', :enctype => 'multipart/form-data'}
+  %p.error
+    = @error
   %label Select file to upload:
   %br
   %input{:type => 'file', :name => 'fileToUpload', :size => 40}
@@ -203,4 +211,6 @@ li
   padding-top: 1em
   font-size: x-small
   text-align: center
-
+p.error
+  color: red
+  font-weight: bold

data/cloudlib.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "cloudlib"
-  s.version  = "0.3.2"
+  s.version  = "0.3.3"
   s.date     = "2008-12-29"
   s.summary  = "Tools for maintaining a library of books and articles in Amazon S3 and SimpleDB"
   s.email    = "jgm@berkeley.edu"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jgm-cloudlib
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - John MacFarlane