From 787912e735a4bdb698fe8951077b22afbe99541b Mon Sep 17 00:00:00 2001
From: Espen Antonsen <espen@inspired.no>
Date: Tue, 13 Apr 2010 23:56:13 -0400
Subject: [PATCH] balder ENV settings. s3 init. remove settings.yml

---
 app/controllers/application_controller.rb |  2 +-
 app/models/album.rb                       |  8 ++++----
 app/uploaders/file_uploader.rb            |  7 +++++--
 app/views/albums/_form.html.erb           |  5 +----
 app/views/layouts/application.html.erb    |  8 ++++----
 config/balder.rb                          |  5 +++++
 config/environment.rb                     |  4 ++++
 config/initializers/load_settings.rb      |  2 --
 config/initializers/s3.rb                 |  6 +++---
 config/settings.example.yml               | 13 -------------
 10 files changed, 27 insertions(+), 33 deletions(-)
 create mode 100644 config/balder.rb
 delete mode 100644 config/initializers/load_settings.rb
 delete mode 100644 config/settings.example.yml

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 41d7565..b266b3d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -18,7 +18,7 @@ class ApplicationController < ActionController::Base
     end
   
     def check_public_access
-      require_user unless APP_CONFIG[:public]
+      require_user unless ENV['public'] == 'true'
     end
 
     def current_user_session
diff --git a/app/models/album.rb b/app/models/album.rb
index 9dd0e3f..285a27f 100644
--- a/app/models/album.rb
+++ b/app/models/album.rb
@@ -92,13 +92,13 @@ class Album < ActiveRecord::Base
   private
   
   def create_folders
-    Dir.mkdir( APP_CONFIG[:photos_path] + self.path ) unless File.exists?( APP_CONFIG[:photos_path] + self.path )
-    Dir.mkdir( APP_CONFIG[:thumbs_path] + self.path ) unless File.exists?( APP_CONFIG[:thumbs_path] + self.path )
+    #Dir.mkdir( APP_CONFIG[:photos_path] + self.path ) unless File.exists?( APP_CONFIG[:photos_path] + self.path )
+    #Dir.mkdir( APP_CONFIG[:thumbs_path] + self.path ) unless File.exists?( APP_CONFIG[:thumbs_path] + self.path )
   end
   
   def destroy_folders
     #puts "DELETE DIRECTORY " + APP_CONFIG[:photos_path] + self.path
-    Dir.delete( APP_CONFIG[:photos_path] + self.path ) if File.exists?( APP_CONFIG[:photos_path] + self.path )
-    Dir.delete( APP_CONFIG[:thumbs_path] + self.path  ) if File.exists?( APP_CONFIG[:thumbs_path] + self.path )
+    #Dir.delete( APP_CONFIG[:photos_path] + self.path ) if File.exists?( APP_CONFIG[:photos_path] + self.path )
+    #Dir.delete( APP_CONFIG[:thumbs_path] + self.path  ) if File.exists?( APP_CONFIG[:thumbs_path] + self.path )
   end
 end
diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb
index 2390eed..d0a1066 100644
--- a/app/uploaders/file_uploader.rb
+++ b/app/uploaders/file_uploader.rb
@@ -8,8 +8,11 @@ class FileUploader < CarrierWave::Uploader::Base
 
   # Choose what kind of storage to use for this uploader
   #storage :file
-  storage :s3
-
+  if ENV['S3_KEY']
+    storage :s3
+  else
+    storage :file
+  end
 
   # Override the directory where uploaded files will be stored
   # This is a sensible default for uploaders that are meant to be mounted:
diff --git a/app/views/albums/_form.html.erb b/app/views/albums/_form.html.erb
index 28df6ff..bf83b9b 100644
--- a/app/views/albums/_form.html.erb
+++ b/app/views/albums/_form.html.erb
@@ -27,7 +27,4 @@
 <%= form.text_field :tags, { :autocomplete => "off", :class => 'tag_list', :value => (@album.tags.map{|tag|tag.title}.join(" ") unless @album.tags.nil?) } %><br />
 
 <br />
-<% if @album.path? %>
-Location on disk: <i><%= APP_CONFIG[:photos_path] + @album.path %></i><br/>
-Contains: <%= @album.photos.count %> photos<br/>
-<% end %>
\ No newline at end of file
+Contains: <%= @album.photos.count %> photos<br/>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b995820..70439fd 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title><%= APP_CONFIG[:site_name] %></title>
+	<title><%= ENV['site_name'] %></title>
 	<%= yield :head %>
 	<%= stylesheet_link_tag 'application' %>
 </head>
@@ -22,10 +22,10 @@
 	<% end %>
 	</div>
 	<h1>
-		<% if APP_CONFIG[:site_logo] %>
-		<%= image_tag APP_CONFIG[:site_logo] %>
+		<% if ENV['LOGO'] %>
+		<%= image_tag ENV['LOGO'] %>
 		<% else %>
-		<%= APP_CONFIG[:site_name] %>
+		<%= ENV['TITLE'] %>
 		<% end %>
 		</h1>
 	<form action="/albums" method="get" id="search">
diff --git a/config/balder.rb b/config/balder.rb
new file mode 100644
index 0000000..ca14e62
--- /dev/null
+++ b/config/balder.rb
@@ -0,0 +1,5 @@
+ENV['PUBLIC']           = 'true'
+ENV['TITLE']            = 'photos'
+#ENV['S3_KEY']           = ''
+#ENV['S3_SECRET']        = ''
+#ENV['S3_BUCKET']        = ''
\ No newline at end of file
diff --git a/config/environment.rb b/config/environment.rb
index c1adefc..ae086ce 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -6,6 +6,10 @@
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
+# Load heroku vars from local file
+balder_env = File.join(RAILS_ROOT, 'config', 'balder.rb')
+load(balder_env) if File.exists?(balder_env)
+
 
 Rails::Initializer.run do |config|
 
diff --git a/config/initializers/load_settings.rb b/config/initializers/load_settings.rb
deleted file mode 100644
index cafed14..0000000
--- a/config/initializers/load_settings.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-#APP_CONFIG = YAML.load_file("#{RAILS_ROOT}/config/settings.yml")[RAILS_ENV].symbolize_keys
-APP_CONFIG = YAML.load(ERB.new(File.read("#{RAILS_ROOT}/config/settings.yml")).result)[RAILS_ENV].symbolize_keys
diff --git a/config/initializers/s3.rb b/config/initializers/s3.rb
index 600c0e2..c0bcd6f 100644
--- a/config/initializers/s3.rb
+++ b/config/initializers/s3.rb
@@ -1,5 +1,5 @@
 CarrierWave.configure do |config|
-      config.s3_access_key_id = APP_CONFIG[:s3_access_key_id]
-      config.s3_secret_access_key = APP_CONFIG[:s3_secret_access_key]
-      config.s3_bucket = APP_CONFIG[:s3_bucket]
+      config.s3_access_key_id = ENV['S3_KEY']
+      config.s3_secret_access_key = ENV['S3_SECRET']
+      config.s3_bucket = ENV['S3_BUCKET']
     end
\ No newline at end of file
diff --git a/config/settings.example.yml b/config/settings.example.yml
deleted file mode 100644
index aa87707..0000000
--- a/config/settings.example.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-development:
-    public: true
-    site_name: 'Photos'
-    #site_logo: 'logo.png'
-    #s3_access_key_id: ''
-    #s3_secret_access_key: ''
-    #s3_bucket: ''
-production:
-    public: true
-    site_name: 'Photos'
-test:
-    public: true
-    site_name: 'Photos'
\ No newline at end of file