rubysl-stringio 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6921e4d7b3812f5dbf37cabcbe0a2ee5bda9262
-  data.tar.gz: 79fed2199276c855acdbb505f097c9354ae2a4d4
+  metadata.gz: ad4377f000371c4db7fcc555b58556ead4b61005
+  data.tar.gz: 2928739f7801ab5da1d9aee92165ef42c49ab5fb
 SHA512:
-  metadata.gz: 346d375e8d4414ddb54329c5662e9f47de85a345f84af053fb2ed04e0477e2b4cf1564a1fbced171171edfc5d55eceb7b9f9c7b547fdaf8c60bdf41c3bffae96
-  data.tar.gz: f99b75b501c6e292ac4cc14b7d88ea8bf9d860b8da2d18dc7c3dad096d3b9bb07fb5ba9d4419ac6f1b1e11e98ff3354f3e698202c77024db5872d30a69c2bb5b
+  metadata.gz: f31db2a4d211f5bd2c576ace419d0a5a79aa2537a3d01c499be3225308043a5b189db2f8c69fb76036bd7f8fc1b6e9808ace694e3f5196336e946d6867d441ac
+  data.tar.gz: 2f3fcf1b00557c2e78af268b8781adbbd3279c25af76d0d094147f3d25738cb4f28deda3e1a245cd6e994a173f62fe83947b21c16d97ab7747c999cbd8980f47

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
-before_install:
-  - gem update --system
-  - gem --version
-  - gem install rubysl-bundler
-script: bundle exec mspec spec
+env:
+  - RUBYLIB=lib
+script: bundle exec mspec
 rvm:
-  - rbx-nightly-18mode
+  - 1.9.3
+  - rbx-nightly-19mode

data/lib/rubysl/stringio/stringio.rb

@@ -1,6 +1,15 @@
+class IO
+  module Writable
+  end
+  module Readable
+  end
+end
+
 class StringIO
 
   include Enumerable
+  include IO::Writable
+  include IO::Readable
 
   DEFAULT_RECORD_SEPARATOR = "\n" unless defined?(::DEFAULT_RECORD_SEPARATOR)
 
@@ -8,10 +17,11 @@ class StringIO
   Undefined = Object.new
 
   class Data
-    attr_accessor :string, :pos, :lineno
+    attr_accessor :string, :pos, :lineno, :encoding
 
     def initialize(string)
       @string = string
+      @encoding = string.encoding
       @pos = @lineno = 0
     end
   end
@@ -31,9 +41,15 @@ class StringIO
 
   attr_reader :__data__
 
-  def initialize(string="", mode=nil)
-    string = Rubinius::Type.coerce_to string, String, :to_str
-    @__data__ = Data.new string
+  def initialize(string=nil, mode=nil)
+    if string.nil?
+      @__data__ = Data.new ""
+      set_encoding(nil)
+      mode = IO::RDWR
+    else
+      string = Rubinius::Type.coerce_to string, String, :to_str
+      @__data__ = Data.new string
+    end
 
     if mode
       if mode.is_a?(Integer)
@@ -75,6 +91,20 @@ class StringIO
 
   private :check_writable
 
+  def set_encoding(external, internal=nil, options=nil)
+    encoding = external || Encoding.default_external
+    @__data__.encoding = encoding
+    @__data__.string.force_encoding(encoding)
+  end
+
+  def external_encoding
+    @__data__.encoding
+  end
+
+  def internal_encoding
+    nil
+  end
+
   def each_byte
     return to_enum :each_byte unless block_given?
     check_readable
@@ -95,26 +125,8 @@ class StringIO
 
   def each_char
     return to_enum :each_char unless block_given?
-    if $KCODE == "UTF8"
-      lookup = 7.downto(4)
-      while c = read(1) do
-        n = c[0]
-        leftmost_zero_bit = lookup.find{|i| n[i].zero? }
-        case leftmost_zero_bit
-        when 7 # ASCII
-          yield c
-        when 6 # UTF 8 complementary characters
-          next # Encoding error, ignore
-        else
-          more = read(6-leftmost_zero_bit)
-          break unless more
-          yield c+more
-        end
-      end
-    else
-      while s = read(1)
-        yield s
-      end
+    while s = getc
+      yield s
     end
 
     self
@@ -122,11 +134,34 @@ class StringIO
 
   alias_method :chars, :each_char
 
-  def each(sep = $/)
-    return to_enum :each, sep unless block_given?
+  def each_codepoint(&block)
+    return to_enum :each_codepoint unless block_given?
     check_readable
 
-    while line = getline(sep)
+    d = @__data__
+    string = d.string
+
+    while d.pos < string.bytesize
+      char = string.chr_at d.pos
+
+      unless char
+        raise ArgumentError, "invalid byte sequence in #{d.encoding}"
+      end
+
+      d.pos += char.bytesize
+      yield char.ord
+    end
+
+    self
+  end
+
+  alias_method :codepoints, :each_codepoint
+
+  def each(sep=$/, limit=Undefined)
+    return to_enum :each, sep, limit unless block_given?
+    check_readable
+
+    while line = getline(true, sep, limit)
       yield line
     end
 
@@ -149,29 +184,35 @@ class StringIO
     check_writable
 
     str = String(str)
-
     return 0 if str.empty?
 
     d = @__data__
     pos = d.pos
     string = d.string
 
-    if @append || pos == string.length
-      string << str
-      d.pos = string.length
-    elsif pos > string.size
-      string[string.size..pos] = "\000" * (pos - string.size)
-      string << str
-      d.pos = string.size
+    if @append || pos == string.bytesize
+      string.byte_append str
+      d.pos = string.bytesize
+    elsif pos > string.bytesize
+      m = Rubinius::Mirror.reflect string
+      m.splice string.bytesize, 0, "\000" * (pos - string.bytesize)
+      string.byte_append str
+      d.pos = string.bytesize
     else
-      string[pos, str.length] = str
-      d.pos += str.length
+      stop = string.bytesize - pos
+      if str.bytesize < stop
+        stop = str.bytesize
+      end
+      m = Rubinius::Mirror.reflect string
+      m.splice pos, stop, str
+      d.pos += str.bytesize
       string.taint if str.tainted?
     end
 
-    return str.length
+    str.bytesize
   end
   alias_method :syswrite, :write
+  alias_method :write_nonblock, :write
 
   def close
     raise IOError, "closed stream" if closed?
@@ -202,7 +243,7 @@ class StringIO
 
   def eof?
     d = @__data__
-    d.pos >= d.string.size
+    d.pos >= d.string.bytesize
   end
   alias_method :eof, :eof?
 
@@ -226,8 +267,10 @@ class StringIO
     check_readable
     d = @__data__
 
-    char = d.string[d.pos]
-    d.pos += 1 unless eof?
+    return nil if eof?
+
+    char = d.string.find_character(d.pos)
+    d.pos += char.bytesize
     char
   end
 
@@ -242,10 +285,10 @@ class StringIO
     byte
   end
 
-  def gets(sep = $/)
+  def gets(sep=$/, limit=Undefined)
     check_readable
 
-    $_ = getline(sep)
+    $_ = getline(false, sep, limit)
   end
 
   def isatty
@@ -253,11 +296,6 @@ class StringIO
   end
   alias_method :tty?, :isatty
 
-  def length
-    @string.length
-  end
-  alias_method :size, :length
-
   def lineno
     @__data__.lineno
   end
@@ -266,10 +304,6 @@ class StringIO
     @__data__.lineno = line
   end
 
-  def path
-    nil
-  end
-
   def pid
     nil
   end
@@ -286,7 +320,6 @@ class StringIO
   def print(*args)
     check_writable
     args << $_ if args.empty?
-    args.map! { |x| x.nil? ? "nil" : x }
     write((args << $\).flatten.join)
     nil
   end
@@ -309,23 +342,26 @@ class StringIO
     if obj.is_a?(String)
       char = obj[0]
     else
-      char = Rubinius::Type.coerce_to obj, Integer, :to_int
+      c = Rubinius::Type.coerce_to obj, Integer, :to_int
+      char = (c & 0xff).chr
     end
 
     d = @__data__
     pos = d.pos
     string = d.string
 
-    if @append || pos == string.length
-      string << char
-      d.pos = string.length
-    elsif pos > string.length
-      string[string.length..pos] = "\000" * (pos - string.length)
-      string << char
-      d.pos = string.length
+    if @append || pos == string.bytesize
+      string.byte_append char
+      d.pos = string.bytesize
+    elsif pos > string.bytesize
+      m = Rubinius::Mirror.reflect string
+      m.splice string.bytesize, 0, "\000" * (pos - string.bytesize)
+      string.byte_append char
+      d.pos = string.bytesize
     else
