aws 2.1.8 → 2.1.9

data/lib/aws.rb

@@ -24,4 +24,4 @@ require 'sqs/right_sqs_interface'
 require 'sqs/right_sqs'
 require 'sdb/right_sdb_interface'
 require 'acf/right_acf_interface'
-require 'elb/right_elb_interface'
+require 'elb/elb_interface'

data/lib/elb/{right_elb_interface.rb → elb_interface.rb}

@@ -128,7 +128,7 @@ module Aws
             @logger.info("Registering Instances #{instance_ids.join(',')} with Load Balancer '#{name}'")
 
             link = generate_request("RegisterInstancesWithLoadBalancer", params)
-            resp = request_info(link, QElbRegisterInstanceParser.new(:logger => @logger))
+            resp = request_info(link, QElbRegisterInstancesParser.new(:logger => @logger))
 
         rescue Exception
             on_exception
@@ -147,12 +147,13 @@ module Aws
             @logger.info("Deregistering Instances #{instance_ids.join(',')} from Load Balancer '#{name}'")
 
             link = generate_request("DeregisterInstancesFromLoadBalancer", params) # Same response as register I believe
-            resp = request_info(link, QElbRegisterInstanceParser.new(:logger => @logger))
+            resp = request_info(link, QElbRegisterInstancesParser.new(:logger => @logger))
 
         rescue Exception
             on_exception
         end
 
+
         def describe_load_balancers(lparams={})
             @logger.info("Describing Load Balancers")
 
@@ -167,6 +168,30 @@ module Aws
             on_exception
         end
 
+
+        def describe_instance_health(name, instance_ids)
+            instance_ids = [instance_ids] if instance_ids.is_a?(String)
+#            @logger.info("Describing Instance Health")
+            params = {}
+            params['LoadBalancerName'] = name
+
+            i = 1
+            instance_ids.each do |l|
+                params["Instances.member.#{i}.InstanceId"] = "#{l}"
+                i += 1
+            end
+
+            @logger.info("Describing Instances Health #{instance_ids.join(',')} with Load Balancer '#{name}'")
+
+            link = generate_request("DescribeInstanceHealth", params)
+            resp = request_info(link, QElbDescribeInstancesHealthParser.new(:logger => @logger))
+
+
+        rescue Exception
+            on_exception
+        end
+
+
         def delete_load_balancer(name)
             @logger.info("Deleting Load Balancer - " + name.to_s)
 
@@ -274,28 +299,61 @@ module Aws
             end
         end
 
-        class QElbRegisterInstanceParser < AwsParser
+        class QElbRegisterInstancesParser < AwsParser
 
             def reset
-                @result = {}
+                @result = []
             end
 
+            def tagstart(name, attributes)
+#                puts 'tagstart ' + name + ' -- ' + @xmlpath
+                if (name == 'member' && @xmlpath == 'RegisterInstancesWithLoadBalancerResult/Instances/member')
+                    @member = { }
+                end
 
+            end
             def tagend(name)
                 case name
                     when 'InstanceId' then
-                        @result[:instance_id] = @text
+                        @member[:instance_id] = @text
                 end
             end
+#
         end
 
-        class QElbDeleteParser < AwsParser
+        class QElbDescribeInstancesHealthParser < AwsParser
 
             def reset
-                @result = true
+                @result = []
+            end
+
+            def tagstart(name, attributes)
+#                puts 'tagstart ' + name + ' -- ' + @xmlpath
+                if (name == 'member' && @xmlpath == 'DescribeInstanceHealthResult/InstanceStates')
+                    @member = { }
+                end
             end
 
+            def tagend(name)
+                case name
+                    when 'Description' then
+                        @member[:description] = @text
+                    when 'State' then
+                        @member[:state] = @text
+                    when 'InstanceId' then
+                        @member[:instance_id] = @text
+                    when 'ReasonCode' then
+                        @member[:reason_code] = @text
 
+                end
+            end
+#
+        end
+
+        class QElbDeleteParser < AwsParser
+            def reset
+                @result = true
+            end
         end
 
 

data/lib/right_aws.rb

@@ -46,7 +46,7 @@ require 'sqs/right_sqs_interface'
 require 'sqs/right_sqs'
 require 'sdb/right_sdb_interface'
 require 'acf/right_acf_interface'
-require 'elb/right_elb_interface'
+require 'elb/elb_interface'
 
 
 # backwards compatible.

data/lib/sdb/active_sdb.rb

@@ -343,7 +343,7 @@ module Aws
                     bunch_of_records_requested = args.size > 1 || args.first.is_a?(Array)
                     # flatten ids
                     args = args.to_a.flatten
-                    args.each { |id| cond << "id=#{self.connection.escape(id)}" }
+                    args.each { |id| cond << "itemName() = #{self.connection.escape(id)}" }
                     ids_cond = "(#{cond.join(' OR ')})"
                     # user defined :conditions to string (if it was defined)
                     options[:conditions] = build_conditions(options[:conditions])
@@ -563,7 +563,7 @@ module Aws
                         sort_by, sort_order = sort_options(options[:order])
                         conditions << (conditions.blank? ? " WHERE " : " AND ") << "(#{sort_by} IS NOT NULL)"
                     end
