rio 0.4.2 → 0.5.1

data/lib/rio/state/data.rb

@@ -0,0 +1,55 @@
+#--
+# ===========================================================================
+# Copyright (c) 2005-2012 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
+# =========================================================================== 
+#++
+#
+
+require 'forwardable'
+
+module RIO
+  module State
+
+    class Data
+      attr :store
+      def initialize(h={})
+        @store = {}
+        h.each do |k,v|
+          @store[k] = v
+        end
+      end
+      def initialize_copy(other)
+        @store = other.store.clone
+      end
+      extend Forwardable
+      def_delegators :@store,:[],:[]=,:keys
+        
+      def method_missing(sym,*args,&block)
+        if sym.to_s.end_with?('=')
+          key = sym.to_s.chop.to_sym
+          @store[key] = args[0]
+        else
+          @store[sym]
+        end
+      end
+
+    end
+  end 
+end # module RIO

data/lib/rio/state/error.rb

@@ -1,6 +1,6 @@
 #--
-# =============================================================================== 
-# Copyright (c) 2005,2006,2007,2008 Christopher Kleckner
+# ===========================================================================
+# Copyright (c) 2005-2012 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -18,20 +18,9 @@
 # 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.
-#
-# Suggested Reading
-# * RIO::Doc::SYNOPSIS
-# * RIO::Doc::INTRO
-# * RIO::Doc::HOWTO
-# * RIO::Doc::EXAMPLES
-# * RIO::Rio
-#
 
 
 require 'rio/exception/state'
@@ -40,29 +29,20 @@ module RIO
   module State
     class Error < Base
       attr_accessor :obj,:msg,:sym
-      def initialize
-        super
-        @obj = nil
-        @msg = nil
-        @sym = nil
-#        self.send(sym,*args) #unless obj == self
-      end
+      fwd :data,:obj,:msg,:sym
       def check?() true end
       def when_missing(sym,*args) self end
       def method_missing(sym,*args,&block)
- #       emsg = sprintf("Can't Handle %s[%s].%s(%s)",@obj.class.to_s,@obj.to_s,sym.to_s,args.join(','))
+        emsg = sprintf("Can't Handle %s[%s].%s(%s)",@obj.class.to_s,@obj.to_s,sym.to_s,args.join(','))
  #       emsg += "\n  "+@msg unless @msg.nil? or @msg.empty?
-        emsg = @msg
+ #       emsg = @msg
         raise Exception::CantHandle.new(@obj,sym,*args),emsg
       end
       def self.error(emsg,obj,sym,*args)
         require 'rio/exception'
-        state = new
-        state.obj = obj
-        state.sym = sym
         msg = sprintf("%s[%s].%s(%s)",obj.class.to_s,obj.to_s,sym.to_s,args.join(','))
         msg += "\n  "+emsg unless emsg.nil? or emsg.empty?
-        state.msg = msg
+        state = new(obj: obj, sym: sym, msg: msg)
         state
 #        raise CantHandle.new(obj,sym,*args),emsg
       end

data/lib/rio/stream.rb

@@ -1,6 +1,6 @@
 #--
-# =============================================================================== 
-# Copyright (c) 2005,2006,2007,2008 Christopher Kleckner
+# ===========================================================================
+# Copyright (c) 2005-2012 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -18,34 +18,30 @@
 # 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.
-#
-# Suggested Reading
-# * RIO::Doc::SYNOPSIS
-# * RIO::Doc::INTRO
-# * RIO::Doc::HOWTO
-# * RIO::Doc::EXAMPLES
-# * RIO::Rio
-#
 
 
 require 'rio/stream/base'
+module RIO
+  autoload :Ops, 'rio/ops'
+  module Stream
+    autoload :Open, 'rio/stream/open'
+    autoload :Duplex, 'rio/stream/duplex'
+  end
+end
+require 'rio/filter'
 require 'rio/ops/path'
 require 'rio/ops/stream'
 require 'rio/ops/stream/input'
 require 'rio/ops/stream/output'
 require 'rio/ext'
-
 require 'rio/filter/gzip'
 #require 'rio/filter/yaml'
 #require 'rio/filter/chomp'
 #require 'rio/filter/strip'
-require 'rio/filter/closeoneof'
+#require 'rio/filter/closeoneof'
 
 module RIO
 
@@ -60,10 +56,13 @@ module RIO
     end
 
     class IOBase < Base
+
+
       # Mixin the appropriate ops
       include Ops::Path::Str
       include Ops::Stream::Status
       include Ops::Stream::Manip
+
       
       def check?() open? end
       def when_missing(sym,*args) 
@@ -76,6 +75,8 @@ module RIO
       end
       def setup
         ioh.sync = sync? if cx.has_key?('sync')
+
+        ioh.set_encoding(*enc?) if cx.has_key?(:enc_args)
         self
       end
       def add_filter(mod)
@@ -102,6 +103,7 @@ module RIO
         super
         @recno = -1
         @get_selrej,@get_rangetops = create_selrej()
+        # @cursor = io_enum
         self
       end
     end
@@ -117,8 +119,21 @@ module RIO
       end
       def add_filters
         #p "IN stream#add_filters"
-        add_filter(Filter::GZipRead) if gzip?
-        #add_filter(Filter::YAML) if yaml?
+        if gzip?
+          gz = Zlib::GzipReader.new(self.ioh.ios)
+          gz.extend Filter::GZipMissing
+          gz.extend Filter::GZipWin32MissingEachLine
+          self.ioh.ios = gz
+          add_filter(Filter::GZipRead)
+        end
+        if csv?
+          require 'rio/ext/csv/filter' if $USE_FASTER_CSV
+          self.extend(::RIO::Ext::CSV::Input)
+          add_csv_filter() if $USE_FASTER_CSV
+#          csvio = CSV.new(self.ioh.ios,*cx['csv_args'])
+#          self.ioh.ios = csvio
+        end
+       #add_filter(Filter::YAML) if yaml?
         add_line_filters()
 #        add_filter(Filter::FasterCSV) if csv?
 #        if closeoneof?
@@ -142,7 +157,19 @@ module RIO
         Ext::Output.add_extensions(self)
       end
       def add_filters
-        add_filter(Filter::GZipWrite) if gzip?
+        if gzip?
+          gz = Zlib::GzipWriter.new(self.ioh.ios)
+          gz.extend Filter::GZipMissing
+          self.ioh.ios = gz
+          add_filter(Filter::GZipWrite)
+        end
+        if csv?
+          require 'rio/ext/csv/filter'  if $USE_FASTER_CSV
+          self.extend(::RIO::Ext::CSV::Output)
+          add_csv_filter() if $USE_FASTER_CSV
+#          csvio = CSV.new(self.ioh.ios,*cx['csv_args'])
+#          self.ioh.ios = csvio
+        end
         #add_filter(Filter::FasterCSV) if csv?
         #add_filter(Filter::YAML) if yaml?
         self

data/lib/rio/stream/base.rb

@@ -1,6 +1,6 @@
 #--
-# =============================================================================== 
-# Copyright (c) 2005,2006,2007,2008 Christopher Kleckner
+# ===========================================================================
+# Copyright (c) 2005-2012 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -18,20 +18,9 @@
 # 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.
-#
-# Suggested Reading
-# * RIO::Doc::SYNOPSIS
-# * RIO::Doc::INTRO
-# * RIO::Doc::HOWTO
-# * RIO::Doc::EXAMPLES
-# * RIO::Rio
-#
 
 
 require 'rio/state'
@@ -39,6 +28,17 @@ module RIO
   module Stream
 
     class Base < State::Base
+      def initialize(*args)
+        super
+      end
+      def initialize_copy(other)
+        super
+        #data.ioh = other.data.ioh
+      end
+      #fwd :data,:ioh
+      #alias :ior :ioh
+      #alias :iow :ioh
+
       def iostate(*args) self end
       def stream?() true end
       def recno() nil end

data/lib/rio/stream/duplex.rb

@@ -1,6 +1,6 @@
 #--
-# =============================================================================== 
-# Copyright (c) 2005,2006,2007,2008 Christopher Kleckner
+# ===========================================================================
+# Copyright (c) 2005-2012 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -18,24 +18,13 @@
 # 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.
-#
-# Suggested Reading
-# * RIO::Doc::SYNOPSIS
-# * RIO::Doc::INTRO
-# * RIO::Doc::HOWTO
-# * RIO::Doc::EXAMPLES
-# * RIO::Rio
-#
 
 
-require 'rio/stream'
-require 'rio/stream/open'
+#require 'rio/stream'
+#require 'rio/stream/duplex'
 
 module RIO
   module Stream
@@ -43,36 +32,85 @@ module RIO
       module Ops
         module Output
           def wclose()
-            #p "wclose #{self}"
+            p "wclose #{self}"
             ioh.close_write
             return self.close.softreset if ioh.closed?
             self
           end
         end
       end
-      class Open < RIO::Stream::Open
-        def output() super.extend(Ops::Output) end
-        def inout() super.extend(Ops::Output) end
-      end
     end
   end
 end
-__END__
+
+
 module RIO
   module Stream
     module Duplex
+      module Ops
+        extend Forwardable
+        extend RIO::Fwd
+        def base_state() 'Stream::Duplex::Close' end
+        #def ior() fibproc.pipe.rd end
+        #def iow() fibproc.pipe.wr end
+        def ior() ioh() end
+        def iow() ioh end
+      end
+
+      class Open < RIO::Stream::Open
+        fwd :data,:fibproc
+        include Ops
+        def output() stream_state('Stream::Duplex::Output') end
+        def input()  stream_state('Stream::Duplex::Input')  end
+        def inout()  stream_state('Stream::Duplex::InOut')  end
+        #def fibproc() input.fibproc() end
+        protected
+
+        def open_(*args)
+          #p callstr('open_',args.inspect)+" mode='#{mode?}' (#{mode?.class}) ioh=#{self.ioh} open?=#{open?}"
+          self.ioh = self.rl.open(mode?,*args) unless open?
+          #p data
+          self
+        end
+      end
 
       class Input < RIO::Stream::Input
-        include Ops::Input
+        include Ops
+        fwd :data,:fibproc
       end
 
       class Output < RIO::Stream::Output
-        include Ops::Output
+        include Ops
+        fwd :data,:fibproc
+        def base_state() 'Stream::Duplex::Close' end
+        #include Ops::Output
       end
       
       class InOut < RIO::Stream::InOut
-        include Ops::Output
-        include Ops::Input
+        include Ops
+        fwd :data,:fibproc
+        def base_state() 'Stream::Duplex::Close' end
+        #include Ops::Output
+        #include Ops::Input
+        def get()
+          until self.eof?
+            raw_rec = self._get_rec
+            return to_rec_(raw_rec) if @get_selrej.match?(raw_rec,@recno)
+          end
+          #loop do
+          #  raw_rec = self._get_rec
+          #  return to_rec_(raw_rec) if @get_selrej.match?(raw_rec,@recno)
+          #  break if self.eof?
+          #end
+          self.close if closeoneof?
+          nil
+#          (closeoneof? ? self.on_eof_close{ nil } : nil)
+        end
+
+      end
+      class Close < RIO::Stream::Close
+      end
+      class Reset < RIO::Stream::Reset
       end
     end
   end

data/lib/rio/stream/open.rb

@@ -1,6 +1,6 @@
 #--
-# =============================================================================== 
-# Copyright (c) 2005,2006,2007,2008 Christopher Kleckner
+# ===========================================================================
+# Copyright (c) 2005-2012 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -18,30 +18,19 @@
 # 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.
-#
-# Suggested Reading
-# * RIO::Doc::SYNOPSIS
-# * RIO::Doc::INTRO
-# * RIO::Doc::HOWTO
-# * RIO::Doc::EXAMPLES
-# * RIO::Rio
-#
 
 
-require 'rio/ioh'
+#require 'rio/ioh'
 require 'rio/stream/base'
-require 'rio/ops/stream'
-require 'rio/ops/path'
+#require 'rio/ops/stream'
+#require 'rio/ops/path'
 require 'rio/cp'
 require 'rio/piper/cp'
 require 'rio/util'
-
+require 'rio/ops'
 
 module RIO
   module Stream
@@ -50,7 +39,7 @@ module RIO
       include Ops::Path::URI
       include Cp::Open::Output
       include Cp::Open::Input
-      include Piper::Cp::Input
+      ##include Piper::Cp::Input
 
       def check?() true end
 
@@ -160,6 +149,7 @@ module RIO
 
     class Close < State::Base
       include Ops::Stream::Status
+      fwd :data,:ioh
 
       def check?() true end
       def close()