rio 0.3.1 → 0.3.2

data/lib/rio/factory.rb

@@ -71,8 +71,14 @@ module RIO
                             require 'rio/scheme/stderr'
                             StdErr
                           when 'tempfile'
-                            require 'rio/scheme/tempfile'
-                            Tempfile
+                            require 'rio/scheme/temp'
+                            Temp::File
+                          when 'temp'
+                            require 'rio/scheme/temp'
+                            Temp
+                          when 'tempdir'
+                            require 'rio/scheme/temp'
+                            Temp::Dir
                           when 'strio'
                             require 'rio/scheme/strio'
                             StrIO
@@ -165,6 +171,11 @@ module RIO
       'HTTP::Stream::Input' => 'rio/scheme/http',
       'HTTP::Stream::Open' => 'rio/scheme/http',
 
+      'Temp::Reset' => 'rio/scheme/temp',
+      'Temp::Stream::Open' => 'rio/scheme/temp',
+      'Temp::Stream::Close' => 'rio/scheme/temp',
+      'Temp::Stream::InOut' => 'rio/scheme/temp',
+
       'FTP::State::Dir' => 'rio/ftp',
       'FTP::State::File' => 'rio/ftp',
       'FTP::State::Reset' => 'rio/ftp',

data/lib/rio/grande.rb

@@ -48,6 +48,31 @@ module RIO
         return to_a()
       end
     end
+
+    def fixnumss(*args)
+      #p "#{callstr('[]',*args)} ss_type=#{cx['ss_type']} stream_iter=#{stream_iter?}"
+      #p args[0].class,ss_type?(_ss_keys())
+      ss_args = cx['ss_args'] = args
+      if ss_args.length == 1 and ss_args[0].kind_of?(Fixnum) and !cx.has_key?('dirlines')
+        ans = nil
+        ss_type = ss_type?(_ss_keys())
+
+        if ss_args and ss_type
+          ans = self.__send__(ss_type,*(ss_args)).to_a
+        else
+          ans = to_a()
+        end
+        
+        return (ans.empty? ? nil : ans[0])
+      else
+        if ss_args and (ss_type = ss_type?(_ss_keys()))
+          return self.__send__(ss_type,*(ss_args)).to_a
+        else
+          return to_a()
+        end
+      end
+    end
+
   end
 end
 module RIO

data/lib/rio/if/basic.rb

@@ -38,7 +38,7 @@
 module RIO
   class Rio
 
-    def to_rl() target.to_rl end
+    #def to_rl() target.to_rl end
     
     # Returns the length of the Rio's String representation
     # 

data/lib/rio/if/path.rb

@@ -40,28 +40,32 @@ module RIO
 
     # Returns the path for the Rio, which is defined differently for different types of Rios.
     #
-    # For Rios representing paths on the underlying file system this proxies URI::FILE#path or URI::Generic#path
-    # depending on whether the Rio is absolute or not. Note that this is *not* the same as Rio#fspath, but rather
-    # a URL path as defined in RFC 1738.
+    # For Rios representing paths on the underlying file system this returns 
+    # URI::FILE#path or URI::Generic#path depending on whether the Rio is absolute or not. 
+    # Note that this is not necessarily the same as Rio#fspath, but rather
+    # a URL path as defined in RFC1738.
     #
-    # For HTTP Rios this proxies this proxies URI::HTTP#path 
+    # For Rios that have a URI representation this returns URI#path 
     #
-    # For special Rios such as stdin: and stderr: this returns the special symbol used to create the Rio
-    #
-    # Specifically:
-    #  '-' => stdio:
-    #  '=' => stderr:
-    #  '?' => tempfile:
-    #  '$' => stringio:
-    #  '_' => sysio:
-    #
-    # This list of possible paths may not be comprehensive as new types of Rios are added, however,
-    # A Rio should always return a path when the underlying object has a concept of a path and something
-    # else that is reasonable for Rios that have no such concept
+    # Otherwise this returns nil.
     # 
     def path(*args) target.path(*args) end
     
+    # For resources that have a absolute URL (RFC1738) representation, 
+    # this returns a string containing that representation. 
+    # For objects that do not this returns a RIORL (a descriptive pseudo-URL).
+    #
+    #  rio('/var/www/')                  #=> "file:///var/www/"
+    #  rio('http://rio.rubyforge.org/')  #=> "http://rio.rubyforge.org"
+    #  
     def to_url() target.to_url end
+
+    # For resources that have a URL (RFC1738) representation, this returns a 
+    # URI object referencing it.  Otherwise this raises NoMethodError.
+    #
+    #  rio('http://rubyforge.org/').to_uri     #=> <URI::HTTP:0x818bd84 URL:http://rubyforge.org/>
+    #  rio('adir/afile').to_uri                #=> <URI::Generic:0x817d288 URL:adir/afile>
+    #
     def to_uri() target.to_uri end
 
     # Returns the path for the Rio on the underlying file system
@@ -97,6 +101,17 @@ module RIO
     def rel(other) target.rel(other)  end
 
 
+    # Returns a new Rio whose path is the base path that is used by 
+    # Rio#abs to create an absolute Rio from a relative one.
+    #
+    #  rio('/tmp').chdir
+    #  rio('afile').base # => rio('/tmp/')
+    #
+    # See Rio#abs.
+    #
+    def base() target.base()  end
+
+
     # Sets the string that the Rio considers an extension. The value will be used by
     # subsequent calls to Rio#basename. If called with no arguments resets its value
     # to the value returned by File#extname. Returns the Rio
@@ -308,14 +323,26 @@ module RIO
 
     # Create a Rio referencing Rio#to_s + arg.to_s
     #
+    #  rio('afile') + '-0.1'   #=> rio('afile-0.1')
+    #
     def +(arg) target + arg end
 
     # Create a new Rio referencing the result of applying String#sub to the value returned by
-    # Rio#to_s
+    # Rio#to_s. So:
+    #
+    #  ario.sub(re,string)
+    # is equivelent to
+    #  rio(ario.to_s.sub(re,string))
+    #
     def sub(re,string) target.sub(re,string) end
 
     # Create a new Rio referencing the result of applying String#gsub to the value returned by
-    # Rio#to_s
+    # Rio#to_s. So:
+    #
+    #  ario.gsub(re,string)
+    # is equivelent to
+    #  rio(ario.to_s.gsub(re,string))
+    #
     def gsub(re,string) target.gsub(re,string) end
 
 
@@ -359,49 +386,48 @@ module RIO
     ##def getwd(*args,&block) target.getwd(*args,&block) end
 
 
-    # Rio#base
-    #
-    #
-    def base() target.base()  end
-
-
-    # Returns the scheme for Rio's URI like URI#scheme where the Rio is represented
+    # Returns the scheme for the Rio's URI like URI#scheme where the Rio is represented
     # by a standard URI. For Rios that are not represented by standard URIs one of
-    # Rio's non-standard schemes's is returned. 
+    # Rio's non-standard schemes is returned. 
     #
-    #  rio('http://ruby-doc.org/') #=> 'http'
+    #  rio('http://ruby-doc.org/').scheme #=> 'http'
     #
     def scheme(*args) target.scheme(*args) end
 
-    # Proxy for URI#host
+    # Calls URI#host for Rios which have a URI. Otherwise raises NoMethodError.
     #
-    #  rio('http://ruby-doc.org/') #=> 'ruby-doc'
+    #  rio('http://ruby-doc.org/').host #=> 'ruby-doc'
     #
     def host(*args) target.host(*args) end
 
-    # Proxy for URI#opaque
+    # Calls URI#opaque for Rios which have URI representations. The opaque portion
+    # of a URI is the portion after the colon and before the question-mark beginning 
+    # the query.
+    #
+    #  rio('http://example.org/do.cgi?n=1').opaque  #=> '//example.org/do.cgi'
     #
+    # For Rios that do not have URL representations, returns the same part of 
+    # Rio's internal psuedo-URL
     def opaque(*args) target.opaque(*args) end
 
 
 
-    # Proxy for URI#merge
+    # Calls URI#merge
     # 
-    # Merges to Rios. URI#merge does not document exactly what merging to URIs means. This appears to
+    # Merges two Rios. URI#merge does not document exactly what merging to URIs means. This appears to
     # join the the paths with like <tt>other + path</tt>. See URI#merge for less information.
     #
-    #
     def merge(other) target.merge(other)  end
 
 
-    # Proxy for URI#route_from
+    # Calls URI#route_from
     #
     # Returns a new rio representing the path to this Rio from the perspective of _other_.
     # URI#route_from requires that absolute URIs be used. Rio#route_from does not.
     #
     def route_from(other) target.route_from(other)  end
 
-    # Proxy for URI#route_to
+    # Calls URI#route_to
     #
     # Returns a new rio representing the path to _other_ from the perspective of this Rio.
     # URI#route_to requires that absolute URIs be used. Rio#route_to does not.

data/lib/rio/matchrecord.rb

@@ -80,6 +80,16 @@ module RIO
           @select_arg === record.recno 
         end
       end
+      class Fixnum < Base
+        def match?(val,recno)
+          #p "match?(#{val},#{recno}) select_arg=#{@select_arg}"
+          @select_arg === recno
+        end
+        def =~(record) 
+          #p "=~(#{record},#{record.recno}) select_arg=#{@select_arg}"
+          @select_arg === record.recno 
+        end
+      end
       class Proc < Base
         def initialize(arg,therio)
           super(arg)
@@ -127,6 +137,10 @@ module RIO
         def inspect
           @list.inspect
         end
+        def size() @list.size unless @list.nil? end
+        def only_one_fixnum?()
+          @list && @list.size == 1 && @list[0].kind_of?(Match::Record::Fixnum)
+        end
         def delete_at(index)
           @list.delete_at(index)
           @list = nil if @list.empty?
@@ -157,8 +171,10 @@ module RIO
             Match::Record::Proc.new(arg,therio)
           when ::Symbol
             Match::Record::Symbol.new(arg)
+          when ::Fixnum
+            Match::Record::Fixnum.new(arg)
           else
-            Match::Record::Range.new(::Range.new(arg,arg))
+            raise ArgumentError,"Argument must be a Regexp,Range,Fixnum,Proc, or Symbol"
           end
         end
         def match?(val,recno)
@@ -188,6 +204,9 @@ module RIO
           @rej = SelList.create(therio,rej_args)
           @always = init_always()
         end
+        def only_one_fixnum?()
+          @rej.nil? && @sel && @sel.only_one_fixnum?
+        end
         def init_always(reset=false)
           if @sel.nil? and @rej.nil?
             !reset

data/lib/rio/ops/dir.rb

@@ -137,14 +137,13 @@ module RIO
         alias :unlink :rmdir
 
         def chdir(*args,&block) 
-          ndir = new_rio('.')
           if block_given?
             Impl::U.chdir(self,*args) { |dir|
-              yield ndir
+              yield new_rio('.')
             }
           else
             Impl::U.chdir(self,*args)
-            return ndir
+            return new_rio('.')
           end
           self
         end

data/lib/rio/ops/path.rb

@@ -109,7 +109,11 @@ module RIO
           new_rio(rl.merge(ensure_rio(other).rl))
         end
         def base(b=nil)
-          new_rio(rl.base)
+          new_rio(rl.base(b))
+        end
+        def setbase(b)
+          rl.base(b)
+          self
         end
         extend Forwardable
         def_instance_delegators(:rl,:scheme,:host,:opaque)
@@ -124,14 +128,6 @@ module RIO
           en = Impl::U.extname(rl.path_no_slash,*args) 
           (en.empty? ? nil : en)
         end
-        def basename(*args)
-          unless args.empty?
-            ex = args[0] || self.extname
-            self.ext(ex)
-          end
-          #p self.ext?.inspect
-          new_rio(Impl::U.basename(rl.path_no_slash,self.ext?))
-        end
         def split()
           require 'rio/to_rio'
           pth = rl.path_no_slash
@@ -142,10 +138,28 @@ module RIO
             parts[0] = rooturi
           end
           # give each rio the correct base
-          parts.inject([rio(parts.shift)]) { |ary,d| ary << rio(d,ary[-1].abs.to_url+'/') }.extend(ToRio::Array)
+          parts.inject([rio(parts.shift)]) { |ary,d| ary << rio(d,{ 'base' => ary[-1].abs.to_url+'/'} ) }.extend(ToRio::Array)
+        end
+        def basename(*args)
+          unless args.empty?
+            ex = args[0] || self.extname
+            self.ext(ex)
+          end
+          #p self.ext?.inspect
+          fn = Impl::U.basename(rl.path_no_slash,self.ext?)
+          new_rio(fn,{'base' => _calc_base()})
         end
         def filename()
-          new_rio(Impl::U.basename(rl.path_no_slash))
+          fn = Impl::U.basename(rl.path_no_slash)
+          new_rio(fn,{'base' => _calc_base()})
+        end
+        def _calc_base()
+          dn = Impl::U.dirname(rl.path_no_slash)
+          if dn[0] == ?/
+            dn 
+          else
+            self.base.to_url + dn + '/'
+          end
         end
         def dirname(*args)
           new_rio(Impl::U.dirname(rl.path_no_slash,*args))

data/lib/rio/ops/stream/input.rb

@@ -90,6 +90,11 @@ module RIO
             return to_rec_(raw_rec) if @get_selrej.match?(raw_rec,@recno)
           end
         end
+        private
+
+        def _ss_like_array(selrej)
+          selrej.only_one_fixnum? and !dir_iter?
+        end
 
         protected
 
@@ -103,9 +108,7 @@ module RIO
             each_rec_ do |raw_rec|
               _got_rec(raw_rec)
               rangetops = check_passed_ranges(selrej,@recno) if rangetops and @recno > rangetops[0]
-              as = selrej.match?(raw_rec,@recno)
-              #p "as: #{as.inspect}" unless as == true || as == false
-              if as
+              if as = selrej.match?(raw_rec,@recno)
                 if want_ma
                   yield(to_rec_(raw_rec),as)
                 else

data/lib/rio/rl/base.rb

@@ -47,7 +47,7 @@ module RIO
       '-'    => 'stdio',
       '='    => 'stderr',
       '"'    => 'strio',
-      '?'    => 'tempfile',
+      '?'    => 'temp',
       '['    => 'aryio',
       '`'    => 'cmdio',
       '#'    => 'fd',
@@ -56,7 +56,7 @@ module RIO
       ?-    => 'stdio',
       ?=    => 'stderr',
       ?"    => 'strio',
-      ??    => 'tempfile',
+      ??    => 'temp',
       ?[    => 'aryio',
       ?`    => 'cmdio',
       ?#    => 'fd',
@@ -133,6 +133,7 @@ module RIO
       def =~(other) other =~ self.to_s end
       def length() self.to_s.length end
       def fspath() nil end
+      def path() nil end
 
       def to_rl() self.rl end
 

data/lib/rio/rl/ioi.rb

@@ -44,7 +44,8 @@ module RIO
       def scheme() self.class.const_get(:RIOSCHEME) end
       def opaque() '' end
       def self.splitrl(s) nil end
-      def path() self.class.const_get(:RIOPATH) end
+      #def path() self.class.const_get(:RIOPATH) end
+      def path() nil end
       def fspath() nil end
       def to_s() url() end
     end

data/lib/rio/rl/path.rb

@@ -57,8 +57,19 @@ module RIO
           @pth = pth
           @uri= nil
         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 || '/'
+                when %r%^/% then b
+                else RL.fs2url(::Dir.getwd)+'/'+b
+                end
+          @wd.squeeze('/')
+        end
         self.join(*args) unless args.empty?
-        @wd = RL.fs2url(::Dir.getwd)+'/'
+        @wd = @pth if @pth[0] == ?/
+        @wd = RL.fs2url(::Dir.getwd)+'/' unless @wd
       end
 
       def parse_url(str)
@@ -98,7 +109,6 @@ module RIO
       def to_s() RL.url2fs(@pth) end
 
       def self.splitrl(s)
-
         sch,opq,whole = split_riorl(s)
         case sch
         when 'file' then [whole]
@@ -124,7 +134,12 @@ module RIO
       def merge(other)
         self.class.new(uri.merge(other.uri))
       end
-      def base() (absolute? ? @pth : @wd) end
+      def base(arg=nil) 
+        unless arg.nil?
+          self.wd = arg
+        end
+        (absolute? ? @pth : @wd) 
+      end
 
       def abs()
         return self if absolute?