rio 0.3.8 → 0.3.9

data/lib/rio/rl/builder.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, 2006 Christopher Kleckner
+# Copyright (c) 2005,2006,2007 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -23,16 +23,15 @@
 #
 # 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.
+# from the distribution directory.
 #
 # Suggested Reading
 # * RIO::Doc::SYNOPSIS
 # * RIO::Doc::INTRO
 # * RIO::Doc::HOWTO
+# * RIO::Doc::EXAMPLES
 # * RIO::Rio
 #
-# <b>Rio is pre-alpha software. 
-# The documented interface and behavior is subject to change without notice.</b>
 
 
 require 'uri'
@@ -43,7 +42,9 @@ require 'stringio'
 module RIO
   module RL
     class Builder
-
+      def self.build_path_rl(rl)
+        return rl
+      end
       def self.build(*a)
         #puts "build: #{a.inspect}" 
         a.flatten!
@@ -64,13 +65,15 @@ module RIO
             return Factory.instance.riorl_class('path').new(*a)
           end
         when RIO::Rio
-          a[0] = a[0].to_rl
+          a[0] = a[0].rl
+          return build(*a)
         when RL::Base
+          #p "HERE a=#{a.inspect}"
           a0 = a.shift.clone
-          return (a.empty? ? a0 : a0.join(*a))
-          #p 'THERE',a0,a0.clone
-          #return a0.clone.join(*a)
-          #return a0.class.new(a0.clone,*a)
+          cl = Factory.instance.riorl_class(a0.scheme)
+          o = cl.new(a0,*a) unless cl.nil?
+          return o
+          #          return (a.empty? ? a0 : a0.join(*a))
         when ::URI
           a0 = a.shift
           cl = Factory.instance.riorl_class(a0.scheme)
@@ -88,7 +91,7 @@ module RIO
           end
         when ::NilClass
           a[0] = 'rio:null:'
-        when ?? , ?= , ?_ , ?", ?[, ?#, ?`, ?|
+        when ?? , ?= , ?_ , ?", ?[, ?#, ?`, ?|, ?z
           a[0] = 'rio:'+CHMAP[a[0]]+':'
         when ?-
           a[0] = ( a.size == 1 ? 'rio:'+CHMAP[a[0]]+':' : 'rio:cmdio:' )
@@ -109,33 +112,6 @@ module RIO
 
       end
 
-
-      def self.build0(*args)
-        #p "build(#{args.inspect})"
-
-        # aryio is a special case -- must not flatten
-        if args[0] == 'rio:aryio'
-          args.shift
-          ary = args[0] unless args.empty? 
-          require 'rio/scheme/aryio'
-          return RIO::AryIO::RL.new(ary)
-        end
-
-        args = canon(args.flatten)
-        a0 = args.shift
-        case a0
-        when RL::Base
-          a0.class.new(a0.uri.dup,*args)
-        when ::URI
-          cl = Factory.instance.riorl_class(a0.scheme)
-          cl.new(a0,*args) unless cl.nil?
-        else
-          sch = Base.subscheme(a0)
-          cl = Factory.instance.riorl_class(sch)
-          cl.parse(a0,*args)  unless cl.nil?
-        end
-      end
-
     end
   end
 end

data/lib/rio/rl/chmap.rb

@@ -0,0 +1,66 @@
+#--
+# =============================================================================== 
+# Copyright (c) 2005,2006,2007 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.
+#
+# Suggested Reading
+# * RIO::Doc::SYNOPSIS
+# * RIO::Doc::INTRO
+# * RIO::Doc::HOWTO
+# * RIO::Doc::EXAMPLES
+# * RIO::Rio
+#
+
+
+require 'uri'
+require 'rio/local'
+require 'rio/uri/file'
+
+module RIO
+  module RL
+    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/rl/fs2url.rb

