rio 0.5.1 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 566aa2a70a79f532a79ac92c4ca603dfb170fa86
+  data.tar.gz: 822ac8d9e81df21b9712dc65d9f975570b453f0b
+SHA512:
+  metadata.gz: b8a4b954b8d997c0355c337b740221ed153f30365c2575dd86f1c288767f05b7e65bed9a7ca900b5fc9bc718a18bbaf1a2d0640b9335da533b460ab9d0944607
+  data.tar.gz: 4763841f80976380eea0a2426f1aa3d5668f9d957d10f0a823d52daa321c3eab422f8314a17fc4e5a61f7ea2a022930f65e45794b2847bf66ad521a9beeb0b65

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2012 Christopher Kleckner
+Copyright (c) 2005-2017 Christopher Kleckner
 
 
 		    GNU GENERAL PUBLIC LICENSE

data/README

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2012 Christopher Kleckner
+Copyright (c) 2005-2017 Christopher Kleckner
 All rights reserved
 
 This file is part of the Rio library for ruby.

data/lib/rio.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -37,8 +37,6 @@ require 'rio/fs'
 #require 'rio/def'
 #require 'rio/exception'
 
-require 'forwardable'
-
 $trace_states = false
 
 require 'rio/kernel'
@@ -49,6 +47,8 @@ require 'rio/const'
 require 'rio/local'
 require 'rio/factory'
 
+require 'rio/undef_rake_dsl'
+
 module RIO
   class Rio #:doc:
     include Local
@@ -109,7 +109,7 @@ module RIO
       self.class.new(self.rl)
     end
 
-    # needed for 1.9.2+ problem with to_ary and method_missing
+    # Returns nil. Needed for 1.9.2+ problem with to_ary and method_missing.
     def to_ary
       nil
     end
@@ -173,6 +173,7 @@ module RIO
 
   end # class Rio
 end # module RIO
+
 module RIO
   class Rio
     USE_IF = true #:nodoc:

data/lib/rio/abstract_method.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.

data/lib/rio/alturi.rb

@@ -1,4 +1,3 @@
-require 'forwardable'
 require 'rio/alturi/uri_parts'
 require 'rio/alturi/algorithm'
 require 'rio/fwd'
@@ -33,6 +32,7 @@ module Alt
     end
   end
 end
+
 module Alt
   module URI
     module Ops
@@ -112,12 +112,8 @@ module Alt
           other.rel(self)
         end
         def join(*a)
-          #p "A=#{a.inspect}"
           pthstr = a.map(&:to_s).join('/')
-          #p "DODODODOD",a.map{ |ar| ar.is_a?(::String) ? "#{ar.encoding} #{ar}" : "#{ar}" }
-          #p pthstr.encoding,pthstr
           newpth = (self.path + (a.empty? || self.path.empty? ? '' : '/') + pthstr).squeeze('/')
-          #p "NEWPATH:",newpth.encoding,newpth
           self.path = newpth
         end
 
@@ -125,7 +121,9 @@ module Alt
     end
   end
 end
+
 require 'rio/alturi/path_parts'
+
 module Alt
   module URI
     class Base
@@ -160,10 +158,10 @@ module Alt
     end
   end
 end
+
 module Alt
   module URI
     class Generic < ::Alt::URI::Base
-      extend Forwardable
       extend Builders
       def initialize(parts=nil)
         prts = parts || Alt::URI::Gen::URIParts.new
@@ -173,10 +171,6 @@ module Alt
         super
       end
       def normalize
-        
-        #if self.host
-        #  self.host = self.scheme ? "" : nil
-        #end
         super
       end
       include Ops::Generic
@@ -188,7 +182,7 @@ module Alt
       fwd :parts, :host,:port
       fwd :parts, :userinfo
       fwd :parts, :user,:password
-      def_delegators :parts, :to_s
+      fwd_readers :parts, :to_s
       
 
       def netpath
@@ -207,12 +201,6 @@ module Alt
       alias :fspath :netpath
       def fspath=(val) netpath = val end
 
-      #      def abs(base)
-      #        Alt::URI::Generic.new(parts.abs(base.parts))
-      #      end
-      #      def rel(base)
-      #        Alt::URI::Generic.new(parts.rel(base.parts))
-      #      end
     end
 
   end
@@ -221,7 +209,6 @@ end
 module Alt
   module URI
     class File < ::Alt::URI::Base
-      extend Forwardable
       extend Builders
 
       def initialize(parts=nil)
@@ -239,7 +226,7 @@ module Alt
       fwd :parts, :authority
       fwd :parts, :netpath
       fwd :parts, :host
-      def_delegators :parts, :to_s
+      fwd_reader :parts, :to_s
       
       def normalize
         hst = self.host if self.host and !(self.host == 'localhost' or self.host.empty?)
@@ -285,7 +272,6 @@ end
 module Alt
   module URI
     class HTTP < ::Alt::URI::Base
-      extend Forwardable
       extend Builders
 
       def initialize(parts=nil)
