rio 0.3.7 → 0.3.8

data/lib/rio/ext/csv.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading
@@ -35,9 +35,28 @@
 # The documented interface and behavior is subject to change without notice.</b>
 
 
+# begin
+#   require 'faster_csv'  # first choice--for speed
+
+#   # A CSV compatible interface for FasterCSV.
+#   module CSV  # :nodoc:
+#     def self.parse_line( line, field_sep=nil, row_sep=nil )
+#       FasterCSV.parse_line( line, :col_sep => field_sep || ",",
+#                                   :row_sep => row_sep   || :auto )
+#     end
+    
+#     def self.generate_line( array, field_sep=nil, row_sep=nil )
+#       FasterCSV.generate_line( array, :col_sep => field_sep || ",",
+#                                       :row_sep => row_sep   || "" )
+#     end
+#   end
+# rescue LoadError
+#   require 'csv'         # second choice--slower but standard
+# end
+
 require 'csv'
-require 'rio/record'
 
+$EXTEND_CSV_RESULTS = false
 module RIO
   module Ext
     module CSV
@@ -92,21 +111,42 @@ module RIO
         end
       end
     end
+  end
+end
 
 
+module RIO
+  module Ext
     module CSV
       module Input
 
         protected
+#        def ior()
+#          p cx['stream_itertype']
+#          case cx['stream_itertype']
+#          when 'lines',nil
+#            self.ioh.iostack[-2]
+#          else
+#            self.ioh
+#          end
+#        end
+#         def each_rec_(&block)
+#           self.ior.each { |line|
+#             yield line
+#           }
+#           self
+#         end
 
         def to_rec_(raw_rec)
           #_init_cols_from_line(raw_rec) if @recno == 0
           #p "#{callstr('to_rec_',raw_rec,@recno)} ; itertype=#{cx['stream_itertype']}"
           case cx['stream_itertype']
           when 'lines' 
-            unless copying_from?
-              raw_rec.extend(RIO::Ext::CSV::Str)
-              raw_rec.csv_s_to_rec = _s_to_rec_proc(cx['csv_fs'],cx['csv_rs'])
+            if $EXTEND_CSV_RESULTS
+              unless copying_from?
+                raw_rec.extend(RIO::Ext::CSV::Str)
+                raw_rec.csv_s_to_rec = _s_to_rec_proc(cx['csv_fs'],cx['csv_rs'])
+              end
             end
             raw_rec
           when 'records'
@@ -154,15 +194,20 @@ module RIO
           end
           tfields
         end
-        def _l2a(line,fs,rs)
+        def parse_line_(line,fs,rs)
           ::CSV.parse_line(line,fs,rs)
         end
+        def _l2a(line,fs,rs)
+          parse_line_(line,fs,rs)
+        end
         def _l2record(line,fs,rs)
           #p callstr('_l2record',line,fs,rs,cols)
-          fields = trim(::CSV.parse_line(line,fs,rs))
-          unless copying_from?
-            fields.extend(RIO::Ext::CSV::Ary)
-            fields.csv_rec_to_s = _rec_to_s_proc(fs,rs)
+          fields = trim(parse_line_(line,fs,rs))
+          if $EXTEND_CSV_RESULTS
+            unless copying_from?
+              fields.extend(RIO::Ext::CSV::Ary)
+              fields.csv_rec_to_s = _rec_to_s_proc(fs,rs)
+            end
           end
           fields
         end

data/lib/rio/ext/yaml.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading

data/lib/rio/ext/zipfile.rb

@@ -0,0 +1,91 @@
+#--
+# =============================================================================== 
+# Copyright (c) 2005, 2006 Christopher Kleckner
+# All rights reserved
+#
+# This file is part of the Rio library for ruby.
+#
+# Rio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Rio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Rio; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# =============================================================================== 
+#++
+#
+# To create the documentation for Rio run the command
+#  ruby build_doc.rb
+# from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
+#
+# Suggested Reading
+# * RIO::Doc::SYNOPSIS
+# * RIO::Doc::INTRO
+# * RIO::Doc::HOWTO
+# * RIO::Rio
+#
+# <b>Rio is pre-alpha software. 
+# The documented interface and behavior is subject to change without notice.</b>
+
+module RIO
+  module_function
+  def load_lib(lib)
+    begin 
+      require lib
+    rescue LoadError => ex
+      begin
+        p "using Gem for #{lib}" if $DEBUG
+        require 'rubygems'
+        require_gem lib
+      rescue
+        raise ex
+      end
+    end
+  end
+end
+
+begin
+  RIO.load_lib('zip/zip')
+  require 'zip/zipfilesystem'
+  require 'rio/ext/zipfile/opt'
+  RIO::Ext::ZipFile.load_extension
+rescue LoadError
+  p "No zipfile support"  if $DEBUG
+end
+
+
+# module RIO
+#   module Ext
+#     module ZipFile
+#       module Cx
+#         def zipfile(&block) 
+#           #require 'rio/ext/zipfile/state'
+#           cxx('zipfile',true,&block)
+#           #self.extend(ZipFile::State).fstream
+#         end
+#         def zipfile?() cxx?('zipfile') end 
+#         def zipfile_() 
+#           cxx_('zipfile',true) 
+#         end
+#         protected :zipfile_
+
+#         def zipent(&block) 
+#           cxx('zipent',true,&block)
+#         end
+#         def zipent?() cxx?('zipent') end 
+#         def zipent_() 
+#           cxx_('zipent',true) 
+#         end
+#         protected :zipent_
+#       end
+#     end
+#   end
+# end
+__END__

data/lib/rio/ext.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading
@@ -37,7 +37,33 @@
 
 require 'rio/ext/csv'
 require 'rio/ext/yaml'
+#require 'rio/ext/zipfile'
+
 require 'rio/util'
+module RIO
+  module Ext #:nodoc: all
+    @@extensions = {}
+
+    module_function
+    def add(cl,meth)
+      @@extensions[cl] ||= []
+      @@extensions[cl].push(meth)
+    end
+    def extend_state(state_class,ext_module)
+      ext_proc = proc{ |obj| obj.extend(ext_module) }
+      RIO::Ext.add(state_class,ext_proc)
+    end
+
+    def became(obj)
+      if @@extensions[obj.class]
+        @@extensions[obj.class].each { |meth|
+          meth[obj]
+        }
+      end
+    end
+  end
+end
+
 module RIO
   module Ext #:nodoc: all
     OUTPUT_SYMS = Util::build_sym_hash(CSV::Output.instance_methods + YAML::Output.instance_methods)
@@ -45,14 +71,22 @@ module RIO
     module Cx
       include CSV::Cx
       include YAML::Cx
+      #include ZipFile::Cx
     end
   end
   module Ext
     module Input
       def add_extensions(obj)
         #p "add_extensions(#{obj.inspect})"
-        obj.extend(CSV::Input) if obj.csv?
+        #p obj.ioh
+        if obj.csv?
+          obj.extend(CSV::Input)
+        end
         obj.extend(YAML::Input) if obj.yaml?
+#        if obj.zipfile?
+#          require 'rio/ext/zipfile/state'
+#          obj.extend(ZipFile::Input) 
+#        end
         obj
       end
       module_function :add_extensions
@@ -67,3 +101,4 @@ module RIO
     end
   end
 end
+

data/lib/rio/factory.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading
@@ -64,12 +64,18 @@ module RIO
                           when 'file','path'
                             require 'rio/scheme/path'
                             Path
+                          when 'zfile','zpath'
+                            require 'rio/ext/zipfile/zpath'
+                            Ext::ZipFile::ZPath
                           when 'stdio','stdin','stdout'
                             require 'rio/scheme/stdio'
                             StdIO
                           when 'stderr'
                             require 'rio/scheme/stderr'
                             StdErr
+                          when 'null'
+                            require 'rio/scheme/null'
+                            Null
                           when 'tempfile'
                             require 'rio/scheme/temp'
                             Temp::File
@@ -138,54 +144,32 @@ module RIO
 
       'Stream::Close' => 'rio/stream/open',
       'Stream::Reset' => 'rio/stream',
-
       'Stream::Open' => 'rio/stream/open',
       'Stream::Input' => 'rio/stream',
       'Stream::Output' => 'rio/stream',
       'Stream::InOut' => 'rio/stream',
 
       'Stream::Duplex::Open' => 'rio/stream/duplex',
-      'Stream::Duplex::Input' => 'rio/stream/duplex',
-      'Stream::Duplex::Output' => 'rio/stream/duplex',
-      'Stream::Duplex::InOut' => 'rio/stream/duplex',
 
-      'Path::Stream::Input' => 'rio/scheme/path',
-      'Path::Stream::Output' => 'rio/scheme/path',
-      'Path::Stream::InOut' => 'rio/scheme/path',
       'Path::Stream::Open' => 'rio/scheme/path',
 
-      'StrIO::Stream::Input' => 'rio/scheme/strio',
-      'StrIO::Stream::Output' => 'rio/scheme/strio',
-      'StrIO::Stream::InOut' => 'rio/scheme/strio',
       'StrIO::Stream::Open' => 'rio/scheme/strio',
 
+      'Null::Stream::Open' => 'rio/scheme/null',
+
+      'ZipFile::CentralDir::Open' => 'rio/zipfile/centraldir',
+      'ZipFile::CentralDir::Stream' => 'rio/zipfile/centraldir',
+      'ZipFile::CentralDir::Close' => 'rio/zipfile/centraldir',
+      'ZipFile::Path::Str' => 'rio/zipfile/path',
+
       'CmdPipe::Stream::Reset' => 'rio/scheme/cmdpipe',
-#      'CmdPipe::Stream::Open' => 'rio/scheme/cmdpipe',
-#      'CmdPipe::Stream::Input' => 'rio/scheme/cmdpipe',
-#      'CmdPipe::Stream::Output' => 'rio/scheme/cmdpipe',
-#      'CmdPipe::Stream::InOut' => 'rio/scheme/cmdpipe',
 
       'HTTP::Stream::Input' => 'rio/scheme/http',
       'HTTP::Stream::Open' => 'rio/scheme/http',
 
       'Temp::Reset' => 'rio/scheme/temp',
       'Temp::Stream::Open' => 'rio/scheme/temp',
-      #'Temp::Stream::Close' => 'rio/scheme/temp',
-      #'Temp::Stream::InOut' => 'rio/scheme/temp',
-
-      'FTP::State::Dir' => 'rio/ftp',
-      'FTP::State::File' => 'rio/ftp',
-      'FTP::State::Reset' => 'rio/ftp',
-      'FTP::State::Open' => 'rio/ftp',
-      'FTP::Stream::Input' => 'rio/ftp',
-      'FTP::Stream::Open' => 'rio/ftp',
-      'FTP::Stream::Close' => 'rio/ftp',
-      'FTP::Stream::Reset' => 'rio/ftp',
-
-      'AryIO::Stream::Input' => 'rio/scheme/aryio',
-      'AryIO::Stream::Output' => 'rio/scheme/aryio',
-      'AryIO::Stream::InOut' => 'rio/scheme/aryio',
-      'AryIO::Stream::Open' => 'rio/scheme/aryio',
+
     }
     def state2class(state_name)
       #p "state_name=#{state_name}"
@@ -218,8 +202,7 @@ module RIO
     # factory creates a state from args
     def create_state(*args)
       riorl = RIO::RL::Builder.build(*args)
-#      state_class = state2class(reset_state(riorl))
-      create_handle(state2class(reset_state(riorl)).new_r(riorl))
+      create_handle(state2class(reset_state(riorl)).new(riorl))
     end
     def clone_state(state)
       create_handle(state.target.clone)

data/lib/rio/file.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading
@@ -35,6 +35,7 @@
 # The documented interface and behavior is subject to change without notice.</b>
 
 
+require 'rio/state'
 require 'rio/ops/path'
 require 'rio/ops/file'
 
@@ -45,12 +46,24 @@ module RIO
     class Base < State::Base
       include Ops::Path::Str
 
+      protected
+
+      def stream_rl_
+        #RIO::File::RL.new(self.to_uri,{:fs => self.fs})
+        self.rl.file_rl
+      end
+
+      public
+
       def fstream() 
-        self.rl = RIO::File::RL.new(self.to_uri)
+        #p self.rl.class
+        self.rl = self.stream_rl_
         become 'Path::Stream::Open'
-#        become 'Stream::Open'
       end
-      def when_missing(sym,*args) fstream() end
+
+      def when_missing(sym,*args) 
+        fstream() 
+      end
     end
     
     class NonExisting < Base
@@ -60,19 +73,46 @@ module RIO
 
     class Existing < Base
       include Ops::File::Existing
+      include Enumerable
+
       def check?() self.file? end
