steamcannon-deltacloud-core 0.0.7.1-java → 0.0.7.2-java

data/lib/deltacloud/helpers/blob_stream.rb

@@ -15,37 +15,46 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-#--
-# based on the example from http://macournoyer.com/blog/2009/06/04/pusher-and-async-with-thin/
-#--
-require 'eventmachine'
-class BlobStream
-  AsyncResponse = [-1, {}, []].freeze
-  def self.call(env, credentials, params)
-    body = DeferrableBody.new
-        #Get the headers out asap. Don't specify a content-type let
-        #the client guess and if they can't they SHOULD default to
-        #'application/octet-stream' anyway as per:
-        #http://www.w3.org/Protocols/rfc2616/rfc2616-sec7.html#sec7.2.1
-    EM.next_tick { env['async.callback'].call [200, {'Content-Type' => "#{params['content_type']}", 'Content-Length' => "#{params['content_length']}"}, body] }
-    #call the driver from here. the driver method yields for every chunk of blob it receives. We then
-    #use body.call to write that chunk as received.
-    driver.blob_data(credentials, params[:bucket], params[:blob], params) {|chunk| body.call ["#{chunk}"]} #close blob_data block
-    body.succeed
-    AsyncResponse # Tells Thin to not close the connection and continue it's work on other request
+begin
+  require 'eventmachine'
+  #--
+  # based on the example from http://macournoyer.com/blog/2009/06/04/pusher-and-async-with-thin/
+  #--
+  class BlobStream
+    AsyncResponse = [-1, {}, []].freeze
+    def self.call(env, credentials, params)
+      body = DeferrableBody.new
+      #Get the headers out asap. Don't specify a content-type let
+      #the client guess and if they can't they SHOULD default to
+      #'application/octet-stream' anyway as per:
+      #http://www.w3.org/Protocols/rfc2616/rfc2616-sec7.html#sec7.2.1
+      EM.next_tick { env['async.callback'].call [200, {'Content-Type' => "#{params['content_type']}", 'Content-Length' => "#{params['content_length']}"}, body] }
+      #call the driver from here. the driver method yields for every chunk of blob it receives. We then
+      #use body.call to write that chunk as received.
+      driver.blob_data(credentials, params[:bucket], params[:blob], params) {|chunk| body.call ["#{chunk}"]} #close blob_data block
+      body.succeed
+      AsyncResponse # Tells Thin to not close the connection and continue it's work on other request
+    end
   end
-end
 
-class DeferrableBody
-  include EventMachine::Deferrable
+  class DeferrableBody
+    include EventMachine::Deferrable
 
-  def call(body)
-    body.each do |chunk|
-      @body_callback.call(chunk)
+    def call(body)
+      body.each do |chunk|
+        @body_callback.call(chunk)
+      end
     end
-  end
 
-  def each(&blk)
-    @body_callback = blk
+    def each(&blk)
+      @body_callback = blk
+    end
+  end
+rescue LoadError => e
+  # EventMachine isn't available, disable blob streaming
+  class BlobStream
+    def self.call(env, credentials, params)
+      raise NotImplementedError.new("Blob streaming is only supported under Thin")
+    end
   end
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
     - 0
     - 0
     - 7
-    - 1
-  version: 0.0.7.1
+    - 2
+  version: 0.0.7.2
 platform: java
 authors: 
   - Red Hat, Inc.
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 -04:00
+date: 2010-10-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -36,6 +37,7 @@ dependencies:
     name: haml
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -50,6 +52,7 @@ dependencies:
     name: sinatra
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -64,6 +67,7 @@ dependencies:
     name: rack
     prerelease: false
     requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -78,6 +82,7 @@ dependencies:
     name: rack-accept
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
@@ -92,6 +97,7 @@ dependencies:
     name: json
     prerelease: false
     requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -106,6 +112,7 @@ dependencies:
     name: compass
     prerelease: false
     requirement: &id007 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -120,6 +127,7 @@ dependencies:
     name: nokogiri
     prerelease: false
     requirement: &id008 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -134,6 +142,7 @@ dependencies:
     name: rack-test
     prerelease: false
     requirement: &id009 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -148,6 +157,7 @@ dependencies:
     name: cucumber
     prerelease: false
     requirement: &id010 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -162,6 +172,7 @@ dependencies:
     name: rcov
     prerelease: false
     requirement: &id011 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -324,6 +335,13 @@ files:
   - public/stylesheets/compiled/application.css
   - public/stylesheets/compiled/screen.css
   - bin/deltacloudd
+  - tests/images_test.rb
+  - tests/instances_test.rb
+  - tests/url_for_test.rb
+  - tests/hardware_profiles_test.rb
+  - tests/instance_states_test.rb
+  - tests/realms_test.rb
+  - tests/api_test.rb
   - COPYING
 has_rdoc: true
 homepage: http://www.deltacloud.org
@@ -335,6 +353,7 @@ rdoc_options: []
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -344,6 +363,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
           - 1
         version: 1.8.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -353,7 +373,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Deltacloud REST API