raws 0.0.10 → 0.0.11

data/spec/raws/sdb/model_spec.rb

@@ -1,43 +1,138 @@
-require 'spec/spec_config'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 class SDBModel
   include RAWS::SDB::Model
-  self.domain_name = RAWS_SDB_DOMAIN
+  self.domain_name = RAWS_SDB_DOMAINS.first
 end
 
 describe RAWS::SDB::Model do
   describe 'class' do
+    before do
+      SDBModel.delete('1')
+      SDBModel.delete('2')
+      SDBModel.delete('3')
+
+      SDBModel.put('1', 'a' => '10')
+      SDBModel.put('2', 'b' => '10')
+      SDBModel.put('3', 'c' => '10')
+    end
+
+    after do
+      SDBModel.delete('1')
+      SDBModel.delete('2')
+      SDBModel.delete('3')
+    end
+
     it 'methods' do
       %w'
         create_domain
         delete_domain
+        domain_metadata
+        metadata
+        get_attributes
+        get
+        put_attributes
+        put
+        batch_put_attributes
+        batch_put
+        delete_attributes
+        delete
+
+        domain_name
+
+        domain
         select
         all
-        generate_id
+        find
+        create_id
       '.each do |val|
         SDBModel.should respond_to val.to_sym
       end
     end
 
     it 'domain_name' do
-      SDBModel.domain_name.should == RAWS_SDB_DOMAIN
+      SDBModel.domain_name.should == RAWS_SDB_DOMAINS.first
     end
-  end
 
-  describe 'object' do
-    before do
-      @model = SDBModel.new
+    it 'get, put & delete' do
+      SDBModel.get('1').should == {'a' => '10'}
+      SDBModel.get('2').should == {'b' => '10'}
+      SDBModel.get('3').should == {'c' => '10'}
+
+      SDBModel.put('1', 'a' => '20', 'b' => '10')
+      SDBModel.get('1').should == {'a' => ['10', '20'], 'b' => '10'}
+
+      SDBModel.delete('1')
+      SDBModel.delete('2')
+      SDBModel.delete('3')
+
+      SDBModel.get('1').should be_nil
+      SDBModel.get('2').should be_nil
+      SDBModel.get('3').should be_nil
+    end
+
+    it 'batch_put' do
+      SDBModel.batch_put(
+        '1' => {'a' => '20', 'b' => '10'},
+        '2' => {'b' => '20'},
+        '3' => {'c' => '20'}
+      )
+
+      SDBModel.get('1').should == {'a' => ['10', '20'], 'b' => '10'}
+      SDBModel.get('2').should == {'b' => ['10', '20']}
+      SDBModel.get('3').should == {'c' => ['10', '20']}
+    end
+
+    it 'all' do
+      SDBModel.all.each do |model|
+        model.should be_instance_of SDBModel
+      end
+    end
+
+    it 'find' do
+      model = SDBModel.find('1')
+      model.should be_instance_of SDBModel
+
+      model = SDBModel.find('0')
+      model.should be_nil
     end
+  end
 
+  describe 'object' do
     it 'methods' do
+      model = SDBModel.new
       %w'
+        create_id
+        exists?
         []
         []=
         delete
         save
       '.each do |val|
-        @model.should respond_to val.to_sym
+        model.should respond_to val.to_sym
       end
     end
+
+    it 'operations' do
+      model = SDBModel.find('0')
+      model.should be_nil
+
+      model = SDBModel.new
+      model['a'] = '1'
+      model['b'] = '2'
+      model['c'] = '3'
+      model.save
+      id = model.id
+
+      model = SDBModel.find(id)
+      model['a'].should == '1'
+      model['b'].should == '2'
+      model['c'].should == '3'
+
+      model.delete
+
+      model = SDBModel.find(id)
+      model.should be_nil
+    end
   end
 end

data/spec/raws/sdb_spec.rb

@@ -2,11 +2,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe RAWS::SDB do
   before :all do
+=begin
     RAWS_SDB_DOMAINS.each do |name|
       RAWS::SDB.create_domain(name)
     end
     puts '[sleep 60 secs]'
     sleep 60
+=end
     @domain_name = RAWS_SDB_DOMAINS.first
     RAWS::SDB[@domain_name].put(
       '100', 'a' => 10
@@ -24,6 +26,7 @@ describe RAWS::SDB do
     )
   end
 
+=begin
   after :all do
     RAWS_SDB_DOMAINS.each do |name|
       RAWS::SDB.delete_domain(name)
@@ -31,22 +34,28 @@ describe RAWS::SDB do
     puts '[sleep 60 secs]'
     sleep 60
   end
+=end
 
   describe 'class' do
     it 'methods' do
       %w'
+        http
         create_domain
         delete_domain
-        metadata
-        list
-        domains
+        domain_metadata
+        list_domains
         each
+        domains
         []
         select
         all
+        get_attributes
         get
+        put_attributes
         put
+        batch_put_attributes
         batch_put
+        delete_attributes
         delete
       '.each do |val|
         RAWS::SDB.should respond_to val.to_sym
@@ -59,8 +68,8 @@ describe RAWS::SDB do
     it 'delete_domain' do
     end
 
-    it 'metadata' do
-      data = RAWS::SDB.metadata(@domain_name)
+    it 'domain_metadata' do
+      data = RAWS::SDB.domain_metadata(@domain_name)
       data.should have_key('Timestamp')
       data.should have_key('ItemCount')
       data.should have_key('AttributeValueCount')
@@ -70,25 +79,13 @@ describe RAWS::SDB do
       data.should have_key('AttributeNamesSizeBytes')
     end
 
-    it 'list' do
-      data = RAWS::SDB.list
-      data.should have_key('DomainName')
-
-      data = RAWS::SDB.list(nil, 1)
-      data['DomainName'].should be_kind_of(Array)
-      data['DomainName'].size.should == 1
-      data['DomainName'].first.should be_kind_of(String)
-      data.should have_key('NextToken')
-    end
-
-    it 'domains' do
-      domains = RAWS::SDB.domains
-      domains.should have_key('Domains')
-
-      data = RAWS::SDB.domains(nil, 1)
+    it 'list_domains' do
+      data = RAWS::SDB.list_domains
+      data.should have_key('Domains')
       data['Domains'].should be_kind_of(Array)
+
+      data = RAWS::SDB.list_domains('MaxNumberOfDomains' => 1)
       data['Domains'].size.should == 1
-      data['Domains'].first.should be_kind_of(RAWS::SDB)
       data.should have_key('NextToken')
     end
 
@@ -114,19 +111,7 @@ describe RAWS::SDB do
       end
     end
 
-    it 'all' do
-      RAWS::SDB[@domain_name].all do |val|
-        val.first.should be_kind_of(String)
-        val.last.should be_kind_of(Hash)
-      end
-
-      RAWS::SDB[@domain_name].all.filter('b = ?', 20) do |val|
-        val.first.should be_kind_of(String)
-        val.last.should be_kind_of(Hash)
-      end
-    end
-
-    it 'get' do
+    it 'get_attributes' do
       RAWS::SDB[@domain_name].get('000').should be_nil
 
       data = RAWS::SDB[@domain_name].get('100')
@@ -139,64 +124,64 @@ describe RAWS::SDB do
       data.should == {'a' => ['10', '20', '30'], 'b' => '20', 'c' => '30'}
     end
 
-    it 'put, get & delete' do
-      RAWS::SDB[@domain_name].put('10', 'a' => [1])
-      RAWS::SDB[@domain_name].put('10', 'a' => 2)
+    it 'put_attributes, get_attributes & delete_attributes' do
+      RAWS::SDB[@domain_name].put_attributes('10', 'a' => [1])
+      RAWS::SDB[@domain_name].put_attributes('10', 'a' => 2)
 
       5.times do
-        data = RAWS::SDB[@domain_name].get('10')
+        data = RAWS::SDB[@domain_name].get_attributes('10')
         if data == {'a' => ['1', '2']}
           data.should == {'a' => ['1', '2']}
           break;
         end
       end
 
-      RAWS::SDB[@domain_name].delete('10')
+      RAWS::SDB[@domain_name].delete_attributes('10')
 
       5.times do
-        data = RAWS::SDB[@domain_name].get('10')
+        data = RAWS::SDB[@domain_name].get_attributes('10')
         unless data
           data.should be_nil
         end
       end
     end
 
-    it 'batch_put & delete' do
-      RAWS::SDB[@domain_name].batch_put(
+    it 'batch_put_attributes & delete_attributes' do
+      RAWS::SDB[@domain_name].batch_put_attributes(
         "1" => {"a"=>["10"]},
         "2" => {"a"=>["20"]},
         "3" => {"a"=>["30"]}
       )
 
       5.times do
-        data = RAWS::SDB[@domain_name].get('1')
+        data = RAWS::SDB[@domain_name].get_attributes('1')
         if data
           data.should == {'a' => '10'}
-          RAWS::SDB[@domain_name].delete('1')
+          RAWS::SDB[@domain_name].delete_attributes('1')
           break
         end
       end
 
       5.times do
-        data = RAWS::SDB[@domain_name].get('2')
+        data = RAWS::SDB[@domain_name].get_attributes('2')
         if data
           data.should == {'a' => '20'}
-          RAWS::SDB[@domain_name].delete('2')
+          RAWS::SDB[@domain_name].delete_attributes('2')
           break
         end
       end
 
       5.times do
-        data = RAWS::SDB[@domain_name].get('3')
+        data = RAWS::SDB[@domain_name].get_attributes('3')
         if data
           data.should == {'a' => '30'}
-          RAWS::SDB[@domain_name].delete('3')
+          RAWS::SDB[@domain_name].delete_attributes('3')
           break
         end
       end
 
       5.times do
-        data = RAWS::SDB[@domain_name].get('1')
+        data = RAWS::SDB[@domain_name].get_attributes('1')
         unless data
           data.should be_nil
           break
@@ -204,7 +189,7 @@ describe RAWS::SDB do
       end
 
       5.times do
-        data = RAWS::SDB[@domain_name].get('2')
+        data = RAWS::SDB[@domain_name].get_attributes('2')
         unless data
           data.should be_nil
           break
@@ -212,7 +197,7 @@ describe RAWS::SDB do
       end
 
       5.times do
-        data = RAWS::SDB[@domain_name].get('3')
+        data = RAWS::SDB[@domain_name].get_attributes('3')
         unless data
           data.should be_nil
           break
@@ -231,13 +216,19 @@ describe RAWS::SDB do
       %w'
         create_domain
         delete_domain
+        domain_metadata
         metadata
         select
         all
+        get_attributes
         get
+        put_attributes
         put
+        batch_put_attributes
         batch_put
+        delete_attributes
         delete
+        <=>
       '.each do |val|
         @sdb.should respond_to val.to_sym
       end

data/spec/raws/sqs_spec.rb

@@ -1,6 +1,7 @@
-require 'spec/spec_config'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe RAWS::SQS do
+=begin
   before :all do
     begin
       RAWS::SQS.create_queue(RAWS_SQS_QUEUE)
@@ -20,38 +21,36 @@ describe RAWS::SQS do
       d e
     end
   end
+=end
 
   describe 'class' do
     it 'methods' do
       %w'
+        http
         queue_url
         create_queue
         delete_queue
-        list
-        queues
+        list_queues
         each
+        queues
         []
-        get_attrs
-        set_attrs
+        get_queue_attributes
+        set_queue_attributes
+        send_message
         send
+        receive_message
         receive
+        change_message_visibility
+        delete_message
+        add_permission
+        remove_permission
       '.each do |val|
         RAWS::SQS.should respond_to val.to_sym
       end
     end
 
-    it 'list' do
-      RAWS::SQS.list
-    end
-
-    it 'queues' do
-      RAWS::SQS.queues.each do |queue|
-        queue.should be_kind_of RAWS::SQS
-      end
-    end
-
-    it 'each' do
-      RAWS::SQS.each do |queue|
+    it 'list_queues' do
+      RAWS::SQS.list_queues.each do |queue|
         queue.should be_kind_of RAWS::SQS
       end
     end
@@ -68,21 +67,27 @@ describe RAWS::SQS do
 
     it 'methods' do
       %w'
+        queue_url
+        queue_name
         delete_queue
-        get_attrs
-        set_attrs
+        get_queue_attributes
+        set_queue_attributes
+        send_message
         send
+        receive_message
         receive
+        change_message_visibility
         delete_message
         add_permission
         remove_permission
+        <=>
       '.each do |val|
         @queue.should respond_to val.to_sym
       end
     end
 
-    it 'get_attrs' do
-      attrs = @queue.get_attrs
+    it 'get_queue_attributes' do
+      attrs = @queue.get_queue_attributes
       %w'
         ApproximateNumberOfMessages
         LastModifiedTimestamp
@@ -92,23 +97,23 @@ describe RAWS::SQS do
         attrs.should have_key val
       end
 
-      attrs = @queue.get_attrs 'VisibilityTimeout'
+      attrs = @queue.get_queue_attributes 'VisibilityTimeout'
       attrs.should have_key 'VisibilityTimeout'
     end
 
-    it 'set_attrs' do
-      @queue.set_attrs 'VisibilityTimeout' => 60
+    it 'set_queue_attributes' do
+      @queue.set_queue_attributes 'VisibilityTimeout' => 60
       5.times do
-        attrs = @queue.get_attrs 'VisibilityTimeout'
+        attrs = @queue.get_queue_attributes 'VisibilityTimeout'
         if attrs['VisibilityTimeout'] == 60
           attrs['VisibilityTimeout'].should == 60
           break
         end
       end
 
-      @queue.set_attrs 'VisibilityTimeout' => 30
+      @queue.set_queue_attributes 'VisibilityTimeout' => 30
       5.times do
-        attrs = @queue.get_attrs 'VisibilityTimeout'
+        attrs = @queue.get_queue_attributes 'VisibilityTimeout'
         if attrs['VisibilityTimeout'] == 30
           attrs['VisibilityTimeout'].should == 30
           break
@@ -116,14 +121,14 @@ describe RAWS::SQS do
       end
     end
 
-    it 'send, receive & delete' do
+    it 'send_message, receive_message & delete_message' do
       5.times do |i|
-        @queue.send(i)
+        @queue.send_message(i)
       end
 
       i = 1
       while i <= 5 
-        @queue.receive.each do |msg|
+        @queue.receive_message.each do |msg|
           msg.should be_kind_of RAWS::SQS::Message
           msg.delete
           i += 1
@@ -133,17 +138,17 @@ describe RAWS::SQS do
 
     it 'change_message_visibility' do
       5.times do |i|
-        p i
-        @queue.receive.each do |msg|
+        #p i
+        @queue.receive_message.each do |msg|
           msg.delete
         end
         sleep 5
       end
-      @queue.send('change message visibility')
+      @queue.send_message('change message visibility')
 
       msg_id, time = nil, nil
       loop do
-        if msg = @queue.receive.first
+        if msg = @queue.receive_message.first
           #p Time.now
           #p msg
           unless time
@@ -156,7 +161,7 @@ describe RAWS::SQS do
               break
             end
           end
-          msg.visibility = 10
+          msg.change_visibility(10)
         end
         #p 'sleep'
         sleep 5