qoobaa-aws-sqs 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/aws-sqs.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aws-sqs}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Kuźma"]

data/lib/awsbase/awsbase.rb

@@ -40,10 +40,7 @@ module Aws
     # Escape a string accordingly Amazon rulles
     # http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/index.html?REST_RESTAuth.html
     def self.amz_escape(param)
-      param.to_s.gsub(/([^a-zA-Z0-9._~-]+)/u) do
-        size = $1.respond_to?(:bytesize) ? $1.bytesize : $1.size
-        '%' + $1.unpack('H2' * size).join('%').upcase
-      end
+      URI.escape(param, /([^a-zA-Z0-9._~-]+)/)
     end
 
     # Set a timestamp and a signature version
@@ -53,24 +50,6 @@ module Aws
       service_hash
     end
 
-    # Signature Version 0
-    # A deprecated guy (should work till septemper 2009)
-    def self.sign_request_v0(aws_secret_access_key, service_hash)
-      fix_service_params(service_hash, '0')
-      string_to_sign = "#{service_hash['Action']}#{service_hash['Timestamp'] || service_hash['Expires']}"
-      service_hash['Signature'] = AwsUtils::sign(aws_secret_access_key, string_to_sign)
-      service_hash.to_a.collect{|key,val| "#{amz_escape(key)}=#{amz_escape(val.to_s)}" }.join("&")
-    end
-
-    # Signature Version 1
-    # Another deprecated guy (should work till septemper 2009)
-    def self.sign_request_v1(aws_secret_access_key, service_hash)
-      fix_service_params(service_hash, '1')
-      string_to_sign = service_hash.sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
-      service_hash['Signature'] = AwsUtils::sign(aws_secret_access_key, string_to_sign)
-      service_hash.to_a.collect{|key,val| "#{amz_escape(key)}=#{amz_escape(val.to_s)}" }.join("&")
-    end
-
     # Signature Version 2
     # EC2, SQS and SDB requests must be signed by this guy.
     # See:  http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/index.html?REST_RESTAuth.html
@@ -103,8 +82,7 @@ module Aws
     # sections of the URI.  Only target chars in the query
     # string should be escaped.
     def self.URLencode(raw)
-      e = URI.escape(raw)
-      e.gsub(/\+/, "%2b")
+      URI.escape(raw, /[^-_.!~*'()a-zA-Z\d;\/?:@&=$,\[\]]/)
     end
 
     def self.allow_only(allowed_keys, params)
@@ -143,6 +121,7 @@ module Aws
 
     # Text, if found in an error message returned by AWS, indicates that this may be a transient
     # error. Transient errors are automatically retried with exponential back-off.
+
     AMAZON_PROBLEMS = [ 'internal service error',
                         'is currently unavailable',
                         'no response from',
@@ -237,10 +216,6 @@ module Aws
 
       def signed_service_params(aws_secret_access_key, service_hash, http_verb=nil, host=nil, service=nil )
         case signature_version.to_s
-        when '0'
-          AwsUtils::sign_request_v0(aws_secret_access_key, service_hash)
-        when '1'
-          AwsUtils::sign_request_v1(aws_secret_access_key, service_hash)
         when '2'
           AwsUtils::sign_request_v2(aws_secret_access_key, service_hash, http_verb, host, service)
         else

data/lib/sqs/sqs_interface.rb

@@ -125,7 +125,7 @@ module Aws
       #
       service_params = signed_service_params(@aws_secret_access_key, service_hash, :post, @params[:server], service)
       request        = Net::HTTP::Post.new(AwsUtils::URLencode(service))
-      request['Content-Type'] = 'application/x-www-form-urlencoded'
+      request['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'
       request.body = service_params
       # prepare output hash
       { :request  => request,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: qoobaa-aws-sqs
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"