bcms_s3 0.2.0 → 0.2.1

data/README.markdown

@@ -31,8 +31,12 @@ Set the config vars on heroku to get it working there as well.
 ## 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.
 
+## using cnames to your S3 bucket
+If you've set up CNAMES in your DNS to point to your bucket, then you can enable the use of that instead of the FQDN ending in amazonaws.com by setting Cms::S3.options[:s3_cname] in your s3.yml file.
+
 ## Important things to note
-1. The s3.yml should be excluded from public repositories (e.g github) since it contains your secret AWS key which should **never** be revealed to the public.
+1. The s3.yml should be excluded from public repositories (e.g github) since it contains your secret AWS key which should **never** be revealed to the public.   
+**Please note**. This no longer applies since the access keys and buckets are now specified in environmental variables and therefore the s3.yml file now contains just references to these environmental variables.
 2. Changing from local storage to S3 storage will require you to re-upload all your files (or copy the tree to s3)
 3. This module requires the RightAWS gem from RightScale (sudo gem install right_aws)
 

data/lib/bcms_s3/s3_module.rb

@@ -17,7 +17,11 @@ module Cms
         @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}")
+          if Cms::S3.options[:s3_cname]
+            redirect_to("http://#{Cms::S3.options[:s3_cname]}/#{@attachment.file_location}")
+          else
+            redirect_to("http://#{Cms::S3.options[:bucket]}.s3.amazonaws.com/#{@attachment.file_location}")
+          end
         else
           #Construct a path to where this file would be if it were cached
           @file = @attachment.full_file_location
@@ -56,7 +60,11 @@ module Cms
 
             if Cms::S3.enabled
               #get the file off S3
-              redirect_to("http://#{Cms::S3.options[:bucket]}.s3.amazonaws.com/#{@attachment.file_location}")
+              if Cms::S3.options[:s3_cname]
+                redirect_to("http://#{Cms::S3.options[:s3_cname]}/#{@attachment.file_location}")
+              else
+                redirect_to("http://#{Cms::S3.options[:bucket]}.s3.amazonaws.com/#{@attachment.file_location}")
+              end
             else
               #Construct a path to where this file would be if it were cached
               @file = @attachment.full_file_location

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bcms_s3
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Anthony Underwood
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 +01:00
+date: 2010-06-29 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -37,21 +42,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: This is a browsercms (browsercms.org) module to allow the facility to have attachments stored on Amazon S3. Also there is the option to change caching to suit heroku and/or use 'www' as the prefix for the non-cms site. Based on original work by Neil Middleton