@@ -303,7 +289,7 @@ module Alt
       fwd :parts, :authority
       fwd :parts, :netpath
       fwd :parts, :host,:port
-      def_delegators :parts, :to_s
+      fwd_readers :parts, :to_s
       
       def netpath
         parts.path
@@ -335,13 +321,9 @@ module Alt
   end
 end
 
-
-
-
 module Alt
   module URI
     class FTP < ::Alt::URI::Base
-      extend Forwardable
       extend Builders
 
       def initialize(parts=nil)
@@ -361,7 +343,7 @@ module Alt
       fwd :parts, :host,:port
       fwd :parts, :userinfo
       fwd :parts, :user,:password
-      def_delegators :parts, :to_s
+      fwd_reader :parts, :to_s
       
 
       def fspath() self.path end
@@ -378,15 +360,11 @@ module Alt
         [pth,typ]
       end
       def path
-        #p parts[:path]
         pth = parts._do_unesc(split_path_type[0])[1..-1]
-        #Alt::URI.unescape(split_path_type[0])[1..-1]
-        #parts.path
         pth
       end
       def path=(val)
         pth = parts._do_esc(val,:path).sub(%r{^/},'%2F')
-        #pth = Alt::URI.escape(val,:path).sub(%r{^/},'%2F')
         typ = self.typecode
         escpath = "/#{pth}" + (typ ? ";type=#{typ}" : "")
         parts[:path] = escpath
@@ -408,15 +386,6 @@ module Alt
         parts.uri = val
       end
 
-      
-      
-
-
-
-
-
-
-
       def normalize
         if self.port == '21'
           self.port = nil
@@ -437,16 +406,6 @@ module Alt
   end
 end
 
-
-
-
-
-
-
-
-
-
-
 module Alt
   module URI
     module Factory
@@ -464,7 +423,6 @@ module Alt
       end
 
       def self.parse(str,opts={})
-        #str = "file:///" + str if str =~ /^[a-zA-Z]:/
         u = Alt::URI::Gen::URIParts.parse(str,opts)
         from_parts(u)
       end
@@ -476,32 +434,15 @@ module Alt
     end
   end
 end
+
 module Alt
   module URI
     def self.parse(str,opts={})
-      #p "Alt::URI.parse str=#{str}"
-      ans = Factory.parse(str,opts)
-      #p "   ans=#{ans.inspect}"
-      ans
+      Factory.parse(str,opts)
     end
     def self.create(hash)
       Factory.create(hash)
     end
-#    def self.escape(str,fld)
-#      if str
-#        # str.encode('UTF-8')
-#        Alt::URI::Escape.escape(str.force_encoding('US-ASCII'),fld) 
-#      end
-#    end
-#    def self.unescape(str)
-#      if str
-#        ustr = Alt::URI::Escape.unescape(str)
-#        @encoding ? ustr.force_encoding(@encoding) : ustr
-#      end
-#    end
   end
 end
 
-if __FILE__ == $0
-  # TODO Generated stub
-end

data/lib/rio/alturi/algorithm.rb

@@ -42,8 +42,6 @@ module Alt
         return out.join("/")
       end
 
-
-
       # 7) The resulting URI components, including any inherited from the
       #     base URI, are recombined to give the absolute form of the URI
       #     reference.  Using pseudocode, this would be
@@ -70,16 +68,6 @@ module Alt
 
       #        return result
 
-
-
-
-
-
-
-
-
-
-
       def self.uri_string(r)
         ( defined(r.scheme) ? r.scheme + ":"  : "") + 
           ( defined(r.authority) ? "//" + r.authority : "") + 
@@ -87,15 +75,13 @@ module Alt
           ( defined(r.query) ? "?" + r.query : "") +
           ( defined(r.fragment) ? "#" + r.fragment : "") 
       end
+
       def self.authority_string(r)
         ( defined(r.userinfo) ? r.userinfo + "@"  : "") + 
           r.host +
           ( defined(r.port) ? ":" + r.port : "") 
       end
 
-
-
-
       def self.defined(el)
         !el.nil?
       end
@@ -307,7 +293,4 @@ module Alt
   end
 end
 
-if __FILE__ == $0
-  # TODO Generated stub
-end
 

data/lib/rio/alturi/escape.rb

@@ -28,12 +28,10 @@ module Alt
 
       def self.escape(str,arg)
         tmp = ""
-        # p "escape: #{es(str)}"
         table = (::Symbol === arg ? CHAR_TABLE[arg] : arg)
         str.each_byte do |b|
           tmp << table[b]
         end
-        #p "escape: tmp=#{es(str)} str.enc=#{str.encoding}"
         tmp.encode(str.encoding)
       end
 
@@ -52,12 +50,10 @@ module Alt
       UNESCAPE_HASH = build_unescape_hash
 
       def self.unescape(estr)
-        #p "ESTR: #{estr}"
         ustr = ""
         pos = 0
         while npos = estr.index('%',pos)
           uh = UNESCAPE_HASH[estr[npos,3].upcase]
-          #p "UH: #{uh.inspect} npos:#{npos} pos:#{pos}"
           ustr << estr[pos,npos-pos] << uh
           pos = npos +3
         end

data/lib/rio/alturi/parse.rb

@@ -15,20 +15,6 @@ module Alt
         }
       end
 
-      #RE_PARTS = /^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/
-    #   RE_GENERIC0 = %r{
-    #  (?<scheme>      [^:/?#]+   ){0}
-    #  (?<authority>   [^/?#]*    ){0}
-    #  (?<path>        [^?#]*     ){0}
-    #  (?<query>       [^#]*      ){0}
-    #  (?<fragment>    .*         ){0}
-
-    #  (      \g<scheme>     :   )?
-    #  (  //  \g<authority>      )?
-    #         \g<path>
-    #  (  \?  \g<query>          )?
-    #  (  \#  \g<fragment>       )?
-    # }x
       RE_GENERIC = %r{
      (?:      (  [^:/?#]+  )  :  )?
      (?:  //  (  [^/?#]*   )     )?
@@ -37,21 +23,6 @@ module Alt
      (?:  \#  (  .*        )     )?
      }x
 
-      #def self.parse(ustr)
-      #  parse_re(ustr,RE_GENERIC)
-      #end
-
-      #authority   = [ userinfo "@" ] host [ ":" port ]
-      #RE_AUTHORITY0 = %r{
-      #(?<userinfo>      [^@]+   ){0}
-      #(?<host>          [^:]*   ){0}
-      #(?<port>          .*      ){0}
-      #
-      #(      \g<userinfo> @   )?
-      #      \g<host>
-      #(   :  \g<port>         )?
-      #}x
-
       RE_AUTHORITY = %r{
      (?:      (  [^@]+  )   @   )?
               (  [^:]*  )

data/lib/rio/alturi/path_parts.rb

@@ -48,9 +48,7 @@ module Alt
         private
 
         def _en_pos(path,extnm=nil)
-          # p "en_pos(#{path},#{extnm.inspect})"
           en = extnm || ::File.extname(path)
-          # p "en = #{en.inspect}"
           [path.rindex(en),en.length]
         end
         def _bn_pos(path,exnam=nil)

data/lib/rio/alturi/uri_parts.rb

@@ -1,4 +1,3 @@
-require 'forwardable'
 require 'rio/alturi/escape'
 require 'rio/alturi/parse'
 require 'rio/alturi/algorithm'
@@ -7,12 +6,13 @@ require 'rio/alturi/algorithm'
 module Alt
   module URI
     class FieldStore
-      extend Forwardable
+      extend RIO::Fwd
       def initialize(hash)
         @hash = hash
       end
 
-      def_delegators :@hash, :[]=, :[], :values_at
+      fwd_readers :@hash, :values_at
+      fwd :@hash, :[]
 
       def method_missing(sym,*args,&block)
         if sym.to_s.end_with? '='
@@ -34,7 +34,6 @@ module Alt
             str.encode('UTF-8')
 
             Alt::URI::Escape.escape(str.force_encoding('US-ASCII'),fld) 
-            #Alt::URI::Escape.escape(str,fld) 
           end
         end
         def _do_unesc(str)
@@ -274,13 +273,6 @@ module Alt
         def initialize(opts={})
           @store = { :path => "" }
           @encoding = opts[:encoding]
-          # p "@encoding=#{@encoding.inspect}"
-          # p caller[0]
-          # @encoding = @store[:path].encoding
-          # p "URIParts",__ENCODING__
-          # @encoding = Encoding.default_internal
-          # @encoding = Encoding.find('UTF-8')
-          # @encoding = __ENCODING__
         end
 
         def initialize_copy(other)
@@ -309,14 +301,6 @@ module Alt
           u
         end
 
-#         def [](sym)
-#           __send__(sym)
-#         end
-
-#         def []=(sym,val)
-#           __send__(sym.to_s+'=',val)
-#         end
-
         def [](sym)
           @store[sym]
         end
@@ -443,16 +427,7 @@ module Alt
             @store.clear
             @store[:path] = ""
           else
-            #Alt::URI::Parse::RE_GENERIC.match(val) { |m|
-            #  p "URI_PARTS: #{m.inspect}"
-            #  self.scheme = m[:scheme]
-            #  self.authority = m[:authority]
-            #  @store[:path] = m[:path]
-            #  @store[:query] = m[:query]
-            #  @store[:fragment] = m[:fragment]
-            #}
             Alt::URI::Parse::RE_GENERIC.match(val) { |m|
-              #p "URI_PARTS: #{m.inspect}"
               self.scheme = m[1]
               self.authority = m[2]
               @store[:path] = m[3]
@@ -470,10 +445,6 @@ module Alt
             self.authority = nil
             self.path = ""
           else
-            #Alt::URI::Parse::RE_GENERIC.match(val) { |m|
-            #  self.authority = m[:authority]
-            #  self.path = m[:path]
-            #}
             Alt::URI::Parse::RE_GENERIC.match(val) { |m|
               self.authority = m[2]
               self.path = m[3]