right_aws 1.4.3 → 1.5.0

data/test/s3/test_right_s3.rb

@@ -7,8 +7,9 @@ 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'
-    @key1   = 'test/woohoo1'
+    @key1   = 'test/woohoo1/'
     @key2   = 'test1/key/woohoo2'
+    @key3   = 'test2/A%B@C_D&E?F+G=H"I'
     @s      = Rightscale::S3.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
   end
 
@@ -31,6 +32,7 @@ class TestS3 < Test::Unit::TestCase
   def test_04_put
     assert @s3.put(@bucket, @key1, RIGHT_OBJECT_TEXT, 'x-amz-meta-family'=>'Woohoo1!'), 'Put bucket fail'
     assert @s3.put(@bucket, @key2, RIGHT_OBJECT_TEXT, 'x-amz-meta-family'=>'Woohoo2!'), 'Put bucket fail'
+    assert @s3.put(@bucket, @key3, RIGHT_OBJECT_TEXT, 'x-amz-meta-family'=>'Woohoo3!'), 'Put bucket fail'
   end
   
   def test_05_get_and_get_object
@@ -39,6 +41,7 @@ class TestS3 < Test::Unit::TestCase
     assert_equal RIGHT_OBJECT_TEXT, data1[:object], "Object text must be equal to '#{RIGHT_OBJECT_TEXT}'"
     assert_equal RIGHT_OBJECT_TEXT, @s3.get_object(@bucket, @key1), "Get_object text must return '#{RIGHT_OBJECT_TEXT}'"
     assert_equal 'Woohoo1!', data1[:headers]['x-amz-meta-family'], "x-amz-meta-family header must be equal to 'Woohoo1!'"
+    assert_equal RIGHT_OBJECT_TEXT, @s3.get_object(@bucket, @key3), "Get_object text must return '#{RIGHT_OBJECT_TEXT}'"
   end
   
   def test_06_head
@@ -63,12 +66,20 @@ class TestS3 < Test::Unit::TestCase
     assert_equal 'Woohoo1!', data1[:headers]['x-amz-meta-family'], "x-amz-meta-family header must be equal to 'Woohoo1!'"
   end
   
-  def test_08_delete_folder
+  def test_08_keys
+    keys = @s3.list_bucket(@bucket).map{|b| b[:key]}
+    assert_equal keys.size, 3, "There should be 3 keys"
+    assert(keys.include? @key1)
+    assert(keys.include? @key2)
+    assert(keys.include? @key3)
+  end
+  
+  def test_09_delete_folder
     assert_equal 1, @s3.delete_folder(@bucket, 'test').size, "Only one key(#{@key1}) must be deleted!"
   end
 
 
-  def test_09_delete_bucket
+  def test_10_delete_bucket
     assert_raise(Rightscale::AwsError) { @s3.delete_bucket(@bucket) }
     assert @s3.clear_bucket(@bucket), 'Clear_bucket fail'
     assert_equal 0, @s3.list_bucket(@bucket).size, 'Bucket must be empty'
@@ -98,11 +109,11 @@ class TestS3 < Test::Unit::TestCase
     assert @s.buckets.map{|b| b.name}.include?(@bucket)
     assert bucket.keys.empty?
       # put data
-    assert bucket.put(@key1, RIGHT_OBJECT_TEXT, {'family'=>'123456'})
+    assert bucket.put(@key3, RIGHT_OBJECT_TEXT, {'family'=>'123456'})
       # get data and compare
-    assert_equal RIGHT_OBJECT_TEXT, bucket.get(@key1)
+    assert_equal RIGHT_OBJECT_TEXT, bucket.get(@key3)
       # get key object
-    key = bucket.key(@key1, true)
+    key = bucket.key(@key3, true)
     assert_equal Rightscale::S3::Key, key.class
     assert       key.exists?
     assert_equal '123456', key.meta_headers['family']
@@ -111,10 +122,10 @@ class TestS3 < Test::Unit::TestCase
   def test_22_keys
     bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
       # create first key
