gn_crossmap 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f632031b720451c4457f11ea203ea87a6e89d2d
-  data.tar.gz: 275f251a2c8552dd926e6a71f0f1468ac79ac3a0
+  metadata.gz: 47ec0f7527076236262e11f44ad1740c730e05a4
+  data.tar.gz: 8656e9ce121a47a533f72fe76c23ea312b46e509
 SHA512:
-  metadata.gz: f0a6220929fbcab033f10f62a5ec64251fe3452710582579f21a6c1512ca1098682f28e1cb9c7a0bb34833b79aaab90097e818282305ba334ae25c202b3f6046
-  data.tar.gz: 530b3112b16764dbf2478a271afeb6b273128e10786860be4a992e1fc0dce146c54e21427a1642f538190d2acaf1dc7cadc38eeb81a09643eb673717888ddae6
+  metadata.gz: cae7ecb4df507bef1fe64c6b9078772a3078d960f2e9af9a1d30ae7e233df85949fe2754c8830bd54dafd0ee2ec36b0788c0a61f7e0f7e8378dd69898465e487
+  data.tar.gz: 0ab13bc741d0f80b3bbc32d16a4e813a9db7f4954f476be23f1f0ef322bd7f1da782fbf7768fbf4c791f0544521ec9c82de1927d3c04cc22e524eb8b05033df9

data/README.md

@@ -37,6 +37,10 @@ gem install gn_crossmap
 
 ## Usage
 
+### Usage as a Web Application
+
+see [gn\_crossmap\_web] project
+
 ### Usage from command line
 
 ```bash
@@ -64,7 +68,7 @@ Compares an input list to a data source from [GN Resolver][resolver] and
 writes result into an output file.
 
 ```ruby
-GnCrossmap.run(input, output, data_source_id, skip_original)
+GnCrossmap.run(input, output, data_source_id, skip_original, alt_headers)
 ```
 
 ``input``
@@ -81,6 +85,10 @@ designates `STDIN`
 : (boolean) if true only `taxonID` is preserved from original data. Otherwise
 all original data is preserved
 
+``alt_headers``
+: (array) empty array by default. If `alt_headers` are not empty they are used
+instead of the headers supplied with the file
+
 #### `GnCrossmap.logger=`
 
 Allows to set logger to a custom logger (default is `STDERR`)
@@ -91,9 +99,15 @@ Allows to set logger to a custom logger (default is `STDERR`)
 require "gn_crossmap"
 
 # If you want to change logger -- default Logging is to standard error
+
 GnCrossmap.logger = MyCustomLogger.new
 
 GnCrossmap.run("path/to/input.csv", "path/to/output.csv", 5, true)
+
+# if you want to use alternative headers instead of ones supplied in a file
+
+alt_headers = %w(taxonId, scientificName, rank)
+GnCrossmap.run("path/to/input.csv", "path/to/output.csv", 5, true, alt_headers)
 ```
 
 If you want to get intermediate statistics for each resolution cycle use a
@@ -268,3 +282,4 @@ See [LICENSE][license] for details.
 [terms]: http://rs.tdwg.org/dwc/terms
 [files]:  https://github.com/GlobalNamesArchitecture/gn_crossmap/tree/master/spec/files
 [output]: https://github.com/GlobalNamesArchitecture/gn_crossmap/tree/master/spec/files/output-example.csv
+[gn_crossmap_web]: https://github.com/GlobalNamesArchitecture/gn_crossmap_web

data/lib/gn_crossmap/reader.rb

@@ -4,8 +4,9 @@ module GnCrossmap
   class Reader
     attr_reader :original_fields
 
-    def initialize(csv_io, input_name, skip_original, stats)
+    def initialize(csv_io, input_name, skip_original, alt_headers, stats)
       @stats = stats
+      @alt_headers = alt_headers
       @csv_io = csv_io
       @col_sep = col_sep
       @original_fields = nil
@@ -33,13 +34,19 @@ module GnCrossmap
       dc = Collector.new(@skip_original)
       csv = CSV.new(@csv_io, col_sep: col_sep)
       csv.each_with_index do |row, i|
-        @original_fields = headers(row) if @original_fields.nil?
+        row = process_headers(row) if @original_fields.nil?
         yield @stats.stats if log_progress(i) && block_given?
         dc.process_row(row)
       end && @csv_io.close
       dc.data
     end
 
+    def process_headers(row)
+      @original_fields = headers(row)
+      row = @alt_headers unless @alt_headers.empty?
+      row
+    end
+
     def log_progress(count)
       return false unless (count % 10_000).zero?
       GnCrossmap.log("Ingesting csv row #{count + 1}")

data/lib/gn_crossmap/version.rb

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

data/lib/gn_crossmap.rb

@@ -35,10 +35,11 @@ module GnCrossmap
 
     # rubocop:disable Metrics/AbcSize
 
-    def run(input, output, data_source_id, skip_original)
+    def run(input, output, data_source_id, skip_original, alt_headers = [])
       stats = Stats.new
       input_io, output_io = io(input, output)
-      reader = Reader.new(input_io, input_name(input), skip_original, stats)
+      reader = Reader.new(input_io, input_name(input),
+                          skip_original, alt_headers, stats)
       data = block_given? ? reader.read(&Proc.new) : reader.read
       writer = Writer.new(output_io, reader.original_fields,
                           output_name(output))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gn_crossmap
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Dmitry Mozzherin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop