gn_crossmap 2.2.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af88cbf0b3ca5ea98ebf8cbb37b41797ba696294
-  data.tar.gz: 75bc41909f7c00eee0311a254e1390aa6ae8307c
+  metadata.gz: c84cc9c99fe6e3a70510415998c826928c4b7013
+  data.tar.gz: 870651fe4c32fbded76f3fb2cc60d94878b19150
 SHA512:
-  metadata.gz: a784f2f6bab3b46fc4f4d7f3ef0aa69116d528589ff116ad85f050d28d430882672bdaef42e2c2fe21aa526bbaac5d27e55939ec9df4e0049b44f98311c9fc1f
-  data.tar.gz: 2b054ace46de4c2f11b15ab52a47a8371c126a4274c4be439115f1a6e37ce77e6f2148bfc38034f096a6f7d21807c58b7101764a4f0e169589140767a485e38c
+  metadata.gz: fd3bbc558395d43e713bd35a58f2eee7bd40f24f37399095c08c3186de004df2752ea6180d4d02b9fd83b0d3419648e58c68a281f2ead4d88e90863e917ae048
+  data.tar.gz: 5d6a973a2bc965ae5015ced006a880e38b6c51231e73e6eabb6182dbc4e88849b2341097397436d7fdaabcf45f02d38ad92e0477a74baba53c75c3c66fd1bda0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ``gn_crossmap`` CHANGELOG
 
+## 2.3.0
+
+* @dimus - add option to supply url for global names resolver
+
 ## 2.2.3
 
 * @dimus - make csv processing more permissive, continue

data/README.md

@@ -92,6 +92,9 @@ all original data is preserved
 : (array) empty array by default. If `alt_headers` are not empty they are used
 instead of the headers supplied with the file
 
+``resolver_url``
+: URL to globalnames' resolver. Default is ``http://resolver.globalnames.org``
+
 #### `GnCrossmap.logger=`
 
 Allows to set logger to a custom logger (default is `STDERR`)

data/lib/gn_crossmap.rb

@@ -37,14 +37,12 @@ module GnCrossmap
     # rubocop:disable Metrics/AbcSize
 
     def run(opts)
-      opts = OpenStruct.new({ stats: Stats.new, alt_headers: [] }.merge(opts))
+      opts = opts_struct(opts)
       input_io, output_io = io(opts.input, opts.output)
-      reader = Reader.new(input_io, input_name(opts.input),
-                          opts.skip_original, opts.alt_headers, opts.stats)
+      reader = create_reader(input_io, opts)
       data = block_given? ? reader.read(&Proc.new) : reader.read
-      writer = Writer.new(output_io, reader.original_fields,
-                          output_name(opts.output))
-      resolver = Resolver.new(writer, opts.data_source_id, opts.stats)
+      writer = create_writer(reader, output_io, opts)
+      resolver = create_resolver(writer, opts)
       block_given? ? resolver.resolve(data, &Proc.new) : resolver.resolve(data)
       opts.output
     end
@@ -61,6 +59,25 @@ module GnCrossmap
 
     private
 
+    def create_resolver(writer, opts)
+      Resolver.new(writer, opts.data_source_id, opts.resolver_url, opts.stats)
+    end
+
+    def create_writer(reader, output_io, opts)
+      Writer.new(output_io, reader.original_fields, output_name(opts.output))
+    end
+
+    def create_reader(input_io, opts)
+      Reader.new(input_io, input_name(opts.input),
+                 opts.skip_original, opts.alt_headers, opts.stats)
+    end
+
+    def opts_struct(opts)
+      resolver_url = "http://resolver.globalnames.org/name_resolvers.json"
+      OpenStruct.new({ stats: Stats.new, alt_headers: [],
+                       resolver_url: resolver_url }.merge(opts))
+    end
+
     def io(input, output)
       io_in = iogen(input, INPUT_MODE)
       io_out = iogen(output, OUTPUT_MODE)

data/lib/gn_crossmap/resolver.rb

@@ -1,10 +1,9 @@
 module GnCrossmap
   # Sends data to GN Resolver and collects results
   class Resolver
-    URL = "http://resolver.globalnames.org/name_resolvers.json".freeze
-
-    def initialize(writer, data_source_id, stats)
+    def initialize(writer, data_source_id, resolver_url, stats)
       @stats = stats
+      @resolver_url = resolver_url
       @processor = GnCrossmap::ResultProcessor.new(writer, @stats)
       @ds_id = data_source_id
       @count = 0
@@ -65,7 +64,7 @@ module GnCrossmap
 
     def remote_resolve(names)
       batch_start = Time.now
-      res = RestClient.post(URL, data: names, data_source_ids: @ds_id)
+      res = RestClient.post(@resolver_url, data: names, data_source_ids: @ds_id)
       @processor.process(res, @current_data)
     rescue RestClient::Exception
       single_remote_resolve(names)
@@ -83,7 +82,8 @@ module GnCrossmap
     def single_remote_resolve(names)
       names.split("\n").each do |name|
         begin
-          res = RestClient.post(URL, data: name, data_source_ids: @ds_id)
+          res = RestClient.post(@resolver_url, data: name,
+                                               data_source_ids: @ds_id)
           @processor.process(res, @current_data)
         rescue RestClient::Exception => e
           process_resolver_error(e, name)

data/lib/gn_crossmap/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gn_crossmap
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Dmitry Mozzherin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop