rio 0.4.2 → 0.5.1

data/lib/rio/scheme/null.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,31 +18,20 @@
 # 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/rl/ioi'
+require 'rio/rrl/ioi'
 require 'rio/stream'
 require 'rio/stream/open'
 
 module RIO
   module Null #:nodoc: all
-    RESET_STATE = RL::IOIBase::RESET_STATE
+    RESET_STATE = RRL::IOIBase::RESET_STATE
 
-    class RL < RL::IOIBase 
+    class RRL < RRL::IOIBase 
       RIOSCHEME = 'null'
 
       def open(m,*args)

data/lib/rio/scheme/path.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,81 +18,70 @@
 # 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/rl/path'
-require 'rio/ioh'
-module RIO
-  module Path #:nodoc: all
-    RESET_STATE = RIO::RL::PathBase::RESET_STATE
+# require 'rio/rl/path'
+# require 'rio/ioh'
+# module RIO
+#   module Path #:nodoc: all
+#     RESET_STATE = RIO::RL::PathBase::RESET_STATE
 
-    class RL < RIO::RL::PathBase 
-      def file_rl()
-        RIO::File::RL.new(self.uri, {:fs => self.fs})
-      end
-      def dir_rl()
-        RIO::Dir::RL.new(self.uri, {:fs => self.fs})
-      end
-    end
-  end
-  module File
-    RESET_STATE = RIO::RL::PathBase::RESET_STATE
+#     class RL < RIO::RL::PathBase 
+#       def file_rl()
+#         RIO::File::RL.new(self.uri, {:fs => self.fs})
+#       end
+#       def dir_rl()
+#         RIO::Dir::RL.new(self.uri, {:fs => self.fs})
+#       end
+#     end
+#   end
+#   module File
+#     RESET_STATE = RIO::RL::PathBase::RESET_STATE
 
-    class RL < RIO::Path::RL
-      def open(m)
-        IOH::Stream.new(fs.file.open(self.fspath,m.to_s))
-      end
-      def file_rl()
-        self
-      end
-    end
-  end
-  module Dir
-    RESET_STATE = RIO::RL::PathBase::RESET_STATE
+#     class RL < RIO::Path::RL
+#       def open(m)
+#         IOH::Stream.new(fs.file.open(self.fspath,m.to_s))
+#       end
+#       def file_rl()
+#         self
+#       end
+#     end
+#   end
+#   module Dir
+#     RESET_STATE = RIO::RL::PathBase::RESET_STATE
 
-    class RL < RIO::Path::RL
-      def open()
-        IOH::Dir.new(fs.dir.open(self.fspath))
-      end
-      def dir_rl()
-        self
-      end
-    end
-  end
-  require 'rio/stream'
-  require 'rio/stream/open'
-  require 'rio/ops/symlink'
-  module Path
-    module Stream
-      module Ops
-        include RIO::Ops::Path::Str
-      end
+#     class RL < RIO::Path::RL
+#       def open()
+#         IOH::Dir.new(fs.dir.open(self.fspath))
+#       end
+#       def dir_rl()
+#         self
+#       end
+#     end
+#   end
+#   require 'rio/stream'
+#   require 'rio/stream/open'
+#   require 'rio/ops/symlink'
+#   module Path
+#     module Stream
+#       module Ops
+#         include RIO::Ops::Path::Str
+#       end
 
-      class Open < RIO::Stream::Open
-        include RIO::Ops::Path::Status
-        include RIO::Ops::Path::URI
-        include RIO::Ops::Path::Query
-        def stream_state(cl)
-          next_state = super
-          next_state.extend(RIO::Ops::Symlink::Existing) if symlink?
-          next_state.extend(Ops)
-        end
-      end
-    end
-  end
-end
+#       class Open < RIO::Stream::Open
+#         include RIO::Ops::Path::Status
+#         include RIO::Ops::Path::URI
+#         include RIO::Ops::Path::Query
+#         def stream_state(cl)
+#           next_state = super
+#           next_state.extend(RIO::Ops::Symlink::Existing) if symlink?
+#           next_state.extend(Ops)
+#         end
+#       end
+#     end
+#   end
+# end
 __END__

data/lib/rio/scheme/stderr.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,22 @@
 # 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
-#
 
 
 module RIO
   module StdErr #:nodoc: all
-    require 'rio/rl/ioi'
-    RESET_STATE = RL::IOIBase::RESET_STATE
+    require 'rio/rrl/ioi'
+    RESET_STATE = RRL::IOIBase::RESET_STATE
     
-    class RL < RL::SysIOBase 
+    class RRL < RRL::SysIOBase 
       RIOSCHEME = 'stderr'
-      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].freeze
-      def initialize()
-        super($stderr)
+      RIOPATH = RIO::RRL::CHMAP.invert[RIOSCHEME].freeze
+      def initialize(u)
+        super(::Alt::URI.parse(u))
       end
-      def opaque() '' end
       def open(*args)
         #self.ios = $stderr
         super($stderr)

data/lib/rio/scheme/stdio.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,44 +18,32 @@
 # 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/rrl/ioi'
 
 module RIO
   module StdIO #:nodoc: all
-    require 'rio/rl/ioi'
-    RESET_STATE = RL::IOIBase::RESET_STATE
+    RESET_STATE = RRL::IOIBase::RESET_STATE
 
-    class RL < RL::SysIOBase 
+    class RRL < RRL::SysIOBase 
       RIOSCHEME = 'stdio'
