spree_banner 1.0.7 → 1.0.8

data/README.md

@@ -9,7 +9,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_banner', '~> 1.0.7'
+  gem 'spree_banner', '~> 1.0.8'
 </pre>
 2. Run `bundle install`
 3. To copy and apply migrations run:

data/app/models/spree/banner.rb

@@ -23,23 +23,23 @@ module Spree
     scope :enable, lambda { |category| {:conditions => {:enabled => true, :category => category}} }
     
     # Load S3 settings
-    if (!YAML.load_file(Rails.root.join('config', 's3.yml'))[Rails.env].blank?)
+    if (FileTest.exist?(Rails.root.join('config', 's3.yml')) && !YAML.load_file(Rails.root.join('config', 's3.yml'))[Rails.env].blank?)
       S3_OPTIONS = {
-              :storage => 's3',
-              :s3_credentials => Rails.root.join('config', 's3.yml')
-            }
-    elsif (ENV['S3_KEY'] && ENV['S3_SECRET'] && ENV['S3_BUCKET'])
+        :storage => 's3',
+        :s3_credentials => Rails.root.join('config', 's3.yml')
+      }
+    elsif (FileTest.exist?(Rails.root.join('config', 's3.yml')) && ENV['S3_KEY'] && ENV['S3_SECRET'] && ENV['S3_BUCKET'])
       S3_OPTIONS = {
-              :storage => 's3',
-              :s3_credentials => {
-                :access_key_id     => ENV['S3_KEY'],
-                :secret_access_key => ENV['S3_SECRET']
-              },
-              :bucket => ENV['S3_BUCKET']
-            }
-    else
-      S3_OPTIONS = { :storage => 'filesystem' }
-    end
+        :storage => 's3',
+        :s3_credentials => {
+          :access_key_id     => ENV['S3_KEY'],
+          :secret_access_key => ENV['S3_SECRET']
+          },
+          :bucket => ENV['S3_BUCKET']
+        }
+      else
+        S3_OPTIONS = { :storage => 'filesystem' }
+      end
     
     attachment_definitions[:attachment] = (attachment_definitions[:attachment] || {}).merge(S3_OPTIONS)
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_banner
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-22 00:00:00.000000000 Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core