bcms_s3 0.1.2 → 0.2.0

data/README.markdown

@@ -10,6 +10,24 @@ This should be in the following format
 ## Using this module with [Heroku](http://heroku.com)
 If using this module in conjunction with deployment on heroku you should probably turning heroku caching on by setting Cms::S3.heroku_caching in config/initializers/browsercms.rb to true.
 
+In order to avoid putting your secret AWS key in the s3.yml file, you can take advantage of [heroku's config vars](http://docs.heroku.com/config-vars). Use ERB to read the values from the environment.  This way you can safely commit your s3.yml file to the repository without revealing your amazon credentials.
+
+    access_key_id: <%= ENV['s3_access_key_id'] %>
+    secret_access_key: <%= ENV['s3_secret_access_key'] %>
+    bucket: <%= ENV['s3_bucket'] %>
+
+For developing on your local machine, export the s3 variables to your environment.
+
+    export s3_access_key_id='your AWS access key'
+    export s3_secret_access_key='your AWS secret access key'
+    export s3_bucket='your unique bucket name'
+
+Set the config vars on heroku to get it working there as well.
+
+    heroku config:add s3_access_key_id='your AWS access key'
+    heroku config:add s3_secret_access_key='your AWS secret access key'
+    heroku config:add s3_bucket='your unique bucket name'
+
 ## www prefix for non cms urls
 If your non cms domain is www.myapp.com rather than app.com this can be enabled by setting Cms::S3.www_domain_prefix in config/initializers/browsercms.rb to true.
 

data/lib/bcms_s3/s3_module.rb

@@ -7,6 +7,32 @@ module Cms
       attr_accessor :www_domain_prefix
       attr_accessor :options
     end
+    module AttachmentsController
+      def self.included(controller_class)
+        controller_class.alias_method_chain :show, :s3
+      end
+      
+      def show_with_s3
+        @attachment = ::Attachment.find(params[:id])
+        @attachment = @attachment.as_of_version(params[:version]) if params[:version]
+        if Cms::S3.enabled
+          #get the file off S3
+          redirect_to("http://#{Cms::S3.options[:bucket]}.s3.amazonaws.com/#{@attachment.file_location}")
+        else
+          #Construct a path to where this file would be if it were cached
+          @file = @attachment.full_file_location
+
+          #Stream the file if it exists
+          if @path != "/" && File.exists?(@file)
+            send_file(@file, 
+            :filename    => @attachment.file_name,
+            :type        => @attachment.file_type,
+            :disposition => "inline"
+            )
+          end
+        end
+      end
+    end
     module ContentController
       def self.included(controller_class)
         controller_class.alias_method_chain :render_page_with_caching, :s3
@@ -103,6 +129,7 @@ module Cms
   end
 end
 
+Cms::AttachmentsController.send(:include, Cms::S3::AttachmentsController)
 Cms::ContentController.send(:include, Cms::S3::ContentController)
 Attachment.send(:include, Cms::S3::Attachment)
 Cms::ApplicationController.send(:include, Cms::S3::ApplicationController)
@@ -114,6 +141,7 @@ Cms::S3.heroku_caching = false if Cms::S3.heroku_caching.nil?
 Cms::S3.www_domain_prefix = false if Cms::S3.www_domain_prefix.nil?
 # load s3 options if s3.yml exists
 if File.exists?("#{RAILS_ROOT}/config/s3.yml")
-  Cms::S3.options =  YAML.load_file("#{RAILS_ROOT}/config/s3.yml")
+  yaml_string = IO.read("#{RAILS_ROOT}/config/s3.yml")
+  Cms::S3.options =  YAML::load(ERB.new(yaml_string).result)
   Cms::S3.options.symbolize_keys!
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bcms_s3
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Anthony Underwood
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 +00:00
+date: 2010-06-17 00:00:00 +01:00
 default_executable: 
 dependencies: []