rio 0.3.4 → 0.3.6

data/lib/rio/rectype.rb

@@ -54,7 +54,7 @@ module RIO
       module Output
         def put_(rec,*args)
           #p callstr('put_',rec,*args)
-          self.ioh.print(rec)
+          self.ioh.print(rec.to_s)
         end
       end
     end
@@ -77,7 +77,7 @@ module RIO
       end
       module Output
         def put_(rec,*args)
-          p callstr('put_',rec,*args)
+          #p callstr('put_',rec,*args)
           print(rec)
         end
       end

data/lib/rio/rl/base.rb

@@ -50,6 +50,7 @@ module RIO
       '?'    => 'temp',
       '['    => 'aryio',
       '`'    => 'cmdio',
+      '|'    => 'cmdpipe',
       '#'    => 'fd',
 
       ?_    => 'sysio',
@@ -59,6 +60,7 @@ module RIO
       ??    => 'temp',
       ?[    => 'aryio',
       ?`    => 'cmdio',
+      ?|    => 'cmdpipe',
       ?#    => 'fd',
     }.freeze
   end
@@ -67,26 +69,38 @@ 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 fs2url(pth)
-#      Base.fs2url(pth)
-      pth.sub!(/^[a-zA-Z]:/,'')
+      #pth.sub!(/^[a-zA-Z]:/,'')
       pth = URI.escape(pth,ESCAPE)
-#      (Local::SEPARATOR == '/' ? pth : pth.gsub(Local::SEPARATOR,%r|/|))
+      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 = 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)+'/'})
+      ::URI::FILE.build({:path => fs2url(::Dir.getwd)})
     end
 
-    module_function :url2fs,:fs2url,:getwd
+    module_function :url2fs,:fs2url,:getwd,:escape,:unescape
   end
 end
 module RIO
@@ -98,14 +112,14 @@ module RIO
     SUBSEPAR = ':'
 
     class Base
+      def initialize(*args)
+        
+      end
+
       def self.subscheme(s)
-#        sch,opq,whole = split_riorl(s)
-#        sch
         /^rio:([^:]+):/.match(s)[1]
-#        s[4...s.index(SUBSEPAR,4)]
-#        e = s.index(SUBSEPAR,b)
-#        s.split(SUBSEPAR,3)[1]
       end
+
       def self.split_riorl(s)
         body = s[SCHC.length...s.length]
         m = SPLIT_RIORL_RE.match(body) 
@@ -122,27 +136,36 @@ module RIO
         new(*(parms+a))
       end
 
-      def rl()
-        SCHC+self.url
-      end
-      def riorl() SCHC+self.url end
+      def rl() SCHC+self.url end
+
+#      def riorl() SCHC+self.url end
 
       def to_s() self.fspath || '' 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
+
       def fspath() nil end
       def path() nil end
 
       def to_rl() self.rl end
 
       def url() self.scheme+SUBSEPAR+self.opaque end
+      def close() 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 callstr(func,*args)
         self.class.to_s+'['+self.to_s+']'+'.'+func.to_s+'('+args.join(',')+')'
       end
-      def close() nil end
-
     end
   end
 end

data/lib/rio/rl/builder.rb

@@ -44,58 +44,18 @@ module RIO
   module RL
     class Builder
 
-      def self.canon(a)
-        #puts "canon: #{a.inspect}" 
-        case a[0]
-        when ::String
-          case a[0]
-          when /^[a-z][a-z]+:/
-            a[0] = 'rio:'+a[0] unless a[0] =~ /^rio:/
-            a
-          when %r|^/|
-            a[0] = 'rio:file://'+a[0]
-            a
-          else
-            a[0] = 'rio:path:'+a[0]
-            a
-          end
-        when RIO::Rio
-          a[0] = a[0].to_rl
-          canon(a)
-        when RL::Base
-          a
-        when ::URI
-          a
-        when ?? , ?= , ?_ , ?",?[,?#,?`
-          a[0] = 'rio:'+CHMAP[a[0]]+':'
-          a
-        when ?-
-          a[0] = ( a.size == 1 ? 'rio:'+CHMAP[a[0]]+':' : 'rio:cmdio:' )
-          a
-        when ?$
-          a[0] = 'rio:strio:'
-          a
-        when ::IO
-          a.unshift('rio:sysio:')
-          a
-        when ::StringIO
-          a.unshift('rio:strio:')
-          a
-        else
-          a[0] = a[0].to_s
-          canon(a)
-        end
-      end
-
-
       def self.build(*a)
         #puts "build: #{a.inspect}" 
         a.flatten!
         case a[0]
         when ::String
           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)
@@ -105,9 +65,10 @@ module RIO
         when RIO::Rio
           a[0] = a[0].to_rl
         when RL::Base
-          #p 'heeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'
           a0 = a.shift
-        return a0.class.new(a0.uri.dup,*a)
+          #p 'THERE',a0,a0.clone
+          return a0.clone
+          #return a0.class.new(a0.clone,*a)
         when ::URI
           a0 = a.shift
           cl = Factory.instance.riorl_class(a0.scheme)
@@ -115,7 +76,7 @@ module RIO
           return o
         when ::Symbol
           a[0] = 'rio:' + a[0].to_s + ':'
-        when ?? , ?= , ?_ , ?", ?[, ?#, ?`
+        when ?? , ?= , ?_ , ?", ?[, ?#, ?`, ?|
           a[0] = 'rio:'+CHMAP[a[0]]+':'
         when ?-
           a[0] = ( a.size == 1 ? 'rio:'+CHMAP[a[0]]+':' : 'rio:cmdio:' )

data/lib/rio/rl/ioi.rb

@@ -45,8 +45,6 @@ module RIO
       def opaque() '' end
       def self.splitrl(s) nil end
       #def path() self.class.const_get(:RIOPATH) end
-      def path() nil end
-      def fspath() nil end
       def to_s() url() end
     end
   end
@@ -58,6 +56,9 @@ module RIO
       def initialize(ios=nil)
         @ios = ios
       end
+      def initialize_copy(*args)
+        @ios = @ios.clone unless @ios.nil?
+      end
       def open(*args)
         @ios
       end

data/lib/rio/rl/path.rb

@@ -36,77 +36,130 @@
 
 
 require 'rio/rl/uri'
+require 'rio/rl/pathmethods'
+
 module RIO
   module RL
     class PathBase < Base
       RESET_STATE = 'Path::Reset'
 
       RIOSCHEME = 'path'
+      HOST = URI::REGEXP::PATTERN::HOST
+      SCHEME = URI::REGEXP::PATTERN::SCHEME
 
       def initialize(pth,*args)
-        @host = nil
+
+        @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
-          @uri = pth.dup
-          @uri.path = '/' if pth.absolute? and pth.path == ''
-          @pth = @uri.path
-        when %r|^file://(localhost)?(/.*)?$|
-          @host = $1
-          @pth = $2 || '/'
+          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) : '/'
         else
-          @pth = pth
-          @uri= nil
+          self.fspath = pth
         end
-        @pth.sub!(%r|/\.$|,'/')
-        @wd = nil
-        if !args.empty? and args[-1].kind_of?(::Hash) and (b = args.pop['base'])
-          @wd = case b
-                when %r%^file://(localhost)?(/.*)?$% then $2 || '/'
+        args = _get_base_from_args(args)
+        self.join(*args) unless args.empty?
+        unless self.absolute? or @base
+          @base = RL.fs2url(::Dir.getwd)+'/'
+        end
+        @fspath.sub!(%r|/\.$|,'/')
+      end
+      def pathroot()
+        return nil unless absolute?
+        rrl = self.clone
+        if self.urlpath =~ %r%^(/[a-zA-Z]):%
+          $1+':/'
+        else
+          '/'
+        end
+      end
+      include PathMethods
+
+      def _get_base_from_args(args)
+        @base = nil
+        if !args.empty? and args[-1].kind_of?(::Hash) and (b = args.pop[:base])
+          @base = case b
+                when %r%^file://(#{HOST})?(/.*)?$% then b
                 when %r%^/% then b
                 else RL.fs2url(::Dir.getwd)+'/'+b
                 end
-          @wd.squeeze('/')
+          @base.squeeze('/')
         end
-        self.join(*args) unless args.empty?
-        @wd = @pth if @pth[0] == ?/
-        @wd = RL.fs2url(::Dir.getwd)+'/' unless @wd
+        args
       end
-
-      def parse_url(str)
-        ::URI.parse(::URI.escape(str,ESCAPE))
+      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 initialize_copy(*args)
-        super
-        @uri = nil
+      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')
       end
 
-      def init_paths()
-        @uri = nil
+      def fspath() 
+        if use_host?
+          '//' + @host + @fspath
+        else 
+          @fspath
+        end
       end
-      def path=(pt)
-        @uri = nil
-        @pth = pt
+      def fspath=(pt)
+        if pt =~ %r|^//(#{HOST})(/.*)?$|
+          @host = $1
+          @fspath = $2 || '/'
+        else
+          @fspath = pt
+        end
       end
-      def join(*args)
-        return self if args.empty?
-        sa = args.map(&:to_s).map { |s| ::URI.escape(s,ESCAPE) }
-        sa.unshift(@pth) unless @pth.empty?
-        @uri = nil
-        @pth = sa.join('/').squeeze('/')
+
+      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)
       end
-      
-      def uri() 
-        @uri ||= (absolute? ? ::URI::FILE.new('file',nil,@host,nil,nil,@pth,nil,nil,nil) : ::URI.parse(@pth))
+      alias abs? absolute?
+
+      def abs()
+        return self if absolute?
+        self.class.new(@base, @fspath) 
       end
-      def url() 
-        if uri and uri.scheme
-          self.uri.to_s 
-        else
-          self.scheme+SUBSEPAR+self.opaque 
-        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 to_s() RL.url2fs(@pth) end
 
       def self.splitrl(s)
         sch,opq,whole = split_riorl(s)
@@ -115,41 +168,11 @@ module RIO
         else [opq]
         end
       end
-      def scheme() (absolute? ? 'file' : 'path') end
-      def opaque() (absolute? ? "//#{@host}#{@pth}" : @pth) end
-      def fspath() RL.url2fs(@pth) end
-      def fs2url(pth) RL.fs2url(pth) end
-      def url2fs(pth) RL.url2fs(pth) end
-      def wd=(wd) @wd = wd end
-      def route_from(other)
-        rfrl = self.class.new(uri.route_from(other.uri))
-        rfrl.wd = other.path
-        rfrl
-      end
-      def route_to(other)
-        rtrl = self.class.new(uri.route_to(other.uri))
-        rtrl.wd = self.abs
-        rtrl
-      end
-      def merge(other)
-        self.class.new(uri.merge(other.uri))
-      end
-      def base(arg=nil) 
-        unless arg.nil?
-          self.wd = arg
-        end
-        (absolute? ? @pth : @wd) 
-      end
 
-      def abs()
-        return self if absolute?
-        self.class.new(@wd + @pth) 
+
+      def dirname()
+        Impl::U.dirname(self.path_no_slash)
       end
-      def path_no_slash() @pth.sub(/\/$/,'') end
-      def path() @pth end
-      def absolute?() @pth[0] == ?/ end
-      def host() @host ||= uri.host end
-      alias abs? absolute?
 
     end
   end