topographer 0.0.6 → 0.0.7

data/lib/topographer/importer/input/base.rb

@@ -10,4 +10,12 @@ class Topographer::Importer::Input::Base
   def each
     raise NotImplementedError
   end
+
+  def importable?
+    true
+  end
+
+  def failure_message
+    ''
+  end
 end

data/lib/topographer/importer.rb

@@ -6,7 +6,7 @@ class Topographer::Importer
   require_relative 'importer/input'
   require_relative 'importer/helpers'
 
-  attr_reader :logger
+  attr_reader :logger, :fatal_errors
 
   def self.build_mapper(model_class, &mapper_definition)
     Mapper.build_mapper(model_class, &mapper_definition)
@@ -19,22 +19,23 @@ class Topographer::Importer
 
   def initialize(input, import_class, strategy_class, logger, options = {})
     @logger = logger
+    @fatal_errors = []
 
     dry_run = options.fetch(:dry_run, false)
     ignore_unmapped_columns = options.fetch(:ignore_unmapped_columns, false)
 
     mapper = import_class.get_mapper(strategy_class)
-    valid_header = mapper.input_structure_valid?(input.get_header, ignore_unmapped_columns: ignore_unmapped_columns)
 
-    if valid_header
+    if importable?(input, mapper, ignore_unmapped_columns)
       strategy = strategy_class.new(mapper)
       strategy.dry_run = dry_run
       import_data(strategy, input, mapper.model_class.name)
     else
-      log_invalid_header(input, mapper)
+      log_fatal_errors(input)
     end
   end
 
+
   def import_data(strategy, input, import_class)
     input.each do |data|
       status = strategy.import_record(data)
@@ -45,9 +46,10 @@ class Topographer::Importer
 
   private
 
-  def log_invalid_header(input, mapper)
-    @logger.log_fatal input.input_identifier,
-                      invalid_header_message(mapper)
+  def log_fatal_errors(input)
+    fatal_errors.each do |fatal_error_message|
+      @logger.log_fatal input.input_identifier, fatal_error_message
+    end
   end
 
   def invalid_header_message(mapper)
@@ -57,4 +59,22 @@ class Topographer::Importer
       mapper.bad_columns.join(', ')
   end
 
+  def importable?(input, mapper, ignore_unmapped_columns)
+    valid_header?(input, mapper, ignore_unmapped_columns) && input_ready?(input)
+  end
+
+  def input_ready?(input)
+    fatal_errors << input.failure_message unless input.importable?
+
+    input.importable?
+  end
+
+  def valid_header?(input, mapper, ignore_unmapped_columns)
+    valid = mapper.input_structure_valid?(input.get_header, ignore_unmapped_columns: ignore_unmapped_columns)
+
+    fatal_errors << invalid_header_message(mapper) unless valid
+
+    valid
+  end
+
 end

data/lib/topographer/version.rb

@@ -1,3 +1,3 @@
 module Topographer
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/topographer/importer/importer_spec.rb

@@ -29,7 +29,6 @@ class MockImportable < OpenStruct
       end
     end
   end
-
 end
 
 class HashImportStrategy < Topographer::Importer::Strategy::Base
@@ -70,6 +69,10 @@ class MockInput
     'test'
   end
 
+  def importable?
+    true
+  end
+
   def each
     yield Topographer::Importer::Input::SourceData.new('1', {'Field1' => 'datum1', 'Field2' => 'datum2'})
     yield Topographer::Importer::Input::SourceData.new('2', {'Field1' => 'datum2', 'Field2' => 'datum2', 'Field3' => 'datum3'})
@@ -82,10 +85,11 @@ describe Topographer::Importer do
   let(:input) { MockInput.new }
   let(:model_class) { MockImportable }
   let(:strategy_class) { HashImportStrategy }
-  let(:bad_input) do
+  let(:bad_header_input) do
     double 'Input',
            get_header: ['BadCol1', 'BadCol2', 'Field1', 'Field3'],
-           input_identifier: 'Test'
+           input_identifier: 'Test',
+           importable?: true
   end
   let(:simple_logger) { Topographer::Importer::Logger::Simple.new }
   let(:import_log) { Topographer::Importer.import_data(input, model_class, strategy_class, simple_logger) }
@@ -109,7 +113,7 @@ describe Topographer::Importer do
     end
 
     it 'does not import data with an invalid header' do
-      import_log = Topographer::Importer.import_data(bad_input, model_class, strategy_class, simple_logger)
+      import_log = Topographer::Importer.import_data(bad_header_input, model_class, strategy_class, simple_logger)
       expect(import_log.errors?).to be_true
       expect(import_log.fatal_error?).to be_true
       expect(import_log.fatal_errors.first.message).

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: topographer
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Mike Simpson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-07-21 00:00:00 Z
+date: 2014-07-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor