rio 0.5.1 → 0.6.0

data/lib/rio/ext/mp3info.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.
@@ -24,16 +24,17 @@
 
 
 require 'mp3info'
-require 'forwardable'
+
 module RIO
   module Ext
     module Mp3Info
         def mp3info() ::Mp3Info.new(self.fspath) end
 
-        extend Forwardable
+        extend RIO::Fwd
+
+        fwd_readers :mp3info,:tag,:bitrate,:samplerate
+        fwd_readers :tag,:tracknum
 
-        def_instance_delegators(:mp3info,:tag,:bitrate,:samplerate)
-        def_instance_delegators(:tag,:tracknum)
         def title() _chop0(tag.title) end
         def album() _chop0(tag.album) end
         def artist() _chop0(tag.artist) end

data/lib/rio/ext/splitlines.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.
@@ -22,26 +22,6 @@
 #++
 #
 
-
-# begin
-#   require 'faster_csv'  # first choice--for speed
-
-#   # A CSV compatible interface for FasterCSV.
-#   module CSV  # :nodoc:
-#     def self.parse_line( line, field_sep=nil, row_sep=nil )
-#       FasterCSV.parse_line( line, :col_sep => field_sep || ",",
-#                                   :row_sep => row_sep   || :auto )
-#     end
-    
-#     def self.generate_line( array, field_sep=nil, row_sep=nil )
-#       FasterCSV.generate_line( array, :col_sep => field_sep || ",",
-#                                       :row_sep => row_sep   || "" )
-#     end
-#   end
-# rescue LoadError
-#   require 'csv'         # second choice--slower but standard
-# end
-
 module RIO
   module Ext
     module SplitLines
@@ -87,8 +67,6 @@ module RIO
         protected
 
         def to_rec_(raw_rec)
-          #_init_cols_from_line(raw_rec) if @recno == 0
-          #p "#{callstr('to_rec_',raw_rec.inspect,@recno)} ; itertype=#{cx['stream_itertype']}"
           case cx['stream_itertype']
           when 'lines' 
             raw_rec

data/lib/rio/ext/yaml.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.
@@ -22,7 +22,6 @@
 #++
 #
 
-
 require 'yaml'
 
 module RIO
@@ -33,7 +32,6 @@ module RIO
           cxx('yaml',true,&block) 
         end
         def yamldoc(&block) 
-          #@yamldoc = YAML::Tie::Doc.new(self.fspath).open
           become('Ext::YAML::Doc::Existing')
         end
         def yaml?() cxx?('yaml') end 
@@ -111,25 +109,12 @@ module RIO
         protected
 
         def cpfrom_(arg)
-          #p "yaml#cpfrom_(#{arg})"
           case arg
-          #when ::Array then cpfrom_array_(arg)
           when Rio,::IO,::StringIO then super
           else self.put_(arg)
           end
           self
         end
-#        def cpfrom_array_(array)
-#          array.each { |el|
-#            self.put_(el)
-#          }
-#          self
-#        end
-#        def cpfrom_rio_(ario)
-#          p "yaml#cpfrom_rio_(#{ario})"
-#          ioh.puts(::YAML.dump_stream(*ario[]))
-#          self
-#        end
         def put_(obj)
           #p callstr('put_',obj)
           ioh.puts(obj.to_yaml)

data/lib/rio/ext/yaml/doc.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.
@@ -68,11 +68,6 @@ module RIO
           end
           
           def ystream() 
-            #cl = 'Dir::Stream'
-            #p "LOOP: retry: #{cx['retrystate'].inspect} => #{cl}" 
-            #return nil if cx['retrystate'] == cl
-            #cx['retrystate'] = cl
-            
             become('Ext::YAML::Doc::Stream')
           end
         end

data/lib/rio/ext/yaml/tie.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.
@@ -22,9 +22,7 @@
 #++
 #
 
-
 require 'yaml'
-require 'forwardable'
 require 'delegate'
 
 module RIO
@@ -32,7 +30,6 @@ module RIO
     module YAML #:nodoc: all
       module Tie
         class Doc
-          extend Forwardable
           def initialize(fn)
             @filename = fn
             @io = nil
@@ -55,7 +52,8 @@ module RIO
             end
           end
 
-          def_instance_delegators(:@root,:inspect)
+          fwd_readers :@root, :inspect
+          
           def method_missing(sym,*args)
             @root.__send__(sym,*args)
           end
@@ -78,7 +76,6 @@ module RIO
           end
         end
         class Root < Base
-          extend Forwardable
           attr_accessor :dirty
           def initialize(doc)
             @doc = doc
@@ -91,7 +88,7 @@ module RIO
           def dirty?()
             @dirty
           end
-          def_instance_delegators(:@root,:inspect)
+          fwd_readers :@root,:inspect
           def method_missing(sym,*args)
             @root.__send__(sym,*args)
           end

data/lib/rio/ext/zipfile.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.
@@ -42,58 +42,3 @@ module RIO
   end
 end
 __END__
-module RIO
-  module_function
-  def load_lib(lib)
-    begin 
-      require lib
-    rescue LoadError => ex
-      begin
-        p "using Gem for #{lib}" if $DEBUG
-        require 'rubygems'
-        require_gem lib
-      rescue
-        raise ex
-      end
-    end
-  end
-end
-
-begin
-  RIO.load_lib('zip/zip')
-  require 'zip/zipfilesystem'
-  require 'rio/ext/zipfile/opt'
-  RIO::Ext::ZipFile.load_extension
-rescue LoadError
-  p "No zipfile support"  if $DEBUG
-end
-
-
-# module RIO
-#   module Ext
-#     module ZipFile
-#       module Cx
-#         def zipfile(&block) 
-#           #require 'rio/ext/zipfile/state'
-#           cxx('zipfile',true,&block)
-#           #self.extend(ZipFile::State).fstream
-#         end
-#         def zipfile?() cxx?('zipfile') end 
-#         def zipfile_() 
-#           cxx_('zipfile',true) 
-#         end
-#         protected :zipfile_
-
-#         def zipent(&block) 
-#           cxx('zipent',true,&block)
-#         end
-#         def zipent?() cxx?('zipent') end 
-#         def zipent_() 
-#           cxx_('zipent',true) 
-#         end
-#         protected :zipent_
-#       end
-#     end
-#   end
-# end
-__END__

data/lib/rio/ext/zipfile/fs.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.
@@ -63,7 +63,6 @@ module RIO
           @file = RIO::ZipFile::Wrap::File.new(@zipfile.file)
           @dir = RIO::ZipFile::Wrap::Dir.new(@zipfile.dir)
           @test = @file
-          #p "InFile: #{@file.class}"
         end
         include RIO::FS::File
         include RIO::FS::Dir
@@ -75,31 +74,3 @@ module RIO
 end
 
 __END__
-
-      
-      class CentralDir < RIO::FS::Native
-        def initialize(zipfilepath)
-          @zipfilepath = zipfilepath
-          @zipfile = Zip::ZipFile.new(@zipfilepath)
-          super
-        end
-        def mkdir(path)
-          @zipfile.mkdir(path)
-        end
-        def rmdir(path)
-          @zipfile.remove(path)
-        end
-        def file()
-          self
-        end
-        def open(zipfilepath)
-          @zipfilepath = zipfilepath
-          @zipfile = Zip::ZipFile.new(@zipfilepath)
-          RIO::ZipFile::CentralDir.new(@zipfile)
-        end
-
-      end
-
-    end
-  end
-end

data/lib/rio/ext/zipfile/rl.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.
@@ -30,7 +30,6 @@ module RIO
   module ZipFile #:nodoc: all
     module RootDir
       RESET_STATE = 'ZipFile::State::Reset'
-      #RESET_STATE = RIO::RL::PathBase::RESET_STATE
       
       require 'rio/rl/base'
       class RL < RIO::RL::Base 
@@ -57,7 +56,6 @@ module RIO
           IOH::Dir.new(ZipFile::Wrap::Stream::Root.new(@zipfile))
         end
         def close()
-          p "CLOSING ZIPFILE RL"
         end
         def path()
           @infilepath
@@ -66,7 +64,6 @@ module RIO
           @infilepath
         end
         def base(*args) 
-          #p "base: #{args.inspect}"
           '' 
         end
         def path_no_slash() self.path.to_s.sub(/\/$/,'') end
@@ -114,127 +111,3 @@ end
 
 
 __END__
-    module Dir
-      require 'rio/rl/path'
-      RESET_STATE = RIO::RL::PathBase::RESET_STATE
-      require 'tmpdir'
-      class RL < RIO::RL::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
-          require 'rio/tempdir'
-          @td = ::Tempdir.new( @prefix.to_s, @tmpdir.to_s)
-          super(@td.to_s)
-        end
-        def dir_rl() 
-          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)
-        end
-      end
-    end
-    module File
-      require 'rio/rl/path'
-      RESET_STATE = 'Temp::Stream::Open'
-      class RL < RIO::RL::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
-          require 'tempfile'
-          @tf = ::Tempfile.new( @prefix.to_s, @tmpdir.to_s)
-          super(@tf.path)
-        end
-        def file_rl() 
-        RIO::File::RL.new(self.uri,{:fs => self.fs})
-          #self 
-        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'
-    class Reset < State::Base
-      def initialize(*args)
-        super
-        #p args
-        @tempobj = nil
-      end
-      #def self.default_cx
-      #  Cx::Vars.new( { 'closeoneof' => false, 'closeoncopy' => false } )
-      #end
-
-      def check?() true end
-      def mkdir(prefix=rl.prefix,tmpdir=rl.tmpdir)
-        self.rl = RIO::Temp::Dir::RL.new(prefix, tmpdir)
-        become 'Dir::Existing'
-      end
-#      def mkdir()
-#        dir()
-#      end
-      def chdir(&block)
-        self.mkdir.chdir(&block)
-      end
-      def file(prefix=rl.prefix,tmpdir=rl.tmpdir)
-        self.rl = RIO::Temp::File::RL.new(prefix, tmpdir)
-        become 'Temp::Stream::Open'
-      end
-      def scheme() rl.scheme() end
-      def host() rl.host() end
-      def opaque() rl.opaque() end
-      def to_s() rl.url() end
-      def exist?() false end
-      def file?() false end
-      def dir?() false end
-      def open?() false end
-      def closed?() true end
-      def when_missing(sym,*args)
-        #p @rl.scheme
-        if @tempobj.nil?
-          file()
-        else
-          gofigure(sym,*args)
-        end
-      end
-    end
-    require 'rio/stream/open'
-    module Stream
-      class Open < RIO::Stream::Open
-        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
-end