right_aws 1.9.0 → 1.10.0

data/lib/sqs/right_sqs_gen2_interface.rb

@@ -38,7 +38,6 @@ module RightAws
   class SqsGen2Interface < RightAwsBase
     include RightAwsBaseInterface
     
-    SIGNATURE_VERSION = "1"
     API_VERSION       = "2008-01-01"
     DEFAULT_HOST      = "queue.amazonaws.com"
     DEFAULT_PORT      = 443
@@ -99,18 +98,15 @@ module RightAws
       # fields required in all requests, and then the headers passed in as
       # params.  We sort the header fields alphabetically and then generate the
       # signature before URL escaping the resulting query and sending it.
-      queue_uri = param[:queue_url] ? URI(param[:queue_url]).path : '/'
+      service = param[:queue_url] ? URI(param[:queue_url]).path : '/'
       param.each{ |key, value| param.delete(key) if (value.nil? || key.is_a?(Symbol)) }
-      request_hash = { "Action"           => action,
+      service_hash = { "Action"           => action,
                        "Expires"          => (Time.now + REQUEST_TTL).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
                        "AWSAccessKeyId"   => @aws_access_key_id,
-                       "Version"          => API_VERSION,
-                       "SignatureVersion" => SIGNATURE_VERSION }
-      request_hash.update(param)
-      request_data   = request_hash.sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
-      request_hash['Signature'] = AwsUtils::sign(@aws_secret_access_key, request_data)
-      request_params = request_hash.to_a.collect{|key,val| key.to_s + "=" + val.to_s }.join("&")
-      request        = Net::HTTP::Get.new(AwsUtils.URLencode("#{queue_uri}?#{request_params}"))
+                       "Version"          => API_VERSION }
+      service_hash.update(param)
+      service_params = signed_service_params(@aws_secret_access_key, service_hash, :get, @params[:server], service)
+      request        = Net::HTTP::Get.new("#{AwsUtils.URLencode(service)}?#{service_params}")
         # prepare output hash
       { :request  => request, 
         :server   => @params[:server],
@@ -119,22 +115,20 @@ module RightAws
     end
 
     def generate_post_request(action, param={})  # :nodoc:
-      queue_uri = param[:queue_url] ? URI(param[:queue_url]).path : '/'
+      service = param[:queue_url] ? URI(param[:queue_url]).path : '/'
       message   = param[:message]                # extract message body if nesessary
       param.each{ |key, value| param.delete(key) if (value.nil? || key.is_a?(Symbol)) }
-      request_hash = { "Action"           => action,
+      service_hash = { "Action"           => action,
                        "Expires"          => (Time.now + REQUEST_TTL).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
                        "AWSAccessKeyId"   => @aws_access_key_id,
                        "MessageBody"      => message,
-                       "Version"          => API_VERSION,
-                       "SignatureVersion" => SIGNATURE_VERSION }
-      request_hash.update(param)
-      request_data   = request_hash.sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
-      request_hash['Signature'] = AwsUtils::sign(@aws_secret_access_key, request_data)
-      request_body = request_hash.to_a.collect{|key,val| CGI.escape(key.to_s) + "=" + CGI.escape(val.to_s) }.join("&")
-      request        = Net::HTTP::Post.new(AwsUtils.URLencode(queue_uri))
+                       "Version"          => API_VERSION }
+      service_hash.update(param)
+      #
+      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.body = request_body
+      request.body = service_params
         # prepare output hash
       { :request  => request, 
         :server   => @params[:server],

data/lib/sqs/right_sqs_interface.rb

@@ -78,24 +78,17 @@ module RightAws
     def generate_request(action, params={})  # :nodoc:
         # Sometimes we need to use queue uri (delete queue etc)
         # In that case we will use Symbol key: 'param[:queue_url]'
-      queue_uri = params[:queue_url] ? URI(params[:queue_url]).path : '/'
+      service = params[:queue_url] ? URI(params[:queue_url]).path : '/'
         # remove unset(=optional) and symbolyc keys
       params.each{ |key, value| params.delete(key) if (value.nil? || key.is_a?(Symbol)) }
         # prepare output hash
       service_hash = { "Action"           => action,
                        "Expires"          => (Time.now + REQUEST_TTL).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
                        "AWSAccessKeyId"   => @aws_access_key_id,
-                       "Version"          => API_VERSION,
-                       "SignatureVersion" => signature_version }
+                       "Version"          => API_VERSION }
       service_hash.update(params)
-      # prepare string to sight
-      string_to_sign = case signature_version
-                       when '0' : service_hash["Action"] + service_hash["Expires"]
-                       when '1' : service_hash.sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
-                       end
-      service_hash['Signature'] = AwsUtils::sign(@aws_secret_access_key, string_to_sign)
-      request_params = service_hash.to_a.collect{|key,val| key.to_s + "=" + CGI::escape(val.to_s) }.join("&")
-      request        = Net::HTTP::Get.new("#{queue_uri}?#{request_params}")
+      service_params = signed_service_params(@aws_secret_access_key, service_hash, :get, @params[:server], service)
+      request        = Net::HTTP::Get.new("#{AwsUtils::URLencode(service)}?#{service_params}")
         # prepare output hash
       { :request  => request, 
         :server   => @params[:server],

data/test/acf/test_right_acf.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class TestS3 < Test::Unit::TestCase
+class TestAcf < Test::Unit::TestCase
 
   RIGHT_OBJECT_TEXT     = 'Right test message'
   

data/test/ec2/test_right_ec2.rb

@@ -72,5 +72,37 @@ class TestEc2 < Test::Unit::TestCase
     # check that the request has correct signature version
     assert ec2.last_request.path.include?('SignatureVersion=0')
   end
+
+  def test_11_regions
+    regions = nil
+    assert_nothing_raised do
+      regions = @ec2.describe_regions
+    end
+    # check we got more that 0 regions
+    assert regions.size > 0
+    # check an access to regions
+    regions.each do |region|
+      regional_ec2 = Rightscale::Ec2.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :region => region)
+      # do we have a correct endpoint server?
+      assert_equal "#{region}.ec2.amazonaws.com", regional_ec2.params[:server]
+      # get a list of images from every region
+      images = nil
+      assert_nothing_raised do
+        images = regional_ec2.describe_regions
+      end
+      # every region must have images
+      assert images.size > 0
+    end
+  end
   
+  def test_12_endpoint_url
+    ec2 = Rightscale::Ec2.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :endpoint_url => 'a://b.c:0/d/', :region => 'z')
+    # :endpoint_url has a priority hence :region should be ommitted
+    assert_equal 'a',   ec2.params[:protocol]
+    assert_equal 'b.c', ec2.params[:server]
+    assert_equal '/d/', ec2.params[:service]
+    assert_equal 0,     ec2.params[:port]
+    assert_nil          ec2.params[:region]
+  end
+
 end