-      string[pos] = char
-      d.pos += 1
+      m = Rubinius::Mirror.reflect string
+      m.splice pos, char.bytesize, char
+      d.pos += char.bytesize
     end
 
     obj
@@ -337,7 +373,7 @@ class StringIO
     else
       args.each do |arg|
         if arg.nil?
-          line = "nil"
+          line = ""
         elsif Thread.guarding? arg
           line = "[...]"
         else
@@ -360,27 +396,43 @@ class StringIO
     nil
   end
 
-  def read(length = nil, buffer = "")
+  def read(length=nil, buffer=nil)
     check_readable
     d = @__data__
     pos = d.pos
     string = d.string
 
-    buffer = StringValue(buffer)
-
     if length
-      return nil if eof?
       length = Rubinius::Type.coerce_to length, Integer, :to_int
       raise ArgumentError if length < 0
-      buffer.replace(string[pos, length])
-      d.pos += buffer.length
+
+      buffer = StringValue(buffer) if buffer
+
+      if eof?
+        buffer.clear if buffer
+        if length == 0
+          return "".force_encoding(Encoding::ASCII_8BIT)
+        else
+          return nil
+        end
+      end
+
+      str = string.byteslice(pos, length)
+      str.force_encoding Encoding::ASCII_8BIT
+
+      str = buffer.replace(str) if buffer
     else
-      return "" if eof?
-      buffer.replace(string[pos..-1])
-      d.pos = string.size
+      if eof?
+        buffer.clear if buffer
+        return "".force_encoding(Encoding::ASCII_8BIT)
+      end
+
+      str = string.byteslice(pos..-1)
+      buffer.replace str if buffer
     end
 
-    return buffer
+    d.pos += str.length
+    return str
   end
 
   def readchar
@@ -388,20 +440,22 @@ class StringIO
     getc
   end
 
-  alias_method :readbyte, :readchar
+  def readbyte
+    readchar.getbyte(0)
+  end
 
-  def readline(sep=$/)
-    raise IO::EOFError, "end of file reached" if eof?
+  def readline(sep=$/, limit=Undefined)
     check_readable
+    raise IO::EOFError, "end of file reached" if eof?
 
-    $_ = getline(sep)
+    $_ = getline(true, sep, limit)
   end
 
-  def readlines(sep=$/)
+  def readlines(sep=$/, limit=Undefined)
     check_readable
 
     ary = []
-    while line = getline(sep)
+    while line = getline(true, sep, limit)
       ary << line
     end
 
@@ -437,7 +491,7 @@ class StringIO
     when IO::SEEK_CUR
       to += @__data__.pos
     when IO::SEEK_END
-      to += @__data__.string.size
+      to += @__data__.string.bytesize
     when IO::SEEK_SET, nil
     else
       raise Errno::EINVAL, "invalid whence"
@@ -451,7 +505,7 @@ class StringIO
   end
 
   def size
-    @__data__.string.size
+    @__data__.string.bytesize
   end
   alias_method :length, :size
 
@@ -476,10 +530,18 @@ class StringIO
 
   def sysread(length=nil, buffer="")
     str = read(length, buffer)
-    raise IO::EOFError, "end of file reached" if str.nil?
+
+    if str.nil?
+      buffer.clear
+      raise IO::EOFError, "end of file reached"
+    end
+
     str
   end
 
+  alias_method :readpartial, :sysread
+  alias_method :read_nonblock, :sysread
+
   def tell
     @__data__.pos
   end
@@ -490,10 +552,10 @@ class StringIO
     raise Errno::EINVAL, "negative length" if len < 0
     string = @__data__.string
 
-    if len < string.size
-      string[len..string.size] = ""
+    if len < string.bytesize
+      string[len..string.bytesize] = ""
     else
-      string << "\000" * (len - string.size)
+      string << "\000" * (len - string.bytesize)
     end
     return length
   end
@@ -505,10 +567,14 @@ class StringIO
     pos = d.pos
     string = d.string
 
-    char = Rubinius::Type.coerce_to char, Integer, :to_int
+    if char.kind_of? Integer
+      char = Rubinius::Type.coerce_to char, String, :chr
+    else
+      char = Rubinius::Type.coerce_to char, String, :to_str
+    end
 
-    if pos > string.size
-      string[string.size..pos] = "\000" * (pos - string.size)
+    if pos > string.bytesize
+      string[string.bytesize..pos] = "\000" * (pos - string.bytesize)
       d.pos -= 1
       string[d.pos] = char
     elsif pos > 0
@@ -519,6 +585,45 @@ class StringIO
     nil
   end
 
+  def ungetbyte(bytes)
+    check_readable
+
+    return unless bytes
+
+    if bytes.kind_of? Fixnum
+      bytes = "" << bytes
+    else
+      bytes = StringValue(bytes)
+      return if bytes.bytesize == 0
+    end
+
+    d = @__data__
+    pos = d.pos
+    string = d.string
+
+    enc = string.encoding
+
+    if d.pos == 0
+      d.string = "#{bytes}#{string}"
+    else
+      size = bytes.bytesize
+      a = string.byteslice(0, pos - size) if size < pos
+      b = string.byteslice(pos..-1)
+      d.string = "#{a}#{bytes}#{b}"
+      d.pos = pos > size ? pos - size : 0
+    end
+
+    d.string.force_encoding enc
+    nil
+  end
+
+  def encode_with(coder)
+  end
+
+  def init_with(coder)
+    @__data__ = Data.new("")
+  end
+
   def to_yaml_properties
     []
   end
@@ -569,8 +674,21 @@ class StringIO
     d.string.replace("") if (mode & IO::TRUNC) != 0
   end
 
-  def getline(sep = $/)
-    sep = StringValue(sep) unless sep.nil?
+  def getline(arg_error, sep, limit)
+    if limit != Undefined
+      limit = Rubinius::Type.coerce_to limit, Fixnum, :to_int
+      sep = Rubinius::Type.coerce_to sep, String, :to_str if sep
+    else
+      limit = nil
+
+      unless sep == $/ or sep.nil?
+        osep = sep
+        sep = Rubinius::Type.check_convert_type sep, String, :to_str
+        limit = Rubinius::Type.coerce_to osep, Fixnum, :to_int unless sep
+      end
+    end
+
+    raise ArgumentError if arg_error and limit == 0
 
     return nil if eof?
 
@@ -579,28 +697,40 @@ class StringIO
     string = d.string
 
     if sep.nil?
-      line = string[pos..-1]
-      d.pos = string.size
+      if limit
+        line = string.byteslice(pos, limit)
+      else
+        line = string.byteslice(pos, string.bytesize - pos)
+      end
+      d.pos += line.bytesize
     elsif sep.empty?
-      if stop = string.index("\n\n", pos)
+      if stop = string.find_string("\n\n", pos)
         stop += 2
-        line = string[pos...stop]
-        while string[stop] == ?\n
+        line = string.byteslice(pos, stop - pos)
+        while string.getbyte(stop) == 10
           stop += 1
         end
         d.pos = stop
       else
-        line = string[pos..-1]
-        d.pos = string.size
+        line = string.byteslice(pos, string.bytesize - pos)
+        d.pos = string.bytesize
       end
     else
-      if stop = string.index(sep, pos)
-        stop += sep.length
-        line = string[pos...stop]
+      if stop = string.find_string(sep, pos)
+        if limit && stop - pos >= limit
+          stop = pos + limit
+        else
+          stop += sep.bytesize
+        end
+        line = string.byteslice(pos, stop - pos)
         d.pos = stop
       else
-        line = string[pos..-1]
-        d.pos = string.size
+        if limit
+          line = string.byteslice(pos, limit)
+        else
+          line = string.byteslice(pos, string.bytesize - pos)
+        end
+        d.pos += line.bytesize
       end
     end
 

data/lib/rubysl/stringio/version.rb

@@ -1,5 +1,5 @@
 module RubySL
   module StringIO
-    VERSION = "1.0.1"
+    VERSION = "2.0.0"
   end
 end

data/rubysl-stringio.gemspec

@@ -16,10 +16,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = "~> 1.8.7"
+  spec.required_ruby_version = "~> 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
-  spec.add_development_dependency "rubysl-prettyprint", "~> 1.0"
 end

metadata

@@ -1,71 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-stringio
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2013-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: mspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: mspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rubysl-prettyprint
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-  prerelease: false
-  type: :development
+        version: '1.5'
 description: Ruby standard library stringio.
 email:
 - brixen@gmail.com
@@ -73,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -172,17 +158,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ~>
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Ruby standard library stringio.
@@ -265,4 +251,3 @@ test_files:
 - spec/ungetc_spec.rb
 - spec/write_nonblock_spec.rb
 - spec/write_spec.rb
-has_rdoc: