rio 0.4.2 → 0.5.1

data/lib/rio/scheme/tcp.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/scheme/temp.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,121 +18,139 @@
 # 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 'tmpdir'
+require 'rio/rrl/base'
+
 module RIO
   module Temp #:nodoc: all
     RESET_STATE = 'Temp::Reset'
 
-    require 'rio/rl/base'
-    class RL < RL::Base 
+    class RRL < ::RIO::RRL::Base 
       RIOSCHEME = 'temp'
-      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].to_s.freeze
+      RIOPATH = RIO::RRL::CHMAP.invert[RIOSCHEME].to_s.freeze
       DFLT_PREFIX = 'rio'
       DFLT_TMPDIR = ::Dir::tmpdir
-      attr_reader :prefix,:tmpdir
-      def initialize(file_prefix=DFLT_PREFIX,temp_dir=DFLT_TMPDIR)
-        #puts "initialize(#{file_prefix.inspect},#{temp_dir.inspect})"
-        @prefix = file_prefix || DFLT_PREFIX
-        @tmpdir = temp_dir || DFLT_TMPDIR
-        super
-      end
-      #def path() nil end
-      def scheme() self.class.const_get(:RIOSCHEME) end
-      def opaque()
-        td = self.escape(@tmpdir.to_s)
-        td += '/' unless td.nil? or td.empty? or (td != '/' and td[-1] == ?/)
-        td + self.escape(@prefix)
-      end
-      
-      SPLIT_RE = %r|(?:(.*)/)?([^/]*)$|.freeze
-      def self.splitrl(s)
-        sub,opq,whole = split_riorl(s)
-        if opq.nil? or opq.empty?
-          []
-        elsif bm = SPLIT_RE.match(opq)
-          tdir = bm[1] unless bm[1].nil? or bm[1].empty?
-          tpfx = bm[2] unless bm[2].nil? or bm[2].empty?
-          [tpfx,tdir]
-        else
-          []
-        end
+      # p 'DFLT_TMPDIR=' + DFLT_TMPDIR 
+      def initialize(u,file_prefix=DFLT_PREFIX,temp_dir=DFLT_TMPDIR)
+        # p "Temp::RRL::initialize u=#{u} file_prefix=#{file_prefix} temp_dir=#{temp_dir}"
+        # puts "Temp::RRL CALLER: ",caller[0..8]
+        alturi = case u
+                 when ::Alt::URI::Base then u
+                 else ::Alt::URI.parse(u.to_s)
+                 end
+        prefix = alturi.query || file_prefix.to_s
+        tmpdir = (alturi.path.nil? || alturi.path.empty?) ? 
+          temp_dir.to_s : alturi.path
+        #alturi = ::Alt::URI.create(:scheme => 'temp', :path => temp_dir,
+        #                           :query => file_prefix)
+        # p 'HERE'
+        super(alturi)
+        # p "alturi=#{alturi}"
+        self.path = tmpdir
+        self.query = prefix
       end
+
+      extend Forwardable
+      def_delegators :uri, :path=, :path, :query, :query=, :scheme
+      alias :prefix :query
+      alias :tmpdir :path
+
     end
     module Dir
-      require 'rio/rl/path'
-      RESET_STATE = RIO::RL::PathBase::RESET_STATE
+      require 'rio/rrl/path'
+      RESET_STATE = RIO::RRL::PathBase::RESET_STATE
       require 'tmpdir'
-      class RL < RIO::RL::PathBase 
+      class RRL < RIO::RRL::PathBase 
         RIOSCHEME = 'tempdir'
-        DFLT_PREFIX = Temp::RL::DFLT_PREFIX
-        DFLT_TMPDIR = Temp::RL::DFLT_TMPDIR
-        attr_reader :prefix,:tmpdir,:tmprl
-        def initialize(file_prefix=DFLT_PREFIX,temp_dir=DFLT_TMPDIR)
-          #puts "initialize(#{file_prefix.inspect},#{temp_dir.inspect})"
-          @prefix = file_prefix || DFLT_PREFIX
-          @tmpdir = temp_dir || DFLT_TMPDIR
+        DFLT_PREFIX = Temp::RRL::DFLT_PREFIX
+        DFLT_TMPDIR = Temp::RRL::DFLT_TMPDIR
+
+        def initialize(u,file_prefix=DFLT_PREFIX,temp_dir=DFLT_TMPDIR)
           require 'rio/tempdir'