data/test/s3/test_right_s3.rb

@@ -6,8 +6,8 @@ class TestS3 < Test::Unit::TestCase
   
   def setup
     @s3     = Rightscale::S3Interface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
-    @bucket = 'right_s3_awesome_test_bucket_00001'
-    @bucket2 = 'right_s3_awesome_test_bucket_00002'
+    @bucket = 'right_s3_awesome_test_bucket_000A1'
+    @bucket2 = 'right_s3_awesome_test_bucket_000A2'
     @key1   = 'test/woohoo1/'
     @key2   = 'test1/key/woohoo2'
     @key3   = 'test2/A%B@C_D&E?F+G=H"I'

data/test/sdb/test_active_sdb.rb

@@ -107,6 +107,10 @@ class TestSdb < Test::Unit::TestCase
     assert_raise(RightAws::ActiveSdb::ActiveSdbError) do 
       Client.find(ids)
     end
+    # find one record by unknown id
+    assert_raise(RightAws::ActiveSdb::ActiveSdbError) do
+      Client.find('dummy_id')
+    end
   end
 
   def test_05_find_first
@@ -144,7 +148,7 @@ class TestSdb < Test::Unit::TestCase
     assert_equal ['Bush'],  Client.find_by_post('president', :order => 'name',      :auto_load => true)['name']
     assert_equal ['Putin'], Client.find_by_post('president', :order => 'name desc', :auto_load => true)['name']
   end
-  
+
   def test_08_reload
     putin = Client.find_by_name('Putin')
     # attributes must be empty until reload (except 'id' field)
