file_iterator 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eed99b464c6ac875c87599da7510fd4fb24c445e
-  data.tar.gz: d07a6c42de9ed0edf89da5f1cfefdeb9cbb1f31d
+  metadata.gz: ab885aa71c469845ed127ebc18183651bbb5e9e9
+  data.tar.gz: 9ef5bceac991488c68d3dda3e99d419c4daf14c8
 SHA512:
-  metadata.gz: f281a708e002fa520ff0fb3d8d4ce4796fa3da20a200c6c9646ba139307f4adbcc8edebfbde0ad1fce890bf6dfe6fb280cf51177db79e561cdbd3b530a2f39e2
-  data.tar.gz: 30cd278b121c478d401b7b93afbb52cfe01ecb74e9d1f435208336f11754aaff5d3889a0375d00993902c5ef90a3a4c1d67adec4f30fd38c0a2cf3b7e9edabc9
+  metadata.gz: 781f797127d92b9b494b817fb430c4adf94a40c80704e82bad648cd7bc3f3000751ea5ae7d92dfebb203fee85e5e0e97d2951474f0bc8cd6abf19792bee4d32c
+  data.tar.gz: 7bc961dfee8e4c08fa1c9154cd0fba80dee9cee5d126bd16bcda4d79dc5264ef08bffd2997671c3f1b020a39fc66510ff5cbf2b9ee9e5a76912cea5083c9b07e

data/Rakefile

@@ -1,2 +1,11 @@
 require "bundler/gem_tasks"
+#require "rake"
 
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+end
+
+desc "runs all examples"
+task :default => :spec

data/lib/file_iterator/version.rb

@@ -1,3 +1,3 @@
 module FileIterator
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/file_iterator.rb

@@ -1,62 +1,57 @@
 require "file_iterator/version"
 
 module FileIterator
-  class FileIterator
-	def initialize(input = nil, output = ARGV[1])
-		@outputfile = output
-		if input
-		    @inputfile = input
-		else
-			@inputfile = ARGV[0]
-			unless @inputfile
-			  puts "usage: #{__FILE__} inputfile [outputfile]"
-			  exit 1
-		    end
-		end
-	end
+	class FileIterator
+		def initialize(input: nil, output: ARGV[1], comment_symbol: nil)
+			@comment_symbol = comment_symbol
+			@outputfile = output
 
-	def iterate
-		File.open(@inputfile,'r') do | file|
-			begin
-				if (@outputfile)
-					out = File.open(@outputfile,'w')
-				else
-					out = $stdout
+			if input
+				@inputfile = input
+			else
+				@inputfile = ARGV[0]
+				unless @inputfile
+					puts "usage: #{__FILE__} inputfile [outputfile]"
+					exit 1
 				end
-				file.each_line do | line |
-					yield(line, out)
+			end
+			iterate(&Proc.new) if block_given?
+		end
+
+		def is_comment_line(line)
+			(@comment_symbol != nil) && line[0] == @comment_symbol
+		end
+
+		def iterate
+			File.open(@inputfile,'r') do | file|
+				begin
+					if (@outputfile)
+						out = File.open(@outputfile,'w')
+					else
+						out = $stdout
+					end
+					file.each_line do | line |
+						yield(line, out) unless is_comment_line(line)
+					end
+				rescue
+					raise
+				ensure
+					out.close if @outputfile
 				end
-			rescue
-				raise
-			ensure
-				out.close if @outputfile
 			end
 		end
-	end
-	def to_a
-		File.open(@inputfile,'r') do | file|
+		
+		def to_a
 			result = []
-			begin
-				if (@outputfile)
-					out = File.open(@outputfile,'w')
+			iterate do | line |
+				if block_given?
+					result << yield(line)
 				else
-					out = $stdout
-				end
-				file.each_line do | line |
-					if block_given?
-					  result << yield(line)
-					else
-					  result << line
-					end
+					result << line
 				end
-			rescue
-				raise
-			ensure
-				out.close if @outputfile
 			end
 			result
-		end		
-	end
-end
+		end
 
+	end
 end

data/spec/file_iterator_spec.rb

@@ -0,0 +1,46 @@
+require 'file_iterator'
+describe FileIterator::FileIterator do
+	describe "collections" do
+		it "just initializes if no block is given" do
+			fi = FileIterator::FileIterator.new(input: 'numbers.txt')
+		end
+		it "iterates if block is given" do
+			result = []
+			FileIterator::FileIterator.new(input: 'spec/numbers.txt') do | line |
+				result << line.to_i
+			end
+			expect(result).to eq [1,2,3,4]
+		end
+		it "iterates" do
+			result = []
+			fi = FileIterator::FileIterator.new(input: 'spec/numbers.txt') 
+			fi.iterate do | line |
+				result << line.to_i
+			end
+			expect(result).to eq [1,2,3,4]
+		end
+		it "converts to array" do
+			result = FileIterator::FileIterator.new(input: 'spec/numbers.txt').to_a.map(&:to_i)
+			expect(result).to eq [1,2,3,4]
+		end
+	end
+
+	describe "error handling" do
+		it "throws an exception if file is missing" do
+			expect{FileIterator::FileIterator.new(input: 'not there').to_a}.to raise_error
+		end
+		it "throws an exception if used with block" do
+			expect do
+				a = []
+				FileIterator::FileIterator.new('not there') do | line |
+					a << line
+				end
+			end.to raise_error
+		end
+	end
+	describe "comments" do
+		it "ignores lines with comments" do
+			expect(FileIterator::FileIterator.new(input: 'spec/file_with_comment.txt', comment_symbol: '#').to_a(&:to_i)).to eq [1, 2, 3, 4]
+		end
+	end
+end

data/spec/file_with_comment.txt

@@ -0,0 +1,6 @@
+# comment
+1
+2
+3
+4
+# last comment

data/spec/numbers.txt

@@ -0,0 +1,4 @@
+1
+2
+3
+4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_iterator
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - B Blinken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,6 +55,9 @@ files:
 - file_iterator.gemspec
 - lib/file_iterator.rb
 - lib/file_iterator/version.rb
+- spec/file_iterator_spec.rb
+- spec/file_with_comment.txt
+- spec/numbers.txt
 homepage: https://github.com/drblinken/file_iterator
 licenses:
 - MIT
@@ -79,4 +82,7 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Eases iterating through a file
-test_files: []
+test_files:
+- spec/file_iterator_spec.rb
+- spec/file_with_comment.txt
+- spec/numbers.txt