spec/csv2hash/validator/collection_spec.rb in csv2hash-0.0.2 vs spec/csv2hash/validator/collection_spec.rb in csv2hash-0.1

@@ -1,20 +1,18 @@
 require 'spec_helper'
 
-describe Validator::Collection do
+describe Csv2hash::Validator::Collection do
 
   let(:definition) do
-    Definition.new([ { position: 0, key: 'name' } ], Definition::COLLECTION).tap do |definition|
+    Csv2hash::Definition.new([ { position: 0, key: 'name' } ], Csv2hash::Definition::COLLECTION).tap do |definition|
       definition.validate!
       definition.default!
     end
   end
 
   subject do
-    Csv2hash.new(definition, 'file_path').tap do |csv2hash|
-      csv2hash.data_source = data_source
-    end
+    Csv2hash.new(definition, 'file_path', true, data_source)
   end
 
   context 'with valid data' do
     let(:data_source) { [ [ 'John Doe' ] ]}
     it { expect { subject.validate_data! }.to_not raise_error }
@@ -23,37 +21,48 @@
       let(:data_source) { [ [ 'Name' ], [ 'John Doe' ] ]}
       it { expect { subject.validate_data! }.to_not raise_error }
     end
   end
 
+  context '#ignore_blank_line' do
+    let(:data_source) { [ [ ] ] }
+    before { subject.ignore_blank_line = true }
+    it { expect { subject.validate_data! }.to_not raise_error }
+    context 'csv mode' do
+      before { subject.exception_mode = false }
+      its(:errors) { should be_empty }
+    end
+  end
+
   context 'with invalid data' do
-    let(:data_source) { [ [ ] ]}
+    let(:data_source) { [ [ ] ] }
     it { expect { subject.validate_data! }.to raise_error('undefined name on [0, 0]') }
     context 'with header' do
       before { subject.definition.header_size = 1 }
       let(:data_source) { [ [ 'Name' ], [ ] ]}
       it { expect { subject.validate_data! }.to raise_error('undefined name on [1, 0]') }
     end
   end
 
   context 'wihtout exception' do
     let(:data_source) { [ [ ] ]}
-    before { subject.exception = false }
-    it { subject.parse.should eql ",\"undefined name on [0, 0]\"\n" }
+    before { subject.exception_mode = false }
+    it { subject.parse.errors.to_csv.should eql ",\"undefined name on [0, 0]\"\n" }
 
     context 'errors should be filled' do
       before { subject.parse }
       its(:errors) { should eql [{x: 0, y: 0, message: 'undefined name on [0, 0]', key: 'name'}] }
     end
 
     context 'original csv + errors should returned' do
       let(:definition) do
-        Definition.new([ { position: 0, key: 'agree', values: ['yes', 'no'] } ], Definition::COLLECTION).tap do |d|
+        Csv2hash::Definition.new(
+          [{ position: 0, key: 'agree', values: ['yes', 'no'] }], Csv2hash::Definition::COLLECTION).tap do |d|
           d.validate!; d.default!
         end
       end
       let(:data_source) { [ [ 'what?' ], [ 'yes' ], [ 'no' ] ] }
-      it { subject.parse.should eql "what?,\"agree not supported, please use one of [\"\"yes\"\", \"\"no\"\"]\"\n" }
+      it { subject.parse.errors.to_csv.should eql "what?,\"agree not supported, please use one of [\"\"yes\"\", \"\"no\"\"]\"\n" }
     end
   end
 
-end
\ No newline at end of file
+end