em-zipper 0.0.2 → 0.0.3

data/examples/io.rb

@@ -40,7 +40,7 @@ EM.run do
 
   # remote to IO to file
   #
-  sites = %w(http://www.google.com/ https://www.github.com/)
+  sites = %w(http://s3.amazonaws.com/ping-em-assets/sample1.txt http://s3.amazonaws.com/ping-em-assets/sample2.txt)
   rzip  = EM::Zipper.new sites, StringIO.new
   rzip.callback do |io|
     write_io_to_file(io, 'io-remote-non-blocking.zip')

data/lib/em-zipper/base.rb

@@ -33,42 +33,44 @@ module EventMachine
       end
 
       def next_entry_non_block
-        proc do |file_path| 
-          new_entry = ::Zip::ZipEntry.new '-', file_name(file_path)
-            #, "", "", file.size, 0, Zip::ZipEntry::STORED, file.size
-          zos.put_next_entry(new_entry)
-          EM.next_tick { write_entry_non_block file_path }
-        end
-      end
+        proc do |file_path|
+          cqueue = EM::Queue.new
+          chunky = proc do |chunk|
+            zos << chunk
+
+            if cqueue.empty?
+              close_zos and return if fqueue.empty?
+              EM.next_tick { fqueue.pop(&next_entry_non_block) }
+            else
+              EM.next_tick { cqueue.pop(&chunky) }
+            end
+          end
 
-      def write_entry_non_block(file_path)
-        cqueue = EM::Queue.new
-        chunky = proc do |chunk|
-          zos << chunk
+          defer = EM::DefaultDeferrable.new
+          defer.callback do
+            # begin the entry when we have all the data
+            new_entry = ::Zip::ZipEntry.new '-', file_name(file_path)
+            zos.put_next_entry(new_entry)
 
-          if cqueue.empty?
-            close_zos and return if fqueue.empty?
-            EM.next_tick { fqueue.pop(&next_entry_non_block) }
-          else
-            EM.next_tick { cqueue.pop(&chunky) }
+            EM.next_tick { cqueue.pop(&chunky) } if cqueue.size > 0
           end
-        end
-
-        defer = EM::DefaultDeferrable.new
-        defer.callback { cqueue.pop(&chunky) if cqueue.size > 0 }
+          defer.errback  { puts 'error' }
 
-        _chunk_method = file_path.match(/\Ahttps?:\/\//) ? :chunk_http : :chunk_file
-        __send__ _chunk_method, file_path, cqueue, defer
+          _chunk_method = file_path.match(/\Ahttps?:\/\//) ? :chunk_http : :chunk_file
+          __send__ _chunk_method, file_path, cqueue, defer
+        end
       end
 
       def chunk_file(file_path, q, d)
         file = File.open file_path
 
         fr = proc do
-          q.push file.read(16384)
-
-          if file.eof? then EM.next_tick { d.succeed }
-          else              EM.next_tick(&fr)
+          begin
+            q.push file.read_nonblock(16384)
+            EM.next_tick(&fr)
+          rescue EOFError
+            file.close
+            EM.next_tick { d.succeed }
           end
         end
 
@@ -77,9 +79,9 @@ module EventMachine
 
       def chunk_http(uri, q, d)
         http = EventMachine::HttpRequest.new(uri).get
-        http.errback  { puts 'error' }
-        http.stream   { |chunk| q.push chunk }
+        http.errback  { EM.next_tick { d.fail } }
         http.callback { EM.next_tick { d.succeed } }
+        http.stream   { |chunk| q.push chunk }
       end
     end
   end

data/lib/em-zipper/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Zipper
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-zipper
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yung Hwa Kwon
@@ -63,6 +63,7 @@ files:
 - .ruby-version
 - Gemfile
 - Gemfile.lock
+- benchmarkz/em-zipper.rb
 - em-zipper.gemspec
 - examples/async_sinatra.md
 - examples/file.rb