gn_crossmap 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3436378ff8a58c2bcbf8fdb9988ccf89a0718429
-  data.tar.gz: efe61399742c47ae81a8131f9418ec3cb7ba51cf
+  metadata.gz: ef76ffb4478fc4a0a74b2ac7ed75ecd81c3dc9a8
+  data.tar.gz: 750d574f44159b5cf9abd190b7f1fecd33328c69
 SHA512:
-  metadata.gz: a95c9255fd031065e3383c10111017025f46ed00a801b1fb6d80cf5f0e01b72e8d1f7348b1f74a22b5f221d82d8c2c67debf3cedd6bc4a23887c58f176e33902
-  data.tar.gz: ae5cecc6f154eec1bc33033a41653527be10c5ac85d22faf83b0ceedd8b5d3f1bc2282a9ec089886de8eb631c87493f4ba13ad92ee053f75dacaf5905f7d3f63
+  metadata.gz: 4a132900cfbc95633f757223ff79ed8f476224de22f3a2f56045b30eef52aa26af7f772d21169ce7c57e716af3134c0759092b87e8e11d9c9c87bf0e4fc1a8fc
+  data.tar.gz: 757eea133471182836ff0b09e1766e54ab85765029a41de324b398959c70df3b0e13a5c537ec81b2707e01e5639de558bfe4e358e476cdd8b2a5f8b2f2b592b2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ``gn_crossmap`` CHANGELOG
 
+## 2.1.1
+
+* @dimus - fix stats for ingestion
+
 ## 2.1.0
 
 * @dimus - #27 terminate resolution by a trigger

data/lib/gn_crossmap/reader.rb

@@ -33,12 +33,23 @@ module GnCrossmap
     def parse_input
       dc = Collector.new(@skip_original)
       csv = CSV.new(@csv_io, col_sep: col_sep)
+      block_given? ? process(csv, dc, &Proc.new) : process(csv, dc)
+      wrap_up
+      yield @stats.stats if block_given?
+      dc.data
+    end
+
+    def process(csv, data_collector)
       csv.each_with_index do |row, i|
         row = process_headers(row) if @original_fields.nil?
         yield @stats.stats if log_progress(i) && block_given?
-        dc.process_row(row)
+        data_collector.process_row(row)
       end && @csv_io.close
-      dc.data
+    end
+
+    def wrap_up
+      @stats.stats[:ingested_records] = @stats.stats[:total_records]
+      @stats.stats[:ingestion_span] = Time.now - @stats.stats[:ingestion_start]
     end
 
     def process_headers(row)
@@ -48,7 +59,7 @@ module GnCrossmap
     end
 
     def log_progress(count)
-      return false unless (count % 10_000).zero?
+      return false unless (count % 1_000).zero?
       GnCrossmap.log("Ingesting csv row #{count + 1}")
       @stats.stats[:ingested_records] = count + 1
       @stats.stats[:ingestion_span] = Time.now - @stats.stats[:ingestion_start]

data/lib/gn_crossmap/version.rb

@@ -1,6 +1,6 @@
 # Namespace module for crossmapping checklists to GN sources
 module GnCrossmap
-  VERSION = "2.1.0".freeze
+  VERSION = "2.1.1".freeze
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gn_crossmap
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Dmitry Mozzherin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop