aws 2.2.6 → 2.3.0

data/lib/awsbase/right_awsbase.rb

@@ -86,24 +86,116 @@ module Aws
             string_to_sign = "#{http_verb.to_s.upcase}\n#{host.downcase}\n#{uri}\n#{canonical_string}"
             # sign the string
             signature = escape_sig(Base64.encode64(OpenSSL::HMAC.digest(digest, aws_secret_access_key, string_to_sign)).strip)
-            "#{canonical_string}&Signature=#{signature}"
+            ret = "#{canonical_string}&Signature=#{signature}"
+#            puts 'full=' + ret.inspect
+            ret
+        end
+
+        HEX = [
+                 "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07",
+                "%08", "%09", "%0A", "%0B", "%0C", "%0D", "%0E", "%0F",
+                "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17",
+                "%18", "%19", "%1A", "%1B", "%1C", "%1D", "%1E", "%1F",
+                "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27",
+                "%28", "%29", "%2A", "%2B", "%2C", "%2D", "%2E", "%2F",
+                "%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37",
+                "%38", "%39", "%3A", "%3B", "%3C", "%3D", "%3E", "%3F",
+                "%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47",
+                "%48", "%49", "%4A", "%4B", "%4C", "%4D", "%4E", "%4F",
+                "%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57",
+                "%58", "%59", "%5A", "%5B", "%5C", "%5D", "%5E", "%5F",
+                "%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67",
+                "%68", "%69", "%6A", "%6B", "%6C", "%6D", "%6E", "%6F",
+                "%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77",
+                "%78", "%79", "%7A", "%7B", "%7C", "%7D", "%7E", "%7F",
+                "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87",
+                "%88", "%89", "%8A", "%8B", "%8C", "%8D", "%8E", "%8F",
+                "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97",
+                "%98", "%99", "%9A", "%9B", "%9C", "%9D", "%9E", "%9F",
+                "%A0", "%A1", "%A2", "%A3", "%A4", "%A5", "%A6", "%A7",
+                "%A8", "%A9", "%AA", "%AB", "%AC", "%AD", "%AE", "%AF",
+                "%B0", "%B1", "%B2", "%B3", "%B4", "%B5", "%B6", "%B7",
+                "%B8", "%B9", "%BA", "%BB", "%BC", "%BD", "%BE", "%BF",
+                "%C0", "%C1", "%C2", "%C3", "%C4", "%C5", "%C6", "%C7",
+                "%C8", "%C9", "%CA", "%CB", "%CC", "%CD", "%CE", "%CF",
+                "%D0", "%D1", "%D2", "%D3", "%D4", "%D5", "%D6", "%D7",
+                "%D8", "%D9", "%DA", "%DB", "%DC", "%DD", "%DE", "%DF",
+                "%E0", "%E1", "%E2", "%E3", "%E4", "%E5", "%E6", "%E7",
+                "%E8", "%E9", "%EA", "%EB", "%EC", "%ED", "%EE", "%EF",
+                "%F0", "%F1", "%F2", "%F3", "%F4", "%F5", "%F6", "%F7",
+                "%F8", "%F9", "%FA", "%FB", "%FC", "%FD", "%FE", "%FF"
+        ]
+        TO_REMEMBER = 'AZaz09 -_.!~*\'()'
+        ASCII = {} # {'A'=>65, 'Z'=>90, 'a'=>97, 'z'=>122, '0'=>48, '9'=>57, ' '=>32, '-'=>45, '_'=>95, '.'=>}
+        TO_REMEMBER.each_char do |c| #unpack("c*").each do |c|
+            ASCII[c] = c.unpack("c")[0]
         end
+#        puts 'ascii=' + ASCII.inspect
 
         # 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 = param.to_s
+#            param = param.force_encoding("UTF-8")
+
+            e = "x" # escape2(param.to_s)
+#            puts 'ESCAPED=' + e.inspect
+
+
             #return CGI.escape(param.to_s).gsub("%7E", "~").gsub("+", "%20") # from: http://umlaut.rubyforge.org/svn/trunk/lib/aws_product_sign.rb
 
             #param.to_s.gsub(/([^a-zA-Z0-9._~-]+)/n) do
             #  '%' + $1.unpack('H2' * $1.size).join('%').upcase
             #end
-            e = CGI.escape(param.to_s)
-            e = e.gsub("%7E", "~")
-            e = e.gsub("+", "%20")
-            e = e.gsub("*", "%2A")
 
-        end
+#            puts 'e in=' + e.inspect
+#            converter = Iconv.new('ASCII', 'UTF-8')
+#            e = converter.iconv(e) #.unpack('U*').select{ |cp| cp < 127 }.pack('U*')
+#            puts 'e out=' + e.inspect
+
+            e2 = CGI.escape(param)
+            e2 = e2.gsub("%7E", "~")
+            e2 = e2.gsub("+", "%20")
+            e2 = e2.gsub("*", "%2A")
+
+#            puts 'E2=' + e2.inspect
+#            puts e == e2.to_s
+
+            e2
+
+        end
+
+        def self.escape2(s)
+            # home grown
+            ret = ""
+            s.unpack("U*") do |ch|
+#                puts 'ch=' + ch.inspect
+                if ASCII['A'] <= ch && ch <= ASCII['Z'] # A to Z
+                    ret << ch
+                elsif ASCII['a'] <= ch && ch <= ASCII['z'] # a to z
+                    ret << ch
+                elsif ASCII['0'] <= ch && ch <= ASCII['9'] # 0 to 9
+                    ret << ch
+                elsif ch == ASCII[' '] # space
+                    ret << "%20" # "+"
+                elsif ch == ASCII['-'] || ch == ASCII['_'] || ch == ASCII['.'] || ch == ASCII['~']
+                    ret << ch
+                elsif ch <= 0x007f # other ascii
+                    ret << HEX[ch]
+                elsif ch <= 0x07FF # non-ascii
+                    ret << HEX[0xc0 | (ch >> 6)]
+                    ret << HEX[0x80 | (ch & 0x3F)]
+                else
+                    ret << HEX[0xe0 | (ch >> 12)]
+                    ret << HEX[0x80 | ((ch >> 6) & 0x3F)]
+                    ret << HEX[0x80 | (ch & 0x3F)]
+                end
 
+            end
+            ret
+
+        end
 
         def self.escape_sig(raw)
             e = CGI.escape(raw)
@@ -275,6 +367,9 @@ module Aws
         def generate_request2(aws_access_key, aws_secret_key, action, api_version, lib_params, user_params={}) #:nodoc:
             # remove empty params from request
             user_params.delete_if {|key, value| value.nil? }
+#            user_params.each_pair do |k,v|
+#                user_params[k] = v.force_encoding("UTF-8")
+#            end
             #params_string  = params.to_a.collect{|key,val| key + "=#{CGI::escape(val.to_s)}" }.join("&")
             # prepare service data
             service = lib_params[:service]
@@ -571,10 +666,10 @@ module Aws
     end
 
 
-    # Exception class to signal any Amazon errors. All errors occuring during calls to Amazon's
-    # web services raise this type of error.
-    # Attribute inherited by RuntimeError:
-    #  message    - the text of the error, generally as returned by AWS in its XML response.
+# Exception class to signal any Amazon errors. All errors occuring during calls to Amazon's
+# web services raise this type of error.
+# Attribute inherited by RuntimeError:
+#  message    - the text of the error, generally as returned by AWS in its XML response.
     class AwsError < RuntimeError
 
         # either an array of errors where each item is itself an array of [code, message]),
@@ -647,7 +742,7 @@ module Aws
 
     end
 
-    # Simplified version
+# Simplified version
     class AwsError2 < RuntimeError
         # Request id (if exists)
         attr_reader :request_id
@@ -851,7 +946,7 @@ module Aws
     end
 
 
-    #-----------------------------------------------------------------
+#-----------------------------------------------------------------
 
     class RightSaxParserCallback #:nodoc:
         def self.include_callback
@@ -1018,9 +1113,9 @@ module Aws
         end
     end
 
-    #-----------------------------------------------------------------
-    #      PARSERS: Errors
-    #-----------------------------------------------------------------
+#-----------------------------------------------------------------
+#      PARSERS: Errors
+#-----------------------------------------------------------------
 
 #<Error>
 #  <Code>TemporaryRedirect</Code>