@@ -163,9 +167,44 @@ class TestSdb < Test::Unit::TestCase
     assert_equal ['2008'],      putin['expiration']
     assert_equal ['president'], putin['post']
   end
+
+  def test_09_select
+    # select all records
+    assert_equal 7, Client.select(:all).size
+    # LIMIT
+    # 1 record
+    assert Client.select(:first).is_a?(Client)
+    # select 2 recs
+    assert_equal 2, Client.select(:all, :limit => 2).size
+    # ORDER
+    # select all recs ordered by 'expration' (must find only recs where 'expration' attribute presents)
+    result = Client.select(:all, :order => 'expiration')
+    assert_equal 3, result.size
+    assert_equal ['2008', '2009', '2012'], result.map{ |c| c['expiration'] }.flatten
+    # desc order
+    result = Client.select(:all, :order => 'expiration desc')
+    assert_equal ['2012', '2009', '2008'], result.map{ |c| c['expiration'] }.flatten
+    # CONDITIONS
+    result = Client.select(:all, :conditions => ["expiration >= ?", 2009], :order => 'name')
+    assert_equal ['Bush', 'Medvedev'], result.map{ |c| c['name'] }.flatten
+    result = Client.select(:all, :conditions => "hobby='flowers' AND gender='female'", :order => 'name')
+    assert_equal ['Mary', 'Sandy'], result.map{ |c| c['name'] }.flatten
+    # SELECT
+    result = Client.select(:all, :select => 'hobby', :conditions => "gender IS NOT NULL", :order => 'name')
+    hobbies = result.map{|c| c['hobby']}
+    # must return all recs
+    assert_equal 6, result.size
+    # but anly 3 of them have this field set
+    assert_equal 3, hobbies.compact.size
+  end
+
+  def test_10_select_by
+    assert_equal 2, Client.select_all_by_hobby('flowers').size
+    assert_equal 2, Client.select_all_by_hobby_and_country('flowers', 'Russia').size
+    assert_equal ['Putin'], Client.select_by_post_and_expiration('president','2008')['name']
+  end
   
-  
-  def test_09_save_and_put
+  def test_11_save_and_put
     putin = Client.find_by_name('Putin')
     putin.reload
     putin['hobby'] = 'ski'
@@ -194,7 +233,7 @@ class TestSdb < Test::Unit::TestCase
     assert ['dogs', 'ski'], new_putin['hobby'].sort
   end
 
-  def test_10_save_and_put_attributes
+  def test_12_save_and_put_attributes
     putin = Client.find_by_name('Putin')
     putin.reload
     # SAVE method (replace values)
@@ -220,12 +259,16 @@ class TestSdb < Test::Unit::TestCase
     assert ['english', 'german', 'russian'], new_putin['language'].sort
   end
   
-  def test_11_delete
+  def test_13_delete
     putin = Client.find_by_name('Putin')
     putin.reload
     # --- delete_values
+    # remove an unknown attribute
+    # should return an empty hash
+    assert_equal( {}, putin.delete_values('undefined_attribute' => 'ohoho'))
     # remove 2 languages
-    putin.delete_values('language' => ['english', 'german'])
+    lang_hash = {'language' => ['english', 'german']}
+    assert_equal lang_hash, putin.delete_values(lang_hash)
     wait SDB_DELAY, 'test 11: after put_attributes'
     # now Putin must know only russian lang
     new_putin = Client.find_by_name('Putin')
@@ -245,7 +288,7 @@ class TestSdb < Test::Unit::TestCase
     assert_nil Client.find_by_name('Putin')
   end
   
-  def test_12_delete_domain
+  def test_14_delete_domain
     assert Client.delete_domain
     wait SDB_DELAY, 'test 12: after delete domain'
     assert_raise(Rightscale::AwsError) do 

data/test/sdb/test_right_sdb.rb

@@ -134,22 +134,40 @@ class TestSdb < Test::Unit::TestCase
     # check that the request has correct signature version
     assert sdb.last_request.path.include?('SignatureVersion=0')
   end 
-  
-  def test_10_array_of_attrs
+
+  def test_10_signature_version_1
+    sdb = Rightscale::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
+    sdb = Rightscale::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
+      domains = sdb.list_domains
+    end
+    assert domains
+  end
+
+  def test_12_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_11_zero_len_attrs
+  def test_13_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_12_nil_attrs
+  def test_14_nil_attrs
     item = 'nils'
     res = nil
     assert_nothing_thrown do
