s3lurp 0.4.1 → 0.4.2

data/README.md

@@ -26,16 +26,16 @@ to the helper via a hash.
 There are three options required for buckets that are not public-write:
 
 * `s3_bucket` - The name of the bucket where files go
-* `s3_access_key` - This is your AWS Access Key ID
-* `s3_secret_ley` - Your AWS Secret Accss Key
+* `aws_access_key` - This is your AWS Access Key ID
+* `aws_secret_key` - Your AWS Secret Accss Key
 
 
 These three options can be set via a yaml config file, an initializer, or ENV vars.
 
 
     ENV['S3_BUCKET']
-    ENV['S3_ACCESS_KEY']
-    ENV['S3_SECRET_KEY']
+    ENV['AWS_ACCESS_KEY']
+    ENV['AWS_SECRET_KEY']
 
 Another way to set up these options is to us an initializer.
 
@@ -44,8 +44,8 @@ In config/initializers/s3lurp.rb
 ```ruby
 S3lurp.configure do |config|
   config.s3_bucket = "bucket_of_holding"
-  config.s3_access_key = "some_acces_key"
-  config.s3_secret_key = "keep_it_secret"
+  config.aws_access_key = "some_acces_key"
+  config.aws_secret_key = "keep_it_secret"
 ```
 
 Finally you can use use a yaml file to load the configuration.
@@ -58,12 +58,12 @@ end
 # config/s3lurp.yml
 development:
   s3_bucket: "dev_bucket"
-  s3_access_key: "dev_key"
-  s3_secret_key: "dev_secret"
+  aws_access_key: "dev_key"
+  aws_secret_key: "dev_secret"
 production:
   s3_bucket: "prod_bucket"
-  s3_access_key: "prod_key"
-  s3_secret_key: "prod_secret"
+  aws_access_key: "prod_key"
+  aws_secret_key: "prod_secret"
 ```
 
 Using a yaml conifg file allows you to use different settings for different
@@ -78,9 +78,9 @@ Setup your ENV variables for heroku and for local use.
 For more on Heroku config see here: https://devcenter.heroku.com/articles/config-vars
 
 ```
