amd/shorten
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixing some old references to get S3 support working again

Browse source
This commit is contained in:
Andrew Davidson 2011-07-27 21:40:39 -07:00
parent 476114d6cc
commit 5049432dde
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
main.rb
View file

@ -10,7 +10,7 @@ configure do
require 'ostruct' require 'ostruct'
Shorten = OpenStruct.new( Shorten = OpenStruct.new(
:base_url => ENV['url'], :base_url => "http://amd.im/",
:service_name => "amd.im", :service_name => "amd.im",
:button_text => "shorten", :button_text => "shorten",
:path_size => 4 :path_size => 4
@ -109,11 +109,14 @@ end
post '/upload' do post '/upload' do
require 'aws/s3' require 'aws/s3'
require 'yaml'
keys = YAML.load(File.open("keys.yaml", "r").read)
# establish connection # establish connection
AWS::S3::Base.establish_connection!( AWS::S3::Base.establish_connection!(
:access_key_id => ENV['s3_key'], :access_key_id => keys['s3_key'],
:secret_access_key => ENV['s3_secret'] :secret_access_key => keys['s3_secret']
) )
# generate key and check uniqueness # generate key and check uniqueness
@ -131,8 +134,8 @@ post '/upload' do
#filename = params[:file][:filename] #filename = params[:file][:filename]
# upload to S3 # upload to S3
AWS::S3::S3Object.store(filename, open(params[:file][:tempfile]), 'amdim', :access => :public_read) AWS::S3::S3Object.store(filename, open(params[:file][:tempfile]), keys["s3_bucket"], :access => :public_read)
object_url = AWS::S3::S3Object.url_for(filename, 'shorten', :authenticated => false) object_url = AWS::S3::S3Object.url_for(filename, keys["s3_bucket"], :authenticated => false)
# generate shorturl # generate shorturl
url = ShortenUrl.new(:url => object_url, :key => key, :image => params[:image]) url = ShortenUrl.new(:url => object_url, :key => key, :image => params[:image])