@@ -1056,8 +1151,8 @@ module Aws
         end
     end
 
-    # Dummy parser - does nothing
-    # Returns the original params back
+# Dummy parser - does nothing
+# Returns the original params back
     class RightDummyParser # :nodoc:
         attr_accessor :result
 

data/lib/sdb/right_sdb_interface.rb

@@ -169,7 +169,8 @@ module Aws
     # Convert a Ruby language value to a SDB value by replacing Ruby nil with the user's chosen string representation of nil.
     # Non-nil values are unaffected by this filter.
     def ruby_to_sdb(value)
-      value.nil? ? @nil_rep : value
+#        puts "value #{value} is frozen? #{value.frozen?}"
+      value.nil? ? @nil_rep : ((value.frozen? || !value.is_a?(String)) ? value : value.force_encoding("UTF-8"))
     end
 
     # Convert a SDB value to a Ruby language value by replacing the user's chosen string representation of nil with Ruby nil.

data/test/sdb/test_active_sdb.rb

@@ -92,13 +92,13 @@ class TestSdb < Test::Unit::TestCase
     ids = clients.map{|client| client.id }[0..1]
     assert_equal @clients.size + 1, clients.size
     # retrieve all presidents (must find: Bush, Putin, Medvedev)
-    assert_equal 3, Client.find(:all, :conditions => ["[?=?]",'post','president']).size
+    assert_equal 3, Client.find(:all, :conditions => ["post=?",'president']).size
     # retrieve all russian presidents (must find: Putin, Medvedev)
-    assert_equal 2, Client.find(:all, :conditions => ["['post'=?] intersection ['country'=?]",'president', 'Russia']).size
+    assert_equal 2, Client.find(:all, :conditions => ["post=? and country=?",'president', 'Russia']).size
     # retrieve all russian presidents and all women (must find: Putin, Medvedev, 2 Maries and Sandy)
-    assert_equal 5, Client.find(:all, :conditions => ["['post'=?] intersection ['country'=?] union ['gender'=?]",'president', 'Russia','female']).size
+    assert_equal 5, Client.find(:all, :conditions => ["post=? and country=? or gender=?",'president', 'Russia','female']).size
     # find all rissian presidents Bushes
-    assert_equal 0, Client.find(:all, :conditions => ["['post'=?] intersection ['country'=?] intersection ['name'=?]",'president', 'Russia','Bush']).size
+    assert_equal 0, Client.find(:all, :conditions => ["post=? and country=? and name=?",'president', 'Russia','Bush']).size
     # --- find by ids
     # must find 1 rec (by rec id) and return it
     assert_equal ids.first, Client.find(ids.first).id

data/test/sdb/test_right_sdb.rb

@@ -103,45 +103,16 @@ class TestSdb < Test::Unit::TestCase
         wait SDB_DELAY, 'after adding attributes'
         # get attributes ('girls' and 'vodka' must be there)
         values = @sdb.get_attributes(@domain, @item)[:attributes]['Volodya'].to_a.sort
-        assert_equal values, ['girls', 'vodka']
+        assert_equal ['girls', 'vodka'], values
         # delete an item
         @sdb.delete_attributes @domain, @item
+        sleep 1
         # get attributes (values must be empty)
         values = @sdb.get_attributes(@domain, @item)[:attributes]['Volodya']
-        assert_equal values, nil
-    end
-
-    def test_08_query
-        # not applicable anymore
-    end
-
-    def test_09_signature_version_0
-        sdb = Aws::SdbInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :signature_version => '0')
-        item = 'toys'
-        # TODO: need to change the below test.  I think Juergen's intention was to include some umlauts in the values
-        # put attributes
-        # mhhh... Not sure how to translate this: hölzchehn klötzchen grÃŒnspan buße... Lets assume this is:
-        attributes = { 'Jurgen' => %w{kitten puppy chickabiddy piglet} }
-        assert sdb.put_attributes(@domain, item, attributes)
-        wait SDB_DELAY, 'after putting attributes'
-        # get attributes
-        values = sdb.get_attributes(@domain, item)[:attributes]['Jurgen'].to_a.sort
-        # compare to original list
-        assert_equal values, attributes['Jurgen'].sort
-        # check that the request has correct signature version
-        assert sdb.last_request.path.include?('SignatureVersion=0')
+        assert_nil values
     end
 
