radosgw-s3 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de2e6c6190b45b9b75aae4043eb248ebe80752aa
-  data.tar.gz: 5eaf652702ee6343ba519b099db3a6436442f9a9
+  metadata.gz: b670b4ebdb3d82028d8123baabdb8b73009c758c
+  data.tar.gz: e55274728dd5ba6e66174ddd31349e1268210768
 SHA512:
-  metadata.gz: 20d3f333a2a7091f2246fbb4fbf9fe98d8252493d790040c898e02c6c9b1026b7ee12d9ad58ae4fb52d13497a7fb641183a68ba02c4af14f7a002bdbd59bff7a
-  data.tar.gz: 828fed5272e3946575c92c86958ad317c243a57468df73600b023edf1f9d365d7f270a7ead77287d8043390400d5dba405dfd7725611430e57fffd263cac0e60
+  metadata.gz: 40dde8be0059906467dfad9efeaa69aa5db302c3718c6fc3108f9a282b0d1d12b8d2cbc683da135ff1cdf6103771c747727e8f88dd74d0eb8d0dd2ceeebc5e79
+  data.tar.gz: 0534107067e63a729561ad184caf01c9be301c0c29aacf60de928433993869aa58994384380aa774bae8abfb1d104b7ad1a40900ffb58a68382b22a7b4f597ae

data/lib/s3/connection.rb

@@ -1,11 +1,10 @@
 module S3
-
   # Class responsible for handling connections to amazon hosts
   class Connection
     include Parser
 
     attr_accessor :access_key_id, :secret_access_key, :use_ssl, :timeout, :debug, :proxy, :host
-    alias :use_ssl? :use_ssl
+    alias_method :use_ssl?, :use_ssl
 
     # Creates new connection object.
     #
@@ -30,7 +29,7 @@ module S3
       @debug = options.fetch(:debug, false)
       @timeout = options.fetch(:timeout, 60)
       @proxy = options.fetch(:proxy, nil)
-      @chunk_size = options.fetch(:chunk_size, 1048576)
+      @chunk_size = options.fetch(:chunk_size, 1_048_576)
     end
 
     # Makes request with given HTTP method, sets missing parameters,
@@ -60,6 +59,7 @@ module S3
       body = options.fetch(:body, nil)
       params = options.fetch(:params, {})
       headers = options.fetch(:headers, {})
+      use_authsign = options.fetch(:use_authsign)
 
       # Must be done before adding params
       # Encodes all characters except forward-slash (/) and explicitly legal URL characters
@@ -70,7 +70,7 @@ module S3
         path << "?#{params}"
       end
 
-      request = Request.new(@chunk_size, method.to_s.upcase, !!body, method.to_s.upcase != "HEAD", path)
+      request = Request.new(@chunk_size, method.to_s.upcase, !!body, method.to_s.upcase != 'HEAD', path)
 
       headers = self.class.parse_headers(headers)
       headers.each do |key, value|
@@ -86,7 +86,11 @@ module S3
         request.content_length = body.respond_to?(:lstat) ? body.stat.size : body.size
       end
 
-      send_request(host, request)
+      if use_authsign
+        send_authsign(host, request)
+      else
+        send_request(host, request)
+      end
     end
 
     # Helper function to parser parameters and create single string of
@@ -104,7 +108,7 @@ module S3
       result = []
       params.each do |key, value|
         if interesting_keys.include?(key)
-          parsed_key = key.to_s.gsub("_", "-")
+          parsed_key = key.to_s.tr('_', '-')
           case value
           when nil
             result << parsed_key
@@ -113,7 +117,7 @@ module S3
           end
         end
       end
-      result.join("&")
+      result.join('&')
     end
 
     # Helper function to change headers from symbols, to in correct
@@ -142,7 +146,7 @@ module S3
       if headers
         headers.each do |key, value|
           if interesting_keys.include?(key)
-            parsed_key = key.to_s.gsub("_", "-")
+            parsed_key = key.to_s.tr('_', '-')
             parsed_value = value
             case value
             when Range
@@ -178,19 +182,7 @@ module S3
       response = http(host).start do |http|
         host = http.address
 
-        request["Date"] ||= Time.now.httpdate
-
-        if request.body
-          request["Content-Type"] ||= "application/octet-stream"
-          request["Content-MD5"] = Base64.encode64(Digest::MD5.digest(request.body)).chomp unless request.body.empty?
-        end
-
-        unless skip_authorization
-          request["Authorization"] = Signature.generate(:host => host,
-                                                        :request => request,
-                                                        :access_key_id => access_key_id,
-                                                        :secret_access_key => secret_access_key)
-        end
+        request = send_authsign(request)
 
         http.request(request)
       end
@@ -198,26 +190,40 @@ module S3
       if response.code.to_i == 307
         if response.body
           doc = Document.new response.body
-          send_request(doc.elements["Error"].elements["Endpoint"].text, request, true)
+          send_request(doc.elements['Error'].elements['Endpoint'].text, request, true)
         end
       else
         handle_response(response)
       end
     end
 
+    def send_authsign(host, request, skip_authorization = false)
+        request['Date'] ||= Time.now.httpdate
+        if request.body
+          request['Content-Type'] ||= 'application/octet-stream'
+          request['Content-MD5'] = Base64.encode64(Digest::MD5.digest(request.body)).chomp unless request.body.empty?
+        end
+        unless skip_authorization
+        request['Authorization'] = Signature.generate(host: host, request: request,
+                           access_key_id: access_key_id,
+                           secret_access_key: secret_access_key)
+        end
+        request
+    end
+
     def handle_response(response)
       case response.code.to_i
       when 200...300
         response
       when 300...600
         if response.body.nil? || response.body.empty?
