swirl 1.5.3 → 1.6.0

data/lib/swirl/ec2.rb

@@ -56,22 +56,28 @@ module Swirl
     #   ec2.call("DescribeInstances")
     #   ec2.call("TerminateInstances", "InstanceId" => ["i-1234", "i-993j"]
     #
-    def call(action, query={})
-      code, data = call!(action, expand(query))
-
-      case code
-      when 200
-        compact(data)
-      when 400...500
-        messages = Array(data["Response"]["Errors"]).map {|_, e| e["Message"] }
-        raise InvalidRequest, messages.join(",")
-      else
-        msg = "unexpected response #{code} -> #{data.inspect}"
-        raise InvalidRequest, msg
+    def call(action, query={}, &blk)
+      call!(action, expand(query)) do |code, data|
+        case code
+        when 200
+          response = compact(data)
+        when 400...500
+          messages = Array(data["Response"]["Errors"]).map {|_, e| e["Message"] }
+          raise InvalidRequest, messages.join(",")
+        else
+          msg = "unexpected response #{code} -> #{data.inspect}"
+          raise InvalidRequest, msg
+        end
+
+        if blk
+          blk.call(response)
+        else
+          response
+        end
       end
     end
 
-    def call!(action, query={})
+    def call!(action, query={}, &blk)
       # Hard coding this here until otherwise needed
       method = "POST"
 
@@ -85,17 +91,17 @@ module Swirl
       body = compile_sorted_form_data(query)
       body += "&" + ["Signature", compile_signature(method, body)].join("=")
 
-      response = post(body)
+      post(body) do |code, xml|
+        if ENV["SWIRL_LOG"]
+          puts response.body
+        end
 
-      if ENV["SWIRL_LOG"]
-        puts response.body
+        data = Crack::XML.parse(xml)
+        blk.call([code, data])
       end
-
-      data = Crack::XML.parse(response.body)
-      [response.code.to_i, data]
     end
 
-    def post(body)
+    def post(body, &blk)
       headers = { "Content-Type" => "application/x-www-form-urlencoded" }
 
       http = Net::HTTP.new(@url.host, @url.port)
@@ -105,7 +111,8 @@ module Swirl
       request = Net::HTTP::Post.new(@url.request_uri, headers)
       request.body = body
 
-      http.request(request)
+      response = http.request(request)
+      blk.call(response.code.to_i, response.body)
     end
 
     def inspect

data/lib/swirl/ec2/em.rb

@@ -0,0 +1,21 @@
+require 'swirl/ec2'
+require 'em-http'
+
+module Swirl
+  class EC2
+    def post(body, &blk)
+      headers = { "Content-Type" => "application/x-www-form-urlencoded" }
+
+      http = EM::HttpRequest.new(@url.to_s)
+      req  = http.post(:head => headers, :body => body)
+
+      req.callback do
+        blk.call(req.response_header.status, req.response)
+      end
+
+      req.errback do
+        raise "Invalid HTTP Request: #{@url}\n"+req.response
+      end
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 5
-  - 3
-  version: 1.5.3
+  - 6
+  - 0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 -08:00
+date: 2011-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,7 @@ files:
 - LICENSE
 - README.md
 - list-types
+- lib/swirl/ec2/em.rb
 - lib/swirl/ec2.rb
 - lib/swirl/helpers.rb
 - lib/swirl.rb