iron-import 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04d666ea1e0170b0186d75fc8b0ec367a16e528a
-  data.tar.gz: 9dad576e17b7d8fc4b523ffe6b4e53c85feae9c8
+  metadata.gz: e989c98b9a8dd112ec7c5926f971934e162b2017
+  data.tar.gz: 7d0e72179fded329171398514a215e7176879bc0
 SHA512:
-  metadata.gz: e5a31e81381d78c29da480b296a8e9569ed415a32f50610881014de52a7b92c925687d3ee4ba683bf64a50562b26bf5785acf09070017710938d39c52f0087ad
-  data.tar.gz: d29901644886a98c617dd215b52edec0e8c011875ae2c0d6724c8f0f03c26bfdb9ea8028a3322c9cf1d16f91d9010950203c73ff0fc0485ce0bfc09ffc53e6f2
+  metadata.gz: 59449ccc93220e21c21b8bee5dfeea71ecf91cafb52fcff0832b991c0c408e82ef7c788da988c526ec0a471426f1b05a3c0fb28bdf7648af226976d88d3f83ed
+  data.tar.gz: 04c84036d445c7117a0dbedff629cf2197533d533243fdaa18a82021e6258e95aeea10153357eb95da625229bbdb844a9554f4457bdd453bc1c3463095f6b5b1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.6.1 / 2015-08-24
+
+* Better handling for nil return value in custom format readers
+
 == 0.6.0 / 2015-08-17
 
 * Refactored readers to allow for custom format reading

data/README.rdoc

@@ -7,8 +7,8 @@ Written by Rob Morris @ Irongaze Consulting LLC (http://irongaze.com)
 Simple, reliable tabular data import.
 
 This gem provides a set of classes to support automating import of tabular data from 
-CSV, XLS or XLSX files.  Provides help in defining columns, auto-detecting column 
-order, pre-parsing data, and error/warning tracking.
+CSV, XLS and XLSX files, or custom formats via a simple block reader.  Provides help 
+in defining columns, auto-detecting column order, pre-parsing data, and error/warning tracking.
 
 The Roo/Spreadsheet gems do a great job of providing general purpose spreadsheet reading.
 However, using them with unreliable user submitted data requires a lot of error checking,

data/Version.txt

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/iron/import/custom_reader.rb

@@ -26,11 +26,16 @@ class Importer
     
     def load_raw_sheet(sheet)
       reader = @readers[@mode]
-      reader.call(@source, sheet)
+      res = DslProxy.exec(self, @source, sheet, &reader)
+      if !res.is_a?(Array) || @importer.has_errors?
+        false
+      else
+        res
+      end
       
     rescue Exception => e
       # Catch any exceptions thrown and note them with helpful stacktrace info for debugging custom readers
-      @importer.add_error("Error in custom reader when loading sheet #{sheet}: #{e} @ #{e.backtrace.first}")
+      @importer.add_error("Error in custom reader when loading #{sheet}: #{e} @ #{e.backtrace.first}")
       false
     end
     

data/lib/iron/import/data_reader.rb

@@ -257,6 +257,14 @@ class Importer
       end
     end
     
+    def add_error(*args)
+      @importer.add_error(*args)
+    end
+    
+    def add_warning(*args)
+      @importer.add_warning(*args)
+    end
+    
   end
   
 end

data/lib/iron/import/sheet.rb

@@ -141,6 +141,8 @@ class Importer
     
     # Add a new row to our stash
     def add_row(line, raw_data)
+      # Gracefully handle custom parsers that return nil for a row's data
+      raw_data ||= []
       # Add the row
       row = Row.new(self, line)
       
@@ -150,8 +152,10 @@ class Importer
         index = col.data.index
         raw_val = raw_data[index]
         if col.parse
+          # Use custom parser if this row has one
           val = col.parse_value(row, raw_val)
         else
+          # Otherwise use our standard parser
           val = @importer.data.parse_value(raw_val, col.type)
         end
         values[col.key] = val
@@ -236,6 +240,14 @@ class Importer
       end
     end
 
+    def add_error(msg)
+      @importer.add_error(self, msg)
+    end
+    
+    def add_warning(msg)
+      @importer.add_warning(self, msg)
+    end
+
     def to_s
       "Sheet #{@id}"
     end

data/spec/importer/custom_reader_spec.rb

@@ -43,4 +43,18 @@ describe Importer::CustomReader do
     ]
   end
   
+  it 'should allow adding errors in custom blocks' do
+    importer = Importer.build do
+      headerless!
+      column :code
+      column :desc
+
+      on_file do |source, sheet|
+        add_error('Unable to read cause no reader')
+      end
+    end
+    importer.import(SpecHelper.sample_path('icd10-custom.txt'))
+    importer.error_summary.should include('Unable to read cause no reader')
+  end
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iron-import
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Rob Morris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron-extensions