rio 0.4.2 → 0.5.1

data/lib/rio/ops/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,23 @@
 # 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/fwd'
 #require 'rio/impl/path'
+require 'rio/ops/create'
+require 'rio/ops/construct'
+module RIO
+  module Ops
+    module Path
+      autoload :Create, 'rio/ops/create'
+    end
+  end
+end
+
 module RIO
   module Ops #:nodoc: all
     module Path
@@ -90,12 +90,19 @@ module RIO
             new_rio(rl.abs(ensure_rio(base).to_s))
           end
         end
-        def abs?
-          rl.abs?
+        def absolute?
+          #p "ops/path.rb absolute?"
+          rl.absolute?
         end
-        alias :absolute? :abs?
+        alias :abs? :absolute?
+        #def abs?
+        #  p "ops/path.rb abs?"
+        #  rl.abs?
+        #end
         def route_from(other)
-          new_rio(rl.abs.route_from(ensure_rio(other).rl.abs))
+          this_uri = rl.uri.abs
+          other_uri = ensure_rio(other).rl.uri.abs
+          new_rio(this_uri.route_from(other_uri))
         end
         def rel(other=nil)
           if other.nil?
@@ -114,6 +121,7 @@ module RIO
           new_rio(rl.merge(ensure_rio(other).rl))
         end
         def base()
+          #p "BASE: " + rl.class.to_s
           new_rio(rl.base())
         end
         def setbase(b)
@@ -121,13 +129,23 @@ module RIO
           self
         end
         extend Forwardable
-        def_instance_delegators(:rl,:scheme,:host,:opaque)
+        extend Fwd
+        fwd :rl,:scheme,:host,:user,:password
+        fwd :rl,:query,:fragment,:userinfo
+        fwd :rl,:typecode
+        fwd :rl,:authority
 
       end
       module Query
+        def normalize
+          rtn_rio {
+            uri.normalize
+          }
+        end
+
         def expand_path(*args)
           args[0] = args[0].to_s unless args.empty?
-          new_rio(RL.fs2url(fs.expand_path(self.to_s,*args)))
+          new_rio(fs.expand_path(self.to_s,*args))
         end
         def extname(*args) 
           en = fs.extname(rl.path_no_slash,*args) 
@@ -135,9 +153,18 @@ module RIO
         end
         def splitpath()
           require 'rio/to_rio'
-          parts = self.rl.split
+          sparts,bparts = self.rl.split
+          parts = []
+          (0...sparts.length).each do |n|
+            parts << new_rio(sparts[n], {:base => bparts[n]})
+          end
+          parts.extend(ToRio::Array)
+          #parts.each do |part|
+          #  p "part=#{part.uri} abs=#{part.abs.uri}"
+          #end
           # map to rios and extend the array with to_array
-          parts.map { |arl| new_rio(arl) }.extend(ToRio::Array)
+          #parts.map { |arl| new_rio(arl) }.extend(ToRio::Array)
+          #parts.map { |arl| new_rio(arl) }
         end
         def basename(*args)
           unless args.empty?
@@ -150,11 +177,15 @@ module RIO
           new_rio(rl.filename)
         end
         def dirname(*args)
-          new_rio(rl.dirname)
+          new_rio(uri.dirname)
         end
 
         def sub(re,arg)
-          new_rio(softreset.to_s.sub(re,arg.to_s))
+          rtn_rio { 
+            softreset
+            uri.ref.sub(re,arg.to_s)
+          }
+          #new_rio(softreset.to_s.sub(re,arg.to_s))
         end
         def gsub(re,arg)
           new_rio(softreset.to_s.gsub(re,arg.to_s))
@@ -167,11 +198,11 @@ module RIO
         private
 
         def _path_with_basename(arg)
-          old =  rl.path_no_slash
+          old =  rl.path
           old[0,old.length-basename.length-ext?.length]+arg.to_s+ext?
         end
         def _path_with_filename(arg)
-          old =  rl.path_no_slash
+          old =  rl.path
           old[0,old.length-filename.length]+arg.to_s
         end
         def _path_with_ext(ex)
@@ -180,7 +211,7 @@ module RIO
         end
         def _path_with_dirname(arg)
           old =  rl.path_no_slash
-          arg.to_s + old[-(old.length-dirname.length),old.length]
+          arg.to_s + old[-(old.length-dirname.length+1),old.length]
         end
       end
       module Change
@@ -205,7 +236,7 @@ module RIO
           if cx['rename']
             must_exist.filename = arg
           else
-            rl.urlpath = _path_with_filename(arg)
+            uri.filename = arg.to_s
             softreset
           end
         end
@@ -214,7 +245,8 @@ module RIO
           if cx['rename']
             must_exist.basename = arg
           else
-            rl.urlpath = _path_with_basename(arg)
+            uri.ext = cx['ext'] if cx.has_key?('ext')
+            uri.basename = arg.to_s
             softreset
           end
         end
@@ -225,7 +257,8 @@ module RIO
           if cx['rename']
             must_exist.extname = arg
           else
-            rl.urlpath = _path_with_ext(arg)
+            uri.ext = cx['ext'] if cx.has_key?('ext')
+            uri.extname = arg.to_s
             softreset
           end
         end
@@ -234,7 +267,7 @@ module RIO
           if cx['rename']
             must_exist.dirname = arg
           else
-            rl.path = _path_with_dirname(arg)
+            uri.dirname = arg.to_s
             softreset
           end
         end
@@ -243,8 +276,6 @@ module RIO
     end 
   end
 end
-require 'rio/ops/create'
-require 'rio/ops/construct'
 module RIO
   module Ops
     module Path
@@ -262,7 +293,7 @@ module RIO
               fs.symlink(self,dst) 
             else
               #p "symlink(#{dst.route_to(self)},#{dst})"
-              fs.symlink(dst.route_to(self),dst.to_s) 
+              fs.symlink(dst.route_to(self).to_s,dst.to_s) 
             end
             dst.reset
           } 

data/lib/rio/ops/stream.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,22 +18,20 @@
 # 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
-#
 
 
+
+module RIO
+  module Ops
+    module Stream
+      autoload :Input,'rio/ops/stream/input'
+      autoload :Output,'rio/ops/stream/output'
+    end
+  end
+end
 module RIO
   module Impl
     module U
@@ -57,7 +55,7 @@ module RIO
         def to_io() ioh ? ioh.to_io : nil end
         def tty?() ioh ? ioh.tty? : false end
         def isatty() ioh ? ioh.isatty : false end
-        def binmode() rtn_self { self.ioh.binmode } end
+        # def binmode() rtn_self { self.ioh.binmode } end
         def flush() rtn_self { self.ioh.flush } end
         def fsync() rtn_self { self.ioh.fsync } end
         def seek(amount,whence=IO::SEEK_SET) rtn_self { self.ioh.seek(amount,whence) } end

data/lib/rio/ops/stream/input.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/matchrecord'
@@ -81,19 +70,11 @@ module RIO
 
         def each_row(*args,&block) 
           #p callstr('each_row',*args)
-          rows(*args).each_row_(*args,&block)
+          #rows(*args).each_row_(*args,&block)
+          rows(*args,&block)
           self
         end
 
-        def get()
-          until self.eof?
-            raw_rec = self._get_rec
-            return to_rec_(raw_rec) if @get_selrej.match?(raw_rec,@recno)
-          end
-          self.close if closeoneof?
-          nil
-#          (closeoneof? ? self.on_eof_close{ nil } : nil)
-        end
         def get_type(itertype,&block)
           old_itertype = cx['stream_itertype']
           _set_itertype(itertype)
@@ -113,19 +94,64 @@ module RIO
         def getrec()
           get_type('records') { get() }
         end
+        def get()
+          until self.eof?
+            raw_rec = self._get_rec
+            return to_rec_(raw_rec) if @get_selrej.match?(raw_rec,@recno)
+          end
+          #loop do
+          #  raw_rec = self._get_rec
+          #  return to_rec_(raw_rec) if @get_selrej.match?(raw_rec,@recno)
+          #  break if self.eof?
+          #end
+          self.close if closeoneof?
+          nil
+#          (closeoneof? ? self.on_eof_close{ nil } : nil)
+        end
+
         private
 
         def _ss_like_array(selrej)
           selrej.only_one_fixnum? and !dir_iter?
         end
 
+        def get1()
+          begin
+            loop do
+              raw_rec = _got_rec(@cursor.next)
+              return to_rec_(raw_rec) if @get_selrej.match?(raw_rec,@recno)
+            end
+          rescue StopIteration
+            @cursor = nil
+            self.close if closeoneof?
+          end
+          nil
+        end
         protected
 
+        # iterate over the records, yielding only with matching records
+        # implemented in terms of an underlying iterator like each_line (see RIO::RecType::*)
+        def each_enum_(*args,&block)
+          selrej,rangetops = create_selrej()
+          want_ma = (!block.nil? && block.arity > 1)
+          enu = io_enum
+          begin
+            loop do
+              raw_rec = _got_rec(enu.next)
+              rangetops = check_passed_ranges2(selrej,@recno) if rangetops and @recno > rangetops[0]
+              as = selrej.match?(raw_rec,@recno)
+              yield(*([to_rec_(raw_rec)] + (want_ma ? [as] : []))) if as
+            end
+          rescue StopIteration
+            closeoneof? ? self.close : self
+          end
+        end
+
         # iterate over the records, yielding only with matching records
         # implemented in terms of an underlying iterator like each_line (see RIO::RecType::*)
         def each_(*args,&block)
           selrej,rangetops = create_selrej()
-          want_ma = block.arity > 1
+          want_ma = (!block.nil? && block.arity > 1)
           catch(:stop_iter) do
             each_rec_ do |raw_rec|
               _got_rec(raw_rec)
@@ -138,7 +164,8 @@ module RIO
                 end
               end
             end
-            return closeoneof? ? self.close : self
+            #return closeoneof? ? self.close : self
+            throw :stop_iter
           end
           closeoneof? ? self.close : self
         end
@@ -157,7 +184,7 @@ module RIO
               rangetops = check_passed_ranges(selrej,@recno) if rangetops and @recno > rangetops[0]
               yield to_rec_(raw_rec) if selrej.match?(raw_rec,@recno)
             end
-            return self
+            throw :stop_iter
           }
           closeoneof? ? self.close : self
         end
@@ -178,7 +205,7 @@ module RIO
         private
 
         def _got_rec(el=nil)
-          @recno += 1 unless el.nil?
+          @recno += 1 if el
           el
         end
 
@@ -199,6 +226,10 @@ module RIO
           [selrej,selrej.rangetops]
         end
 
+        def check_passed_ranges2(selrej,recno)
+          raise StopIteration if selrej.remove_passed_ranges(recno).never?
+          selrej.rangetops
+        end
         def check_passed_ranges(selrej,recno)
           throw :stop_iter if selrej.remove_passed_ranges(recno).never?
           selrej.rangetops

data/lib/rio/ops/stream/output.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/cp'
@@ -55,6 +44,7 @@ module RIO
         include Ops::Stream::Write
         include Cp::Stream::Output
         def putrec(rec,*args)
+          #p callstr('putrec',rec.inspect,args.inspect)
           self.put_(rec,*args)
           self
         end