s3 0.3.22 → 0.3.23

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjM4ZTVkNTRkODZjMWY1MzBmNDU1NDc4YTFjOWI5MzAzM2I4NzhiOA==
-  data.tar.gz: !binary |-
-    OWVjNTUwZjFiZDU5NzI3NmEwNWFjNWU1YjMzNmVhNWJlOWVhZTZkMA==
+SHA1:
+  metadata.gz: 7ea0ee1684b02cf5fcadc99748bf330317abb957
+  data.tar.gz: c48ded25b29a209253cb2b09ae1d4ae192df2373
 SHA512:
-  metadata.gz: !binary |-
-    MmY2MTFlNWFjMjZiM2UzOTA2NTJmZDUxZGM0NzM1YjZhOWZlZmVkMDE3MWIz
-    MzhkZjRiZDRiNzFiMDU0ZDZjMDRlNDliMDlkYzZhYWE2YjMzZmVkYzdlZWU0
-    OTM4Y2RlZDhmYjhmNWY4MjYwMjI2OGQzMzYzZWYwOGJjMjhkNzM=
-  data.tar.gz: !binary |-
-    MGU3NzgwOGZlMmUzMzkxMWE0OGEyMmI0Y2I5ZGNjMWVjZDcwZmQwMzkwZTAz
-    MGI4ZThjZjA1MWNjM2YwMGJmOWJlYzExNjkzYjFhZDc2OGY4OWRjMzk0NmYw
-    MGRiNzVjMDhjOTRjODllYzIwZDIxZmM5YThmNjNjYWIwMjZhMDk=
+  metadata.gz: 343cfa6f0cd5997536fcf18a3c1d839de3bfc417a205e62f25531b4b24fa58daa45ebce5809a1f3315b4ad72de6b617cef74752d15cbff674207e732930c5275
+  data.tar.gz: 3a7fe5f9c902779776e462008da107adca6fadcb9acffac771d84864f692851581bd431b71116c2e7c6711b2e8bf38c766e5132322f3712aff173e2f3fab8332

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    s3 (0.3.22)
+    s3 (0.3.23)
       proxies (~> 0.2.0)
 
 GEM

data/README.rdoc

@@ -75,7 +75,7 @@ Please refer to: http://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictio
     new_object.save
     #=> true
 
-Please note that new objects are created with "public-read" ACL by
+Please note that new objects are created with "private" ACL by
 default.
 
 === Fetch ACL
@@ -88,13 +88,14 @@ This will return hash with all users/groups and theirs permissions
 === Modify ACL
 
    object = bucket.objects.find("lenna.png")
-   object.copy(:key => "lenna.png", :bucket => bucket, :acl => :private)
+   object.copy(:key => "lenna.png", :bucket => bucket, :acl => :public_read)
 
 === Upload file direct to amazon
 
 ==== Rails 3
 
-  To do that you just send file using proper form direct to amazon. You can create simple helper for that, for example like this one: https://gist.github.com/3169039
+Check the {example in this gist}[https://gist.github.com/3169039], which describes how to use
+a simple form element to upload files directly to S3.
 
 == See also
 

data/lib/s3/bucket.rb

@@ -40,7 +40,7 @@ module S3
     end
 
     # Assigns a new ACL to the bucket. Please note that ACL is not
-    # retrieved from the server and set to "public-read" by default.
+    # retrieved from the server and set to "private" by default.
     #
     # Valid Values: :private | :public_read | :public_read_write | authenticated_read
     #
@@ -94,7 +94,7 @@ module S3
     # name. If the bucket contains characters like underscore it can't
     # be used as +VHOST+ (e.g. <tt>bucket_name.s3.amazonaws.com</tt>)
     def vhost?
-      !service.use_ssl && "#@name.#{HOST}" =~ /\A#{URI::REGEXP::PATTERN::HOSTNAME}\Z/
+      !service.use_ssl && service.use_vhost && "#@name.#{HOST}" =~ /\A#{URI::REGEXP::PATTERN::HOSTNAME}\Z/
     end
 
     # Returns host name of the bucket according (see #vhost? method)
@@ -131,7 +131,7 @@ module S3
     def save_acl(options = {})
       headers = {}
       headers[:content_length] = 0
-      headers[:x_amz_acl] = options[:acl] || acl || "public-read"
+      headers[:x_amz_acl] = options[:acl] || acl || "private"
 
       bucket_request(:put, :headers => headers, :path => name)
     end

data/lib/s3/object.rb

@@ -33,7 +33,7 @@ module S3
     end
 
     # Assigns a new ACL to the object. Please note that ACL is not
-    # retrieved from the server and set to "public-read" by default.
+    # retrieved from the server and set to "private" by default.
     #
     # ==== Example
     #   object.acl = :public_read
@@ -102,7 +102,7 @@ module S3
     # * <tt>:bucket</tt> - New bucket to store object in (instance of
     #   S3::Bucket)
     # * <tt>:acl</tt> - ACL of the copied object (default:
-    #   "public-read")
+    #   "private")
     # * <tt>:content_type</tt> - Content type of the copied object
     #   (default: "application/octet-stream")
     def copy(options = {})
@@ -156,7 +156,7 @@ module S3
 
       headers = {}
 
-      headers[:x_amz_acl] = options[:acl] || acl || "public-read"
+      headers[:x_amz_acl] = options[:acl] || acl || "private"
       headers[:content_type] = options[:content_type] || content_type || "application/octet-stream"
       headers[:content_encoding] = options[:content_encoding] if options[:content_encoding]
       headers[:content_disposition] = options[:content_disposition] if options[:content_disposition]
@@ -232,7 +232,7 @@ module S3
 
     def dump_headers
       headers = {}
-      headers[:x_amz_acl] = @acl || "public-read"
+      headers[:x_amz_acl] = @acl || "private"
       headers[:x_amz_storage_class] = @storage_class || "STANDARD"
       headers[:content_type] = @content_type || "application/octet-stream"
       headers[:content_encoding] = @content_encoding if @content_encoding

data/lib/s3/service.rb

@@ -3,7 +3,7 @@ module S3
     include Parser
     include Proxies
 
-    attr_reader :access_key_id, :secret_access_key, :use_ssl, :proxy
+    attr_reader :access_key_id, :secret_access_key, :use_ssl, :use_vhost, :proxy
 
     # Compares service to other, by <tt>access_key_id</tt> and
     # <tt>secret_access_key</tt>
@@ -18,6 +18,8 @@ module S3
     # * <tt>:secret_access_key</tt> - Secret access key (REQUIRED)
     # * <tt>:use_ssl</tt> - Use https or http protocol (false by
     #   default)
+    # * <tt>:use_vhost</tt> - Use bucket.s3.amazonaws.com or s3.amazonaws.com/bucket (true by
+    #   default)
     # * <tt>:debug</tt> - Display debug information on the STDOUT
     #   (false by default)
     # * <tt>:timeout</tt> - Timeout to use by the Net::HTTP object
@@ -26,6 +28,7 @@ module S3
       @access_key_id = options.fetch(:access_key_id)
       @secret_access_key = options.fetch(:secret_access_key)
       @use_ssl = options.fetch(:use_ssl, false)
+      @use_vhost = options.fetch(:use_vhost, true)
       @timeout = options.fetch(:timeout, 60)
       @debug = options.fetch(:debug, false)
 

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.3.22"
+  VERSION = "0.3.23"
 end

data/test/bucket_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 class BucketTest < Test::Unit::TestCase
   def setup
     @bucket_vhost = S3::Bucket.send(:new, S3::Service.new(access_key_id: 'test', secret_access_key: 'secret'), "Data-Bucket")
-    @bucket_path = S3::Bucket.send(:new, S3::Service.new(access_key_id: 'test', secret_access_key: 'secret'), "Data_Bucket")
+    @bucket_path = S3::Bucket.send(:new, S3::Service.new(access_key_id: 'test', secret_access_key: 'secret', use_vhost: false), "Data_Bucket")
     @secure_bucket = S3::Bucket.send(:new, S3::Service.new(access_key_id: 'test', secret_access_key: 'secret', use_ssl: true), "Data-Secured")
     @bucket = @bucket_vhost
 
@@ -36,7 +36,7 @@ class BucketTest < Test::Unit::TestCase
       S3::Object.send(:new, @bucket, :key => "prefix/"),
       S3::Object.send(:new, @bucket, :key => "prefix/obj3")
     ]
-    
+
     @objects_list_prefix = [
       S3::Object.send(:new, @bucket, :key => "prefix/"),
       S3::Object.send(:new, @bucket, :key => "prefix/obj3")
@@ -55,11 +55,11 @@ class BucketTest < Test::Unit::TestCase
 
     @response_objects_list = Net::HTTPOK.new("1.1", "200", "OK")
     @response_objects_list.stubs(:body).returns(@response_objects_list_body)
-    
+
     @response_objects_list_body_prefix = <<-EOObjectsPrefix
     <?xml version="1.0" encoding="UTF-8"?>\n<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> <Name>bucket</Name> <Prefix>prefix</Prefix> <Marker></Marker> <MaxKeys>1000</MaxKeys> <IsTruncated>false</IsTruncated> <Contents> <Key>prefix/</Key> <LastModified>2009-07-03T10:17:33.000Z</LastModified> <ETag>&quot;99519cdf14c255e580e1b7bca85a458c&quot;</ETag> <Size>1729</Size> <Owner> <ID>df864aeb6f42be43f1d9e60aaabe3f15e245b035a4b79d1cfe36c4deaec67205</ID> <DisplayName>owner</DisplayName> </Owner> <StorageClass>STANDARD</StorageClass> </Contents> <Contents> <Key>prefix/obj3</Key> <LastModified>2009-07-03T10:17:33.000Z</LastModified> <ETag>&quot;99519cdf14c255e580e1b7bca85a458c&quot;</ETag> <Size>1729</Size> <Owner> <ID>df864aeb6f42be43f1d9e60aaabe3f15e245b035a4b79d1cfe36c4deaec67205</ID> <DisplayName>owner</DisplayName> </Owner> <StorageClass>STANDARD</StorageClass> </Contents> </ListBucketResult>
     EOObjectsPrefix
-    
+
 
     @response_objects_list_prefix = Net::HTTPOK.new("1.1", "200", "OK")
     @response_objects_list_prefix.stubs(:body).returns(@response_objects_list_body_prefix)

data/test/object_test.rb

@@ -108,13 +108,13 @@ class ObjectTest < Test::Unit::TestCase
   end
 
   test "save" do
-    @object_lena.expects(:object_request).with(:put, :body=>"test", :headers=>{ :x_amz_acl=>"public-read", :x_amz_storage_class=>"STANDARD", :content_type=>"application/octet-stream" }).returns(@response_binary)
+    @object_lena.expects(:object_request).with(:put, :body=>"test", :headers=>{ :x_amz_acl=>"private", :x_amz_storage_class=>"STANDARD", :content_type=>"application/octet-stream" }).returns(@response_binary)
     assert @object_lena.save
   end
 
   test "save with cache control headers" do
     assert_equal "max-age=315360000", @object_mac.cache_control
-    @object_mac.expects(:object_request).with(:put, :body=>"test2", :headers=>{ :x_amz_acl=>"public-read", :x_amz_storage_class=>"STANDARD", :content_type=>"application/octet-stream", :cache_control=>"max-age=315360000" }).returns(@response_binary)
+    @object_mac.expects(:object_request).with(:put, :body=>"test2", :headers=>{ :x_amz_acl=>"private", :x_amz_storage_class=>"STANDARD", :content_type=>"application/octet-stream", :cache_control=>"max-age=315360000" }).returns(@response_binary)
     assert @object_mac.save
   end
 
@@ -203,7 +203,7 @@ class ObjectTest < Test::Unit::TestCase
   end
 
   test "replace" do
-    @bucket_images.expects(:bucket_request).with(:put, :path => "Lena-copy.png", :headers => { :x_amz_acl => "public-read", :content_type => "application/octet-stream", :x_amz_copy_source => "images/Lena.png", :x_amz_metadata_directive => "REPLACE" }).returns(@response_xml)
+    @bucket_images.expects(:bucket_request).with(:put, :path => "Lena-copy.png", :headers => { :x_amz_acl => "private", :content_type => "application/octet-stream", :x_amz_copy_source => "images/Lena.png", :x_amz_metadata_directive => "REPLACE" }).returns(@response_xml)
 
     new_object = @object_lena.copy(:key => "Lena-copy.png")
 
@@ -212,7 +212,7 @@ class ObjectTest < Test::Unit::TestCase
   end
 
   test "copy" do
-    @bucket_images.expects(:bucket_request).with(:put, :path => "Lena-copy.png", :headers => { :x_amz_acl => "public-read", :content_type => "application/octet-stream", :x_amz_copy_source => "images/Lena.png", :x_amz_metadata_directive => "COPY" }).returns(@response_xml)
+    @bucket_images.expects(:bucket_request).with(:put, :path => "Lena-copy.png", :headers => { :x_amz_acl => "private", :content_type => "application/octet-stream", :x_amz_copy_source => "images/Lena.png", :x_amz_metadata_directive => "COPY" }).returns(@response_xml)
 
     new_object = @object_lena.copy(:key => "Lena-copy.png", :replace => false)
 

metadata

@@ -1,95 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: s3
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
 platform: ruby
 authors:
 - Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: proxies
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'S3 library provides access to Amazon''s Simple Storage Service. It
-  supports both: European and US buckets through REST API.'
+description: 'S3 library provides access to Amazon''s Simple Storage Service. It supports
+  both: European and US buckets through REST API.'
 email:
 - kuba@jah.pl
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -124,17 +124,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: s3
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Library for accessing S3 objects and buckets