-    key1 = Rightscale::S3::Key.create(bucket, @key1)
-    key1.refresh
-    assert key1.exists?
-    assert_equal '123456', key1.meta_headers['family']
+    key3 = Rightscale::S3::Key.create(bucket, @key3)
+    key3.refresh
+    assert key3.exists?
+    assert_equal '123456', key3.meta_headers['family']
       # create second key
     key2 = Rightscale::S3::Key.create(bucket, @key2)
     assert !key2.refresh
@@ -162,9 +173,10 @@ class TestS3 < Test::Unit::TestCase
   
   def test_32_grant_revoke_drop
     bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
-    grantees = bucket.grantees
-      # Take one of grantees
-    grantee = grantees[0]
+      # Take 'AllUsers' grantee 
+    grantee = Rightscale::S3::Grantee.new(bucket,'http://acs.amazonaws.com/groups/global/AllUsers')
+      # Check exists?
+    assert grantee.exists?
       # Add grant as String
     assert grantee.grant('WRITE')
       # Add grants as Array
@@ -177,8 +189,19 @@ class TestS3 < Test::Unit::TestCase
     grantee.perms -= ['READ_ACP']
     grantee.apply
     assert_equal 2, grantee.perms.size
+      # Check grantee removal if it has no permissions
+    assert grantee.perms = []
+    assert grantee.apply
+    assert !grantee.exists?
+      # Check multiple perms assignment
+    assert grantee.grant 'FULL_CONTROL', 'READ', 'WRITE'
+    assert_equal ['FULL_CONTROL','READ','WRITE'].sort, grantee.perms.sort
+      # Check multiple perms removal
+    assert grantee.revoke 'FULL_CONTROL', 'WRITE'
+    assert_equal ['READ'], grantee.perms
       # check 'Drop' method
     assert grantee.drop
+    assert !grantee.exists?
     assert_equal 1, bucket.grantees.size
       # Delete bucket
     bucket.delete(true)

data/test/sdb/test_helper.rb

@@ -0,0 +1,2 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../lib/right_aws'

data/test/sdb/test_right_sdb.rb

@@ -0,0 +1,128 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestSdb < Test::Unit::TestCase
+
+  def setup
+    STDOUT.sync  = true
+    @domain = 'right_sdb_awesome_test_domain'
+    @item   = 'toys'
+    @attr   = { 'Jon' => %w{beer car} }
+    # Interface instance
+    @sdb    = Rightscale::SdbInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+  end
+
+  SDB_DELAY = 2
+  
+  def wait(delay, msg='')
+    print "waiting #{delay} seconds #{msg}"
+    while delay>0 do
+      delay -= 1
+      print '.'
+      sleep 1
+    end
+    puts
+  end
+
+  #---------------------------
+  # Rightscale::SdbInterface
+  #---------------------------
+
+  def test_00_delete_domain
+    # delete the domain to reset all the things
+    assert @sdb.delete_domain(@domain), 'delete_domain fail'
+    wait SDB_DELAY, 'after domain deletion'
+  end
+  
+  def test_01_create_domain
+    # check that domain does not exist
+    assert !@sdb.list_domains[:domains].include?(@domain)
+    # create domain
+    assert @sdb.create_domain(@domain), 'create_domain fail'
+    wait SDB_DELAY, 'after domain creation'
+    # check that we have received new domain from Amazin
+    assert @sdb.list_domains[:domains].include?(@domain)
+  end
+
+  def test_02_put_attributes
+    # put attributes
+    assert @sdb.put_attributes(@domain, @item, @attr)
+    wait SDB_DELAY, 'after putting attributes'
+  end
+  
+  def test_03_get_attributes
+    # get attributes
+    values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon'].to_a.sort
+    # compare to original list
+    assert_equal values, @attr['Jon'].sort
+  end
+
+  def test_04_add_attributes
+    # add new attribute
+    new_value = 'girls'
+    @sdb.put_attributes @domain, @item, {'Jon' => new_value}
+    wait SDB_DELAY, 'after putting attributes'
+    # get attributes ('girls' must be added to already existent attributes)
+    values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon'].to_a.sort
+    assert_equal values, (@attr['Jon'] << new_value).sort
+  end
+  
+  def test_05_replace_attributes
+    # replace attributes
+    @sdb.put_attributes @domain, @item, {'Jon' => 'pub'}, :replace
+    wait SDB_DELAY, 'after replacing attributes'
+    # get attributes (all must be removed except of 'pub')
+    values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon']
+    assert_equal values, ['pub']
+  end
+  
+  def test_06_delete_attribute
+    # add value 'girls' and 'vodka' to 'Jon'
+    @sdb.put_attributes @domain, @item, {'Jon' => ['girls','vodka']}
+    wait SDB_DELAY, 'after adding attributes'
+    # get attributes ('girls' and 'vodka' must be added 'pub')
+    values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon'].to_a.sort
+    assert_equal values, ['girls', 'pub', 'vodka']
+    # delete a single value 'girls' from attribute 'Jon'
+    @sdb.delete_attributes @domain, @item, 'Jon' => ['girls']
+    wait SDB_DELAY, 'after the deletion of attribute'
+    # get attributes ('girls' must be removed)
+    values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon']
+    assert_equal values, ['pub', 'vodka']
+    # delete all values from attribute 'Jon'
+    @sdb.delete_attributes @domain, @item, ['Jon']
+    wait SDB_DELAY, 'after the deletion of attributes'
+    # get attributes (values must be empty)
+    values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon']
+    assert_equal values, nil
+  end
+
+  def test_07_delete_item
+    @sdb.put_attributes @domain, @item, {'Jon' => ['girls','vodka']}
+    wait SDB_DELAY, 'after adding attributes'
+    # get attributes ('girls' and 'vodka' must be there)
+    values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon'].to_a.sort
+    assert_equal values, ['girls', 'vodka']
+    # delete an item
+    @sdb.delete_attributes @domain, @item
+    # get attributes (values must be empty)
+    values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon']
+    assert_equal values, nil
+  end  
+  
+  def test_08_query
+    # add some values for query
+    @sdb.put_attributes @domain, @item, {'Jon' => ['girls','vodka']}
+    wait SDB_DELAY, 'after adding attributes'
+    items = @sdb.query(@domain, ['[?=?]', 'Jon','vodka'])[:items]
+    assert_equal items.size, 1
+    assert_equal items.first, @item
+  end
+  
+  def test_09_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

data/test/ts_right_aws.rb

@@ -9,4 +9,4 @@ require 'ec2/test_right_ec2.rb'
 require 's3/test_right_s3.rb'
 require 's3/test_right_s3_stubbed.rb'
 require 'sqs/test_right_sqs.rb'
-
+require 'sdb/test_right_sdb.rb'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: right_aws
 version: !ruby/object:Gem::Version 
-  version: 1.4.3
-date: 2007-10-26 00:00:00 +04:00
+  version: 1.5.0
+date: 2008-02-11 00:00:00 -08:00
 summary: Interface classes for the Amazon EC2, SQS, and S3 Web Services
 require_paths: 
 - lib
 email: support@rightscale.com
 homepage: 
 rubyforge_project: rightaws
-description: "== DESCRIPTION:  The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, Amazon, S3, and Amazon SQS. 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) - RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service) - RightAws::Sqs and RightAws::SqsInterface -- interface to Amazon SQS (Simple Queue Service)  == FEATURES:"
+description: "== DESCRIPTION:  The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, Amazon S3, Amazon SQS, and Amazon SDB. 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) - RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service) - RightAws::Sqs and RightAws::SqsInterface -- interface to Amazon SQS (Simple Queue Service) - RightAws::SdbInterface -- interface to Amazon SDB (SimpleDB)  == FEATURES:"
 autorequire: 
 default_executable: 
 bindir: bin
@@ -40,6 +40,7 @@ files:
 - lib/ec2/right_ec2.rb
 - lib/s3/right_s3.rb
 - lib/s3/right_s3_interface.rb
+- lib/sdb/right_sdb_interface.rb
 - lib/sqs/right_sqs.rb
 - lib/sqs/right_sqs_interface.rb
 - test/ec2/test_helper.rb
@@ -47,6 +48,8 @@ files:
 - test/s3/test_helper.rb
 - test/s3/test_right_s3.rb
 - test/s3/test_right_s3_stubbed.rb
+- test/sdb/test_right_sdb.rb
+- test/sdb/test_helper.rb
 - test/sqs/test_helper.rb
 - test/sqs/test_right_sqs.rb
 - test/ts_right_aws.rb
@@ -75,7 +78,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe