rio 0.4.2 → 0.5.1

data/lib/rio/rl/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,27 +18,14 @@
 # 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/alturi'
 require 'rio/local'
-require 'rio/uri/file'
 require 'rio/rl/chmap'
-require 'rio/rl/fs2url'
 
 module RIO
   module RL
@@ -101,14 +88,14 @@ module RIO
         nil 
       end
 
-      def fs2url(pth) RL.fs2url(pth) end
-      def url2fs(pth) RL.url2fs(pth) end
-      def escape(pth,esc=RL::ESCAPE)
-        RL.escape(pth,esc)
-      end
-      def unescape(pth)
-        RL.unescape(pth)
-      end
+      #def fs2url(pth) RL.fs2url(pth) end
+      #def url2fs(pth) RL.url2fs(pth) end
+      #def escape(pth,esc=RL::ESCAPE)
+      #  RL.escape(pth,esc)
+      #end
+      #def unescape(pth)
+      #  RL.unescape(pth)
+      #end
 
       def callstr(func,*args)
         self.class.to_s+'['+self.to_s+']'+'.'+func.to_s+'('+args.join(',')+')'

data/lib/rio/rl/builder.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,25 +18,15 @@
 # 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/alturi'
 require 'rio/local'
 require 'rio/rl/base'
+require 'rio/rrl/base'
 require 'stringio'
 
 module RIO
@@ -50,6 +40,12 @@ module RIO
         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
           case a[0]
           when /^[a-zA-Z]:/
@@ -59,23 +55,33 @@ module RIO
           when %r|^//|
             a[0] = 'rio:file:'+a[0]
           when %r|^/|
-            a[0] = 'file://'+a[0]
+            #a[0] = 'file://'+a[0]
+              #p "IN BUILDER #{a.inspect}"
             return Factory.instance.riorl_class('file').new(*a)
           else
             return Factory.instance.riorl_class('path').new(*a)
           end
         when RIO::Rio
+          #p "BUILD: a[0]=#{a[0].inspect} a[0].rl=#{a[0].rl.inspect}"
           a[0] = a[0].rl
           return build(*a)
         when RL::Base
-          #p "HERE a=#{a.inspect}"
+          #p "BUILD: RL::Base a=#{a.inspect}"
           a0 = a.shift.clone
           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
+        when ::RIO::RRL::Base
+          #p "BUILD: RRL::Base a=#{a.inspect}"
+          a0 = a.shift.uri
+          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 ::Alt::URI::Base
           a0 = a.shift
+          #p "SCHEME is #{a0.scheme}"
           cl = Factory.instance.riorl_class(a0.scheme)
           o = cl.new(a0,*a) unless cl.nil?
           return o
@@ -91,12 +97,6 @@ module RIO
           end
         when ::NilClass
           a[0] = 'rio:null:'
-        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 ::IO
           a.unshift('rio:sysio:')
         when ::StringIO
@@ -108,6 +108,7 @@ module RIO
         a0 = a.shift
         sch = Base.subscheme(a0)
         cl = Factory.instance.riorl_class(sch)
+        #p "cl=#{cl}"
         cl.parse(a0,*a)  unless cl.nil?
 
       end

data/lib/rio/rl/chmap.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,25 +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 'uri'
 require 'rio/local'
-require 'rio/uri/file'
 
 module RIO
   module RL

data/lib/rio/rl/fs2url.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 'uri'
@@ -41,8 +30,8 @@ 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
+    PESCAPE = Regexp.new("[^-_.!~*'()a-zA-Z0-9;?:@&=+$,]",false).freeze
+    ESCAPE = Regexp.new("[^-_.!~*'()a-zA-Z0-9;\/?:@&=+$,]",false).freeze
     def escape(pth,esc=ESCAPE)
       ::URI.escape(pth,esc)
     end

data/lib/rio/rl/ioi.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'

data/lib/rio/rl/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,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/uri'
+require 'rio/alturi'
 require 'rio/rl/withpath'
 require 'rio/rl/pathmethods'
 
@@ -48,10 +37,10 @@ module RIO
         #p callstr('init_from_args_',arg0.inspect,args)
         vuri,vbase,vfs = nil,nil,nil
         case arg0
-        when RIO::Rio, URIBase, ::URI
+        when RIO::Rio, URIBase, ::Alt::URI::Base, ::Alt::URI::File
           return super
         when ::String 
-          vuri = uri_from_string_(RL.fs2url(arg0)) || ::URI.parse(RL.fs2url(arg0))
+          vuri = uri_from_string_(arg0) || ::Alt::URI.parse(arg0)
         else
           raise(ArgumentError,"'#{arg0}'[#{arg0.class}] can not be used to create a Rio")
         end
@@ -76,15 +65,15 @@ module RIO
 
       def join(*args)
         return self if args.empty?
-        join_(args.map{ |arg| RL.fs2url(arg.to_s)})
-      end
-      def fspath() 
-        if use_host?
-          '//' + uri.host + RL.url2fs(self.urlpath)
-        else 
-          RL.url2fs(self.urlpath)
-        end
+        join_(args.map{ |arg| arg.to_s})
       end
+      #def fspath() 
+      #  if use_host?
+      #    '//' + uri.host + RL.url2fs(self.urlpath)
+      #  else 
+      #    RL.url2fs(self.urlpath)
+      #  end
+      #end
 #      def fspath=(pt)
 #        if pt =~ %r|^//(#{HOST})(/.*)?$|
 #          @host = $1

data/lib/rio/rl/pathmethods.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/uri'

data/lib/rio/rl/uri.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,33 +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
-#
 
 
 require 'rio/rl/base'
 require 'rio/rl/withpath'
 require 'rio/fs/url'
 require 'rio/fs/native'
-require 'rio/uri/file'
+require 'rio/alturi'
 
 module RIO
   module RL
     class URIBase < WithPath
-      SCHEME = URI::REGEXP::PATTERN::SCHEME
-      HOST = URI::REGEXP::PATTERN::HOST
+      #SCHEME = URI::REGEXP::PATTERN::SCHEME
+      #HOST = URI::REGEXP::PATTERN::HOST
 
       attr_accessor :uri
       def initialize(u,*args)
@@ -56,7 +45,7 @@ module RIO
         init_from_args_(u,*args)
         super
         unless self.absolute? or @base
-          @base = ::URI::parse('file://'+RL.fs2url(fs.getwd)+'/')
+          @base = ::Alt::URI::create(:scheme => 'file', :path => fs.getwd+'/')
         end
         @uri.path = '/' if @uri.absolute? and @uri.path == ''
       end
@@ -68,10 +57,10 @@ module RIO
           return _init_from_arg(arg0.rl)
         when URIBase
           vuri,vbase,vfs = arg0.uri,arg0.base,arg0.fs
-        when ::URI 
+        when ::Alt::URI::Base 
           vuri = arg0
         when ::String 
-          vuri = uri_from_string_(arg0) || ::URI.parse(arg0)
+          vuri = uri_from_string_(arg0) || ::Alt::URI.parse(arg0)
         else
           raise(ArgumentError,"'#{arg0}'[#{arg0.class}] can not be used to create a Rio")
         end
@@ -79,15 +68,8 @@ module RIO
         [vuri,vbase,vfs]
       end
       def init_from_args_(arg0,*args)
-        #p "init_from_args_(#{arg0.inspect})"
-        #p callstr('init_from_args_',arg0.inspect,args)
         vuri,vbase,vfs = self.arg0_info_(arg0,*args)
-        #p vuri,vbase
-        #p vuri
         @uri = vuri
-        #p 'HERE'
-        #p vuri
-        #p args unless args.nil? || args.empty?
         self.join(*args)
         @base = vbase unless @base or vbase.nil?
         fs = vfs if vfs 
@@ -99,10 +81,10 @@ module RIO
           arg.abs.to_uri
         when URIBase
           arg.abs.uri
-        when ::URI 
+        when ::Alt::URI::Base
           arg if arg.absolute?
         when ::String 
-          uri_from_string_(arg) || ::URI.parse([RL.fs2url(::Dir.getwd+'/'),arg].join('/').squeeze('/'))
+          uri_from_string_(arg) || ::Alt::URI.parse([RL.fs2url(::Dir.getwd+'/'),arg].join('/').squeeze('/'))
         else
           raise(ArgumentError,"'#{arg}' is not a valid base path")
         end
@@ -151,10 +133,7 @@ module RIO
         end
       end
       def path=(pth)
-        case scheme
-        when 'file','path' then self.fspath = pth
-        else self.urlpath = pth
-        end
+        uri.path = pth
       end
       def scheme() uri.scheme end
       def host() uri.host end
@@ -164,12 +143,16 @@ module RIO
         u.query = nil
         u.to_s.sub(/^#{SCHEME}:/,'')
       end
+      def self.parse(*a)
+        parms = splitrl(a.shift) || []
+        new(*(parms+a))
+      end
       def pathroot()
         u = uri.clone
-        u.query = nil
+        #u.query = nil
         case scheme
         when 'file'
-          if self.urlpath =~ %r%^(/[a-zA-Z]):% then $1+':/'
+          if self.urlpath =~ %r'^(/[a-zA-Z]):' then $1+':/'
           else '/'
           end
         else