em-zipper 0.0.1 → 0.0.2

data/examples/io.rb

@@ -1,41 +1,54 @@
 $LOAD_PATH << './lib'
 require './lib/em-zipper'
 
+def write_io_to_file(io, file_name)
+  q = EM::Queue.new
+  file = File.new(file_name, 'w')
+
+  wf = proc do |chunk|
+    file.write chunk
+    if q.empty?
+      file.close
+    else
+      EM.next_tick { q.pop(&wf) }
+    end
+  end
+
+  io.rewind
+  while buffer = io.read(16348)
+    q.push buffer
+  end
+  q.pop(&wf)
+end
+
+
 EM.run do
   EM.add_periodic_timer(1) { puts 'tick' } # tick tock
 
+  # file to IO to file
+  #
   files = %w(sample1.txt sample2.txt).map do |file_name|
     File.join(File.expand_path("./examples/files"), file_name)
   end
 
-  # zip to IO
-  #
-  buff = StringIO.new
-
-  zippy = EM::Zipper.new files, buff
-  zippy.zip! 
-  zippy.callback do |io|
-
-    # Write it out to a file
-    #
-    q = EM::Queue.new
-    file = File.new('io-non-blocking.zip', 'w')
-
-    wf = proc do |chunk|
-      file.write chunk
-      if q.empty?
-        file.close
-        EM.stop
-      else
-        EM.next_tick { q.pop(&wf) }
-      end
-    end
+  fzip = EM::Zipper.new files, StringIO.new
+  fzip.callback do |io|
+    write_io_to_file(io, 'io-file-non-blocking.zip')
+    puts 'IO zipped from files'
+  end
 
-    io.rewind
-    while buffer = io.read(16348)
-      q.push buffer
-    end
-    q.pop(&wf)
+
+  # remote to IO to file
+  #
+  sites = %w(http://www.google.com/ https://www.github.com/)
+  rzip  = EM::Zipper.new sites, StringIO.new
+  rzip.callback do |io|
+    write_io_to_file(io, 'io-remote-non-blocking.zip')
+    puts 'IO zipped from remotes'
   end
+
+
+  fzip.zip! 
+  rzip.zip! 
 end
 

data/lib/em-zipper/base.rb

@@ -13,7 +13,7 @@ module EventMachine
         @fqueue = EM::Queue.new
       end
 
-      def zip!(zip_name=nil)
+      def zip!
         files.each { |file_path| fqueue.push file_path }
         fqueue.pop(&next_entry_non_block)
 
@@ -28,7 +28,7 @@ module EventMachine
       end
 
       def close_zos
-        # zos.close
+        zos.close if zos.io.is_a?(File) # close the io if it's a file
         succeed zos.close_buffer # return the zos
       end
 
@@ -54,18 +54,32 @@ module EventMachine
           end
         end
 
-        # TODO http requests
-        file_for_non_block file_path, cqueue
+        defer = EM::DefaultDeferrable.new
+        defer.callback { cqueue.pop(&chunky) if cqueue.size > 0 }
 
-        # begin write
-        cqueue.pop(&chunky) if cqueue.size > 0
+        _chunk_method = file_path.match(/\Ahttps?:\/\//) ? :chunk_http : :chunk_file
+        __send__ _chunk_method, file_path, cqueue, defer
       end
 
-      def file_for_non_block(file_path, q)
+      def chunk_file(file_path, q, d)
         file = File.open file_path
-        while buffer = file.read(16384)
-          q.push buffer
+
+        fr = proc do
+          q.push file.read(16384)
+
+          if file.eof? then EM.next_tick { d.succeed }
+          else              EM.next_tick(&fr)
+          end
         end
+
+        EM.next_tick(&fr)
+      end
+
+      def chunk_http(uri, q, d)
+        http = EventMachine::HttpRequest.new(uri).get
+        http.errback  { puts 'error' }
+        http.stream   { |chunk| q.push chunk }
+        http.callback { EM.next_tick { d.succeed } }
       end
     end
   end

data/lib/em-zipper/version.rb

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

data/lib/em-zipper/zip_output_stream.rb

@@ -10,6 +10,10 @@ module EventMachine
         @outputStream = io
       end
 
+      def io
+        @outputStream
+      end
+
       def update_local_headers
         nil
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-zipper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Yung Hwa Kwon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -64,6 +64,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - em-zipper.gemspec
+- examples/async_sinatra.md
 - examples/file.rb
 - examples/files/sample1.txt
 - examples/files/sample2.txt
@@ -71,6 +72,7 @@ files:
 - lib/em-zipper.rb
 - lib/em-zipper/base.rb
 - lib/em-zipper/stream_io.rb
+- lib/em-zipper/version.rb
 - lib/em-zipper/zip_output_stream.rb
 homepage: http://github.com/nowk/em-zipper
 licenses: