iron-import 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87cd90d663132748c61dfaa450449136f0cc00c4
-  data.tar.gz: e350419e3bdc6afb98b6a84b4fef8c9a4f1cd4be
+  metadata.gz: af5ddfc35604cb25d28377798c3ea609ca7e575e
+  data.tar.gz: 76a6ed3cc099d49e6a5fa888b3a37dff26e2bee8
 SHA512:
-  metadata.gz: 1646f83be5af42715b1f71f9090aa0bf323bf9495d97d4abbb5543f85cb98f006fe9bd407823810c343e3dbc81a477da1445f399bcad9eca79108fd2869719f5
-  data.tar.gz: ba01474f1f4eebf7eaf2a23bc12824d0d57c00de61226ede66e1f1c9bd554d57161b8d811aeb2793cedc42f5a4b0bf8e9d34961c98f755aee5f09cfef1b81847
+  metadata.gz: d8d0f3a7cd1a6a2503df394b94dd74630d1226e4c1b0ed43fe9d76d0f264df358641ce7be2d51f30b7c0d870118af109f7e183de37e7a8d3a0c4d3aea8cd68b7
+  data.tar.gz: 3d6d629a0c09ce84b526025d945b55d0f4c6b8e250b3053b43ddb5fdba91e62e7c13a623f66c65a2e39700dd632464471309a6c3357b04c5e7e45c4b757a69ba

data/History.txt

@@ -1,3 +1,9 @@
+== 0.8.1 / 2017-07-18
+* Do not include optional headers in #missing_headers
+* Improve string parsing to strip trailing '.0' from incoming float values
+* Add #to_h to Row for consistency with Column
+* Bugfix for calls to #add_error with invalid calling signature
+
 == 0.8.0 / 2017-06-29
 * Breaking Change: change signature of Importer#add_error to support new features
 * Breaking Change: Importer.missing_headers will be [] instead of nil on all headers found

data/README.rdoc

@@ -55,7 +55,7 @@ any errors encountered... well, this is the library for you!
     # order and the starting row of the data.
     importer = Importer.build do
       column :name do
-        # Column order and start row are auto-detected
+        # Provide a regex to find the header for this column
         header /(name|product)/i
       end
       column :description do

data/Version.txt

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/iron/import/data_reader.rb

@@ -161,7 +161,8 @@ class Importer
         
       elsif path_or_stream.is_a?(String)
         # Assume it's a path
-        if File.exist?(path_or_stream)
+        is_path = File.exist?(path_or_stream) rescue false
+        if is_path
           if supports_file?
             # We're all set, load up the given path
             load_each(:file, path_or_stream, scopes, &block)
@@ -171,7 +172,7 @@ class Importer
             load_each(:stream, file, scopes, &block)
           end
         else
-          add_error("Unable to locate source file #{path_or_stream}")
+          add_error("Unable to locate source file with path #{path_or_stream.slice(0,200)}")
         end
         
       else
@@ -219,7 +220,11 @@ class Importer
       
       case type
       when :string then
-        val = val.to_s.strip
+        if val.is_a?(Float)
+          val.to_s.strip.gsub(/\.0+$/, '')
+        else
+          val.to_s.strip
+        end
         
       when :integer, :int then 
         if val.class < Numeric

data/lib/iron/import/importer.rb

@@ -343,7 +343,7 @@ class Importer
     else
       # Auto select
       @reader = DataReader::for_source(self, path_or_stream)
-      @format = @reader.format
+      @format = @reader.format if @reader
     end
 
     # Verify we got one
@@ -423,7 +423,7 @@ class Importer
       begin
         yield row
       rescue Exception => e
-        add_error(row, e.to_s)
+        add_error(e.to_s, :row => row)
       end
     end
   end
@@ -488,7 +488,7 @@ class Importer
       
     else
       # Match by testing
-      missing = nil
+      missing = []
       raw_rows.each_with_index do |row, i|
         # Um, have data?
         next unless row
@@ -496,7 +496,7 @@ class Importer
         # Set up for this iteration
         remaining = @columns.select {|c| !c.virtual? }
     
-        # Step through this row's raw values, and look for a matching column for all columns
+        # Step through this row's raw values, and look for a matching header for all columns
         row.each_with_index do |val, i|
           val = val.to_s
           col = remaining.detect {|c| c.match_header?(val, i) }
@@ -532,7 +532,9 @@ class Importer
           @missing_headers = []
           return true
         else
-          missing = remaining if (missing.nil? || missing.count > remaining.count)
+          # Didn't find 'em all, remember this set of missing ones for reporting later
+          remaining.select! {|col| !col.optional? }
+          missing = remaining if missing.empty? || missing.count > remaining.count
         end
       end
       

data/lib/iron/import/row.rb

@@ -52,12 +52,13 @@ class Importer
     end
     
     # This row's values as a hash of :column_key => <parsed + validated value>
-    def to_hash
+    def to_h
       @values.dup
     end
+    def to_hash ; to_h ; end
     
     def add_error(msg)
-      @importer.add_error(self, msg)
+      @importer.add_error(msg, :row => self)
     end
     
     def has_errors?

data/spec/importer/data_reader_spec.rb

@@ -10,7 +10,10 @@ describe Importer::DataReader do
       '1234' => 1234,
       '-2' => -2,
       '5.00' => 5,
+      '2.5.00' => nil,
       'foo' => nil,
+      '4 ducks' => nil,
+      '2-4' => nil,
       '' => nil,
       55 => 55,
       3.0 => 3
@@ -22,6 +25,7 @@ describe Importer::DataReader do
   it 'should parse floats' do
     {
       '1.256' => 1.256,
+      '4.22.00' => nil,
       '-20.3' => -20.3,
       '5.00' => 5.0,
       'foo' => nil,
@@ -39,7 +43,8 @@ describe Importer::DataReader do
       " spaces \t" => 'spaces',
       '' => nil,
       255 => '255',
-      -1.5 => '-1.5'
+      -1.5 => '-1.5',
+      10.0 => '10'
     }.each_pair do |val, res|
       @reader.parse_value(val, :string).should === res
     end
@@ -50,6 +55,7 @@ describe Importer::DataReader do
       '$123.00' => 12300,
       '9.95' => 995,
       '5' => 500,
+      '04 ' => 400,
       '0.5' => 50,
       '-95' => -9500,
       52 => 5200,
@@ -77,6 +83,7 @@ describe Importer::DataReader do
     Importer::DataReader.for_format(@importer, :csv).should be_a(Importer::CsvReader)
     Importer::DataReader.for_format(@importer, :xls).should be_a(Importer::XlsReader)
     Importer::DataReader.for_format(@importer, :xlsx).should be_a(Importer::XlsxReader)
+    Importer::DataReader.for_format(@importer, :html).should be_a(Importer::HtmlReader)
     Importer::DataReader.for_format(@importer, :foo).should be_nil
   end
   
@@ -84,6 +91,8 @@ describe Importer::DataReader do
     Importer::DataReader.for_path(@importer, '/tmp/foo.csv').should be_a(Importer::CsvReader)
     Importer::DataReader.for_path(@importer, 'BAR.XLS').should be_a(Importer::XlsReader)
     Importer::DataReader.for_path(@importer, '/tmp/nog_bog.xlsx').should be_a(Importer::XlsxReader)
+    Importer::DataReader.for_path(@importer, '/tmp/nog_bog.htm').should be_a(Importer::HtmlReader)
+    Importer::DataReader.for_path(@importer, '/tmp/tim.txt.html').should be_a(Importer::HtmlReader)
     Importer::DataReader.for_path(@importer, '/tmp/blinkin.bmp').should be_nil
   end
   

data/spec/importer/importer_spec.rb

@@ -62,6 +62,7 @@ describe Importer do
     importer = Importer.new
     importer.column(:alpha)
     importer.column(:gamma)
+    importer.column(:optional, :optional => true)
     # Some dummy data
     rows = [
       ['Bob', 'Beta', 'Gamma', 'Epsilon']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iron-import
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Rob Morris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron-extensions