-          @td = ::Tempdir.new( @prefix.to_s, @tmpdir.to_s)
-          super(@td.to_s)
+          # p "Temp::Dir u=#{u.inspect} file_prefix=#{file_prefix} temp_dir=#{temp_dir}"
+          alturi = case u
+                   when ::Alt::URI::Base then u
+                   else ::Alt::URI.parse(u.to_s)
+                   end
+          prefix = alturi.query || file_prefix.to_s
+          tmpdir = (alturi.path.nil? || alturi.path.empty?) ? 
+             temp_dir.to_s : alturi.path
+          #p "Temp::Dir prefix=#{prefix} tmpdir=#{tmpdir}"
+          td = ::Tempdir.new( prefix, tmpdir)
+          #td = "file:///" + td if td.to_s =~ /^[a-zA-Z]:/
+          #p "Temp::Dir td=#{td.to_s.inspect}"
+          td = "file:///" + td.to_s if td.to_s =~ /^[a-zA-Z]:/
+          super(td.to_s)
+          #self.query = file_prefix.to_s
+          #self.path = temp_dir.to_s
         end
+        extend Forwardable
+        def_delegators :uri, :path=, :path, :query, :query=
+        alias :prefix :query
+        alias :tmpdir :path
+
         def dir_rl() 
-          #p "temp:dir_rl: #{self.uri.inspect}"
-          RIO::Dir::RL.new(self.uri, {:fs => self.fs})
-          #self 
-        end
-        SPLIT_RE = Temp::RL::SPLIT_RE
-        def self.splitrl(s)
-          Temp::RL.splitrl(s)
+          RIO::Dir::RRL.new(self.uri, {:fs => self.fs})
         end
       end
     end
     module File
-      require 'rio/rl/path'
+      require 'rio/rrl/path'
       RESET_STATE = 'Temp::Stream::Open'
-      class RL < RIO::RL::PathBase 
+      class RRL < RIO::RRL::PathBase 
         RIOSCHEME = 'tempfile'
-        DFLT_PREFIX = Temp::RL::DFLT_PREFIX
-        DFLT_TMPDIR = Temp::RL::DFLT_TMPDIR
-        attr_reader :prefix,:tmpdir,:tmprl
-        def initialize(file_prefix=DFLT_PREFIX,temp_dir=DFLT_TMPDIR)
-          #puts "initialize(#{file_prefix.inspect},#{temp_dir.inspect})"
-          @prefix = file_prefix || DFLT_PREFIX
-          @tmpdir = temp_dir || DFLT_TMPDIR
+        DFLT_PREFIX = Temp::RRL::DFLT_PREFIX
+        DFLT_TMPDIR = Temp::RRL::DFLT_TMPDIR
+
+        def initialize(u,file_prefix=DFLT_PREFIX,temp_dir=DFLT_TMPDIR)
           require 'tempfile'
-          @tf = ::Tempfile.new( @prefix.to_s, @tmpdir.to_s)
-          super(@tf.path)
+           #p "Temp::File::initialize u=#{u.inspect} file_prefix=#{file_prefix.inspect} temp_dir=#{temp_dir.inspect}"
+          # puts "Temp::File CALLER: ",caller[0..8]
+          # FIXME: Temporary fix for jruby 1.4 - make tmpdir absolute
+          #tmpdir_rio = rio(@tmpdir).abs
+          alturi = case u
+                   when ::Alt::URI::Base then u
+                   else ::Alt::URI.parse(u.to_s)
+                   end
+          prefix = alturi.query || file_prefix.to_s
+          tmpdir = (alturi.path.nil? || alturi.path.empty?) ? 
+             temp_dir.to_s : alturi.path
+          # p "Temp::File::initialize alturi=#{alturi} prefix=#{prefix} tmpdir=#{tmpdir}"
+
+          @tf = ::Tempfile.new( prefix, tmpdir)
+
+          #puts "TF=#{@tf.inspect}"
+          # @tf = ::Tempfile.new( @prefix.to_s, @tmpdir.to_s)
+
+          # FIXME: Temporary fix for jruby 1.4 - fix slashes
+          pth =  @tf.path
+          pth.gsub!("\\","/")
+          pth = "file:///" + pth if pth =~ /^[a-zA-Z]:/
+
+          #p "PTH=#{pth}"
+          # @tf = "file:///" + @tf if @tf.to_s =~ /^[a-zA-Z]:/
+          #
+          #p "Temp::File pth=#{pth.inspect}"
+          super(::Alt::URI.parse(pth))
+          #self.query = file_prefix
+          #self.path = temp_dir
         end
+        extend Forwardable
+        def_delegators :uri, :path=, :path, :query, :query=
         def file_rl() 
-        RIO::File::RL.new(self.uri,{:fs => self.fs})
-          #self 
+          RIO::File::RRL.new(self.uri,{:fs => self.fs})
         end
         def open(mode='ignored')
-          #p callstr('open',mode)
           @tf
         end
         def close 
           super
           @tf = nil
         end
-        SPLIT_RE = Temp::RL::SPLIT_RE
-        def self.splitrl(s)
-          Temp::RL.splitrl(s)
-        end
       end
     end
     require 'rio/state'
@@ -148,7 +166,8 @@ module RIO
 
       def check?() true end
       def mkdir(prefix=rl.prefix,tmpdir=rl.tmpdir)
-        self.rl = RIO::Temp::Dir::RL.new(prefix, tmpdir)
+        # p "scheme/temp.rb mkdir(): prefix="+prefix+" tmpdir="+tmpdir
+        self.rl = RIO::Temp::Dir::RRL.new("",prefix, tmpdir)
         become 'Dir::Existing'
       end
 #      def mkdir()
@@ -158,7 +177,8 @@ module RIO
         self.mkdir.chdir(&block)
       end
       def file(prefix=rl.prefix,tmpdir=rl.tmpdir)
-        self.rl = RIO::Temp::File::RL.new(prefix, tmpdir)
+        # p "scheme/temp.rb file(): prefix="+prefix+" tmpdir="+tmpdir
+        self.rl = RIO::Temp::File::RRL.new("",prefix, tmpdir)
         become 'Temp::Stream::Open'
       end
       def scheme() rl.scheme() end
@@ -171,7 +191,6 @@ module RIO
       def open?() false end
       def closed?() true end
       def when_missing(sym,*args)
-        #p @rl.scheme
         if @tempobj.nil?
           file()
         else
@@ -185,15 +204,7 @@ module RIO
         def iostate(sym)
           mode_('w+').open_.inout()
         end
-#        def inout() stream_state('Temp::Stream::InOut') end
       end
-#      require 'rio/stream'
-#      class InOut < RIO::Stream::InOut
-#        def base_state() 'Temp::Stream::Close' end
-#      end
-#      class Close < RIO::Stream::Close
-#        def base_state() 'Temp::Reset' end
-#      end
 
     end
   end

data/lib/rio/state.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,29 +18,25 @@
 # 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/context'
+#require 'rio/context/methods'
+#require 'rio/ext'
+#require 'rio/filter'
+#require 'rio/fs/native'
+#require 'rio/fwd'
+
 require 'rio/exception/state'
-require 'rio/context'
-require 'rio/context/methods'
-require 'rio/ext'
+require 'rio/state/data'
 require 'rio/symantics'
-require 'rio/filter'
-require 'rio/fs/native'
+module RIO
+  autoload :Cx,'rio/context'
+  autoload :Ext,'rio/ext'
+end
 
 module RIO
 
@@ -54,9 +50,35 @@ module RIO
     # * the state changing mechanism
     # * and some basic error handling stubs
     class Base
-      KIOSYMS = [:gets,:getc,:open,:readline,:readlines,:chop,:to_a,:putc,:puts,:print,:printf,
-                 #:split,
-                 :=~,:===,:==,:eql?,:sub,:sub!,:gsub,:gsub!,:load]
+      kiosyms = []
+      kiosyms << :gets
+      kiosyms << :open
+      kiosyms << :readline
+      kiosyms << :readlines
+      kiosyms << :putc
+      kiosyms << :puts
+      kiosyms << :print
+      kiosyms << :printf
+      kiosyms << :=~
+      kiosyms << :===
+      kiosyms << :==
+      kiosyms << :eql?
+      kiosyms << :load
+      kiosyms << :to_a
+      #kiosyms << :split
+      #kiosyms << :sub
+      #kiosyms << :sub!
+      #kiosyms << :gsub
+      #kiosyms << :gsub!
+      #kiosyms << :chop
+      #kiosyms << :getc
+
+      # In 1.8 #to_a is inherited from Object
+      # For 1.9 we create this -- only to undef it immediatly.
+      # So we end up in the same state for both ruby versions.
+      def to_a() end
+
+      KIOSYMS = kiosyms
       @@kernel_cleaned ||= KIOSYMS.each { |sym| undef_method(sym) } 
       undef_method(:rio)
     end 
@@ -65,49 +87,46 @@ module RIO
       attr_accessor :try_state
       #attr_accessor :handled_by
 
-      attr_accessor :rl
-      attr_accessor :ioh
-
-      attr_accessor :cx
-
+      # include Enumerable
       # Context handling
       include Cx::Methods
       include RIO::Ext::Cx
 
       
-      def initialize(rl=nil,cx=nil,ioh=nil)
-        cx ||= self.class.default_cx
-        _init(rl,cx,ioh)
-        #        @handled_by = self.class.to_s
+      attr_reader :data
+      def initialize(iv)
+        #p "State#initialize(#{iv.keys.inspect})"
+        @data = State::Data.new
+        iv.keys.each do |k|
+          @data[k] = iv[k]
+        end
+        @data.cx ||= self.class.default_cx
       end
       
-      def _init(riorl,cntx,iohandle=nil)
-        @rl = riorl
-        @cx = cntx
-        @ioh = iohandle
-#        raise Exception::FailedCheck.new(self) unless check?
-        self
-      end
-      private :_init
-
-      def initialize_copy(*args)
-        #p callstr('initialize_copy',args[0].inspect)
+      def initialize_copy(other)
         super
-        @rl = @rl.clone unless @rl.nil?
-        @cx = @cx.clone unless @cx.nil?
-        @ioh = @ioh.clone unless @ioh.nil?
-        # @fs = @fs
+        @data = State::Data.new
+        data.rl = other.data.rl.clone if other.data.rl
+        data.cx = other.data.cx.clone if other.data.cx
+        data.ioh = other.data.ioh.clone if other.data.ioh
       end
 
+      extend Forwardable
+      def_instance_delegators(:rl,:path,:netpath,:to_s,:fspath,:length)
+
+      extend RIO::Fwd
+      fwd :data,:rl,:cx
+      fwd :data,:ioh
+      alias :ior :ioh
+      alias :iow :ioh
+
       def self.default_cx
          Cx::Vars.new( { 'closeoneof' => true, 'closeoncopy' => true } )
       end
       def self.new_other(other)
-        new(other.rl,other.cx,other.ioh)
+        new(other.data)
       end
 
-      alias :ior :ioh
-      alias :iow :ioh
 
 
 
@@ -122,12 +141,7 @@ module RIO
         #p "BECOME #{new_class}: #{cx['ss_type']}"
         return self if new_class == self.class
 
-        begin
-          new_state = try_state[new_class,*args]
-        rescue Exception::FailedCheck => ex
-          p "not a valid "+new_class.to_s+": "+ex.to_s+" '"+self.to_s+"'"
-          raise
-        end
+        new_state = try_state[new_class,*args]
         became(new_state)
         new_state
       end
@@ -135,7 +149,8 @@ module RIO
         #RIO::Ext.became(obj)
       end
       def method_missing_trace_str(sym,*args)
-        "missing: "+self.class.to_s+'['+self.to_url+" {#{self.rl.fs}}"+']'+'.'+sym.to_s+'('+args.join(',')+')'
+        # "missing: "+self.class.to_s+'['+self.to_url+" {#{self.rl.fs}}"+']'+'.'+sym.to_s+'('+args.join(',')+')'
+          "missing: "+self.class.to_s+'['+self.to_url+']'+'.'+sym.to_s+'('+args.join(',')+')'
         #"missing: "+self.class.to_s+'['+self.to_url+""+']'+'.'+sym.to_s+'('+args.join(',')+')'
       end
 
@@ -144,13 +159,14 @@ module RIO
 
         obj = when_missing(sym,*args)
         raise RuntimeError,"when_missing returns nil" if obj.nil?
+        #p "STATE: METHOD_MISSING",obj.to_s,sym,args
         obj.__send__(sym,*args,&block) #unless obj == self
       end
       
       def when_missing(sym,*args) gofigure(sym,*args) end
 
 
-      def base_state() Factory.instance.reset_state(@rl) end
+      def base_state() Factory.instance.reset_state(rl) end
 
       def softreset 
         #p "softreset(#{self.class}) => #{self.base_state}"
@@ -180,18 +196,20 @@ module RIO
       def to_rl() self.rl.rl end
       def fs() self.rl.fs end
 
-      extend Forwardable
-      def_instance_delegators(:rl,:path,:to_s,:fspath,:urlpath,:length)
+      #def_instance_delegators(:uri,:path,:netpath,:to_s,:fspath,:length)
 
-      def ==(other) @rl == other end
+      def ==(other) rl == other end
       def ===(other) self == other end
       def =~(other) other =~ self.to_str end
-      def to_url() @rl.url end
-      def to_uri() @rl.uri end
-      alias to_str to_s
+      def to_url() rl.url end
+      def to_uri() rl.uri end
+      def uri() rl.uri end
+      alias :to_str :to_s
+      alias :to_path :to_s
+      def to_ary() nil end
 
-      def hash() @rl.to_s.hash end
-      def eql?(other) @rl.to_s.eql?(other.to_s) end
+      def hash() rl.to_s.hash end
+      #def eql?(other) @rl.to_s.eql?(other.to_s) end
 
       def stream?() false end
 
@@ -209,7 +227,7 @@ module RIO
       def clone_rio()
         cp = Rio.new(self.rl)
         cp.cx = self.cx.clone
-        cp.ioh = self.ioh.clone unless self.ioh.nil?
+        #cp.ioh = self.ioh.clone unless self.ioh.nil?
         cp.rl = self.rl.clone
         cp
       end
@@ -223,7 +241,7 @@ module RIO
       end
       def ensure_cmd_rio(arg)
         case arg
-        when ::String then new_rio(:cmdio,arg)
+        when ::String then new_rio("cmdio:"+arg)
         when ::Fixnum then new_rio(arg)
         when Rio then arg.clone
         else ensure_rio(arg)