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

@@ -1,20 +1,18 @@
 require 'spec_helper'
 
-describe Validator::Mapping do
+describe Csv2hash::Validator::Mapping do
 
   let(:definition) do
-    Definition.new([ { position: [0,0], key: 'name' } ], Definition::MAPPING).tap do |definition|
+    Csv2hash::Definition.new([ { position: [0,0], key: 'name' } ], Csv2hash::Definition::MAPPING).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 }
@@ -24,22 +22,22 @@
     let(:data_source) { [ [ ] ]}
     it { expect { subject.validate_data! }.to raise_error('undefined name on [0, 0]') }
   end
 
   context 'wihtout exception' do
-    let(:data_source) { [ [ ] ]}
-    before { subject.exception = false }
-    it { subject.parse.should eql ",\"undefined name on [0, 0]\"\n" }
+    let(:data_source) { [ [ ] ] }
+    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 be returned' do
       let(:definition) do
-        Definition.new(rules, Definition::MAPPING).tap do |d|
+        Csv2hash::Definition.new(rules, Csv2hash::Definition::MAPPING).tap do |d|
           d.validate!; d.default!
         end
       end
       context 'string values' do
         let(:rules) do
@@ -48,21 +46,51 @@
             { position: [1,0], key: 'agree', values: ['yes', 'no'] },
             { position: [2,0], key: 'agree', values: ['yes', 'no'] }
           ]
         end
         let(:data_source) { [ [ 'what?' ], [ 'yes', 'what?' ], [ 'yes', 'what?', '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
       context 'range values' do
         let(:rules) do
           [
             { position: [0,0], key: 'score', values: 1..10 },
             { position: [1,0], key: 'score', values: 1..10 },
             { position: [2,0], key: 'score', values: 1..10 }
           ]
         end
         let(:data_source) { [ [ 12 ], [ 2, 12 ], [ 3, 12, 1 ] ] }
-        it { subject.parse.should eql "12,\"score not supported, please use one of 1..10\"\n" }
+        it { subject.parse.errors.to_csv.should eql("12,\"score not supported, please use one of 1..10\"\n") }
       end
     end
+
+    context 'with extra_validator' do
+      let(:definition) do
+        Csv2hash::Definition.new([
+            { position: [0,0], key: 'name', extra_validator: DowncaseValidator.new,
+              message: 'your data should be writting in downcase only'
+            }
+          ],
+          Csv2hash::Definition::MAPPING).tap do |definition|
+          definition.validate!; definition.default!
+        end
+      end
+      before { subject.parse }
+      context 'not valid data' do
+        let(:data_source) { [ [ 'Foo' ] ] }
+        its(:errors) { should eql [{x: 0, y: 0, message: 'your data should be writting in downcase only', key: 'name'}]}
+      end
+      context 'valid data' do
+        let(:data_source) { [ [ 'foo' ] ] }
+        its(:errors) { should be_empty }
+      end
+    end
   end
-end
\ No newline at end of file
+end
+
+class DowncaseValidator < Csv2hash::ExtraValidator
+  def valid? rule, value
+    !!(value.match /^[a-z]+$/)
+  end
+end
+