@@ -163,7 +181,7 @@ class TestSdb < Test::Unit::TestCase
     assert_not_nil(res[:attributes]['three'][0])
   end
   
-  def test_13_url_escape
+  def test_15_url_escape
     item = 'urlescapes'
     content = {:a=>"one & two & three",
                :b=>"one ? two / three"}
@@ -174,7 +192,7 @@ class TestSdb < Test::Unit::TestCase
     assert_equal(content[:b], res[:attributes]['b'][0])
   end
   
-  def test_14_put_attrs_by_post
+  def test_16_put_attrs_by_post
     item = 'reqgirth'
     i = 0
     sa = ""
@@ -184,15 +202,46 @@ class TestSdb < Test::Unit::TestCase
     end
     @sdb.put_attributes(@domain, item, {:a => sa, :b => sa, :c => sa, :d => sa, :e => sa})
   end
-  
+
+  def test_20_query_with_atributes
+    response = @sdb.query_with_attributes(@domain)
+    # convers response to a hash representation
+    items = {};
+    response[:items].each{ |item| items.merge!(item) }
+    # check we have receied all 5 items each full of attributes
+    assert_equal 5, items.keys.size
+    assert items['toys'].size > 0
+    assert items['nils'].size > 0
+    assert items['urlescapes'].size > 0
+    assert items['multiples'].size > 0
+    assert items['reqgirth'].size > 0
+    # fetch only Jon's attributes from all items
+    response = @sdb.query_with_attributes(@domain,['Jon'])
+    items = {};
+    response[:items].each{ |item| items.merge!(item) }
+    # check we have receied all 5 items
+    # check we have receied all 5 items, but only 'toys' has attributes
+    puts items.inspect
+    assert_equal 2, items['toys']['Jon'].size
+    assert_equal 0, items['nils'].size
+    assert_equal 0, items['urlescapes'].size
+    assert_equal 0, items['multiples'].size
+    assert_equal 0, items['reqgirth'].size
+    # kust Jurgen's attriburs
+    response = @sdb.query_with_attributes(@domain,['Jurgen'], "['Jurgen'='piglet']")
+    items = {};
+    response[:items].each{ |item| items.merge!(item) }
+    # check we have receied an only item
+    assert_equal 1, items.keys.size
+    assert_equal ["chickabiddy", "kitten", "piglet", "puppy"], items['toys']['Jurgen'].sort
+  end
+
   # Keep this test last, because it deletes the domain...
-  def test_20_delete_domain
+  def test_21_delete_domain
     assert @sdb.delete_domain(@domain), 'delete_domain fail'
     wait SDB_DELAY, 'after domain deletion'
     # check that domain does not exist
     assert !@sdb.list_domains[:domains].include?(@domain)
   end
   
-  
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: right_aws
 version: !ruby/object:Gem::Version 
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors: 
 - RightScale, Inc.
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-21 00:00:00 -08:00
+date: 2009-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,10 +20,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.2.4
     version: 
 description: "== DESCRIPTION:  The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.  These gems have been used in production by RightScale since late 2006 and are being maintained to track enhancements made by Amazon.  The RightScale AWS gems comprise:  - RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud) and the associated EBS (Elastic Block Store) - RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service) - RightAws::Sqs and RightAws::SqsInterface -- interface to first-generation Amazon SQS (Simple Queue Service) (API version 2007-05-01) - RightAws::SqsGen2 and RightAws::SqsGen2Interface -- interface to second-generation Amazon SQS (Simple Queue Service) (API version 2008-01-01) - RightAws::SdbInterface and RightAws::ActiveSdb -- interface to Amazon SDB (SimpleDB) - RightAws::AcfInterface -- interface to Amazon CloudFront, a content distribution service  == FEATURES:"
-email: support@rightscale.com
+email: rubygems@rightscale.com
 executables: []
 
 extensions: []
@@ -89,10 +89,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: rightaws
+rubyforge_project: rightscale
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Interface classes for the Amazon EC2, SQS, and S3 Web Services
+summary: Interface classes for the Amazon EC2/EBS, SQS, S3, SDB, and ACF Web Services
 test_files: 
 - test/ts_right_aws.rb