rio 0.4.2 → 0.5.1

data/lib/rio/rl/withpath.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/rl/base'
@@ -111,27 +100,22 @@ end
 module RIO
   module RL
     class WithPath < RIO::RL::Base
-      SCHEME = URI::REGEXP::PATTERN::SCHEME
-      HOST = URI::REGEXP::PATTERN::HOST
+      #SCHEME = URI::REGEXP::PATTERN::SCHEME
+      #HOST = URI::REGEXP::PATTERN::HOST
 
       # returns the path as the file system sees it. Spaces are spaces and not
       # %20 etc. This is the path that would be passed to the fs object.
       # For windows RLs this includes the '//host' part and the 'C:' part
       # returns a String
-      def fspath() 
-        RL.url2fs(self.urlpath)
+      def fspath()
+        uri.netpath
       end
 
       def fspath=(fpth)
         #p "FSPATH= #{fpth} => #{RL.fs2url(fpth)}"
-        case fpth
-        when %r{^//(#{HOST})(/.*)?$}
-          self.host = $1
-          self.urlpath = RL.fs2url($2||'')
-        else
-          self.urlpath = RL.fs2url(fpth)
-        end
+        uri.netpath = fpth
       end
+      
       def is_root?(upth)
         upth =~ %r%^(/?[a-zA-Z]:)?/% or upth =~ %r%^//(#{HOST})%
       end
@@ -139,24 +123,21 @@ module RIO
       # The value of urlpath() with any trailing slash removed
       # returns a String
       def path_no_slash() 
-        pth = self.urlpath
-        #p "path_no_slash: #{is_root?(pth)} #{pth}"
-        is_root?(pth) ? pth : pth.sub(/\/$/,'')
+        path.sub(%r{/*$},'')
       end
       # The value of fspath() with any trailing slash removed
       # returns a String
       def fspath_no_slash() 
-        pth = self.fspath
-        #p "path_no_slash: #{is_root?(pth)} #{pth}"
-        is_root?(pth) ? pth : pth.sub(/\/$/,'')
+        fspath.sub(%r{/*$},'')
       end
       def pathdepth()
         pth = self.path_no_slash
-        is_root?(pth) ? 0 : pth.count('/')
+        #is_root?(pth) ? 0 : pth.count('/')
+        pth.count('/')
       end
 
       def _uri(arg)
-        arg.kind_of?(::URI) ? arg.clone : ::URI.parse(arg.to_s)
+        arg.kind_of?(::Alt::URI) ? arg.clone : ::Alt::URI.parse(arg.to_s)
       end
       # returns the absolute path. combines the urlpath with the
       # argument, or the value returned by base() to create an
@@ -169,9 +150,9 @@ module RIO
         #p "abs: base_uri=#{base_uri.inspect}"
         #p "abs: path_uri=#{path_uri.inspect}"
         if path_uri.scheme == 'file' and base_uri.scheme != 'file'
-          abs_uri = base_uri.merge(path_uri.path)
+          abs_uri = path_uri.abs(base_uri)
         else
-          abs_uri = base_uri.merge(path_uri)
+          abs_uri = path_uri.abs(base_uri)
         end
         #p "abs: abs_uri=#{abs_uri.inspect}"
         _build(abs_uri,{:fs => self.fs})
@@ -232,15 +213,16 @@ module RIO
       # like File#dirname
       # returns a RL
       def dirname() 
-        new_rl = self.clone
-        #p "dirname: fspath_no_slash(#{self.fspath_no_slash} dn(#{fs.dirname(self.fspath_no_slash)})"
-        pth = self.fspath_no_slash
-        if pth =~ %r{^//(#{HOST})(/.*)}
-          new_rl.fspath = "//#{$1}#{fs.dirname($2)}"
-        else
-          new_rl.fspath = fs.dirname(pth)
-        end
-        new_rl
+        #u = uri.clone
+        #u.path = fs.dirname(uri.path).sub(%r{/*$},'/')
+        #puts
+        #if uri.scheme == 'file'
+        #  u.host = self.host
+        #else
+        #  u.scheme = uri.scheme
+        #  u.host = uri.host
+        #end
+        RIO::RL::Builder.build(uri.dirname)
       end
         
       # returns the tail portion of the path minus the extension
@@ -249,7 +231,7 @@ module RIO
         #p callstr('basename',ext)
         base_rl = self.abs
         base_rl.fspath = fs.dirname(base_rl.fspath_no_slash)
-        path_str = fs.basename(self.fspath_no_slash,ext)
+        path_str = fs.basename(self.path,ext)
         _build(path_str,{:base => base_rl.uri, :fs => self.fs})
       end
       def build_arg0_(path_str)
@@ -279,15 +261,16 @@ module RIO
 
       def uri_from_string_(str)
         #p "uri_from_string(#{str})"
-        case str
-        when %r%^file://(#{HOST})?(/.*)?$% then ::URI.parse(str)
-        when %r/^[a-zA-Z]:/ then 
-          ::URI.parse(str)
-        when %r/^#{SCHEME}:/ then ::URI.parse(str)
+        ::Alt::URI.parse(str)
+        #case str
+        #when %r%^file://(#{HOST})?(/.*)?$% then ::URI.parse(str)
+        #when %r/^[a-zA-Z]:/ then 
+        #  ::URI.parse(str)
+        #when %r/^#{SCHEME}:/ then ::URI.parse(str)
         #when %r{^/} then ::URI.parse('file://'+str+( ( str[-1,0] == '/' ) ? "" : "/"))
-        when %r{^/} then ::URI.parse('file://'+RL.fs2url(str))
-        else ::URI.parse(str)
-        end
+        #when %r{^/} then ::URI.parse('file://'+RL.fs2url(str))
+        #else ::URI.parse(str)
+        #end
       end
     end
   end

data/lib/rio/rrl/base.rb

@@ -0,0 +1,75 @@
+#--
+# ===========================================================================
+# 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
+# ===========================================================================
+#++
+#
+#
+module RIO
+  module RRL
+    autoload :CHMAP, 'rio/rrl/chmap'
+  end
+end
+
+
+
+
+module RIO
+  module RRL
+
+    class Base
+      attr_accessor :fs, :uri
+      def initialize(u,fs=nil)
+        @uri = u
+        @fs ||= openfs_
+      end
+      def initialize_copy(other)
+        super
+        @fs = other.fs if other.fs
+        @uri = other.uri.clone if other.uri
+      end
+      def self.parse(*a)
+        u = a.shift.sub(/^rio:/,'')
+        new(u,*a)
+      end
+
+      def openfs_() 
+        nil 
+      end
+      def to_s() uri.to_s end
+      def ==(other) self.to_s == other.to_s end
+      def ===(other) self == other end
+      def =~(other) other =~ self.to_str end
+      def length() self.to_s.length end
+
+      extend Forwardable
+      def url() uri.to_s end
+      
+      def close() 
+        nil 
+      end
+
+      def callstr(func,*args)
+        self.class.to_s+'['+self.to_s+']'+'.'+func.to_s+'('+args.join(',')+')'
+      end
+    end
+  end
+end
+

data/lib/rio/rrl/builder.rb

@@ -0,0 +1,122 @@
+#--
+# ===========================================================================
+# 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 'rio/alturi'
+require 'rio/uriref'
+require 'rio/rrl/base'
+require 'stringio'
+
+module RIO
+  module RRL
+    class Builder
+      def self.build_path_rl(rl)
+        return rl
+      end
+      def self.build(*a)
+        #puts "build: #{a.inspect} (#{a.map(&:class).inspect})" 
+        a.flatten!
+        a.push('') if a.empty?
+        case a[0]
+        when ?? , ?= , ?_ , ?", ?[, ?#, ?`, ?|, ?z
+          a[0] = 'rio:'+CHMAP[a[0]]+':'
+        when ?-
+          a[0] = ( a.size == 1 ? 'rio:'+CHMAP[a[0]]+':' : 'rio:cmdio:' )
+        when ?$
+          a[0] = 'rio:strio:'
+        when ::String
+          #p a[0].encoding,a[0]
+          case a[0]
+          when /^[a-zA-Z]:/
+            a[0] = 'rio:file:///'+a[0]
+          when /^[a-z][a-z]+:/
+            a[0] = 'rio:'+a[0] unless a[0] =~ /^rio:/
+          when %r|^//|
+            a[0] = 'rio:file:'+a[0]
+          when %r|^/|
+              a[0] = 'file://'+a[0]
+#            return Factory.instance.riorl_class('file').new(*a)
+          else
+            #a[0] = 'path:'+a[0]
+            return Factory.instance.riorl_class('path').new(*a)
+          end
+        when RIO::Rio
+          a[0] = a[0].rl
+          return build(*a)
+        when ::RIO::RRL::Base
+          a0 = a.shift.uri
+          cl = Factory.instance.riorl_class(a0.scheme)
+          o = cl.new(a0,*a) unless cl.nil?
+          return o
+        when ::Alt::URI::Base
+          a0 = a.shift
+          cl = Factory.instance.riorl_class(a0.scheme)
+          o = cl.new(a0,*a) unless cl.nil?
+          return o
+        when ::RIO::URIRef
+          a0 = a.shift
+          cl = Factory.instance.riorl_class(a0.scheme)
+          o = cl.new(a0,*a) unless cl.nil?
+          return o
+        when ::Symbol
+          case a[0]
+          when :_
+            a[0] = 'sysio:'
+          when :""
+            a[0] = 'strio:'
+          when :|
+            a[0] = 'cmdpipe:'
+          when :-
+            a[0] = ( a.size == 1 ? 'stdio:' : 'cmdio:' )
+          when :zpath
+            a0 = a.shift
+            cl = Factory.instance.riorl_class(a0.to_s)
+            o = cl.new(*a) unless cl.nil?
+            return o
+          else
+            a[0] = 'rio:' + a[0].to_s + ':'
+          end
+        when ::NilClass
+          a[0] = 'rio:null:'
+        when ::IO
+          a.unshift('rio:sysio:')
+        when ::StringIO
+          a.unshift('rio:strio:')
+        else
+          a[0] = a[0].to_s
+          return build(*a)
+        end
+        a0 = a.shift
+        sch = /^(rio:)?([^:]+):/.match(a0)[2]
+
+        #sch = Base.subscheme(a0)
+        cl = Factory.instance.riorl_class(sch)
+        #p "cl=#{cl} a=#{a.inspect}"
+        cl.parse(a0,*a)  unless cl.nil?
+
+      end
+
+    end
+  end
+end

data/lib/rio/rrl/chmap.rb

@@ -0,0 +1,53 @@
+#--
+# ===========================================================================
+# 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 'rio/local'
+
+module RIO
+  module RRL
+    CHMAP = { 
+      '_'    => 'sysio',
+      '-'    => 'stdio',
+      '='    => 'stderr',
+      '"'    => 'strio',
+      '?'    => 'temp',
+      '['    => 'aryio',
+      '`'    => 'cmdio',
+      '|'    => 'cmdpipe',
+      '#'    => 'fd',
+
+      ?_    => 'sysio',
+      ?-    => 'stdio',
+      ?=    => 'stderr',
+      ?"    => 'strio',
+      ??    => 'temp',
+      ?[    => 'aryio',
+      ?`    => 'cmdio',
+      ?|    => 'cmdpipe',
+      ?#    => 'fd',
+      ?z    => 'zipfile',
+    }.freeze
+  end
+end

data/lib/rio/rrl/ioi.rb

@@ -0,0 +1,78 @@
+#--
+# ===========================================================================
+# 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 'rio/rrl/base'
+require 'rio/ioh'
+require 'rio/fs/stream'
+
+module RIO
+  module RRL
+    class IOIBase < Base
+      RESET_STATE = 'Stream::Open'
+      def openfs_()
+        RIO::FS::Stream.create()
+      end
+      def scheme() self.class.const_get(:RIOSCHEME) end
+      def opaque() '' end
+      #def self.splitrl(s) nil end
+      def fspath() nil end
+      def path() uri.path end
+      #def path() self.class.const_get(:RIOPATH) end
+      def to_s() url() end
+      def open(ios)
+        IOH::Stream.new(ios)
+      end
+    end
+  end
+  module RRL
+    class SysIOBase < IOIBase
+      attr_reader :ios
+      attr_writer :ios
+      protected(:ios=)
+      def initialize(u,*args)
+        alturi = case u
+                 when ::Alt::URI::Base then u
+                 else ::Alt::URI.parse(u.to_s)
+                 end
+        super(alturi)
+        @ios = args.shift
+      end
+      def self.parse(*a)
+        u = a.shift.sub(/^rio:/,'')
+        new(u,*a)
+      end
+
+      def initialize_copy(cp)
+        super
+        @ios = cp.ios.clone unless cp.ios.nil? or cp.ios.closed?
+      end
+      def open(ios=nil)
+        @ios = ios unless ios.nil?
+        super(@ios)
+      end
+        
+    end
+  end
+end