-                    "SELECT #{select} FROM #{from}#{conditions}#{order}#{limit}"
+                    "SELECT #{select} FROM `#{from}`#{conditions}#{order}#{limit}"
                 end
 
                 def build_conditions(conditions) # :nodoc:

data/test/elb/test_elb.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'pp'
+require File.dirname(__FILE__) + '/../test_credentials.rb'
+
+class TestEc2 < Test::Unit::TestCase
+
+    # Some of RightEc2 instance methods concerning instance launching and image registration
+    # are not tested here due to their potentially risk.
+
+  def setup
+    TestCredentials.get_credentials
+    @ec2   = Aws::Elb.new(TestCredentials.aws_access_key_id,
+                                 TestCredentials.aws_secret_access_key)
+    @key   = 'right_ec2_awesome_test_key'
+    @group = 'right_ec2_awesome_test_security_group'
+  end
+
+  def test_01_create_elb
+    
+  end
+
+  def test_02_register_instances
+    assert @ec2.create_security_group(@group,'My awesone test group'), 'Create_security_group fail'
+    group = @ec2.describe_security_groups([@group])[0]
+    assert_equal @group, group[:aws_group_name], 'Group must be created but does not exist'
+  end
+
+  def test_03_deregister_instances
+    assert @ec2.authorize_security_group_named_ingress(@group, TestCredentials.account_number, 'default')
+    assert @ec2.authorize_security_group_IP_ingress(@group, 80,80,'udp','192.168.1.0/8')
+  end
+
+  def test_04_describe_instance_health
+    assert_equal 2, @ec2.describe_security_groups([@group])[0][:aws_perms].size
+  end
+
+  def test_05_describe_elb
+    assert @ec2.revoke_security_group_IP_ingress(@group, 80,80,'udp','192.168.1.0/8')
+    assert @ec2.revoke_security_group_named_ingress(@group,
+                                                    TestCredentials.account_number, 'default')
+  end
+
+  def test_06_delete_elb
+    images = @ec2.describe_images
+    assert images.size>0, 'Amazon must have at least some public images'
+      # unknown image
+    assert_raise(Aws::AwsError){ @ec2.describe_images(['ami-ABCDEFGH'])}
+  end
+
+
+end

data/test/sdb/test_active_sdb.rb

@@ -4,10 +4,14 @@ require File.dirname(__FILE__) + '/../test_credentials.rb'
 class TestSdb < Test::Unit::TestCase
   
   DOMAIN_NAME = 'right_sdb_awesome_test_domain'
+  DASH_DOMAIN_NAME = 'right_sdb-awesome_test_domain'
   
   class Client < Aws::ActiveSdb::Base
     set_domain_name DOMAIN_NAME
   end
+  class DashClient < RightAws::ActiveSdb::Base
+    set_domain_name DASH_DOMAIN_NAME
+  end
 
   def setup
       TestCredentials.get_credentials
@@ -115,6 +119,39 @@ class TestSdb < Test::Unit::TestCase
     end
   end
 
+  def test_04b_find_all_dashed
+    # retrieve all the DB, make sure all are in place
+    clients = DashedClient.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, DashedClient.find(:all, :conditions => ["[?=?]",'post','president']).size
+    # retrieve all russian presidents (must find: Putin, Medvedev)
+    assert_equal 2, DashedClient.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, DashedClient.find(:all, :conditions => ["['post'=?] intersection ['country'=?] union ['gender'=?]",'president', 'Russia','female']).size
+    # find all rissian presidents Bushes
+    assert_equal 0, DashedClient.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, DashedClient.find(ids.first).id
+    # must find 1 rec (by one item array) and return an array
+    assert_equal ids.first, DashedClient.find([ids.first]).first.id
+    # must find 2 recs (by a list of comma separated ids) and return an array
+    assert_equal ids.size, DashedClient.find(*ids).size
+    # must find 2 recs (by an array of ids) and return an array
+    assert_equal ids.size, DashedClient.find(ids).size
+    ids << 'dummy_id'
+    # must raise an error when getting unexistent record
+    assert_raise(RightAws::ActiveSdb::ActiveSdbError) do 
+      DashedClient.find(ids)
+    end
+    # find one record by unknown id
+    assert_raise(RightAws::ActiveSdb::ActiveSdbError) do
+      DashedClient.find('dummy_id')
+    end
+  end
+
   def test_05_find_first
     # find any record
     assert Client.find(:first)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aws
 version: !ruby/object:Gem::Version 
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors: 
 - Travis Reeder
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 -08:00
+date: 2009-12-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ files:
 - lib/awsbase/support.rb
 - lib/ec2/right_ec2.rb
 - lib/ec2/right_mon_interface.rb
-- lib/elb/right_elb_interface.rb
+- lib/elb/elb_interface.rb
 - lib/right_aws.rb
 - lib/s3/right_s3.rb
 - lib/s3/right_s3_interface.rb
@@ -93,6 +93,7 @@ test_files:
 - test/ec2/test_helper.rb
 - test/ec2/test_mon.rb
 - test/ec2/test_right_ec2.rb
+- test/elb/test_elb.rb
 - test/http_connection.rb
 - test/s3/test_helper.rb
 - test/s3/test_right_s3.rb