s3 0.3.21 → 0.3.22

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 3fb4a11b96fe119fc5b67dd54f1e9418f682c1c4
-  data.tar.gz: 24eda3309ae8f62742c696e396e45a5ae40ab3c2
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjM4ZTVkNTRkODZjMWY1MzBmNDU1NDc4YTFjOWI5MzAzM2I4NzhiOA==
+  data.tar.gz: !binary |-
+    OWVjNTUwZjFiZDU5NzI3NmEwNWFjNWU1YjMzNmVhNWJlOWVhZTZkMA==
 SHA512:
-  metadata.gz: 0a36e844ad009eb1602acc425f644beb2b16837f432ee94cfd2b03cbcc717126308817343651b47a3066b7984ed4ab4543391d205c8a79fd6d5020b4383c260a
-  data.tar.gz: 4fa122a14e36b4f40d2848c0e32e1140f5e2997f790036d8fcd44ab047b965de354fe83b83eadf3a2c7fd1e382b4ec91ef4be023d24d154e1f8a7626717642b6
+  metadata.gz: !binary |-
+    MmY2MTFlNWFjMjZiM2UzOTA2NTJmZDUxZGM0NzM1YjZhOWZlZmVkMDE3MWIz
+    MzhkZjRiZDRiNzFiMDU0ZDZjMDRlNDliMDlkYzZhYWE2YjMzZmVkYzdlZWU0
+    OTM4Y2RlZDhmYjhmNWY4MjYwMjI2OGQzMzYzZWYwOGJjMjhkNzM=
+  data.tar.gz: !binary |-
+    MGU3NzgwOGZlMmUzMzkxMWE0OGEyMmI0Y2I5ZGNjMWVjZDcwZmQwMzkwZTAz
+    MGI4ZThjZjA1MWNjM2YwMGJmOWJlYzExNjkzYjFhZDc2OGY4OWRjMzk0NmYw
+    MGRiNzVjMDhjOTRjODllYzIwZDIxZmM5YThmNjNjYWIwMjZhMDk=

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+  - 2.2
+sudo: false

data/Gemfile.lock

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

data/README.rdoc

@@ -1,8 +1,10 @@
 = S3
 
+{<img src="https://travis-ci.org/qoobaa/s3.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/qoobaa/s3]
+
 S3 library provides access to {Amazon's Simple Storage Service}[http://aws.amazon.com/s3/].
 
-It supports both: European and US buckets through the {REST API}[http://docs.amazonwebservices.com/AmazonS3/latest/API/APIRest.html].
+It supports *all* S3 regions through the {REST API}[http://docs.amazonwebservices.com/AmazonS3/latest/API/APIRest.html].
 
 == Installation
 
@@ -92,7 +94,7 @@ This will return hash with all users/groups and theirs permissions
 
 ==== Rails 3
 
-  To do that you just send file using proper form direct to amazon. You can create simple halper for that, for example like this one: https://gist.github.com/3169039
+  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
 
 == See also
 

data/lib/s3/object.rb

@@ -227,11 +227,7 @@ module S3
     end
 
     def key_valid?(key)
-      if (key.nil? or key.empty? or key =~ %r#//#)
-        false
-      else
-        true
-      end
+      !(key.nil? or key.empty?)
     end
 
     def dump_headers
@@ -257,7 +253,9 @@ module S3
         self.size = response["content-range"].sub(/[^\/]+\//, "").to_i
       else
         self.size = response["content-length"]
-        self.content = response.body
+        if body = response.body
+          self.content = body
+        end
       end
     end
   end

data/lib/s3/version.rb

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

data/test/object_test.rb

@@ -34,7 +34,6 @@ class ObjectTest < Test::Unit::TestCase
 
   test "initializing" do
     assert_raise ArgumentError do S3::Object.send(:new, nil, :key => "") end # should not allow empty key
-    assert_raise ArgumentError do S3::Object.send(:new, nil, :key => "//") end # should not allow key with double slash
 
     assert_nothing_raised do
       S3::Object.send(:new, nil, :key => "Lena.png")
@@ -68,7 +67,7 @@ class ObjectTest < Test::Unit::TestCase
     expected = "http://images.s3.amazonaws.com/Lena%20S%C3%B6derberg.png"
     actual = object12.url
     assert_equal expected, actual
-    
+
     object13 = S3::Object.send(:new, bucket1, :key => "Lena Söderberg [1].png")
     expected = "http://images.s3.amazonaws.com/Lena%20S%C3%B6derberg%20%5B1%5D.png"
     actual = object13.url
@@ -146,6 +145,19 @@ class ObjectTest < Test::Unit::TestCase
     assert_equal meta, @object_lena.retrieve.metadata
   end
 
+  test "retrieve dont set content" do
+    @object_lena.send(:remove_instance_variable, :@content)
+
+    @response_binary.stubs(:body).returns(nil)
+    @object_lena.expects(:object_request).with(:head, {}).returns(@response_binary)
+    assert @object_lena.retrieve
+
+    @object_lena.expects(:object_request).with(:get, {}).returns(@response_binary)
+    @response_binary.stubs(:body).returns("hello")
+
+    assert_equal "hello", @object_lena.content
+  end
+
   test "exists" do
     @object_lena.expects(:retrieve).returns(true)
     assert @object_lena.exists?

metadata

@@ -1,94 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: s3
 version: !ruby/object:Gem::Version
-  version: 0.3.21
+  version: 0.3.22
 platform: ruby
 authors:
 - Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2015-04-14 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"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -123,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.2.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Library for accessing S3 objects and buckets