-          raise Error::ResponseError.new(nil, response)
+          fail Error::ResponseError.new(nil, response)
         else
           code, message = parse_error(response.body)
-          raise Error::ResponseError.exception(code).new(message, response)
+          fail Error::ResponseError.exception(code).new(message, response)
         end
       else
-        raise(ConnectionError.new(response, "Unknown response code: #{response.code}"))
+        fail(ConnectionError.new(response, "Unknown response code: #{response.code}"))
       end
       response
     end

data/lib/s3/service.rb

@@ -8,7 +8,7 @@ module S3
     # Compares service to other, by <tt>access_key_id</tt> and
     # <tt>secret_access_key</tt>
     def ==(other)
-      self.access_key_id == other.access_key_id and self.secret_access_key == other.secret_access_key
+      access_key_id == other.access_key_id && secret_access_key == other.secret_access_key
     end
 
     # Creates new service.
@@ -28,8 +28,8 @@ module S3
       # The keys for these required options might exist in the options hash, but
       # they might be set to something like `nil`. If this is the case, we want
       # to fail early.
-      raise ArgumentError, "Missing :access_key_id." if !options[:access_key_id]
-      raise ArgumentError, "Missing :secret_access_key." if !options[:secret_access_key]
+      fail ArgumentError, 'Missing :access_key_id.' unless options[:access_key_id]
+      fail ArgumentError, 'Missing :secret_access_key.' unless options[:secret_access_key]
 
       @access_key_id = options.fetch(:access_key_id)
       @secret_access_key = options.fetch(:secret_access_key)
@@ -39,14 +39,14 @@ module S3
       @timeout = options.fetch(:timeout, 60)
       @debug = options.fetch(:debug, false)
 
-      raise ArgumentError, "Missing proxy settings. Must specify at least :host." if options[:proxy] && !options[:proxy][:host]
+      fail ArgumentError, 'Missing proxy settings. Must specify at least :host.' if options[:proxy] && !options[:proxy][:host]
       @proxy = options.fetch(:proxy, nil)
     end
 
     # Returns all buckets in the service and caches the result (see
     # +reload+)
     def buckets
-      Proxy.new(lambda { list_all_my_buckets }, :owner => self, :extend => BucketsExtension)
+      Proxy.new(-> { list_all_my_buckets }, owner: self, extend: BucketsExtension)
     end
 
     # Returns the bucket with the given name. Does not check whether the
@@ -56,10 +56,15 @@ module S3
       Bucket.send(:new, self, name)
     end
 
+    # Returns the signature for POST operations done externally via javascript
+    def auth_sign
+      service_request(:post, use_authsign: true)
+    end
+
     # Returns "http://" or "https://", depends on <tt>:use_ssl</tt>
     # value from initializer
     def protocol
-      use_ssl ? "https://" : "http://"
+      use_ssl ? 'https://' : 'http://'
     end
 
     # Returns 443 or 80, depends on <tt>:use_ssl</tt> value from
@@ -69,7 +74,7 @@ module S3
     end
 
     def inspect #:nodoc:
-      "#<#{self.class}:#@access_key_id>"
+      "#<#{self.class}:#{@access_key_id}>"
     end
 
     private
@@ -81,18 +86,18 @@ module S3
     end
 
     def service_request(method, options = {})
-      connection.request(method, options.merge(:path => "/#{options[:path]}"))
+      connection.request(method, options.merge(path: "/#{options[:path]}"))
     end
 
     def connection
       return @connection if defined?(@connection)
-      @connection = Connection.new(:access_key_id => @access_key_id,
-                               :secret_access_key => @secret_access_key,
-                               :host => @host,
-                               :use_ssl => @use_ssl,
-                               :timeout => @timeout,
-                               :debug => @debug,
-                               :proxy => @proxy)
+      @connection = Connection.new(access_key_id: @access_key_id,
+                                   secret_access_key: @secret_access_key,
+                                   host: @host,
+                                   use_ssl: @use_ssl,
+                                   timeout: @timeout,
+                                   debug: @debug,
+                                   proxy: @proxy)
     end
   end
 end

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.5"
+  VERSION = "0.6"
 end

data/radosgw-s3.gemspec

@@ -20,15 +20,14 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "s3"
 
   s.add_dependency "proxies", "~> 0.2.0"
-  s.add_dependency "net-ssh"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "json"
-  s.add_development_dependency "test-unit"
-  s.add_development_dependency "mocha"
-  s.add_development_dependency "bundler"
+  s.add_dependency "net-ssh", "~> 3.0"
+  s.add_development_dependency "rake", "~> 10.4"
+  s.add_development_dependency "json", "~> 1.8"
+  s.add_development_dependency "test-unit", "~> 3.1"
+  s.add_development_dependency "mocha", "~> 1.1"
+  s.add_development_dependency "bundler", "~> 1.10"
 
   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"
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radosgw-s3
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Thomas Alrin, Kishorekumar Neelamegam, Rajthilak, Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: proxies
@@ -28,86 +28,86 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 description: 'radosgw-s3 library provides access to your ceph-radosgw. It supports
   both: radosgw user creation and bucket operation using REST API.'
 email:
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: s3
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Library for accessing ceph objects and buckets