s3 0.3.25 → 0.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 66cf7c8b5f8f96174d65bedf2a54160503f6036b
-  data.tar.gz: f78a9262d7b9972116f2125ee8f118a467200c5e
+SHA256:
+  metadata.gz: 4ba1a66cd1b2070360712c3ec3ad0bdc01b35821f87dc6241307558b3ec99f5a
+  data.tar.gz: 0afd07c4159fa258eb415e611f56d3d069d9f789563aa57225fda26c914eb448
 SHA512:
-  metadata.gz: a61766e049d380fc82a53d709e68caa36e44e250f981412139264d7c23b6f3a4e68169c9a1389a194f3ee1e83208bbe70be9b91a8f23d7cd092cffbfc63af773
-  data.tar.gz: 0135258cb2c6dc9b32f3c1b6e1b56c1984944f3a6d42365781c2b77b68ee92ccbed86902d55995ae93da9442734c8445aadb9ff35ee0e48fc0e5bbd32fb71e59
+  metadata.gz: 06aab60c71c763fe50bc79f6461ff580627f5d58d7016d433aab2fe83ab861faf22dcb723f18cae494ff9a5f440ff652110a56cbfb1897adfd2ac3d8ce9f36dd
+  data.tar.gz: 48aaf87bf566a218f2cd84b18186d77c82a74a550fccf465a6bef3c6a49490f463a9d2ea56f624c1c9c2fc42d94fbc94434311654c4944ce2b246f6a6ffaaa47

data/.gitignore

@@ -1,7 +1,8 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg
-*.gem
-.bundle
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.travis.yml

@@ -1,7 +1,5 @@
+sudo: false
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
-sudo: false
+  - 2.5.0
+before_install: gem install bundler -v 1.16.1

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at kuba@jah.pl. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -1,2 +1,6 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in s3.gemspec
 gemspec

data/Gemfile.lock

@@ -2,29 +2,33 @@ PATH
   remote: .
   specs:
     s3 (0.3.25)
-      proxies (~> 0.2.0)
+      addressable
+      proxies
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     metaclass (0.0.4)
-    mocha (1.2.1)
+    mocha (1.3.0)
       metaclass (~> 0.0.1)
-    power_assert (0.3.1)
-    proxies (0.2.1)
-    rake (11.3.0)
-    test-unit (3.2.1)
+    power_assert (1.1.1)
+    proxies (0.2.3)
+    public_suffix (3.0.1)
+    rake (10.5.0)
+    test-unit (3.2.7)
       power_assert
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
+  bundler (~> 1.16)
   mocha
-  rake
+  rake (~> 10.0)
   s3!
   test-unit
 
 BUNDLED WITH
-   1.12.5
+   1.16.1

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2018 Kuba Kuźma
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/Rakefile

@@ -1,21 +1,10 @@
-require "bundler"
-Bundler::GemHelper.install_tasks
-Bundler.setup
-
+require "bundler/gem_tasks"
 require "rake/testtask"
-require "rdoc/task"
-
-Rake::TestTask.new(:test) do |test|
-  test.libs << "lib" << "test"
-  test.pattern = "test/**/*_test.rb"
-  test.verbose = true
-end
 
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.title = "s3 #{S3::VERSION}"
-  rdoc.rdoc_files.include("README.rdoc")
-  rdoc.rdoc_files.include("lib/**/*.rb")
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
 task :default => :test

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "s3"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/s3.rb

@@ -1,3 +1,4 @@
+require "addressable/uri"
 require "base64"
 require "cgi"
 require "digest/md5"
@@ -23,7 +24,7 @@ require "s3/version"
 
 module S3
   class << self
-    attr_accessor :host # Default host serving S3 stuff
+    attr_writer :host # Default host serving S3 stuff
     def host
       @host ||= "s3.amazonaws.com"
     end

data/lib/s3/bucket.rb

