From 02f5d01ca1e8edad4ea64f7c9c84ced130f29b24 Mon Sep 17 00:00:00 2001
From: Andrew Spinks <aspinks@dius.com.au>
Date: Sat, 12 May 2012 13:37:26 +1000
Subject: [PATCH] try to get s3 to work.

---
 Gemfile       |  3 ++-
 Gemfile.lock  | 25 +++++++++++++++++++++++++
 config/s3.yml | 10 +++++++---
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1469eab74e..ad592a2297 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,8 +14,9 @@ gem 'spree_skrill'
 gem 'simple_form'
 
 gem 'unicorn'
-# gem 'spree_heroku'
+gem 'spree_heroku', :git => 'git://github.com/joneslee85/spree-heroku.git'
 gem 'haml'
+gem 'aws-s3'
 
 
 # Gems used only for assets and not required
diff --git a/Gemfile.lock b/Gemfile.lock
index 041856a429..8b1d1c800b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+  remote: git://github.com/joneslee85/spree-heroku.git
+  revision: 63f0cfa47089cae50365e226ec7dd1eccde0ac05
+  specs:
+    spree_heroku (1.0)
+      aws-sdk (~> 1.3.4)
+      spree_core (>= 0.70.0)
+
 GIT
   remote: git://github.com/spree/spree_i18n.git
   revision: 258bceaa7b67692d64a689840aede311afd791aa
@@ -52,6 +60,15 @@ GEM
       gyoku (>= 0.4.0)
     ansi (1.4.2)
     arel (2.2.3)
+    aws-s3 (0.6.2)
+      builder
+      mime-types
+      xml-simple
+    aws-sdk (1.3.9)
+      httparty (~> 0.7)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+      uuidtools (~> 2.1)
     bcrypt-ruby (3.0.1)
     braintree (2.15.0)
       builder (>= 2.0.0)
@@ -92,6 +109,9 @@ GEM
     haml (3.1.4)
     highline (1.6.8)
     hike (1.2.1)
+    httparty (0.8.3)
+      multi_json (~> 1.0)
+      multi_xml
     httpi (0.9.6)
       rack
     i18n (0.6.0)
@@ -118,6 +138,7 @@ GEM
     money (3.7.1)
       i18n (~> 0.4)
     multi_json (1.2.0)
+    multi_xml (0.5.1)
     nested_set (1.6.8)
       activerecord (>= 3.0.0)
       railties (>= 3.0.0)
@@ -261,10 +282,12 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
+    uuidtools (2.1.2)
     warden (1.0.6)
       rack (>= 1.0)
     wasabi (2.1.0)
       nokogiri (>= 1.4.0)
+    xml-simple (1.1.1)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -272,6 +295,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  aws-s3
   capybara
   coffee-rails (~> 3.1.1)
   haml
@@ -284,6 +308,7 @@ DEPENDENCIES
   shoulda-matchers
   simple_form
   spree
+  spree_heroku!
   spree_i18n!
   spree_skrill
   spree_usa_epay
diff --git a/config/s3.yml b/config/s3.yml
index 360b487259..2c01bfcdbe 100644
--- a/config/s3.yml
+++ b/config/s3.yml
@@ -1,4 +1,8 @@
+developement:
+  bucket: openfoodweb_test
+  access_key_id: AKIAJ3EE2EKGP36D4PUA
+  secret_access_key: GUvfWLC5G5bpcjqRYOa9/IyxofIPjKQjgJonJuTW
 production:
-  bucket: fool-man-chew_production
-  access_key_id: your_access_key
-  secret_access_key: secret_access_key
\ No newline at end of file
+  bucket: openfoodweb
+  access_key_id: AKIAJ3EE2EKGP36D4PUA
+  secret_access_key: GUvfWLC5G5bpcjqRYOa9/IyxofIPjKQjgJonJuTW
\ No newline at end of file