em-files 0.2.1 → 0.2.2

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
    gem "eventmachine", ">= 0.12.10"
-   gem "multitype-introspection", ">= 0.1.2"
+   gem "hash-utils", ">= 0.14.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -3,11 +3,11 @@ GEM
   specs:
     eventmachine (0.12.10)
     git (1.2.5)
+    hash-utils (0.14.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    multitype-introspection (0.1.2)
     rake (0.8.7)
     riot (0.12.2)
       rr
@@ -19,6 +19,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   eventmachine (>= 0.12.10)
+  hash-utils (>= 0.14.0)
   jeweler (~> 1.5.2)
-  multitype-introspection (>= 0.1.2)
   riot (>= 0.12.1)

data/README.md

@@ -57,6 +57,10 @@ using filters:
     EM::run do
         EM::File::write(data, filter)   # done in several ticks
     end
+    
+`#write` supports also copying data from another IO stream because it 
+uses `StringIO` internally. Simply give it IO object instead of 
+`String`. It will read it until EOF will occur.
 
     
 Contributing

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/em-files.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{em-files}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Kozák"]
-  s.date = %q{2011-03-24}
+  s.date = %q{2011-03-25}
   s.email = %q{martinkozak@martinkozak.net}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -38,20 +38,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
-      s.add_runtime_dependency(%q<multitype-introspection>, [">= 0.1.2"])
+      s.add_runtime_dependency(%q<hash-utils>, [">= 0.14.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<riot>, [">= 0.12.1"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
-      s.add_dependency(%q<multitype-introspection>, [">= 0.1.2"])
+      s.add_dependency(%q<hash-utils>, [">= 0.14.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<riot>, [">= 0.12.1"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
-    s.add_dependency(%q<multitype-introspection>, [">= 0.1.2"])
+    s.add_dependency(%q<hash-utils>, [">= 0.14.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<riot>, [">= 0.12.1"])

data/lib/em-files.rb

@@ -3,7 +3,9 @@
 
 require "eventmachine"
 require "stringio"
-require "multitype-introspection"
+require "hash-utils/io"    # >= 0.14.0
+require "hash-utils/stringio"
+require "hash-utils/object"
 
 ##
 # Main EventMachine module.
@@ -139,7 +141,7 @@ module EM
             rwsize = self::RWSIZE if rwsize.nil?
             
             # If filepath is directly IO, uses it
-            if filepath.kind_of_any? [StringIO, IO]
+            if filepath.io?
                 @native = filepath
             else
                 @native = ::File::open(filepath, mode)
@@ -229,12 +231,13 @@ module EM
         end
         
         ##
-        # Writes data to file.
+        # Writes data to file. Supports writing both strings or copying 
+        # from another IO object.
         #
         # It will reopen the file if +EBADF: Bad file descriptor+ of 
-        # +File+ class IO object will occur.
+        # +File+ class IO object will occur on +File+ object.
         #
-        # @param [String] data data for write
+        # @param [String, IO, StringIO] data data for write or IO object
         # @param [Proc] filter filter which for preprocessing each 
         #   written chunk
         # @param [Proc] block callback called when finish and for giving
@@ -242,18 +245,23 @@ module EM
         #
         
         def write(data, filter = nil, &block)
-            written = 0
             pos = 0
             
+            if data.io?
+                io = data
+            else
+                io = StringIO::new(data)
+            end
+            
             worker = Proc::new do
             
                 # Writes
                 begin
-                    chunk = data[written...(written + @rw_len)]
+                    chunk = io.read(@rw_len)
                     if not filter.nil?
                         chunk = filter.call(chunk)
                     end
-                    written += @native.write(chunk)
+                    @native.write(chunk)
                 rescue Errno::EBADF
                     if @native.kind_of? File
                         self.reopen!
@@ -267,9 +275,9 @@ module EM
                 pos = @native.pos
                 
                 # Returns or continues work
-                if written >= data.bytesize
+                if io.eof?
                     if not block.nil?
-                        block.call(written)             # returns result
+                        block.call(pos)                 # returns result
                     end
                 else
                     EM::next_tick { worker.call() }     # continues work

metadata

@@ -2,7 +2,7 @@
 name: em-files
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - "Martin Koz\xC3\xA1k"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 +01:00
+date: 2011-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,13 +25,13 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: multitype-introspection
+  name: hash-utils
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.2
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1975590278330534789
+      hash: -2585745239736637618
       segments: 
       - 0
       version: "0"