@@ -2,11 +2,9 @@ module S3
   class Bucket
     include Parser
     include Proxies
-    extend Forwardable
 
     attr_reader :name, :service, :acl
 
-    def_instance_delegators :service, :service_request
     private_class_method :new
 
     # Retrieves the bucket information from the server. Raises an
@@ -206,12 +204,11 @@ module S3
 
     def bucket_request(method, options = {})
       path = "#{path_prefix}#{options[:path]}"
-      service_request(method, options.merge(:host => host, :path => path))
+      service.send(:service_request, method, options.merge(:host => host, :path => path))
     end
 
     def name_valid?(name)
       name =~ /\A[a-z0-9][a-z0-9\._-]{2,254}\Z/i and name !~ /\A#{URI::REGEXP::PATTERN::IPV4ADDR}\Z/
     end
-
   end
 end

data/lib/s3/connection.rb

@@ -62,7 +62,7 @@ module S3
 
       # Must be done before adding params
       # Encodes all characters except forward-slash (/) and explicitly legal URL characters
-      path = URI.escape(path, /[^#{URI::REGEXP::PATTERN::UNRESERVED}\/]/)
+      path = Addressable::URI.escape(path)
 
       if params
         params = params.is_a?(String) ? params : self.class.parse_params(params)

data/lib/s3/object.rb

@@ -118,7 +118,7 @@ module S3
     # Returns Object's URL using protocol specified in service,
     # e.g. <tt>http://domain.com.s3.amazonaws.com/key/with/path.extension</tt>
     def url
-      "#{protocol}#{host}/#{path_prefix}#{URI.escape(key, /[^#{URI::REGEXP::PATTERN::UNRESERVED}\/]/)}"
+      "#{protocol}#{host}/#{path_prefix}#{Addressable::URI.escape(key)}"
     end
 
     # Returns a temporary url to the object that expires on the
@@ -138,7 +138,7 @@ module S3
     # have to set the CNAME in your DNS before using the CNAME URL
     # schema).
     def cname_url
-      URI.escape("#{protocol}#{name}/#{key}") if bucket.vhost?
+      Addressable::URI.escape("#{protocol}#{name}/#{key}") if bucket.vhost?
     end
 
     def inspect #:nodoc:
@@ -147,7 +147,7 @@ module S3
 
     private
 
-    attr_writer :last_modified, :etag, :size, :original_key, :bucket
+    attr_writer :size, :original_key, :bucket
 
     def copy_object(options = {})
       key = options[:key] or raise ArgumentError, "No key given"
@@ -206,6 +206,21 @@ module S3
     end
 
     def initialize(bucket, options = {})
+      @content_type = nil
+      @content_encoding = nil
+      @content_disposition = nil
+      @cache_control = nil
+      @acl = nil
+      @last_modified = nil
+      @etag = nil
+      @size = nil
+      @bucket = nil
+      @key = nil
+      @acl = nil
+      @storage_class = nil
+      @metadata = nil
+      @content = nil
+
       self.bucket = bucket
       self.key = options[:key]
       self.last_modified = options[:last_modified]

data/lib/s3/parser.rb

@@ -61,30 +61,30 @@ module S3
 
     private
 
-     def convert_uri_to_group_name(uri)
-        case uri
-        when "http://acs.amazonaws.com/groups/global/AllUsers"
-          return "Everyone"
-        when "http://acs.amazonaws.com/groups/global/AuthenticatedUsers"
-          return "Authenticated Users"
-        when "http://acs.amazonaws.com/groups/s3/LogDelivery"
-          return "Log Delivery"
-        else
-          return uri
-        end
+    def convert_uri_to_group_name(uri)
+      case uri
+      when "http://acs.amazonaws.com/groups/global/AllUsers"
+        return "Everyone"
+      when "http://acs.amazonaws.com/groups/global/AuthenticatedUsers"
+        return "Authenticated Users"
+      when "http://acs.amazonaws.com/groups/s3/LogDelivery"
+        return "Log Delivery"
+      else
+        return uri
       end
+    end
 
-     def extract_grantee(grant)
-        grants  = {}
-        grant.each_element_with_attribute("xsi:type", "Group") do |grantee|
-          group_name = convert_uri_to_group_name(grantee.get_text("URI").value)
-          grants[group_name] = grant.get_text("Permission").value
-        end
-        grant.each_element_with_attribute("xsi:type", "CanonicalUser") do |grantee|
-          user_name = grantee.get_text("DisplayName").value
-          grants[user_name] = grant.get_text("Permission").value
-        end
-        grants
-     end
+    def extract_grantee(grant)
+      grants  = {}
+      grant.each_element_with_attribute("xsi:type", "Group") do |grantee|
+        group_name = convert_uri_to_group_name(grantee.get_text("URI").value)
+        grants[group_name] = grant.get_text("Permission").value
+      end
+      grant.each_element_with_attribute("xsi:type", "CanonicalUser") do |grantee|
+        user_name = grantee.get_text("DisplayName").value
+        grants[user_name] = grant.get_text("Permission").value
+      end
+      grants
+    end
   end
 end

data/lib/s3/signature.rb

@@ -52,13 +52,12 @@ module S3
     def self.generate_temporary_url_signature(options)
       bucket = options[:bucket]
       resource = options[:resource]
-      secret_access_key = options[:secret_access_key]
       expires = options[:expires_at]
 
       headers = options[:headers] || {}
       headers.merge!("date" => expires.to_i.to_s)
 
-      resource = "/#{URI.escape(resource, /[^#{URI::REGEXP::PATTERN::UNRESERVED}\/]/)}"
+      resource = "/#{Addressable::URI.escape(resource)}"
       resource = "/#{bucket}" + resource unless options[:add_bucket_to_host]
 
       options.merge!(:resource => resource,
@@ -113,7 +112,6 @@ module S3
       headers = options[:headers] || {}
       host = options[:host] || ""
       resource = options[:resource]
-      access_key_id = options[:access_key_id]
       secret_access_key = options[:secret_access_key]
 
       http_verb = options[:method].to_s.upcase

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.3.25"
+  VERSION = "0.3.26"
 end

data/s3.gemspec

@@ -1,31 +1,31 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
 
-# Load version requiring the canonical "s3/version", otherwise Ruby will think
-# is a different file and complaint about a double declaration of S3::VERSION.
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "s3/version"
 
-Gem::Specification.new do |s|
-  s.name        = "s3"
-  s.version     = S3::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Kuba Kuźma"]
-  s.email       = ["kuba@jah.pl"]
-  s.homepage    = "http://github.com/qoobaa/s3"
-  s.summary     = "Library for accessing S3 objects and buckets"
-  s.description = "S3 library provides access to Amazon's Simple Storage Service. It supports both: European and US buckets through REST API."
-  s.license     = "MIT"
+Gem::Specification.new do |spec|
+  spec.name          = "s3"
+  spec.version       = S3::VERSION
+  spec.authors       = ["Kuba Kuźma"]
+  spec.email         = ["kuba@jah.pl"]
 
-  s.required_rubygems_version = ">= 1.3.6"
-  s.rubyforge_project         = "s3"
+  spec.summary       = "Library for accessing S3 objects and buckets"
+  spec.description   = "S3 library provides access to Amazon's Simple Storage Service."
+  spec.homepage      = "http://github.com/qoobaa/s3"
+  spec.license       = "MIT"
 
-  s.add_dependency "proxies", "~> 0.2.0"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "test-unit"
-  s.add_development_dependency "mocha"
-  s.add_development_dependency "bundler"
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
-  s.require_path = "lib"
+  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "mocha"
+  spec.add_dependency "addressable"
+  spec.add_dependency "proxies"
 end