nmax-aoirgf 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c48d21d220cb287a4c039010a759a2bcfebc45b754e472f6b123955670280dd
-  data.tar.gz: c0de8d7264c04dddef2d61b50956a8ee1db1d8548cbd722a0dfd8637638b8a7d
+  metadata.gz: 9da73431b6eb699aaa93643c6adee14810155f6af5e90e28e5537609ae364f6d
+  data.tar.gz: 7dd3b6dfcd0af4a90dc66a9b2e0c5ef716ff3552304211db2088f8b33271576c
 SHA512:
-  metadata.gz: 49445802262660406eecabac10098b79e1bcd61e028a607a81f5e796f3af1bb578e77f4463e46d06d97cb4228e7de325c761e845258474745b524b83c96d193b
-  data.tar.gz: dff76a1c773f037158f5440fce3a0931ddb6f77bcf14545233a6945309353f80de46170147440a5d1ac2dba50cec6b0767a12460f908717d23d1442052b14250
+  metadata.gz: 5869d956ab3265689153846e6dc87f1d74de6bae6c4640d8d71327bf654732b767717e32565d46635427772b3c9981e3c367610fa7b1929931c867190794b7cb
+  data.tar.gz: 7e665d6c19537c0b98270d56f7be7c4f50e18ee42d30f186a6f528c970672bdf120fd5f67f42e76176ad0fbaf7ba35f75484dc3040f168b8b8cfadd79b2e8173

data/CHANGELOG

@@ -1,2 +1,6 @@
 == 0.1.0 / 2020-05-16
   * initial version
+== 0.1.2 / 2020-05-16
+  * working version
+== 0.1.3 / 2020-05-17
+  * optimized perfomance of stdin reading

data/README.md

@@ -1,4 +1,4 @@
-nmax
+nmax [![Build Status](https://travis-ci.org/r72cccp/nmax.svg?branch=master)](https://travis-ci.org/r72cccp/nmax)
 ====
 
 Ruby gem, reads text data from the input stream, upon completion of the input, displays the n largest integers,
@@ -9,7 +9,7 @@ usage
 
 Script runs from console with command:
 ```bash
-cat <filename> | ruby nmax.rb <limit_count>
+cat <filename> | nmax <limit_count>
 ```
 
 Where

data/lib/nmax_reader.rb

@@ -2,36 +2,67 @@
 require_relative './nmax_core'
 
 class NmaxReader
+  attr_reader :block_length
+
+  def initialize
+    @digit_buffer = ''
+    @block_length = 121
+    @data_size = 0
+  end
+
   def main
     raise ArgumentError, 'You must pass argument - maximum length of matches found.' if ARGV.length != 1
 
     capture_data(ARGV.first.to_i)
   end
 
-  def capture_data(count_limit)
-    block_length = 121
-    data_size = 0
+  def capture_data(count_limit, verbose = false)
     maximum_numbers = NmaxCore.new(count_limit)
-    digit_buffer = ''
 
     loop do
-      block = $stdin.read(block_length)
+      block = $stdin.read(@block_length)
       break if block.empty?
 
-      data_size += block.length
-      print "\rReading: #{data_size}."
-      block.each_char do |char|
-        if char =~ /\d/
-          digit_buffer << char
-        elsif digit_buffer.length.positive?
-          maximum_numbers.propose digit_buffer.to_i
-          digit_buffer = ''
-        end
+      @data_size += block.length
+
+      print "\rReading: #{@data_size}." if verbose
+      items = block.scan(/\d+/)
+
+      # Extreme cases.
+      # 1. If the entire read data block is a string
+      if items.empty? && !@digit_buffer.empty?
+        maximum_numbers.propose @digit_buffer.to_i
+        @digit_buffer = ''
+      end
+
+      # 2. If the entire block of read data is a number, add it to the buffer
+      if block =~ /^\d+$/
+        @digit_buffer << block
+        next
       end
 
-      maximum_numbers.propose digit_buffer.to_i if digit_buffer.length.positive?
-      break if block.length < block_length
+      # 3. If the first found number is the beginning of a block of read data - add it to the buffer and accept
+      if block =~ /^\d/ && !items.empty?
+        next if items.first.length == @block_length
+
+        @digit_buffer << items.first
+        maximum_numbers.propose @digit_buffer.to_i
+        @digit_buffer = ''
+        items.shift
+      end
+
+      # 4. If the last found number is the end of the block of read data - add it to the buffer
+      if block =~ /\d$/ && !items.empty?
+        @digit_buffer << items.last
+        items.pop
+      end
+
+      # Common, the remaining numbers found, if any, are accepted without buffering
+      items.each { |item| maximum_numbers.propose item.to_i } unless items.empty?
+
+      break if block.length < @block_length
     end
+    maximum_numbers.propose @digit_buffer.to_i if @digit_buffer.length.positive?
 
     puts "maximum_numbers.items: #{maximum_numbers.items.join(', ')}"
     maximum_numbers.items

data/nmax.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'nmax-aoirgf'
-  s.version = '0.1.2'
+  s.version = '0.1.3'
   s.executables = ['nmax']
 
   s.authors = ['Sergio Belevskij']
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'rake', '12.3.3'
-  s.add_development_dependency 'rspec', '3.9.1'
-  s.add_development_dependency 'simplecov', '0.8.15'
+  s.add_development_dependency 'rspec', '3.5.0'
+  s.add_development_dependency 'simplecov'
 
   s.files = [
     'LICENSE',

data/spec/nmax_reader_spec.rb

@@ -30,5 +30,16 @@ RSpec.describe NmaxReader do
       $stdin = StringIO.new('Text with numbers: 555, 100500, 222, 333, 1001, 777')
       expect(reader_instance.capture_data(3)).to be == [777, 1001, 100_500]
     end
+
+    it 'must coverage case when while number found, next readed block is a string' do
+      $stdin = StringIO.new('t' * (reader_instance.block_length - 3) + '777' + 'ddd dff ' * 20)
+      expect(reader_instance.capture_data(1000).length).to be == 1
+    end
+
+    it 'must coverage case when next readed block is all number' do
+      length = reader_instance.block_length - 3
+      $stdin = StringIO.new('t' * length + '777' + '333' * length + '3434 sdf werfwe')
+      expect(reader_instance.capture_data(1000).length).to be == 1
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nmax-aoirgf
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sergio Belevskij
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-16 00:00:00.000000000 Z
+date: 2020-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.9.1
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.9.1
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.15
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.15
+        version: '0'
 description: Reads text data from the input stream. Upon completion of the input,
   displays the largest integers.
 email: bbelevskij@gmail.com