topographer 0.0.7 → 0.0.8

data/spec/topographer/importer/mapper/validation_field_mapping_spec.rb

@@ -23,12 +23,12 @@ describe Topographer::Importer::Mapper::ValidationFieldMapping do
   describe '#process_input' do
     it 'should not return an error if the validation block passes' do
       validation_mapping.process_input(valid_input, result)
-      expect(result.errors?).to be_false
-      expect(result.data.blank?).to be_true
+      expect(result.errors?).to be_falsey
+      expect(result.data.blank?).to be_truthy
     end
     it 'should return an error if the validation block raises an error' do
       validation_mapping.process_input(invalid_input, result)
-      expect(result.errors?).to be_true
+      expect(result.errors?).to be_truthy
       expect(result.errors.values).to include('Sum must be 15')
     end
     it 'should not rescue Exceptions that do not inherit from standard error' do

data/spec/topographer/importer/mapper_spec.rb

@@ -7,15 +7,15 @@ describe Topographer::Importer::Mapper do
         mapper = Topographer::Importer::Mapper.build_mapper(Object) do |m|
           m.required_mapping 'Field1', 'field_1'
         end
-        mapper.required_mapping_columns.should include("Field1")
-        mapper.output_fields.should include('field_1')
+        expect(mapper.required_mapping_columns).to include("Field1")
+        expect(mapper.output_fields).to include('field_1')
       end
       it 'can require a many to one field mapping' do
         mapper = Topographer::Importer::Mapper.build_mapper(Object) do |m|
           m.required_mapping ['Field1', 'Field2'], 'field_1'
         end
-        mapper.required_mapping_columns.should include("Field1", "Field2")
-        mapper.output_fields.should include('field_1')
+        expect(mapper.required_mapping_columns).to include("Field1", "Field2")
+        expect(mapper.output_fields).to include('field_1')
       end
       it 'cannot require a one to many field mapping' do
         expect { mapper = Topographer::Importer::Mapper.build_mapper(Object) do |m|
@@ -29,15 +29,15 @@ describe Topographer::Importer::Mapper do
         mapper = Topographer::Importer::Mapper.build_mapper(Object) do |m|
           m.optional_mapping 'Field1', 'field_1'
         end
-        mapper.optional_mapping_columns.should include("Field1")
-        mapper.output_fields.should include('field_1')
+        expect(mapper.optional_mapping_columns).to include("Field1")
+        expect(mapper.output_fields).to include('field_1')
       end
       it 'can create an optional many to one field mapping' do
         mapper = Topographer::Importer::Mapper.build_mapper(Object) do |m|
           m.optional_mapping ['Field1', 'Field2'], 'field_1'
         end
-        mapper.optional_mapping_columns.should include("Field1", "Field2")
-        mapper.output_fields.should include('field_1')
+        expect(mapper.optional_mapping_columns).to include("Field1", "Field2")
+        expect(mapper.output_fields).to include('field_1')
       end
       it 'cannot create an optional one to many field mapping' do
         expect { mapper = Topographer::Importer::Mapper.build_mapper(Object) do |m|
@@ -51,8 +51,8 @@ describe Topographer::Importer::Mapper do
         mapper = Topographer::Importer::Mapper.build_mapper(Object) do |m|
           m.ignored_column 'Field1'
         end
-        mapper.ignored_mapping_columns.should include('Field1')
-        mapper.output_fields.should be_empty
+        expect(mapper.ignored_mapping_columns).to include('Field1')
+        expect(mapper.output_fields).to be_empty
       end
 
       it 'raises an error when adding a mapping whose output is already an output of another mapping' do
@@ -85,7 +85,7 @@ describe Topographer::Importer::Mapper do
           end
         end
         expect(mapper.validation_mapping_columns).to include('Field1')
-        expect(mapper.output_fields.empty?).to be_true
+        expect(mapper.output_fields.empty?).to be_truthy
       end
       it 'can create a multicolumn validation' do
         mapper = Topographer::Importer::Mapper.build_mapper(Object) do |m|
@@ -94,7 +94,7 @@ describe Topographer::Importer::Mapper do
           end
         end
         expect(mapper.validation_mapping_columns).to eql(['Field1', 'Field2'])
-        expect(mapper.output_fields.empty?).to be_true
+        expect(mapper.output_fields.empty?).to be_truthy
       end
       it 'raises an error if a validation name is repeated' do
         expect {
@@ -189,32 +189,32 @@ describe Topographer::Importer::Mapper do
     let(:unmapped_column_structure) {['Field1', 'Field2', 'Field3', 'Field4', 'UnmappedField'] }
 
     it 'returns false if required fields are missing' do
-      expect(mapper.input_structure_valid?(missing_required_column_structure)).to be_false
+      expect(mapper.input_structure_valid?(missing_required_column_structure)).to be_falsey
     end
     it 'returns false if a validation field is missing' do
-      expect(mapper.input_structure_valid?(missing_validation_column_structure)).to be_false
+      expect(mapper.input_structure_valid?(missing_validation_column_structure)).to be_falsey
     end
     it 'returns true if all of the required fields are present' do
-      expect(mapper.input_structure_valid?(valid_input_structure_without_options)).to be_true
+      expect(mapper.input_structure_valid?(valid_input_structure_without_options)).to be_truthy
     end
     it 'returns true if all the required and optional fields are present' do
-      expect(mapper.input_structure_valid?(valid_input_structure_with_options)).to be_true
+      expect(mapper.input_structure_valid?(valid_input_structure_with_options)).to be_truthy
     end
     it 'returns true regardless of whether ignored fields are present' do
-      expect(mapper.input_structure_valid?(valid_input_structure_with_options)).to be_true
-      expect(mapper.input_structure_valid?(valid_input_structure_with_options+['Field5'])).to be_true
+      expect(mapper.input_structure_valid?(valid_input_structure_with_options)).to be_truthy
+      expect(mapper.input_structure_valid?(valid_input_structure_with_options+['Field5'])).to be_truthy
     end
     context 'not ignoring unmapped columns' do
       it 'returns false if there are any extra fields that have not been ignored' do
-        expect(mapper.input_structure_valid?(bad_column_structure)).to be_false
+        expect(mapper.input_structure_valid?(bad_column_structure)).to be_falsey
       end
     end
     context 'ignoring unmapped columns' do
       it 'returns false if there are any extra fields that have not been ignored and required fields are missing' do
-        expect(mapper.input_structure_valid?(bad_column_structure, ignore_unmapped_columns: true)).to be_false
+        expect(mapper.input_structure_valid?(bad_column_structure, ignore_unmapped_columns: true)).to be_falsey
       end
       it 'returns true if there are any extra fields that have not been ignored but all required fields are present' do
-        expect(mapper.input_structure_valid?(unmapped_column_structure, ignore_unmapped_columns: true)).to be_true
+        expect(mapper.input_structure_valid?(unmapped_column_structure, ignore_unmapped_columns: true)).to be_truthy
       end
     end
   end
@@ -328,24 +328,24 @@ describe Topographer::Importer::Mapper do
 
     it 'returns an error if required field is missing in input data' do
       invalid_field_result = mapper.map_input(missing_field_input)
-      expect(invalid_field_result.errors?).to be_true
+      expect(invalid_field_result.errors?).to be_truthy
       expect(invalid_field_result.errors['field_4']).to include('Missing required input(s): `Field3` for `field_4`')
     end
 
     it 'returns an error if a validation does not pass' do
       invalid_data_result = mapper.map_input(invalid_data_input)
-      expect(invalid_data_result.errors?).to be_true
+      expect(invalid_data_result.errors?).to be_truthy
       expect(invalid_data_result.errors['Field2 Validation']).to include('FAILURE')
 
     end
 
     it 'does not return an error if an optional field is missing in the input data' do
-      expect(result.errors?).to be_false
+      expect(result.errors?).to be_falsey
     end
 
     it 'returns a `blank row` error if an entire row is blank' do
       empty_result = mapper.map_input(empty_input)
-      expect(empty_result.errors?).to be_true
+      expect(empty_result.errors?).to be_truthy
       expect(empty_result.errors['EmptyRow']).to include('empty row')
     end
   end

data/spec/topographer/importer/strategy/base_spec.rb

@@ -13,12 +13,23 @@ describe Topographer::Importer::Strategy::Base do
     double 'Status',
            errors?: true
   end
+
+  subject do
+    described_class.new(mapper)
+  end
+
   describe '#initialize' do
     it 'creates a new Strategy instance with the given mapper' do
       strategy = Topographer::Importer::Strategy::Base.new(mapper)
-      strategy.instance_variable_get(:@mapper).should be(mapper)
+      expect(strategy.instance_variable_get(:@mapper)).to be(mapper)
     end
   end
+
+  it 'has an attr_accessor for mapper' do
+    expect(subject.respond_to?(:mapper=)).to be_truthy
+    expect(subject.respond_to?(:mapper)).to be_truthy
+  end
+
   describe '#import_record' do
     it 'should raise NotImplementedError' do
       expect { strategy.import_record(nil) }.to raise_error(NotImplementedError)
@@ -27,16 +38,16 @@ describe Topographer::Importer::Strategy::Base do
 
   describe '#should_persist_import?' do
     it 'returns true if the status has no errors and the import is not a dry run' do
-      expect(strategy.should_persist_import?(status)).to be_true
+      expect(strategy.should_persist_import?(status)).to be_truthy
     end
     it 'returns false if the status has errors regardless of whether the import is a dry run or not' do
-      expect(strategy.should_persist_import?(bad_status)).to be_false
+      expect(strategy.should_persist_import?(bad_status)).to be_falsey
       strategy.dry_run = true
-      expect(strategy.should_persist_import?(bad_status)).to be_false
+      expect(strategy.should_persist_import?(bad_status)).to be_falsey
     end
     it 'returns false if the status has no errors and the import is a dry run' do
       strategy.dry_run = true
-      expect(strategy.should_persist_import?(status)).to be_false
+      expect(strategy.should_persist_import?(status)).to be_falsey
     end
   end
 

data/spec/topographer/importer/strategy/create_or_update_record_spec.rb

@@ -25,20 +25,20 @@ describe Topographer::Importer::Strategy::CreateOrUpdateRecord do
       expect(strategy.import_record(input)).to be_a Topographer::Importer::Strategy::ImportStatus
     end
     it 'should import a record from valid input' do
-      MappedModel.any_instance.should_receive(:save).once
+      expect_any_instance_of(MappedModel).to receive(:save).once
       import_status = strategy.import_record(input)
       expect(import_status.errors?).to be false
     end
     it 'should not import a record from invalid input' do
 
-      MappedModel.any_instance.should_not_receive(:save)
+      expect_any_instance_of(MappedModel).not_to receive(:save)
       import_status = strategy.import_record(invalid_input)
       expect(import_status.errors?).to be true
       expect(import_status.errors[:mapping]).to include('Missing required input(s): `Field2` for `field_2`')
       expect(import_status.errors[:validation]).to include('Field 2 is not datum2')
     end
     it 'should not save a record on a dry run' do
-      MappedModel.any_instance.should_not_receive(:save)
+      expect_any_instance_of(MappedModel).not_to receive(:save)
       strategy.dry_run = true
       import_status = strategy.import_record(input)
       expect(import_status.errors?).to be false

data/spec/topographer/importer/strategy/import_new_records_spec.rb

@@ -34,7 +34,7 @@ describe Topographer::Importer::Strategy::ImportNewRecord do
   describe '#initialize' do
     it 'creates a new Strategy instance with the given mapper' do
       strategy = Topographer::Importer::Strategy::ImportNewRecord.new(mapper)
-      strategy.instance_variable_get(:@mapper).should be(mapper)
+      expect(strategy.instance_variable_get(:@mapper)).to be(mapper)
     end
   end
 
@@ -43,21 +43,21 @@ describe Topographer::Importer::Strategy::ImportNewRecord do
       expect(strategy.import_record(input)).to be_a Topographer::Importer::Strategy::ImportStatus
     end
     it 'should import a record from valid input' do
-      MappedModel.any_instance.should_receive(:save).once
+      expect_any_instance_of(MappedModel).to receive(:save).once
       result = strategy.import_record(input)
       expect(result.errors?).to be false
     end
     it 'should not import a record from invalid input' do
-      mapper.stub(:map_input).and_return(invalid_result)
+      allow(mapper).to receive(:map_input).and_return(invalid_result)
       strategy = Topographer::Importer::Strategy::ImportNewRecord.new(mapper)
-      MappedModel.any_instance.should_not_receive(:save)
+      expect_any_instance_of(MappedModel).not_to receive(:save)
       import_status = strategy.import_record(input)
       expect(import_status.errors?).to be true
       expect(import_status.errors[:mapping]).to include('Missing input(s): `Field2` for `field_2`')
       expect(import_status.errors[:validation]).to include('Field 2 is not datum2')
     end
     it 'should not save a record on a dry run' do
-      MappedModel.any_instance.should_not_receive(:save)
+      expect_any_instance_of(MappedModel).not_to receive(:save)
       strategy.dry_run = true
       import_status = strategy.import_record(input)
       expect(import_status.errors?).to be false

data/spec/topographer/importer/strategy/mapped_model.rb

@@ -17,6 +17,15 @@ class MappedModel < OpenStruct
     end
   end
 
+  # def method_missing(symbol, *args)
+  #   if symbol != :attributes && attributes
+  #     attributes
+  #     attributes[symbol.to_s]
+  #   else
+  #     super
+  #   end
+  # end
+
   def save
     true
   end

data/spec/topographer/importer/strategy/update_record_spec.rb

@@ -24,20 +24,20 @@ describe Topographer::Importer::Strategy::UpdateRecord do
       expect(strategy.import_record(input)).to be_a Topographer::Importer::Strategy::ImportStatus
     end
     it 'should import a record from valid input' do
-      MappedModel.any_instance.should_receive(:save).once
+      expect_any_instance_of(MappedModel).to  receive(:save).once
       result = strategy.import_record(input)
       expect(result.errors?).to be false
     end
     it 'should not import a record from invalid input' do
 
-      MappedModel.any_instance.should_not_receive(:save)
+      expect_any_instance_of(MappedModel).not_to receive(:save)
       import_status = strategy.import_record(invalid_input)
       expect(import_status.errors?).to be true
       expect(import_status.errors[:mapping]).to include('Missing required input(s): `Field2` for `field_2`')
       expect(import_status.errors[:validation]).to include('Field 2 is not datum2')
     end
     it 'should not save a record on a dry run' do
-      MappedModel.any_instance.should_not_receive(:save)
+      expect_any_instance_of(MappedModel).not_to receive(:save)
       strategy.dry_run = true
       import_status = strategy.import_record(input)
       expect(import_status.errors?).to be false

data/topographer.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency('thor')
 
-  spec.add_runtime_dependency('activesupport', ['>= 3'])
+  spec.add_dependency('activesupport', ['>= 3'])
+  spec.add_dependency('i18n')
 
   spec.add_development_dependency('bundler', ['~> 1.3'])
   spec.add_development_dependency('rake')
-  spec.add_development_dependency('rspec')
+  spec.add_development_dependency('rspec', '~> 3')
 end

metadata

@@ -1,107 +1,110 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: topographer
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
+version: !ruby/object:Gem::Version
+  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - Mike Simpson
 - Emerson Huitt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-07-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-02-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        version: "3"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Topographer enables importing of models from various input sources.
-email: 
+email:
 - mjs2600@gmail.com
 - ehuitt@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .travis.yml
+files:
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - LICENSE.txt
@@ -132,6 +135,7 @@ files:
 - lib/topographer/importer/importable.rb
 - lib/topographer/importer/input.rb
 - lib/topographer/importer/input/base.rb
+- lib/topographer/importer/input/delimited_spreadsheet.rb
 - lib/topographer/importer/input/roo.rb
 - lib/topographer/importer/input/source_data.rb
 - lib/topographer/importer/logger.rb
@@ -157,12 +161,14 @@ files:
 - lib/topographer/importer/strategy/update_record.rb
 - lib/topographer/tasks.rb
 - lib/topographer/version.rb
+- spec/assets/test_files/a_csv.csv
 - spec/generators/helpers_spec.rb
 - spec/spec_helper.rb
 - spec/topographer/importer/helpers/write_log_to_csv_spec.rb
 - spec/topographer/importer/helpers_spec.rb
 - spec/topographer/importer/importable_spec.rb
 - spec/topographer/importer/importer_spec.rb
+- spec/topographer/importer/input/delimited_spreadsheet_spec.rb
 - spec/topographer/importer/input/source_data_spec.rb
 - spec/topographer/importer/logger/base_spec.rb
 - spec/topographer/importer/logger/fatal_error_entry_spec.rb
@@ -181,46 +187,40 @@ files:
 - spec/topographer/importer/strategy/mapped_model.rb
 - spec/topographer/importer/strategy/update_record_spec.rb
 - topographer.gemspec
-homepage: ""
-licenses: 
+homepage: ''
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: Topographer allows the mapping of columnar input data to fields for active record models. This facilitates importing from a variety of sources.
-test_files: 
+specification_version: 4
+summary: Topographer allows the mapping of columnar input data to fields for active
+  record models. This facilitates importing from a variety of sources.
+test_files:
+- spec/assets/test_files/a_csv.csv
 - spec/generators/helpers_spec.rb
 - spec/spec_helper.rb
 - spec/topographer/importer/helpers/write_log_to_csv_spec.rb
 - spec/topographer/importer/helpers_spec.rb
 - spec/topographer/importer/importable_spec.rb
 - spec/topographer/importer/importer_spec.rb
+- spec/topographer/importer/input/delimited_spreadsheet_spec.rb
 - spec/topographer/importer/input/source_data_spec.rb
 - spec/topographer/importer/logger/base_spec.rb
 - spec/topographer/importer/logger/fatal_error_entry_spec.rb
@@ -238,4 +238,3 @@ test_files:
 - spec/topographer/importer/strategy/import_status_spec.rb
 - spec/topographer/importer/strategy/mapped_model.rb
 - spec/topographer/importer/strategy/update_record_spec.rb
-has_rdoc: