lib/rio/stream.rb in rio-0.3.3 vs lib/rio/stream.rb in rio-0.3.4
- old
+ new
@@ -41,17 +41,17 @@
require 'rio/ops/stream/input'
require 'rio/ops/stream/output'
require 'rio/ext'
require 'rio/filter/gzip'
-require 'rio/filter/chomp'
+#require 'rio/filter/chomp'
+#require 'rio/filter/strip'
require 'rio/filter/closeoneof'
module RIO
module Stream #:nodoc: all
-
class Reset < Base
# Mixin the appropriate ops
#include Ops::Path::Str
include Ops::Stream::Reset
@@ -106,23 +106,23 @@
end
end
class Input < IOBase
include Ops::Stream::Input
include Ini
+ include Filters
def initialize_copy(*args)
#p callstr('enter Input:initialize_copy',*args)
super
self.ioh.oncloseproc = proc { self.on_closeoneof } if closeoneof?
end
def add_extensions()
Ext::Input.add_extensions(self)
end
-
def add_filters
add_filter(Filter::GZipRead) if gzip?
- add_filter(Filter::Chomp) if chomp?
+ add_line_filters()
if closeoneof?
add_filter(Filter::CloseOnEOF)
ioh.oncloseproc = proc { self.on_closeoneof }
end
self
@@ -150,10 +150,11 @@
class InOut < IOBase
include Ops::Stream::Input
include Ops::Stream::Output
include Ini
+ include Filters
def initialize_copy(*args)
super
self.ioh.oncloseproc = proc { self.on_closeoneof } if closeoneof?
end
@@ -164,11 +165,13 @@
end
def add_extensions()
Ext::Input.add_extensions(self)
Ext::Output.add_extensions(self)
end
+
def add_filters
- add_filter(Filter::Chomp) if chomp?
+ add_line_filters()
+
if closeoneof?
add_filter(Filter::CloseOnEOF)
ioh.oncloseproc = proc { self.on_closeoneof }
end
self