s3lurp 0.4.2 → 0.4.3

data/lib/s3lurp/version.rb

@@ -1,3 +1,3 @@
 module S3lurp
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/s3lurp.rb

@@ -4,7 +4,8 @@ require 's3lurp/railtie' if defined? ::Rails::Railtie
 
 module S3lurp
  VALID_CONFIG_KEYS = [
-      :s3_bucket, :aws_access_key, :aws_secret_key, :acl, :cache_control,
+      :s3_bucket, :aws_access_key, :aws_secret_key,
+      :s3_access_key, :s3_secret_key, :acl, :cache_control,
       :content_type, :content_disposition, :content_encoding, :expires,
       :success_action_redirect, :success_action_status,
       :min_file_size, :max_file_size,
@@ -23,7 +24,7 @@ module S3lurp
       loaded_conf = YAML.load_file(Rails.root.join("config", config.file).to_s)
       env_conf = loaded_conf[Rails.env] || loaded_conf
       VALID_CONFIG_KEYS.each do |key|
-        config.send("#{key.to_s}=", env_conf[key.to_s])
+        config.send("#{key.to_s}=", env_conf[key.to_s]) if !env_conf[key.to_s].nil?
       end
     end
   end
@@ -37,8 +38,8 @@ module S3lurp
 
     def initialize
       @s3_bucket = ENV['S3_BUCKET'] || "S3_BUCKET"
-      @aws_access_key = ENV['AWS_ACCESS_KEY'] || "AWS_KEY"
-      @aws_secret_key = ENV['AWS_SECRET_KEY'] || "AWS_SECRET"
+      @aws_access_key = ENV['AWS_ACCESS_KEY'] || ENV['S3_ACCESS_KEY'] || "AWS_KEY"
+      @aws_secret_key = ENV['AWS_SECRET_KEY'] || ENV['S3_SECRET_KEY'] || "AWS_SECRET"
       @min_file_size = 0
       @max_file_size = 10485760
       @minutes_valid = 360
@@ -46,6 +47,14 @@ module S3lurp
       @submit_tag_options = {}
     end
 
+    # legacy for s3_* config vars
+    def s3_access_key=(arg)
+      self.aws_access_key = arg
+    end
+    def s3_secret_key=(arg)
+      self.aws_secret_key = arg
+    end
+
   end
 
 end

data/spec/s3lurp_spec.rb

@@ -112,6 +112,17 @@ describe S3lurp do
     S3lurp.config.aws_secret_key.should == @secret
   end
 
+  it 'should also configure with legacy options' do
+    S3lurp.configure do |config|
+      config.s3_bucket = @bucket
+      config.s3_access_key = @key
+      config.s3_secret_key = @secret
+    end
+    S3lurp.config.s3_bucket.should == @bucket
+    S3lurp.config.aws_access_key.should == @key
+    S3lurp.config.aws_secret_key.should == @secret
+  end
+
   it 'should should always use ENV first for config' do
     ENV['S3_BUCKET'] = @bucket
     ENV['AWS_ACCESS_KEY'] = @key

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3lurp
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3054736488437017560
+      hash: -4220849144564821796
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3054736488437017560
+      hash: -4220849144564821796
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25