external 0.3.0 → 0.3.1

data/History

@@ -1,3 +1,8 @@
+== 0.3.1 / 2009-06-29
+
+* updates to gem dependencies
+* experimentally added IO as an accepted type in Utils
+
 == 0.3.0 / 2008-10-27
 
 Major update with refactoring (ex ExtArr is now ExternalArray) 

data/lib/external/base.rb

@@ -24,9 +24,14 @@ module External
       # used (in which case mode gets ignored as Tempfiles always open
       # in 'r+' mode).
       def open(path=nil, mode="rb", *argv)
-        path = File.open(path, mode) unless path == nil
-        base = new(path, *argv)
-        
+        begin
+          io = path == nil ? nil : File.open(path, mode) 
+          base = new(io, *argv)
+        rescue(Errno::ENOENT)
+          io.close if io
+          raise
+        end
+
         if block_given?
           begin
             yield(base)

data/lib/external/utils.rb

@@ -13,15 +13,15 @@ module External
     # Nested classes have '::' replaced by '_'. Thus to add support
     # for Some::Unknown::IO, extend External::IO as below:
     #
-    # module External::IO
-    # def some_unknown_io_mode(io)
-    # ...
-    # end
+    #   module External::IO
+    #     def some_unknown_io_mode(io)
+    #     ...
+    #     end
     #
-    # def some_unknown_io_length(io)
-    # ...
-    # end
-    # end
+    #     def some_unknown_io_length(io)
+    #     ...
+    #     end
+    #   end
     #
     # See stringio_mode and stringio_length for more details.
     def try_handle(io, method)
@@ -78,9 +78,9 @@ module External
       end
     end
     
-    # Returns an array of bools determining if the input File 
+    # Returns an array of bools determining if the input Io 
     # is readable and writable.
-    def file_mode(io)
+    def io_mode(io)
       begin
         dup = io.dup
         
@@ -104,10 +104,18 @@ module External
       end
     end
     
-    # Returns the length of the input File
-    def file_length(io)
+    # Returns the length of the input IO
+    def io_length(io)
       io.fsync
-      File.size(io.path)
+      io.stat.size
+    end
+    
+    def file_mode(io)
+      io_mode(io)
+    end
+    
+    def file_length(io)
+      io_length(io)
     end
     
     # Returns an array of bools determining if the input Tempfile 

data/lib/external_archive.rb

@@ -76,12 +76,18 @@ class ExternalArchive < External::Base
         FileUtils.touch(index) unless File.exists?(index)
       end
       
-      io_index = case index
-      when Array, ExternalIndex then index
-      else ExternalIndex.open(index, 'r+', :format => 'II')
+      begin
+        io = path == nil ? nil : File.open(path, mode)
+        io_index = case index
+        when Array, ExternalIndex then index
+        else ExternalIndex.open(index, 'r+', :format => 'II')
+        end
+      rescue(Errno::ENOENT)
+        io.close if io
+        io_index.close if io_index
+        raise
       end
       
-      io = path == nil ? nil : File.open(path, mode)
       extarc = new(io, io_index)
       
       # reindex if necessary

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: external
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Simon Chiang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-27 00:00:00 -06:00
+date: 2009-06-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.7
+        version: 0.18.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: mspec
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: "1.5"
     version: 
 description: 
 email: simon.a.chiang@gmail.com
@@ -60,6 +60,8 @@ files:
 - History
 has_rdoc: true
 homepage: http://rubyforge.org/projects/external/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -80,9 +82,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: external
-rubygems_version: 1.2.0
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: array-like access to external data files
 test_files: []