happening 0.0.4 → 0.0.5

data/lib/happening/s3/item.rb

@@ -33,17 +33,17 @@ module Happening
         Happening::S3::Request.new(:get, url, request_options).execute
       end
       
-      def put(data, request_options = {})
+      def put(data, request_options = {}, &blk)
         permissions = options[:permissions] != 'private' ? {'x-amz-acl' => options[:permissions] } : {}
         headers = needs_to_sign? ? aws.sign("PUT", path, permissions.update({'url' => path})) : {}
-        
+        request_options[:on_success] = blk if blk
         request_options.update(:headers => headers, :data => data)
         Happening::S3::Request.new(:put, url, request_options).execute
       end
       
-      def delete(request_options = {})
+      def delete(request_options = {}, &blk)
         headers = needs_to_sign? ? aws.sign("DELETE", path, {'url' => path}) : {}
-        
+        request_options[:on_success] = blk if blk
         request_options.update(:headers => headers)
         Happening::S3::Request.new(:delete, url, request_options).execute
       end

data/test/s3/item_test.rb

@@ -176,6 +176,34 @@ class ItemTest < Test::Unit::TestCase
         end
       end
       
+      should "support direct blocks" do
+        EventMachine::MockHttpRequest.register('https://bucket.s3.amazonaws.com:443/the-key', :delete, {
+           "Authorization"=>"AWS abc:nvkrlq4wor1qbFXZh6rHnAbiRjk=", 
+           'date' => @time, 
+           'url' => "/bucket/the-key"}, fake_response("data-here"))
+        
+        called = false
+        data = nil
+        @item = Happening::S3::Item.new('bucket', 'the-key', :aws_access_key_id => 'abc', :aws_secret_access_key => '123')
+        run_in_em_loop do
+          @item.delete do |http| 
+            called = true
+            data = http.response
+          end
+          
+          EM.add_timer(1) {
+            assert called
+            assert_equal "data-here\n", data
+            EM.stop_event_loop
+            assert_equal 1, EventMachine::MockHttpRequest.count('https://bucket.s3.amazonaws.com:443/the-key', :delete, {
+              "Authorization"=>"AWS abc:nvkrlq4wor1qbFXZh6rHnAbiRjk=", 
+              'date' => @time, 
+              'url' => "/bucket/the-key"})
+          }
+          
+        end
+      end
+      
       should "handle re-direct" do
         EventMachine::MockHttpRequest.register('https://bucket.s3.amazonaws.com:443/the-key', :delete, {
            "Authorization"=>"AWS abc:nvkrlq4wor1qbFXZh6rHnAbiRjk=", 
@@ -250,6 +278,34 @@ class ItemTest < Test::Unit::TestCase
         end
       end
       
+      should "support direct blocks" do
+        EventMachine::MockHttpRequest.register('https://bucket.s3.amazonaws.com:443/the-key', :put, {
+           "Authorization"=>"AWS abc:lZMKxGDKcQ1PH8yjbpyN7o2sPWg=", 
+           'date' => @time, 
+           'url' => "/bucket/the-key"}, fake_response("data-here"))
+        
+        called = false
+        data = nil
+        @item = Happening::S3::Item.new('bucket', 'the-key', :aws_access_key_id => 'abc', :aws_secret_access_key => '123')
+        run_in_em_loop do
+          @item.put('upload me') do |http| 
+            called = true
+            data = http.response
+          end
+          
+          EM.add_timer(1) {
+            assert called
+            assert_equal "data-here\n", data
+            EM.stop_event_loop
+            assert_equal 1, EventMachine::MockHttpRequest.count('https://bucket.s3.amazonaws.com:443/the-key', :put, {
+              "Authorization"=>"AWS abc:lZMKxGDKcQ1PH8yjbpyN7o2sPWg=", 
+              'date' => @time, 
+              'url' => "/bucket/the-key"})
+          }
+          
+        end
+      end
+      
       should "set the desired permissions" do
        EventMachine::MockHttpRequest.register('https://bucket.s3.amazonaws.com:443/the-key', :put, {
          "Authorization"=>"AWS abc:cqkfX+nC7WIkYD+yWaUFuoRuePA=", 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: happening
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jonathan Weiss
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 +01:00
+date: 2010-02-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency