hflr 1.2.0 → 1.2.1

data/hflr.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hflr}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Colin Davis"]

data/lib/hflr/fl_record_file.rb

@@ -31,11 +31,11 @@ class FLRFile
   end
       if @fast
        @width = get_record_width_from_file
-       puts "record width #{@width.to_s}"
+
        records_to_take =  50000001 / @width
-       puts "records_to_take: #{records_to_take}"
+
        @buffer_size = @width * records_to_take       
-       puts "Buffer size: #{@buffer_size}"
+
        @position=0
        @current_buffer=nil
       end        
@@ -48,7 +48,7 @@ class FLRFile
      end
      
       @offsets =offsets_to_read(ranges, @width)
-      puts "Chunks of data #{@offsets.inspect}"
+
       @ranges = ranges
   end
 
@@ -100,28 +100,29 @@ def fast_get_next_known_line_type
   unless @current_buffer.nil? && (@offsets.nil? ||  @offsets.empty?)
     if @current_buffer.nil?
       chunk = @offsets.shift
-      puts "shifting first chunk #{chunk.inspect}"
+      
     @file.pos =  chunk.pos
     @current_buffer=@file.read(chunk.width)        
           record= @current_buffer.slice(@position,@width)
-          puts "Record was from #{@position} width of #{@width}"
-          puts "Getting record: #{record}"
-          @position += @width
-          puts "Position incremented to #{@position}"
-          puts "Current buffer size: #{@current_buffer.size}"
-          @current_buffer = nil if @position >= @current_buffer.size
-          puts "current_buffer changed to #{@current_buffer}"
+
+          @position += @width         
+          if @position >= @current_buffer.size
+                    @current_buffer = nil 
+                    @position=0
+                    end                             
           return record
     else
-      record= @current_buffer.slice(@position,@width)
-      puts "Getting subsequent record: #{record}"
+      record= @current_buffer.slice(@position,@width)     
       @position += @width
-      @current_buffer = nil if @position >= @current_buffer.size
-      return record
+      if @position>=@current_buffer.size
+        @position=0
+        @current_buffer=nil
+      end
+      return record           
     end
     
   else    
-  puts "At end of all chunks"
+
     nil
   end
 end

data/test/flrfile_test.rb

@@ -108,6 +108,7 @@ customer_file.ranges=[(0..2)]
 records = []
 while !customer_file.finished?
   record = customer_file.next_record 
+  
   puts record.inspect
   records << record
   end

metadata

@@ -2,7 +2,7 @@
 name: hflr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
   - Colin Davis