em_s3 0.0.3 → 0.0.4

data/lib/em_s3/version.rb

@@ -1,3 +1,3 @@
 module EmS3
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/s3_agent.rb

@@ -1,4 +1,4 @@
-class S3Agent < EM::Queue
+class S3Agent
   include Singleton
   # Refer to http://eventmachine.rubyforge.org/EventMachine/Queue.html for interface details
   # This agent class solves the following problem
@@ -11,6 +11,10 @@ class S3Agent < EM::Queue
   def initialize
     @public_key = nil
     @private_key = nil
+    setup
+  end
+
+  def setup
     @obj_pools = {}
   end
 
@@ -20,17 +24,6 @@ class S3Agent < EM::Queue
     self
   end
 
-  # Called from clients if due to some reason, they skip over the write part
-  # @param [String] bucket
-  #   The name of the bucket
-  # @param [String] object
-  #   The name of the object's key
-  # @return [true]
-  def revoke_service(bucket, object)
-    @obj_pools.delete("#{bucket}:#{object}")
-    true
-  end
-
   # Requests any of :get or :put from S3.
   # If the object is not being processed now, service it immediately.
   # If not, push it in a queue and wait for the reactor to take it through.
@@ -43,27 +36,18 @@ class S3Agent < EM::Queue
   # @param [String] value
   #   The object's value
   # @return [true]
-  def request_service(method, bucket, object, value = nil, &blk)
-    # Allow `put`s to go through.
-    # For `get`s, check if the object is not in use and only then, allow to pass though
-    if (!@obj_pools["#{bucket}:#{object}"]) || (method == :put)
-      # Some client is using the agent.
-      @obj_pools["#{bucket}:#{object}"] = true
+  def request_service(method, *args)
+    setup
+    self.send(method.to_sym, *args)
+  end
+
+  def method_missing(method, *args)
+    params = args[0]
+    q = (@obj_pools["#{params[:bucket]}:#{params[:object]}"] ||= EM::Queue.new)
+    q.push({:method => method, :params => params})
+    q.pop{|request|
       s3i = S3Interface.new(@public_key, @private_key)
-      s3i.callback{|resp, status|
-        # Unblock the other client only if this is a write
-        revoke_service(bucket, object) if method == :put
-        yield resp, status if block_given?
-      }
-      method == :get ? s3i.get_object(bucket, object) : s3i.put_object(bucket, object, value)
-    else
-      push({:bucket => bucket, :object => object, :value => value})
-      pop{|request|
-        request_service(request[:bucket], request[:object], request[:value]){|resp, status|
-          yield resp, status if block_given?
-        }
-      }
-    end
-    true
+      s3i.send(method, params)
+    }
   end
 end

data/lib/s3_interface.rb

@@ -19,6 +19,7 @@ class S3Interface
       if (@num_tries += 1) < retry_count
         retry_request
       else
+        @cb.call resp, status if @cb
         succeed resp, status
       end
     }
@@ -34,7 +35,12 @@ class S3Interface
   # @param [String] content_type
   #   The value's MIME type
   # @return [self]
-  def put_object(bucket, object, value, content_type = 'binary/octet-stream')
+  def put(params)
+    bucket = params[:bucket]
+    object = params[:object]
+    value = params[:value]
+    content_type = params[:content_type]
+    cb = params[:cb]
     date = generate_date
     sign_string = generate_signed_string('PUT', 'private', bucket, object, content_type)
     signature = generate_signature(sign_string)
@@ -43,6 +49,7 @@ class S3Interface
     path = "/" << object
 
     @req_options = {:method => :put, :head => headers, :path => path, :body => value}
+    @cb = cb if cb
     @bucket = bucket
     try_request
     self
@@ -54,7 +61,11 @@ class S3Interface
   # @param [String] object
   #   The name of the object's key
   # @return [self]
-  def get_object(bucket, object)
+  def get(params)
+    bucket = params[:bucket]
+    object = params[:object]
+    content_type = params[:content_type]
+    cb = params[:cb]
     date = generate_date
     sign_string = generate_signed_string('GET', nil, bucket, object, 'text/plain')
     signature = generate_signature(sign_string)
@@ -63,6 +74,7 @@ class S3Interface
     path = "/" << object
 
     @req_options = {:method => :get, :head => headers, :path => path}
+    @cb = cb if cb
     @bucket = bucket
     try_request
     self
@@ -70,7 +82,7 @@ class S3Interface
 
   private
 
-  # Perhaps an inappropriate method name, sonce we call it even the first time
+  # Perhaps an inappropriate method name, since we call it even the first time
   def retry_request
     # Explore persistent connections from within AWS
     s3_conn = EM::HttpRequest.new("http://#{@bucket}.s3.amazonaws.com")
@@ -78,6 +90,7 @@ class S3Interface
     s3_req = s3_conn.send(req_method, @req_options)
     s3_req.callback{|cli|
       if cli.response_header.http_status < 500
+        @cb.call cli.response, cli.response_header.http_status if @cb
         self.succeed cli.response, cli.response_header.http_status
       else # Some S3 issue
         self.fail cli.response, cli.response_header.http_status

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em_s3
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request