s3 0.3.19 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef05d572015de8e0b22e63077cb088457ef6ca06
-  data.tar.gz: b768faead4bb99ce5d220315a01387db651ee913
+  metadata.gz: 8c5d5f7082f9caa8479147358b5585e9d0f04b6e
+  data.tar.gz: 2aeccffd7eff52ec62871b72c856c9d1fa0e6544
 SHA512:
-  metadata.gz: 4fc53163459ee46eeb822af2fd51ae455e9aded601e2861b8bb3350686b3c45adc88b1fee5aa474275e2e958b75fab03e0cfea9339e3995f79468de4852a07cf
-  data.tar.gz: d22d8601d0f8f81116af6e434439fad971dd0d50dd87851fd10cb6365e6b6c302077861c847491bdb3efccab1899bd019fdcc95c3e3593aef6e866da3caa38f2
+  metadata.gz: 13a7def06ef1d1f73f74d30dba3908ea5de28a1cf41a76cd20b4040c6f55ae152a1223f58ea3958581656b098986a0add1f04ef98d84d7f9a5bd6f7553ef30d8
+  data.tar.gz: 4f3b37d58d9dd5c05cfc0db1928cee278333e10224341e88a9978b36f2db66670ddfd67c4aa4066a23073f310743139a712b526fa222725de7987df6c3cfe103

data/Gemfile.lock

@@ -1,23 +1,25 @@
 PATH
   remote: .
   specs:
-    s3 (0.3.19)
+    s3 (0.3.20)
       proxies (~> 0.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    mocha (0.9.8)
-      rake
+    metaclass (0.0.2)
+    mocha (1.0.0)
+      metaclass (~> 0.0.1)
     proxies (0.2.1)
-    rake (0.8.7)
-    test-unit (2.1.1)
+    rake (10.1.1)
+    test-unit (2.5.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0)
+  bundler
   mocha
+  rake
   s3!
-  test-unit (>= 2.0)
+  test-unit

data/Rakefile

@@ -3,7 +3,7 @@ Bundler::GemHelper.install_tasks
 Bundler.setup
 
 require "rake/testtask"
-require "rake/rdoctask"
+require "rdoc/task"
 
 Rake::TestTask.new(:test) do |test|
   test.libs << "lib" << "test"

data/lib/s3/bucket.rb

@@ -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?
-      "#@name.#{HOST}" =~ /\A#{URI::REGEXP::PATTERN::HOSTNAME}\Z/
+      !service.use_ssl && "#@name.#{HOST}" =~ /\A#{URI::REGEXP::PATTERN::HOSTNAME}\Z/
     end
 
     # Returns host name of the bucket according (see #vhost? method)

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.3.19"
+  VERSION = "0.3.20"
 end

data/s3.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "s3"
 
   s.add_dependency "proxies", "~> 0.2.0"
-  s.add_development_dependency "test-unit", ">= 2.0"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "test-unit"
   s.add_development_dependency "mocha"
-  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "bundler"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/test/bucket_test.rb

@@ -2,8 +2,9 @@ require "test_helper"
 
 class BucketTest < Test::Unit::TestCase
   def setup
-    @bucket_vhost = S3::Bucket.send(:new, nil, "Data-Bucket")
-    @bucket_path = S3::Bucket.send(:new, nil, "Data_Bucket")
+    @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")
+    @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
 
     @bucket_location = "EU"
@@ -18,14 +19,14 @@ class BucketTest < Test::Unit::TestCase
     <?xml version="1.0" encoding="UTF-8"?>\n<Error> <Code>BucketAlreadyOwnedByYou</Code> <Message>Your previous request to create the named bucket succeeded and you already own it.</Message> <BucketName>bucket</BucketName> <RequestId>117D08EA0EC6E860</RequestId> <HostId>4VpMSvmJ+G5+DLtVox6O5cZNgdPlYcjCu3l0n4HjDe01vPxxuk5eTAtcAkUynRyV</HostId> </Error>
     EOOwnedByYou
 
-    @reponse_owned_by_you = Net::HTTPConflict.new("1.1", "409", "Conflict")
-    @reponse_owned_by_you.stubs(:body).returns(@bucket_owned_by_you_body)
+    @response_owned_by_you = Net::HTTPConflict.new("1.1", "409", "Conflict")
+    @response_owned_by_you.stubs(:body).returns(@bucket_owned_by_you_body)
 
     @bucket_already_exists_body = <<-EOAlreadyExists
     <?xml version="1.0" encoding="UTF-8"?>\n<Error> <Code>BucketAlreadyExists</Code> <Message>The requested bucket name is not available. The bucket namespace is shared by all users of the system. Please select a different name and try again.</Message> <BucketName>bucket</BucketName> <RequestId>4C154D32807C92BD</RequestId> <HostId>/xyHQgXcUXTZQhoO+NUBzbaxbFrIhKlyuaRHFnmcId0bMePvY9Zwg+dyk2LYE4g5</HostId> </Error>
     EOAlreadyExists
 
-    @reponse_already_exists = Net::HTTPConflict.new("1.1", "409", "Conflict")
+    @response_already_exists = Net::HTTPConflict.new("1.1", "409", "Conflict")
     @response_already_exists.stubs(:body).returns(@bucket_already_exists_body)
 
     @objects_list_empty = []
@@ -98,6 +99,10 @@ class BucketTest < Test::Unit::TestCase
     expected = "s3.amazonaws.com"
     actual = @bucket_path.host
     assert_equal expected, actual
+
+    expected = "s3.amazonaws.com"
+    actual = @secure_bucket.host
+    assert_equal expected, actual
   end
 
   test "vhost" do

data/test/test_helper.rb

@@ -1,3 +1,3 @@
 require "test/unit"
-require "mocha"
+require "mocha/test_unit"
 require "s3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.3.20
 platform: ruby
 authors:
 - Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: proxies
@@ -24,20 +24,34 @@ dependencies:
     - - "~>"
       - !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: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 description: 'S3 library provides access to Amazon''s Simple Storage Service. It supports
   both: European and US buckets through REST API.'
 email: