rio 0.4.0 → 0.4.1

data/lib/rio/ftp/fs.rb

@@ -79,7 +79,7 @@ module RIO
         wduri.to_s
       end
       def remote_path(url)
-        self.remote_root+URI(url).path
+        self.remote_root+RIO::RL.url2fs(URI(url).path)
       end
       def chdir(url,&block)
         if block_given?
@@ -119,6 +119,7 @@ module RIO
 
       def get_ftype(url)
         pth = remote_path(url)
+        #p url,pth
         ftype = nil
         begin
           conn.mdtm(pth)

data/lib/rio/ftp/ftpfile.rb

@@ -1,20 +1,20 @@
-
-require 'tempfile'
-require 'delegate'
-module RIO
-  module FTP
-    class FTPFile < DelegateClass( ::Tempfile )
-      def initialize(remote_path, netftp)
-        @remote_path = remote_path
-        @netftp = netftp
-        @ftpfile = ::Tempfile.new('ftpfile')
-        super(@ftpfile)
-      end
-      def close()
-        super
-        @netftp.put(path(),@remote_path)
-      end
-      
-    end
-  end
-end
+
+require 'tempfile'
+require 'delegate'
+module RIO
+  module FTP
+    class FTPFile < DelegateClass( ::Tempfile )
+      def initialize(remote_path, netftp)
+        @remote_path = remote_path
+        @netftp = netftp
+        @ftpfile = ::Tempfile.new('ftpfile')
+        super(@ftpfile)
+      end
+      def close()
+        super
+        @netftp.put(path(),@remote_path)
+      end
+      
+    end
+  end
+end

data/lib/rio/if/grande.rb

@@ -115,7 +115,8 @@ module RIO
       #
       # Arguments may consist of strings (treated as globs) or regular expressions. 
       # An empty argument list selects all entries
-      # See ::Dir#glob and ::File::fnmatch? for more in information on _globs_. Be warned that using the '**' glob
+      # See ::Dir#glob and ::File::fnmatch? for more in information on _globs_. 
+      # Be warned that using the '**' glob
       # recurses into directories independently of IF::GrandeEntry#all and using both is unsupported.
       # 
       #  ario = rio('adir')
@@ -143,7 +144,8 @@ module RIO
       # IF::GrandeStream#records, and IF::GrandeStream#rows
       #
       # Using IF::GrandeStream#lines and related methods with a Rio referencing a directory 
-      # imples IF::GrandeEntry#files and will cause an array of the lines or bytes in the files to be returned. As above,
+      # imples IF::GrandeEntry#files and will cause an array of the lines or bytes in the 
+      # files to be returned. As above,
       # the arguments to the subscript operator will be applied to the closest.
       #  rio('adir').lines[] # array of all lines in the files in 'adir'
       #  rio('adir').files.lines[] # same thing
@@ -219,7 +221,8 @@ module RIO
       # IF::Grande#each
       #
       # For Rios that refer to files, the item passed to the block is a String containing
-      # the line or block as selected by IF::GrandeStream#lines, or IF::GrandeStream#bytes. +lines+ is the default.
+      # the line or block as selected by IF::GrandeStream#lines, or IF::GrandeStream#bytes. 
+      # +lines+ is the default.
       #  rio('afile').lines.each { |line| ...}
       # 
       # The block passed to +each+ will also accept an optional second parameter which will contain
@@ -380,7 +383,7 @@ module RIO
       #  rio('src.txt.gz').gzip > rio('dst.txt')
       #
       # Copying to an array
-      #  rio('afile') > ary # each line of the file becomes and element of the ary
+      #  rio('afile') > ary # each line of the file becomes an element of the ary
       #  rio('afile').chomp > ary # same thing with lines chomped
       #  rio('afile.gz').gzip.chomp > ary # same thing from a gzipped file
       #
@@ -406,7 +409,7 @@ module RIO
       #
       # Copy the first and 8th through 10th columns of the first ten rows of a gzipped csv 
       # file on a web site into a local gzipped csv file that uses semi-colons as separators
-      #  rio('http://domain/file.csv.gz').columns(0,7..9).gzip.csv[0..9] > rio('localfile.csv.gz').csv(';').gzip
+      #  rio('http://host/file.csv.gz').columns(0,7..9).gzip.csv[0..9] > rio('localfile.csv.gz').csv(';').gzip
       #
       # See also IF::Grande#>>, IF::Grande#|
       #
@@ -521,10 +524,13 @@ module RIO
       # That is to say, it iterates through its argument, calling the copy-from operator
       # again for each element. While it is not implemented like this, and the above code would
       # not give the same results, This generalized description is convenient.
+      #
       # For example the code:
-      #    dst < src
-      #    # is like
-      #    src.each { |line| dst << line }
+      #
+      #  destination < source
+      #  # is like
+      #  source.each { |element| destination << element }
+      #
       # for any of the following definitions of src and dst
       # * copying files
       #    src = rio('afile')
@@ -679,11 +685,11 @@ module RIO
       # which will put the parts back together again.
       #
       #  ary = rio('a/b/c').split   #=> [rio('a'),rio('b'),rio('c')]
-      #  ary.to_rio           #=> rio('a/b/c')
+      #  ary.to_rio                 #=> rio('a/b/c')
       #
       #  ary = rio('a/b/c').split   #=> [rio('a'),rio('b'),rio('c')]
       #  ary[1] = rio('d')
-      #  ary.to_rio           #=> rio('a/d/c')
+      #  ary.to_rio                 #=> rio('a/d/c')
       #
       # See also IF::Path#join, IF::Path#/, IF::Path#splitpath
       #

data/lib/rio/if/test.rb

@@ -236,7 +236,7 @@ module RIO
       def zero?(*args) target.zero?(*args) end
 
 
-      # Returns true if the rio represents and absolute path or URI. Alias for IF::Test#absolute?
+      # Returns true if the rio represents an absolute path or URI. Alias for IF::Test#absolute?
       #
       #  rio('/tmp').abs?                     # >> true
       #  rio('.ssh').abs?                     # >> false

data/lib/rio/ops/construct.rb

@@ -35,18 +35,19 @@
 
 module RIO
   CONSTRUCTOR_SYMS = [
-      :strio,
-      :stdio,
-      :stderr,
-      :temp,
-      :tempfile,
-      :tempdir,
-      :tcp,
-      :cmdio,
-      :cmdpipe,
-      :sysio,
-      :fd,
-    ]
+                      :strio,
+                      :stdio,
+                      :stderr,
+                      :temp,
+                      :tempfile,
+                      :tempdir,
+                      :tcp,
+                      :cmdio,
+                      :cmdpipe,
+                      :sysio,
+                      :fd,
+                      :ftp,
+                     ]
 end
 
 module RIO

data/lib/rio/ops/dir.rb

@@ -230,7 +230,7 @@ module RIO
           self.skipentries(*args)
         end
         def ent_to_rio_(ent,indir)
-          #p "ent_to_rio: #{ent.inspect},#{ent.fs.class} indir=#{indir}"
+          #p "ent_to_rio: ent=#{ent.inspect} indir=#{indir}"
           if ent.kind_of?(RIO::Rio)
             oldpath = ent.to_s
             ent.rl.urlpath = indir.to_s
@@ -238,6 +238,7 @@ module RIO
             ent.cx = self.cx.bequeath(ent.cx)
             ent
           else
+            # KIT: should this be RL.fs2url(ent) ???
             if indir
               new_rio_cx(indir.rl,ent)
             else

data/lib/rio/rl/fs2url.rb

@@ -52,9 +52,9 @@ module RIO
     def fs2urls(*args)
       args.map{ |pth| fs2url(pth) }
     end
-    def fs2url(pth)
+    def fs2url(pth, esc=ESCAPE)
       #pth.sub!(/^[a-zA-Z]:/,'')
-      pth = URI.escape(pth,ESCAPE)
+      pth = URI.escape(pth,esc)
       pth = '/' + pth if pth =~ /^[a-zA-Z]:/
       pth
       #      (Local::SEPARATOR == '/' ? pth : pth.gsub(Local::SEPARATOR,%r|/|))

data/lib/rio/rl/path.rb

@@ -55,6 +55,7 @@ module RIO
         else
           raise(ArgumentError,"'#{arg0}'[#{arg0.class}] can not be used to create a Rio")
         end
+        #puts "path.rb arg0_info_: vuri=#{vuri}"
         [vuri,vbase,vfs]
       end
       def build_arg0_(path_str)

data/lib/rio/rl/uri.rb

@@ -75,14 +75,18 @@ module RIO
         else
           raise(ArgumentError,"'#{arg0}'[#{arg0.class}] can not be used to create a Rio")
         end
+        #puts "uri.rb arg0_info_: vuri=#{vuri}"
         [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?

data/lib/rio/rl/withpath.rb

@@ -278,6 +278,7 @@ module RIO
       def _build(*args) RIO::RL::Builder.build(*args) end
 
       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 

data/lib/rio/scheme/ftp.rb

@@ -49,13 +49,56 @@ module RIO
     require 'rio/rl/uri'
 
     class RL < RIO::RL::URIBase
-      def initialize(*args)
-        super
+      def initialize(arg0,*args)
+        #p callstr('initialize',arg0,*args)
+        super(*_sup_args(arg0,*args))
         @ftype = nil
         @names = nil
       end
-      def self.splitrl(s) 
+      def _sup_args(arg0,*args)
+        if arg0 == 'ftp:'
+          hn = args.shift || 'localhost'
+          us = args.shift 
+          pw = args.shift
+          pt = args.shift || ''
+          ph = args.shift || '/'
+          tc = args.shift || ''
+          u = URI::FTP.new2(us,pw,hn,pt,ph,tc)
+          return [u]
+        else
+          return [arg0] + args
+        end
+      end
+#       def arg0_info_(arg0,*args)
+#         #p "arg0_info_(#{arg0.inspect},#{args.inspect})"
+#         vuri,vbase,vfs = nil,nil,nil
+#         case arg0
+#         when RIO::Rio
+#           return _init_from_arg(arg0.rl)
+#         when RIO::RL::URIBase,RIO::FTP::RL
+#           vuri,vbase,vfs = arg0.uri,arg0.base,arg0.fs
+#         when ::URI 
+#           vuri = arg0
+#         when ::String 
+#           vuri = uri_from_string_(arg0) || ::URI.parse(arg0)
+#         else
+#           raise(ArgumentError,"'#{arg0}'[#{arg0.class}] can not be used to create a Rio")
+#         end
+#         [vuri,vbase,vfs]
+#       end
+#       def build_arg0_(path_str)
+#         path_str
+#       end
+      def join(*args)
+        return self if args.empty?
+        join_(args.map{ |arg| RIO::RL.fs2url(arg.to_s)})
+      end
+
+
+      def self.splitrl(s)
+        #p "splitrl(#{s})"
         sub,opq,whole = split_riorl(s)
+        #p sub,opq,whole
         [whole] 
       end
       def openfs_

data/lib/rio/uri/file.rb

@@ -87,14 +87,24 @@ RFC 1738            Uniform Resource Locators (URL)        December 1994
   module REGEXP
     module PATTERN
       DRIVE_SPEC = "[A-Za-z]:"
-      ABS_FILE_PATH = "(?:/#{DRIVE_SPEC})?/#{PATH_SEGMENTS}"
+      FILE_ESCAPED = ESCAPED
+      FILE_UNRESERVED = "-_.!~*'()#{ALNUM}"
+      FILE_PCHAR = "(?:[#{FILE_UNRESERVED}:@?&=+$,]|#{FILE_ESCAPED})"
+      FILE_SEGMENT = "#{FILE_PCHAR}*(?:;#{PARAM})*"
+      FILE_PATH_SEGMENTS = "#{FILE_SEGMENT}(?:/#{FILE_SEGMENT})*"
+      FILE_ABS_PATH = "(?:/#{DRIVE_SPEC})?/#{FILE_PATH_SEGMENTS}"
+
+      FILE_REL_SEGMENT = "(?:[#{FILE_UNRESERVED};@?&=+$,]|#{FILE_ESCAPED})+"
+      FILE_REL_PATH = "#{FILE_REL_SEGMENT}(?:#{FILE_ABS_PATH})?"
+
+      #FILE_ABS_PATH = "(?:/#{DRIVE_SPEC})?/#{FILE_PATH_SEGMENTS}(?:\\?#{QUERY})?"
     end
     EMPTYHOST = Regexp.new("^$", false, 'N').freeze #"
-    ABS_FILE_PATH = Regexp.new("^#{PATTERN::ABS_FILE_PATH}$", false, 'N').freeze
+    FILE_ABS_PATH = Regexp.new("^#{PATTERN::FILE_ABS_PATH}$", false, 'N').freeze
   end # module REGEXP
 
   class FILE < Generic
-    #ABS_FILE_PATH = REGEXP::ABS_FILE_PATH
+    #FILE_ABS_PATH = REGEXP::FILE_ABS_PATH
     COMPONENT = [
       :scheme, 
       :host,
@@ -111,18 +121,19 @@ RFC 1738            Uniform Resource Locators (URL)        December 1994
       # raise if both hier and opaque are not nil, because:
       # absoluteURI   = scheme ":" ( hier_part | opaque_part )
       # hier_part     = ( net_path | abs_path ) [ "?" query ]
+      #p "URI::FILE self=#{self} v=#{v}"
       if v && @opaque
         raise InvalidURIError, 
           "path conflicts with opaque"
       end
 
       if @scheme
-        if v && v != '' && ABS_FILE_PATH !~ v
+        if v && v != '' && FILE_ABS_PATH !~ v
           raise InvalidComponentError, 
             "bad component(expected absolute path component): #{v}"
         end
       else
-        if v && v != '' && ABS_FILE_PATH !~ v && REL_PATH !~ v
+        if v && v != '' && FILE_ABS_PATH !~ v && FILE_REL_PATH !~ v
           raise InvalidComponentError, 
             "bad component(expected relative path component): #{v}"
         end
@@ -133,7 +144,6 @@ RFC 1738            Uniform Resource Locators (URL)        December 1994
     private :check_path
 
     def path=(v)
-      #p "self=#{self} v=#{v}"
       check_path(v)
       set_path(v)
       v

data/lib/rio/version.rb

@@ -38,7 +38,7 @@
 module RIO
   # :stopdoc:
   module Version #:nodoc: all
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
 
     N = VERSION.split('.').freeze
     MAJOR = N[0].freeze

data/test/ftp/anon_copy_data.rb

@@ -0,0 +1,36 @@
+#!/usr/local/bin/ruby
+if $0 == __FILE__
+  Dir.chdir File.dirname(__FILE__)+'/../'
+  $:.unshift File.expand_path('../lib/')
+end
+
+require 'rio'
+require 'tc/testcase'
+require 'open-uri'
+require 'ftp/testdef'
+
+class TC_ftp_copy_data < Test::RIO::TestCase
+  @@once = false
+  include Test::RIO::FTP::Const
+
+  def self.once
+    @@once = true
+  end
+  def setup
+    super
+    self.class.once unless @@once
+    FS_RWROOT.entries { |ent| ent.delete! }
+  end
+
+  def test_copy_string
+    exp = "a string\n"
+    ario = rio(FTP_RWROOT,'file0') < exp
+    assert_equal(exp,ario.contents)
+  end
+  def test_copy_array
+    exp = (0..1).map{|n| "Line #{n}\n"}
+    ario = rio(FTP_RWROOT,'file0') < exp
+    assert_equal(exp,ario[])
+  end
+end
+

data/test/ftp/testdef.rb

@@ -6,10 +6,11 @@ module Test
       module Const
         FTPUSER = 'ftp'
         
-        #DRV = $mswin32 ? 'x:' : ''
-        #FSROOT = rio("#{DRV}/srv/ftp")
-        FSROOT = rio("../../srv/ftp")
-        FTPHOST = '192.168.1.101'
+        DRV = $mswin32 ? 'x:' : ''
+        FSROOT = rio("#{DRV}/srv/ftp")
+        #FSROOT = rio("../../srv/ftp")
+        #FTPHOST = '192.168.1.101'
+        FTPHOST = 'riotest.hopto.org'
         #FTPHOST = 'localhost'
         FTPROOT = rio("ftp://#{FTPHOST}/")
 

data/test/http/all.rb

@@ -1,3 +1,4 @@
 require 'tc/testcase'
 
 require 'http/copy-from-http'
+require 'http/uri-meta'

data/test/http/copy-from-http.rb

@@ -46,9 +46,9 @@ class TC_copy_from_http < Test::RIO::TestCase
     ario = rio('out.txt').delete! < rio(GZURL).gzip
     ans = rio(ario).contents
     exp = rio(GZFILE).gzip.contents
-    
     assert_equal(exp,ans)
   end
+
   def test_uri_rio_to_file
     ario = rio('outf').delete!.touch
     url = HWURL
@@ -58,6 +58,7 @@ class TC_copy_from_http < Test::RIO::TestCase
     assert_equal(exp,ario.contents)
     assert_equal(rio(HWFILE).contents,rio('outf').contents)
   end
+
   def test_uri_rio_to_file2
     ario = rio('outf2').delete!.touch
     url = HWURL