@@ -17,6 +17,6 @@ module FileAttachment
end
def delete_file
- Thread.new { FileUtils.rm_rf file_path }
+ FileUtils.rm_rf file_path
end
end
\ No newline at end of file
lib/file_attachment.rb
@@ -6,28 +6,25 @@ class Image
property :id, Serial, :key => true
property :filename, String, :nullable => false
- property :link, String, :length => 0..255
property :entry_system_id, Integer
- def initialize(attrs)
+ def initialize(attrs={})
self.data = attrs.delete(:data) if attrs[:data]
super
end
- protected
def extension
'png'
end
+ protected
def directory
'images'
end
def save_file_type
- Thread.new do
- image = Magick::Image.from_blob(data.read).first
- image.change_geometry!("240x190") { |cols, rows| image.thumbnail! cols, rows }
- image.write(file_path)
- end
+ image = Magick::Image.from_blob(data).first
+ image.change_geometry!("240x190") {|c, r| image.thumbnail!(c, r)}
+ image.write(file_path)
end
end
lib/image.rb
@@ -4,27 +4,26 @@ class PdfManual
property :id, Serial, :key => true
property :filename, String
- property :content_type, String
property :link, Text
property :entry_system_id, Integer
belongs_to :entry_system
- def initialize(attrs)
+ def initialize(attrs={})
self.data = attrs.delete(:data) if attrs[:data]
super
end
- protected
def extension
'pdf'
end
+ protected
def directory
'pdfs'
end
def save_file_type
- Thread.new { File.open(file_path, 'w') {|f| f.write data.read} }
+ File.open(file_path, 'w') {|f| f.write data.read}
end
end
lib/pdf_manual.rb
@@ -1,8 +1,8 @@
-%w(rubygems sinatra dm-core dm-validations fileutils do_postgres).each { |f| require f }
+%w(rubygems sinatra dm-core dm-validations fileutils do_sqlite3).each { |f| require f }
Dir[File.join(File.dirname(__FILE__), *%w[lib *])].each { |f| require f }
configure do
- DataMapper.setup(:default, 'postgres://localhost/entry_systems')
+ DataMapper.setup(:default, "sqlite3:///#{Dir.pwd}entry_systems.db")
DataMapper.auto_migrate!
end
@@ -61,10 +61,8 @@ post '/entry_systems/:id/image' do
@entry_system = EntrySystem.get(params[:id])
redirect "/entry_systems/new" unless @entry_system
@image = Image.new(
- :link => params[:link],
:filename => @entry_system.name.gsub(/\W/, '_'),
- :content_type => params[:image][:type],
- :data => params[:image][:tempfile]
+ :data => params[:image][:tempfile].read
)
if @image.save
@entry_system.image = @image
@@ -81,7 +79,6 @@ post '/entry_systems/:id/pdf_manual' do
@pdf_manual = PdfManual.new(
:link => params[:link],
:filename => @entry_system.name.gsub(/\W/, '_'),
- :content_type => params[:pdf_manual][:type],
:data => params[:pdf_manual][:tempfile]
)
if @pdf_manual.save
opwn_sesame.rb
@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), *%w[spec_helper])
describe Image do
def fixture_file
- File.open(File.join(File.dirname(__FILE__), *%w[fixtures v.jpg]))
+ File.open(File.join(File.dirname(__FILE__), *%w[fixtures v.jpg])).read
end
def created_file
@@ -22,8 +22,6 @@ describe Image do
describe "before save" do
it "saves data as an image" do
File.exists?(created_file).should_not be_true
- thread = nil
- mock(Thread).new.yields
image = Image.create(attrs)
File.exists?(created_file).should be_true
end
@@ -32,8 +30,6 @@ describe Image do
describe "before destroy" do
it "deletes the corresponding image file" do
File.exists?(created_file).should_not be_true
- thread = nil
- mock(Thread).new.twice.yields
image = Image.create(attrs)
image.destroy
File.exists?(created_file).should_not be_true
spec/image_spec.rb
@@ -21,4 +21,4 @@ describe Hash do
it "#drop" do
{:a => :foo, :b => :bar}.drop(:a).should == {:b => :bar}
end
-end
\ No newline at end of file
+end
spec/spec_helper.rb
@@ -5,11 +5,7 @@
<ul>
<% if entry_system.image %>
<li>
- <% if entry_system.image.link != "" %>
- <img src="<%= entry_system.image.link %>" alt="picture of <%= entry_system.name %>" />
- <% else %>
- <img src="/images/<%= entry_system.image.filename %>" alt="picture of <%= entry_system.name %>" />
- <% end %>
+ <img src="/images/<%= entry_system.image.filename + entry_system.image.extension %>" alt="picture of <%= entry_system.name %>" />
</li>
<% end %>
<% if entry_system.pdf_manual %>
views/entry_systems_index.erb
@@ -6,11 +6,7 @@
<ul>
<% if @entry_system.image %>
<li>
- <% if @entry_system.image.link != "" %>
- <img src="<%= @entry_system.image.link %>" alt="picture of <%= @entry_system.name %>" />
- <% else %>
- <img src="/images/<%= @entry_system.image.filename %>" alt="picture of <%= @entry_system.name %>" />
- <% end %>
+ <img src="/images/<%= @entry_system.image.filename + "." + @entry_system.image.extension %>" alt="picture of <%= @entry_system.name %>" />
</li>
<% end %>
<% if @entry_system.pdf_manual %>
views/entry_systems_show.erb
@@ -1,23 +1,19 @@
<h2>upload image for: <%= @entry_system.manufacturer %> - <%= @entry_system.name %></h1>
<form action="/entry_systems/<%= @entry_system.id %>/image" method="post" enctype="multipart/form-data">
- <% unless @image.errors.empty? %>
- <ul class="errors">
- <%= @image.errors.map {|msg| "<li>#{msg}</li>"} %>
- </ul>
- <% end %>
- <ul>
- <li>
- <label for="image">image: </label>
- <input type="file" name="image" id="image">
- </li>
- <li>or</li>
- <li>
- <label for="link">link: </label>
- <input type="text" name="link" id="link">
- </li>
- <li><input type="submit" value="upload →"></li>
- <li>
- <a href="/">← index</a>
- </li>
- </ul>
+ <% unless @image.errors.empty? %>
+ <ul class="errors">
+ <%= @image.errors.map {|msg| "<li>#{msg}</li>"} %>
+ </ul>
+ <% end %>
+ <ul>
+ <li>
+ <label for="image">image: </label>
+ <input type="file" name="image" id="image">
+ </li>
+ <li>
+ <li>
+ <input type="button" value="← index" onclick="document.location = '/'">
+ <input type="submit" value="upload →">
+ </li>
+ </ul>
</form>
\ No newline at end of file
views/images_new.erb
ae683fc776f1c335ebb22cb239411b98cc266559
da3mon mccormick
d@3mon.org
http://github.com/da3mon/opwn_sesame/commit/88637aa30a4c24e08d3926c0103490df45890673
88637aa30a4c24e08d3926c0103490df45890673
2008-10-28T17:30:44-07:00
2008-10-28T17:30:44-07:00
fixed up a bunch of small errors
28339b6c414b1f655db0fb25988b6b4ac813119a
da3mon mccormick
d@3mon.org