-      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].to_s.freeze
-      attr_reader :scheme
-      def initialize(sch=RIOSCHEME)
-        @scheme = sch
-        #super
+      RIOPATH = RIO::RRL::CHMAP.invert[RIOSCHEME].to_s.freeze
+      def initialize(u)
+        super(u)
       end
-      def opaque() '' end
+      extend Forwardable
+      def_delegators :uri, :path=, :path
       require 'rio/iomode'
       def open(m)
         case 
         when m.primarily_read? 
-          @scheme = 'stdin'
+          uri.scheme = 'stdin'
           return super($stdin.clone)
         when m.primarily_write? 
-          @scheme = 'stdout'
+          uri.scheme = 'stdout'
           return super($stdout.clone)
         else 
           raise ArgumentError,sprintf("Can not %s a %s with mode '%s'",'open',self.class,m)
@@ -63,7 +51,7 @@ module RIO
         nil
       end
       def close()
-        @scheme = RIOSCHEME
+        uri.scheme = RIOSCHEME
         self.ios = nil
       end
     end

data/lib/rio/scheme/strio.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,23 +18,12 @@
 # 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/rl/ioi'
+require 'rio/rrl/ioi'
 require 'stringio'
 require 'rio/stream'
 require 'rio/stream/open'
@@ -43,32 +32,41 @@ module RIO
   module StrIO #:nodoc: all
     RESET_STATE = 'StrIO::Stream::Open'
 
-    class RL < RL::IOIBase 
+    class RRL < ::RIO::RRL::IOIBase 
       RIOSCHEME = 'strio'
-      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].to_s.freeze
+      RIOPATH = RIO::RRL::CHMAP.invert[RIOSCHEME].to_s.freeze
       attr_accessor :str
-      def initialize(str="")
-        @str = str
-        super
+      def initialize(u,str="")
+        #p "StrIO::RRL initialize: u=#{u.inspect} str=#{str.inspect}"
+        alturi = ::Alt::URI.parse(u.to_s)
+        super(alturi)
+        self.query ||= str
+        @sio = self.query
       end
-
-      def opaque() sprintf('0x%08x',@str.object_id) end
-
-      # must be able to process both
-      # parse('rio:strio',string)
-      # parse('rio:strio:0xHEXIOS')
-      SPLIT_RE = %r|0x([0-9a-fA-F]+)$|
-      def self.splitrl(s)
-        sub,opq,whole = split_riorl(s)
-        if bm = SPLIT_RE.match(opq)
-          oid = bm[1].hex
-          str = ObjectSpace._id2ref(oid)
-          [str]
-        end
+      def self.parse(*a)
+        u = a.shift.sub(/^rio:/,'')
+        new(u,*a)
       end
-
+      def query=(arg)
+        uri.query = if arg.nil?
+                      nil 
+                    else
+                      @sio = (::StringIO === arg ? arg : ::StringIO.new(arg))
+                      sprintf('0x%08x',@sio.object_id)
+                    end
+        arg
+      end
+      def query
+        uri.query.nil? ? nil :  ObjectSpace._id2ref(uri.query.hex)
+      end
+      alias :stringio :query
+      alias :stringio= :query=
       def open(m,*args)
-        super(::StringIO.new(@str,m.to_s,*args))
+        #p "STRIO open: m=#{m} args=#{args.inspect}"
+        strio = self.stringio
+        str = strio.string
+        nstrio = self.stringio.reopen(str,m.to_s)
+        super(nstrio)
       end
     end
     module Stream
@@ -77,8 +75,9 @@ module RIO
         def string=(p1) ioh.string = p1 end
       end
       class Open < RIO::Stream::Open
-        def string=(p1) rl.str = p1 end
-        def string() rl.str end
+        def string=(p1) rl.query = p1 end
+        def stringio() rl.query end
+        def string() stringio.string end
         def stream_state(*args) super.extend(Ops) end
       end
     end

data/lib/rio/scheme/sysio.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,45 +18,33 @@
 # 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
-#
 
 
 module RIO
   module SysIO #:nodoc: all
-    require 'rio/rl/ioi'
-    RESET_STATE = RL::IOIBase::RESET_STATE
+    require 'rio/rrl/ioi'
+    RESET_STATE = RRL::IOIBase::RESET_STATE
 
-    class RL < RL::SysIOBase
+    class RRL < RRL::SysIOBase
       RIOSCHEME = 'sysio'
-      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].to_s.freeze
-      def opaque() sprintf('0x%08x',self.ios.object_id) end
-      def open(*args)
-        super(*args)
+      RIOPATH = RIO::RRL::CHMAP.invert[RIOSCHEME].to_s.freeze
+      def initialize(u,arg=nil)
+        super(::Alt::URI.parse(u),arg)
+        self.query ||= ios unless ios.nil?
+      end
+      def query=(arg)
+        uri.query = arg.nil? ? nil : sprintf('0x%08x',arg.object_id)
+        arg
       end
-      # must be able to process both
-      # parse('rio:sysio',ios)
-      # parse('rio:sysio:0xHEXIOS')
-      SPLIT_RE = %r|0x([0-9a-fA-F]+)$|
-      def self.splitrl(s)
-        sub,opq,whole = split_riorl(s)
-        if bm = SPLIT_RE.match(opq)
-          oid = bm[1].hex
-          ios = ObjectSpace._id2ref(oid)
-          [ios]
-        end
+      def query
+        uri.query.nil? ? nil :  ObjectSpace._id2ref(uri.query.hex)
+      end
+
+      def open(*args)
+        super(self.ios)
       end
     end
   end