+      def handle_skipped
+        return self unless cx.has_key?('skip_args')
+        args = cx['skip_args'] || []
+        self.skipentries(*args)
+      end
+      def [](*args)
+        #p "#{callstr('[]',*args)} ss_type=#{ss_type?}"
+        if _using_files_with_a_file
+          unless args.empty?
+            ss_args = cx['ss_args'] = args
+            return self.files(*ss_args).to_a
+          else
+            return to_a()
+          end
+        else
+          fstream[*args]
+        end
+        
+      end
       def each(*args,&block)
         #p "#{callstr('each',*args)} ss_type=#{ss_type?}"
-        if ss_type? == 'files' and !stream_iter?
-          #sel = Match::Entry::Selector.new(cx['sel'],cx['nosel'])
+        if _using_files_with_a_file
+          handle_skipped()
           sel = Match::Entry::Selector.new(cx['entry_sel'])
           yield new_rio_cx(self) if sel.match?(self)
         else
           fstream.each(*args,&block)
         end
       end
+      
+      private
+
+      def _using_files_with_a_file
+        ss_type? == 'files' and !stream_iter?
+      end
     end
     
   end
   
-end # module RIO
+end

data/lib/rio/filter/closeoneof.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading
@@ -48,36 +48,56 @@ module RIO
       def autoclosed?
         @autoclosed
       end
-      def close_on_eof(rtn)
+#       def close_on_eof_raise(&block)
+#         begin
+#           rtn = yield
+#         rescue EOFError
+#           close_on_eof_(rtn)
+#           raise
+#         end
+#         rtn
+#       end
+      def close_on_eof(&block)
         #p callstr('close_on_eof',rtn)
-#        p @ios
+        rtn = yield
         if handle.eof?
           close_on_eof_(rtn)
         end
         rtn
       end
+      def close_on_eof1(&block)
+        #p callstr('close_on_eof',rtn)
+        if handle.eof?
+          close_on_eof_(nil)
+          yield
+        else
+          yield
+        end
+      end
       def close_on_eof_(rtn)
         #p callstr('close_on_eof_',rtn)
-#        p @ios
         unless @autoclosed or closed?
-          handle.close()
+          #handle.close()
           @oncloseproc.call() unless @oncloseproc.nil?
           @autoclosed = true
         end
         rtn
       end
         
-      def readlines(*args)            close_on_eof(super) end
-      def each_line(*args,&block)     close_on_eof(super) end
-      def each_byte(*args,&block)     close_on_eof(super) end
-      def each_bytes(nb,*args,&block) close_on_eof(super) end
-      def readline(*args)             close_on_eof(super) end
-      def read(*args)                 close_on_eof(super) end
-      def readchar(*args)             close_on_eof(super) end
-      def gets(*args)                 close_on_eof(super) end
+      def each_line(*args,&block)     close_on_eof{super} end
+      def each_byte(*args,&block)     close_on_eof{super} end
+      def each_bytes(nb,*args,&block) close_on_eof{super} end
+
+      def readline(*args)             close_on_eof{super} end
+
+      def readchar(*args)             close_on_eof{super} end
+      def gets(*args)                 close_on_eof{super} end
+      def readlines(*args)            close_on_eof{super} end
+
+      def read(*args)                 close_on_eof{super} end
 
-      def copy_stream(dst)            close_on_eof(super) end
-      def contents()                  close_on_eof(super) end
+      def copy_stream(dst)            close_on_eof{super} end
+      def contents()                  close_on_eof{super} end
     end
   end
 end

data/lib/rio/filter/gzip.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading

data/lib/rio/filter.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading

data/lib/rio/fs/base.rb

@@ -0,0 +1,42 @@
+#--
+# =============================================================================== 
+# Copyright (c) 2005, 2006 Christopher Kleckner
+# All rights reserved
+#
+# This file is part of the Rio library for ruby.
+#
+# Rio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Rio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Rio; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# =============================================================================== 
+#++
+#
+# To create the documentation for Rio run the command
+#  ruby build_doc.rb
+# from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
+#
+# Suggested Reading
+# * RIO::Doc::SYNOPSIS
+# * RIO::Doc::INTRO
+# * RIO::Doc::HOWTO
+# * RIO::Rio
+#
+# <b>Rio is pre-alpha software. 
+# The documented interface and behavior is subject to change without notice.</b>
+
+module RIO
+  module FS
+    class Base
+    end
+  end
+end