-$ heroku config:add S3_KEY=asdfg12345 S3_SECRET=qwertyu0987622`
-$ export S3_KEY=asdfg12345
-$ export S3_SECRET=qwertyu0987622
+$ heroku config:add AWS_ACCESS_KEY=asdfg12345 AWS_SECRET=qwertyu0987622`
+$ export AWS_ACCESS_KEY=asdfg12345
+$ export AWS_SECRET=qwertyu0987622
 ```
 
 Set up some defaults with an initialzer
@@ -114,8 +114,8 @@ to the helper in a hash.
 |--------------------------|-------------|
 |__:file__                 | Name of yaml file located in the config directory. Contains any of the options listed in this table. Should be set inside a configuration block via an initializer. |
 |__:s3\_bucket__           | AWS S3 bucket name where files will stored. Can also be configured via ENV['S3_BUCKET']. __Required__|
-|__:s3\_access\_key__      | AWS Access Key. Can also be configured via ENV['S3_ACCESS_KEY']. __Required for buckets that are not public-write.__|
-|__:s3\_secret\_key__      | AWS AWS Secret Accss Key. Can also be configured via ENV['S3_SECRET_KEY']. __Required for buckets that are not public-write.__|
+|__:aws\_access\_key__     | AWS Access Key. Can also be configured via ENV['AWS_ACCESS_KEY']. __Required for buckets that are not public-write.__|
+|__:aws\_secret\_key__     | AWS AWS Secret Accss Key. Can also be configured via ENV['AWS_SECRET_KEY']. __Required for buckets that are not public-write.__|
 |__:key__                  | This is the key for the S3 object. To use the filename of the upload, use the vairable ${filename} (see example). __Required__|
 |__:acl__                  | Sepecies an S3 access control list. Valid values: `private` `public-read` `public-read-write` `authenticated-read` `bucket-owner-read` `bucket-owner-full-control`. _Default_: `private` |
 |__:cache\_control__       | Refer to [S3 PUT Object documentation](http://docs.aws.amazon.com/AmazonS3/2006-03-01/API/RESTObjectPUT.html)|

data/lib/s3lurp.rb

@@ -4,7 +4,7 @@ require 's3lurp/railtie' if defined? ::Rails::Railtie
 
 module S3lurp
  VALID_CONFIG_KEYS = [
-      :s3_bucket, :s3_access_key, :s3_secret_key, :acl, :cache_control,
+      :s3_bucket, :aws_access_key, :aws_secret_key, :acl, :cache_control,
       :content_type, :content_disposition, :content_encoding, :expires,
       :success_action_redirect, :success_action_status,
       :min_file_size, :max_file_size,
@@ -37,8 +37,8 @@ module S3lurp
 
     def initialize
       @s3_bucket = ENV['S3_BUCKET'] || "S3_BUCKET"
-      @s3_access_key = ENV['S3_ACCESS_KEY'] || "S3_KEY"
-      @s3_secret_key = ENV['S3_SECRET_KEY'] || "S3_SECRET"
+      @aws_access_key = ENV['AWS_ACCESS_KEY'] || "AWS_KEY"
+      @aws_secret_key = ENV['AWS_SECRET_KEY'] || "AWS_SECRET"
       @min_file_size = 0
       @max_file_size = 10485760
       @minutes_valid = 360

data/lib/s3lurp/version.rb

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

data/lib/s3lurp/view_helpers.rb

@@ -6,7 +6,7 @@ module S3lurp
   module ViewHelpers
     HIDDEN_FIELD_MAP= {
       :key => 'key',
-      :s3_access_key => 'AWSAccessKeyId',
+      :aws_access_key => 'AWSAccessKeyId',
       :acl => 'acl',
       :cache_control => 'Cache-Control',
       :content_type => 'Content-Type',
@@ -16,7 +16,7 @@ module S3lurp
       :success_action_redirect => 'success_action_redirect',
       :success_action_status => 'success_action_status'
     }
-    NON_FIELD_OPTIONS = %w( s3_bucket s3_secret_key
+    NON_FIELD_OPTIONS = %w( s3_bucket aws_secret_key
                            max_file_size min_file_size
                            amz_meta_tags minutes_valid
                            form_html_options file_field_tag_accept
@@ -39,7 +39,7 @@ module S3lurp
       expiration_date = minutes.minutes.from_now.utc.strftime('%Y-%m-%dT%H:%M:%S.000Z')
 
       security_fields = {}
-      if hidden_fields[:s3_access_key] # only generate security fields when necessary
+      if hidden_fields[:aws_access_key] # only generate security fields when necessary
         security_fields[:policy] = Base64.encode64(
           s3_generate_policy(
             hidden_fields.clone,
@@ -53,7 +53,7 @@ module S3lurp
         security_fields[:signature] = Base64.encode64(
           OpenSSL::HMAC.digest(
             OpenSSL::Digest::Digest.new('sha1'),
-            options[:s3_secret_key], security_fields[:policy])
+            options[:aws_secret_key], security_fields[:policy])
         ).gsub(/\n/,'')
       end
 
@@ -71,7 +71,7 @@ module S3lurp
     end
 
     def s3_generate_policy(fields = {}, options = {})
-      fields.delete(:s3_access_key)
+      fields.delete(:aws_access_key)
       conditions = [
         { :bucket => options[:s3_bucket]},
         ['content-length-range', options[:min_file_size], options[:max_file_size]],

data/spec/s3lurp_spec.rb

@@ -14,8 +14,8 @@ describe S3lurp::ViewHelpers do
 
   it "should return a form with a minimum set of hidden fields for public buckets" do
     S3lurp.configure do |config|
-      config.s3_access_key = nil
-      config.s3_secret_key = nil
+      config.aws_access_key = nil
+      config.aws_secret_key = nil
     end
     form = view.s3_direct_form_tag({:key => '/files/s3lurp/lib/s3lurp.rb'})
     (!!form.match(/<form.*?>/)).should be_true
@@ -26,8 +26,8 @@ describe S3lurp::ViewHelpers do
   it "should return a form with a policy and signature and my meta tags" do
     S3lurp.configure do |config|
       config.s3_bucket = "bucket_o_stuff"
-      config.s3_access_key = 'oingoboingo'
-      config.s3_secret_key = "qwerty5678_"
+      config.aws_access_key = 'oingoboingo'
+      config.aws_secret_key = "qwerty5678_"
     end
     form = view.s3_direct_form_tag({
       :key => '/some/key.pl',
@@ -104,24 +104,24 @@ describe S3lurp do
   it 'should configure with options' do
     S3lurp.configure do |config|
       config.s3_bucket = @bucket
-      config.s3_access_key = @key
-      config.s3_secret_key = @secret
+      config.aws_access_key = @key
+      config.aws_secret_key = @secret
     end
     S3lurp.config.s3_bucket.should == @bucket
-    S3lurp.config.s3_access_key.should == @key
-    S3lurp.config.s3_secret_key.should == @secret
+    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['S3_ACCESS_KEY'] = @key
-    ENV['S3_SECRET_KEY'] = @secret
+    ENV['AWS_ACCESS_KEY'] = @key
+    ENV['AWS_SECRET_KEY'] = @secret
     S3lurp.configure do |config|
       # nothing
     end
     S3lurp.config.s3_bucket.should == @bucket
-    S3lurp.config.s3_access_key.should == @key
-    S3lurp.config.s3_secret_key.should == @secret
+    S3lurp.config.aws_access_key.should == @key
+    S3lurp.config.aws_secret_key.should == @secret
 
   end
 
@@ -130,8 +130,8 @@ describe S3lurp do
       config.file = 's3.yml'
     end
     S3lurp.config.s3_bucket.should == 'yml_bucket'
-    S3lurp.config.s3_access_key.should == 'yml_key'
-    S3lurp.config.s3_secret_key.should == 'yml_secret'
+    S3lurp.config.aws_access_key.should == 'yml_key'
+    S3lurp.config.aws_secret_key.should == 'yml_secret'
   end
 end
 

data/spec/support/config/s3.yml

@@ -1,4 +1,4 @@
 s3_bucket: "yml_bucket"
-s3_access_key: "yml_key"
-s3_secret_key: "yml_secret"
+aws_access_key: "yml_key"
+aws_secret_key: "yml_secret"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3lurp
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -741012443240584985
+      hash: 3054736488437017560
 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: -741012443240584985
+      hash: 3054736488437017560
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25