gn_crossmap 2.1.0 → 2.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3436378ff8a58c2bcbf8fdb9988ccf89a0718429
4
- data.tar.gz: efe61399742c47ae81a8131f9418ec3cb7ba51cf
3
+ metadata.gz: ef76ffb4478fc4a0a74b2ac7ed75ecd81c3dc9a8
4
+ data.tar.gz: 750d574f44159b5cf9abd190b7f1fecd33328c69
5
5
  SHA512:
6
- metadata.gz: a95c9255fd031065e3383c10111017025f46ed00a801b1fb6d80cf5f0e01b72e8d1f7348b1f74a22b5f221d82d8c2c67debf3cedd6bc4a23887c58f176e33902
7
- data.tar.gz: ae5cecc6f154eec1bc33033a41653527be10c5ac85d22faf83b0ceedd8b5d3f1bc2282a9ec089886de8eb631c87493f4ba13ad92ee053f75dacaf5905f7d3f63
6
+ metadata.gz: 4a132900cfbc95633f757223ff79ed8f476224de22f3a2f56045b30eef52aa26af7f772d21169ce7c57e716af3134c0759092b87e8e11d9c9c87bf0e4fc1a8fc
7
+ data.tar.gz: 757eea133471182836ff0b09e1766e54ab85765029a41de324b398959c70df3b0e13a5c537ec81b2707e01e5639de558bfe4e358e476cdd8b2a5f8b2f2b592b2
@@ -1,5 +1,9 @@
1
1
  # ``gn_crossmap`` CHANGELOG
2
2
 
3
+ ## 2.1.1
4
+
5
+ * @dimus - fix stats for ingestion
6
+
3
7
  ## 2.1.0
4
8
 
5
9
  * @dimus - #27 terminate resolution by a trigger
@@ -33,12 +33,23 @@ module GnCrossmap
33
33
  def parse_input
34
34
  dc = Collector.new(@skip_original)
35
35
  csv = CSV.new(@csv_io, col_sep: col_sep)
36
+ block_given? ? process(csv, dc, &Proc.new) : process(csv, dc)
37
+ wrap_up
38
+ yield @stats.stats if block_given?
39
+ dc.data
40
+ end
41
+
42
+ def process(csv, data_collector)
36
43
  csv.each_with_index do |row, i|
37
44
  row = process_headers(row) if @original_fields.nil?
38
45
  yield @stats.stats if log_progress(i) && block_given?
39
- dc.process_row(row)
46
+ data_collector.process_row(row)
40
47
  end && @csv_io.close
41
- dc.data
48
+ end
49
+
50
+ def wrap_up
51
+ @stats.stats[:ingested_records] = @stats.stats[:total_records]
52
+ @stats.stats[:ingestion_span] = Time.now - @stats.stats[:ingestion_start]
42
53
  end
43
54
 
44
55
  def process_headers(row)
@@ -48,7 +59,7 @@ module GnCrossmap
48
59
  end
49
60
 
50
61
  def log_progress(count)
51
- return false unless (count % 10_000).zero?
62
+ return false unless (count % 1_000).zero?
52
63
  GnCrossmap.log("Ingesting csv row #{count + 1}")
53
64
  @stats.stats[:ingested_records] = count + 1
54
65
  @stats.stats[:ingestion_span] = Time.now - @stats.stats[:ingestion_start]
@@ -1,6 +1,6 @@
1
1
  # Namespace module for crossmapping checklists to GN sources
2
2
  module GnCrossmap
3
- VERSION = "2.1.0".freeze
3
+ VERSION = "2.1.1".freeze
4
4
 
5
5
  def self.version
6
6
  VERSION
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gn_crossmap
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.0
4
+ version: 2.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Mozzherin
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-01-28 00:00:00.000000000 Z
11
+ date: 2017-01-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: trollop