@@ -0,0 +1,82 @@
+#--
+# =============================================================================== 
+# Copyright (c) 2005,2006,2007 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.
+#
+# Suggested Reading
+# * RIO::Doc::SYNOPSIS
+# * RIO::Doc::INTRO
+# * RIO::Doc::HOWTO
+# * RIO::Doc::EXAMPLES
+# * RIO::Rio
+#
+
+
+require 'uri'
+require 'rio/local'
+require 'rio/uri/file'
+require 'rio/rl/chmap'
+
+module RIO
+  module RL #:nodoc: all
+    PESCAPE = Regexp.new("[^-_.!~*'()a-zA-Z0-9;?:@&=+$,]",false, 'N').freeze
+    ESCAPE = Regexp.new("[^-_.!~*'()a-zA-Z0-9;\/?:@&=+$,]",false, 'N').freeze
+    def escape(pth,esc=ESCAPE)
+      ::URI.escape(pth,esc)
+    end
+    def unescape(pth)
+      ::URI.unescape(pth)
+    end
+    def fs2urls(*args)
+      args.map{ |pth| fs2url(pth) }
+    end
+    def fs2url(pth)
+      #pth.sub!(/^[a-zA-Z]:/,'')
+      pth = URI.escape(pth,ESCAPE)
+      pth = '/' + pth if pth =~ /^[a-zA-Z]:/
+      pth
+      #      (Local::SEPARATOR == '/' ? pth : pth.gsub(Local::SEPARATOR,%r|/|))
+    end
+
+    def url2fs(pth)
+#      pth = pth.chop if pth.length > 1 and pth[-1] == ?/      cwd = RIO::RL.fs2url(::Dir.getwd)
+
+      #pth = pth.chop if pth != '/' and pth[-1] == ?/
+      pth = ::URI.unescape(pth)
+      if pth =~ %r#^/[a-zA-Z]:#
+        pth = pth[1..-1] 
+      end
+      pth
+#      (Local::SEPARATOR == '/' ? pth : pth.gsub(%r|/|,Local::SEPARATOR))
+    end
+
+    def getwd()
+      #::URI::FILE.build({:path => fs2url(::Dir.getwd)+'/'})
+      ::URI::FILE.build({:path => fs2url(::Dir.getwd)})
+    end
+
+    module_function :url2fs,:fs2url,:fs2urls,:getwd,:escape,:unescape
+  end
+end

data/lib/rio/rl/ioi.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, 2006 Christopher Kleckner
+# Copyright (c) 2005,2006,2007 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -23,16 +23,15 @@
 #
 # 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.
+# from the distribution directory.
 #
 # Suggested Reading
 # * RIO::Doc::SYNOPSIS
 # * RIO::Doc::INTRO
 # * RIO::Doc::HOWTO
+# * RIO::Doc::EXAMPLES
 # * RIO::Rio
 #
-# <b>Rio is pre-alpha software. 
-# The documented interface and behavior is subject to change without notice.</b>
 
 
 require 'rio/rl/base'
@@ -66,6 +65,7 @@ module RIO
         super
       end
       def initialize_copy(cp)
+        super
         @ios = cp.ios.clone unless cp.ios.nil?
       end
       def open(ios=nil)

data/lib/rio/rl/path.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, 2006 Christopher Kleckner
+# Copyright (c) 2005,2006,2007 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -23,165 +23,87 @@
 #
 # 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.
+# from the distribution directory.
 #
 # Suggested Reading
 # * RIO::Doc::SYNOPSIS
 # * RIO::Doc::INTRO
 # * RIO::Doc::HOWTO
+# * RIO::Doc::EXAMPLES
 # * RIO::Rio
 #
-# <b>Rio is pre-alpha software. 
-# The documented interface and behavior is subject to change without notice.</b>
 
 
 require 'rio/rl/uri'
+require 'rio/rl/withpath'
 require 'rio/rl/pathmethods'
 
 module RIO
   module RL
-    class PathBase < Base
+    class PathBase < URIBase
       RESET_STATE = 'Path::Reset'
 
-      RIOSCHEME = 'path'
-      HOST = URI::REGEXP::PATTERN::HOST
-      SCHEME = URI::REGEXP::PATTERN::SCHEME
-
-      #attr :fs
-      def initialize(pth,*args)
-
-        @host = nil  # host or nil
-        @fspath = nil
-        case pth
-        when ::Hash
-          @host = pth[:host]
-          @fspath = RL.url2fs(pth[:path])
-          @base = pth[:base]
-        when RL::Base
-          @host = pth.host
-          @fspath = RL.url2fs(pth.path)
-          @base = pth.base
-        when ::URI
-          u = pth.dup
-          u.path = '/' if pth.absolute? and pth.path == ''
-          @fspath = RL.url2fs(u.path)
-          @host = u.host
-        when %r|^file://(#{HOST})?(/.*)?$|
-          @host = $1 || ''
-          @fspath = $2 ? RL.url2fs($2) : '/'
+      def arg0_info_(arg0,*args)
+        #p "arg0_info_(#{arg0.inspect},#{args.inspect})"
+        #p callstr('init_from_args_',arg0.inspect,args)
+        vuri,vbase,vfs = nil,nil,nil
+        case arg0
+        when RIO::Rio, URIBase, ::URI
+          return super
+        when ::String 
+          vuri = uri_from_string_(RL.fs2url(arg0)) || ::URI.parse(RL.fs2url(arg0))
         else
-          self.fspath = pth
+          raise(ArgumentError,"'#{arg0}'[#{arg0.class}] can not be used to create a Rio")
         end
-        args = _get_opts_from_args(args)
-        self.join(*args) unless args.empty?
-        unless self.absolute? or @base
-          @base = RL.fs2url(::Dir.getwd)+'/'
-        end
-        @fspath.sub!(%r|/\.$|,'/')
-        #@fs = openfs_ 
-        super
+        [vuri,vbase,vfs]
       end
-      def openfs_
-        RIO::FS::Native.create()
+      def build_arg0_(path_str)
+        RL.url2fs(path_str)
       end
-      def pathroot()
-        return nil unless absolute?
-        rrl = self.clone
-        if self.urlpath =~ %r%^(/[a-zA-Z]):%
-          $1+':/'
-        else
-          '/'
-        end
+      def scheme() 
+        uri.scheme || 'path' 
       end
-      include PathMethods
-
-      def _get_opts_from_args(args)
-        @base = nil
-        if !args.empty? and args[-1].kind_of?(::Hash) 
-          opts = args.pop
-          if b = opts[:base]
-            @base = case b
-                    when %r%^file://(#{HOST})?(/.*)?$% then b
-                    when %r%^/% then b
-                    else RL.fs2url(::Dir.getwd)+'/'+b
-                    end
-            @base.squeeze('/')
-          end
-          if fs = opts[:fs]
-            @fs = fs
-          end
-        end
-        args
+      def url
+        str = uri.to_s
+        str = scheme + ':' +str unless uri.scheme
+        str
       end
-      def base(arg=nil) 
-        self.base = arg unless arg.nil?
-        if absolute? 
-          #p self.dirname
-          urlpath 
-        else
-          @base
-        end
-      end
-      def base=(arg) @base = arg end
-
-#      def urlpath() @pth end
-#      def urlpath=(arg) @pth = arg end
-      def urlpath() RL.fs2url(@fspath) end
-      def urlpath=(arg) @fspath = RL.url2fs(arg) end
-
-      def path() self.fspath() end
-      def path=(arg) self.fspath = arg end
-      def path_no_slash() self.path.sub(/\/$/,'') end
       def use_host?
-        !(@host.nil? || @host.empty? || @host == 'localhost')
+        hst = uri.host
+        !(hst.nil? || hst.empty? || hst == 'localhost')
       end
 
+      def join(*args)
+        return self if args.empty?
+        join_(args.map{ |arg| RL.fs2url(arg.to_s)})
+      end
       def fspath() 
         if use_host?
-          '//' + @host + @fspath
+          '//' + uri.host + RL.url2fs(self.urlpath)
         else 
-          @fspath
+          RL.url2fs(self.urlpath)
         end
       end
-      def fspath=(pt)
-        if pt =~ %r|^//(#{HOST})(/.*)?$|
-          @host = $1
-          @fspath = $2 || '/'
-        else
-          @fspath = pt
-        end
-      end
-
-      def opaque() (absolute? ? "//#{@host}#{self.urlpath}" : self.urlpath) end
-
-      def scheme() (absolute? ? 'file' : 'path') end
-      def host() @host end
-      def host=(arg) @host = arg end
-
-      def absolute?() 
-        (@fspath =~ %r%^([a-zA-Z]:)?/%  ? true : false)
+#      def fspath=(pt)
+#        if pt =~ %r|^//(#{HOST})(/.*)?$|
+#          @host = $1
+#          @fspath = $2 || '/'
+#        else
+#          @fspath = pt
+#        end
+#      end
+      def to_s()
+        self.fspath
       end
-      alias abs? absolute?
-
-      def abs()
-        return self if absolute?
-        self.class.new(@base, @fspath) 
-      end
-    
-      def uri() 
-        (absolute? ? 
-         ::URI::FILE.new('file',nil,@host,nil,nil,RL.fs2url(@fspath),nil,nil,nil) : ::URI.parse(RL.fs2url(@fspath)))
-      end
-
       def self.splitrl(s)
         sch,opq,whole = split_riorl(s)
+        #p sch,opq,whole
         case sch
         when 'file' then [whole]
         else [opq]
         end
       end
-
-
     end
   end
 end
+__END__