-    def test_10_signature_version_1
-        sdb = Aws::SdbInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :signature_version => '1')
-        domains = nil
-        assert_nothing_thrown "Failed to use signature V1" do
-            domains = sdb.list_domains
-        end
-        assert domains
-    end
-
-    def test_11_signature_version_1
+    def test_11_signature_version_2
         sdb = Aws::SdbInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :signature_version => '2')
         domains = nil
         assert_nothing_thrown "Failed to use signature V2" do
@@ -150,26 +121,46 @@ class TestSdb < Test::Unit::TestCase
         assert domains
     end
 
-    def test_12_array_of_attrs
+    def test_12_unicode
+
+        # This was creating a bad signature
+        s = ''
+        File.open("unicode.txt", "r") { |f|
+            s = f.read
+        }
+#        s = s.force_encoding("UTF-8")
+        puts 's=' + s.inspect
+        puts "encoding? " + s.encoding.name
+#        s = s.encode("ASCII")
+        # todo: I'm thinking just iterate through characters and swap out ones that aren't in ascii range.
+        @sdb.put_attributes @domain, @item, {"badname"=>[s]}
+        sleep 1
+        value = @sdb.get_attributes(@domain, @item)[:attributes]['badname'][0]
+        puts 'value=' + value.inspect
+        assert value == s
+    end
+
+    def test_15_array_of_attrs
         item = 'multiples'
         assert_nothing_thrown "Failed to put multiple attrs" do
             @sdb.put_attributes(@domain, item, {:one=>1, :two=>2, :three=>3})
         end
     end
 
-    def test_13_zero_len_attrs
+    def test_16_zero_len_attrs
         item = 'zeroes'
         assert_nothing_thrown "Failed to put zero-length attributes" do
             @sdb.put_attributes(@domain, item, {:one=>"", :two=>"", :three=>""})
         end
     end
 
-    def test_14_nil_attrs
+    def test_17_nil_attrs
         item = 'nils'
         res = nil
         assert_nothing_thrown do
             @sdb.put_attributes(@domain, item, {:one=>nil, :two=>nil, :three=>'chunder'})
         end
+        sleep 1
         assert_nothing_thrown do
             res = @sdb.get_attributes(@domain, item)
         end
@@ -178,7 +169,7 @@ class TestSdb < Test::Unit::TestCase
         assert_not_nil(res[:attributes]['three'][0])
     end
 
-    def test_15_url_escape
+    def test_18_url_escape
         item = 'urlescapes'
         content = {:a=>"one & two & three",
                    :b=>"one ? two / three"}
@@ -189,7 +180,7 @@ class TestSdb < Test::Unit::TestCase
         assert_equal(content[:b], res[:attributes]['b'][0])
     end
 
-    def test_16_put_attrs_by_post
+    def test_19_put_attrs_by_post
         item = 'reqgirth'
         i = 0
         sa = ""
@@ -200,12 +191,12 @@ class TestSdb < Test::Unit::TestCase
         @sdb.put_attributes(@domain, item, {:a => sa, :b => sa, :c => sa, :d => sa, :e => sa})
     end
 
-    def test_20_query_with_atributes
+    def test_21_query_with_atributes
         # not applicable anymore
     end
 
     # Keep this test last, because it deletes the domain...
-    def test_21_delete_domain
+    def test_40_delete_domain
         assert @sdb.delete_domain(@domain), 'delete_domain fail'
         wait SDB_DELAY, 'after domain deletion'
         # check that domain does not exist

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: aws
 version: !ruby/object:Gem::Version 
-  version: 2.2.6
+  prerelease: false
+  segments: 
+  - 2
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Travis Reeder
@@ -11,39 +16,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -08:00
+date: 2010-03-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: uuidtools
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: http_connection
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: xml-simple
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: AWS Ruby Library for interfacing with Amazon Web Services.
 email: travis@appoxy.com
 executables: []
@@ -84,18 +95,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: AWS Ruby Library for interfacing with Amazon Web Services.