right_aws 1.6.2 → 1.7.0

data/lib/sdb/right_sdb_interface.rb

@@ -55,10 +55,10 @@ module RightAws
     # see: http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/
     #
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
-      init({ :name             => 'S3', 
-             :default_host     => ENV['S3_URL'] ? URI.parse(ENV['S3_URL']).host   : DEFAULT_HOST, 
-             :default_port     => ENV['S3_URL'] ? URI.parse(ENV['S3_URL']).port   : DEFAULT_PORT, 
-             :default_protocol => ENV['S3_URL'] ? URI.parse(ENV['S3_URL']).scheme : DEFAULT_PROTOCOL }, 
+      init({ :name             => 'SDB', 
+             :default_host     => ENV['SDB_URL'] ? URI.parse(ENV['SDB_URL']).host   : DEFAULT_HOST, 
+             :default_port     => ENV['SDB_URL'] ? URI.parse(ENV['SDB_URL']).port   : DEFAULT_PORT, 
+             :default_protocol => ENV['SDB_URL'] ? URI.parse(ENV['SDB_URL']).scheme : DEFAULT_PROTOCOL }, 
            aws_access_key_id     || ENV['AWS_ACCESS_KEY_ID'], 
            aws_secret_access_key || ENV['AWS_SECRET_ACCESS_KEY'], 
            params)
@@ -144,7 +144,7 @@ module RightAws
     # (similar to ActiveRecord::Base#find using :conditions => ['query', param1, .., paramN])
     #
     def query_expression_from_array(params) #:nodoc:
-      if params
+      unless params.blank?
         query = params.shift.to_s
         query.gsub(/(\\)?(\?)/) do
           if $1 # if escaped '\?' is found - replace it by '?' without backslash

data/lib/sqs/right_sqs_gen2.rb

@@ -181,13 +181,13 @@ module RightAws
       end
 
         # Pops (and deletes) first accessible message from queue. 
-        # Returns Message instance or +nil+ it the queue is empty.
+        # Returns Message instance or +nil+ if the queue is empty.
         #
         #  queue.pop #=> #<RightAws::SqsGen2::Message:0xb7bf0884 ... >
         #
       def pop
         list = @sqs.interface.pop_messages(@url, 1)
-        return nil if list == nil
+        return nil if list.empty?
         entry = list[0]
         msg = Message.new(self, entry['MessageId'], entry['ReceiptHandle'],
                             entry['Body'], visibility)

data/test/ec2/test_right_ec2.rb

@@ -64,5 +64,5 @@ class TestEc2 < Test::Unit::TestCase
 ##      # key must be deleted already
 ##    assert_raise(Rightscale::AwsError) { @ec2.delete_key_pair(@key) }
   end
-  
+
 end

data/test/sdb/test_active_sdb.rb

@@ -0,0 +1,249 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestSdb < Test::Unit::TestCase
+  
+  DOMAIN_NAME = 'right_sdb_awesome_test_domain'
+  
+  class Client < RightAws::ActiveSdb::Base
+    set_domain_name DOMAIN_NAME
+  end
+
+  def setup
+    STDOUT.sync  = true
+    @clients = [ 
+      { 'name' => 'Bush',     'country' => 'USA',    'gender' => 'male',   'expiration' => '2009', 'post' => 'president' },
+      { 'name' => 'Putin',    'country' => 'Russia', 'gender' => 'male',   'expiration' => '2008', 'post' => 'president' },
+      { 'name' => 'Medvedev', 'country' => 'Russia', 'gender' => 'male',   'expiration' => '2012', 'post' => 'president' },
+      { 'name' => 'Mary',     'country' => 'USA',    'gender' => 'female', 'hobby' => ['patchwork', 'bundle jumping'] },
+      { 'name' => 'Sandy',    'country' => 'Russia', 'gender' => 'female', 'hobby' => ['flowers', 'cats', 'cooking'] },
+      { 'name' => 'Mary',     'country' => 'Russia', 'gender' => 'female', 'hobby' => ['flowers', 'cats', 'cooking'] } ]
+    RightAws::ActiveSdb.establish_connection(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+  end
+
+  SDB_DELAY = 3
+  
+  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
+    assert RightAws::ActiveSdb.delete_domain(DOMAIN_NAME)
+    wait SDB_DELAY, 'test 00: after domain deletion'
+  end
+  
+  def test_01_create_domain
+    # check that domain does not exist
+    assert !RightAws::ActiveSdb.domains.include?(DOMAIN_NAME)
+    # create domain
+    assert Client.create_domain
+    wait SDB_DELAY, 'test 01: after domain creation'
+    # check that we have received new domain from Amazin
+    assert RightAws::ActiveSdb.domains.include?(DOMAIN_NAME)
+  end
+
+  def test_02_create_items
+    # check that DB is empty
+    clients = Client.find(:all)
+    assert clients.blank?
+    # put some clients there
+    @clients.each do |client|
+      Client.create client
+    end
+    wait SDB_DELAY, 'test 02: after clients creation'
+    # check that DB has all the clients we just putted
+    clients = Client.find(:all)
+    assert_equal @clients.size, clients.size
+  end
+  
+  def test_03_create_and_save_new_item
+    # get the db
+    old_clients = Client.find(:all)
+    # create new client
+    new_client = Client.new('country' => 'unknown', 'dummy' => 'yes')
+    wait SDB_DELAY, 'test 03: after in-memory client creation'
+    # get the db and ensure we created the client in-memory only
+    assert_equal old_clients.size, Client.find(:all).size
+    # put the client to DB
+    new_client.save
+    wait SDB_DELAY, 'test 03: after in-memory client saving'
+    # get all db again and compare to original list
+    assert_equal old_clients.size+1, Client.find(:all).size
+  end
+
+  def test_04_find_all
+    # retrieve all the DB, make sure all are in place
+    clients = Client.find(:all)
+    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
+    # retrieve all russian presidents (must find: Putin, Medvedev)
+    assert_equal 2, Client.find(:all, :conditions => ["['post'=?] intersection ['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
+    # find all rissian presidents Bushes
+    assert_equal 0, Client.find(:all, :conditions => ["['post'=?] intersection ['country'=?] intersection ['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
+    # must find 1 rec (by one item array) and return an array
+    assert_equal ids.first, Client.find([ids.first]).first.id
+    # must find 2 recs (by a list of comma separated ids) and return an array
+    assert_equal ids.size, Client.find(*ids).size
+    # must find 2 recs (by an array of ids) and return an array
+    assert_equal ids.size, Client.find(ids).size
+    ids << 'dummy_id'
+    # must raise an error when getting unexistent record
+    assert_raise(RightAws::ActiveSdb::ActiveSdbError) do 
+      Client.find(ids)
+    end
+  end
+
+  def test_05_find_first
+    # find any record
+    assert Client.find(:first)
+    # find any president
+    assert Client.find(:first, :conditions => ["[?=?]",'post','president'])
+    # find any rissian president
+    assert Client.find(:first, :conditions => ["['post'=?] intersection ['country'=?]",'president','Russia'])
+    # find any unexistent record
+    assert_nil Client.find(:first, :conditions => ["['post'=?] intersection ['country'=?]",'president','Rwanda'])
+  end
+
+  def test_06_find_all_by_helpers
+    # find all Bushes
+    assert_equal 1, Client.find_all_by_name('Bush').size
+    # find all russian presidents
+    assert_equal 2, Client.find_all_by_post_and_country('president','Russia').size
+    # find all women in USA that love flowers
+    assert_equal 2, Client.find_all_by_gender_and_country_and_hobby('female','Russia','flowers').size
+  end
+  
+  def test_07_find_by_helpers
+    # find mr Bush
+    assert Client.find_by_name('Bush')
+    # find any russian president
+    assert Client.find_by_post_and_country('president','Russia')
+    # find Mary in Russia that loves flowers
+    assert Client.find_by_gender_and_country_and_hobby('female','Russia','flowers')
+  end
+  
+  def test_08_reload
+    putin = Client.find_by_name('Putin')
+    # attributes must be empty until reload (except 'id' field)
+    assert_nil putin['name']
+    assert_nil putin['country']
+    assert_nil putin['gender']
+    assert_nil putin['expiration']
+    assert_nil putin['post']
+    # reloaded attributes must have 5 items + id
+    putin.reload
+    assert_equal 6, putin.attributes.size
+    # check all attributes
+    assert_equal ['Putin'],     putin['name']
+    assert_equal ['Russia'],    putin['country']
+    assert_equal ['male'],      putin['gender']
+    assert_equal ['2008'],      putin['expiration']
+    assert_equal ['president'], putin['post']
+  end
+  
+  
+  def test_09_save_and_put
+    putin = Client.find_by_name('Putin')
+    putin.reload
+    putin['hobby'] = 'ski'
+    # SAVE method (replace values)
+    putin.save
+    wait SDB_DELAY, 'test 09: after saving'
+    # check that DB was updated with 'ski'
+    new_putin = Client.find_by_name('Putin')
+    new_putin.reload
+    assert ['ski'], new_putin['hobby']
+    # replace hobby
+    putin['hobby'] = 'dogs'
+    putin.save
+    wait SDB_DELAY, 'test 09: after saving'
+    # check that 'ski' in DB was replaced by 'dogs'
+    new_putin = Client.find_by_name('Putin')
+    new_putin.reload
+    assert ['dogs'], new_putin['hobby']
+    # PUT method (add values)
+    putin['hobby'] = 'ski'
+    putin.put
+    wait SDB_DELAY, 'test 09: after putting'
+    # check that 'ski' was added to 'dogs'
+    new_putin = Client.find_by_name('Putin')
+    new_putin.reload
+    assert ['dogs', 'ski'], new_putin['hobby'].sort
+  end
+
+  def test_10_save_and_put_attributes
+    putin = Client.find_by_name('Putin')
+    putin.reload
+    # SAVE method (replace values)
+    putin.save_attributes('language' => 'russian')
+    wait SDB_DELAY, 'test 10: after save_attributes'
+    # check that DB was updated with 'ski'
+    new_putin = Client.find_by_name('Putin')
+    new_putin.reload
+    assert ['russian'], new_putin['language']
+    # replace 'russian' by 'german'
+    putin.save_attributes('language' => 'german')
+    wait SDB_DELAY, 'test 10: after save_attributes'
+    # check that 'russian' in DB was replaced by 'german'
+    new_putin = Client.find_by_name('Putin')
+    new_putin.reload
+    assert ['german'], new_putin['language']
+    # PUT method (add values)
+    putin.put_attributes('language' => ['russian', 'english'])
+    wait SDB_DELAY, 'test 10: after put_attributes'
+    # now Putin must know all the languages
+    new_putin = Client.find_by_name('Putin')
+    new_putin.reload
+    assert ['english', 'german', 'russian'], new_putin['language'].sort
+  end
+  
+  def test_11_delete
+    putin = Client.find_by_name('Putin')
+    putin.reload
+    # --- delete_values
+    # remove 2 languages
+    putin.delete_values('language' => ['english', 'german'])
+    wait SDB_DELAY, 'test 11: after put_attributes'
+    # now Putin must know only russian lang
+    new_putin = Client.find_by_name('Putin')
+    new_putin.reload
+    assert ['russian'], new_putin['language'].sort
+    # --- delete_attributes
+    putin.delete_attributes('language', 'hobby')
+    wait SDB_DELAY, 'test 11: after put_attributes'
+    # trash hoddy and langs
+    new_putin = Client.find_by_name('Putin')
+    new_putin.reload
+    assert_nil new_putin['language']
+    assert_nil new_putin['hobby']
+    # --- delete item
+    putin.delete
+    wait SDB_DELAY, 'test 11: after delete item'
+    assert_nil Client.find_by_name('Putin')
+  end
+  
+  def test_12_delete_domain
+    assert Client.delete_domain
+    wait SDB_DELAY, 'test 12: after delete domain'
+    assert_raise(Rightscale::AwsError) do 
+      Client.find :all 
+    end
+  end
+    
+end

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: right_aws
 version: !ruby/object:Gem::Version 
-  version: 1.6.2
-date: 2008-03-19 00:00:00 -07:00
+  version: 1.7.0
+date: 2008-04-01 00:00:00 -07: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, 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 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 -- interface to Amazon SDB (SimpleDB)  == 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 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)  == FEATURES:"
 autorequire: 
 default_executable: 
 bindir: bin
@@ -33,31 +33,33 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- lib/right_aws.rb
 - lib/awsbase/benchmark_fix.rb
-- lib/awsbase/support.rb
 - lib/awsbase/right_awsbase.rb
+- lib/awsbase/support.rb
 - lib/ec2/right_ec2.rb
+- lib/right_aws.rb
 - lib/s3/right_s3.rb
 - lib/s3/right_s3_interface.rb
+- lib/sdb/active_sdb.rb
 - lib/sdb/right_sdb_interface.rb
 - lib/sqs/right_sqs.rb
-- lib/sqs/right_sqs_interface.rb
 - lib/sqs/right_sqs_gen2.rb
 - lib/sqs/right_sqs_gen2_interface.rb
+- lib/sqs/right_sqs_interface.rb
 - test/ec2/test_helper.rb
 - test/ec2/test_right_ec2.rb
+- test/http_connection.rb
 - 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_active_sdb.rb
 - test/sdb/test_helper.rb
+- test/sdb/test_right_sdb.rb
 - test/sqs/test_helper.rb
 - test/sqs/test_right_sqs.rb
 - test/sqs/test_right_sqs_gen2.rb
-- test/ts_right_aws.rb
 - test/test_credentials.rb
-- test/http_connection.rb
+- test/ts_right_aws.rb
 test_files: 
 - test/ts_right_aws.rb
 rdoc_options: