primo_central_counter 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e47cedcc636353d5b8623c3693ace12af43eea52
-  data.tar.gz: 34f1cd2abf6c872a71cd69c23a79b6411b7ba312
+  metadata.gz: eedacf0ca23e92ecd8f1254d0193d8a21059c302
+  data.tar.gz: f63fadf9400ec532277d29e0e93212f2aa9c8e74
 SHA512:
-  metadata.gz: cfea6a88d35200f722856f356e709fa2e70912f4a39c07a71b5b8cf3414d238c27e24c044b14a3a67451860bcfe1f9b1b19acff9cf973e967de84c7ba425ded8
-  data.tar.gz: 7c0a88a1b36ada00437370da2928ae0790ff673db98af980d4125faf1f5a780818e8147f7ac9291a8a0a163232c7fefb7ce09dfe74dd9177730c57cf7f660dcc
+  metadata.gz: a56477fbd5f7c599564334676eb677e6d039d03f2594559766d9b7e819c04924e98c78ffd5ee5a139ea6c573e41f39db7a09ddd479d8ad1d8b718c099ddfc240
+  data.tar.gz: 739846bdcdebab65e7432b26bbfda7582ccf62458e183254bb9f6f22be79acf73bd2a5e2f6bb49355d2f3f3a2e7b6c104a20156d556b8966e57e8c216aa93e31

data/README.md

@@ -20,16 +20,16 @@ Usage: primo_central_counter [options]
     -h, --help                             Display usage informations
 ```
 
-The output is (Excel) CSV on STDOUT. If you enable logging, this will be outputted on STDERR.
+The output is total record cound on STDOUT. If you enable logging, this will be outputted on STDERR.
 
 ### Examples
 
 ```
-primo_central_counter -u http://primo.kobv.de -i PAD > ./output.csv
+primo_central_counter -u http://primo.kobv.de -i PAD
 ```
 
 ```
-primo_central_counter -u http://primo.kobv.de -i PAD -l info 1> ./output.csv 2> ./messages.txt
+primo_central_counter -u http://primo.kobv.de -i PAD -l info 1> ./sum.txt 2> ./messages.txt
 ```
 
 ## Development

data/exe/primo_central_counter

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
 require "primo_central_counter"
 
 PrimoCentralCounter::Cli.new(ARGV)

data/lib/primo_central_counter/cli.rb

@@ -1,5 +1,6 @@
 require "logger"
 require_relative "../primo_central_counter"
+require_relative "./connection_checker"
 require_relative "./counter"
 require_relative "./option_parser"
 require_relative "./soap_discoverer"
@@ -28,19 +29,30 @@ class PrimoCentralCounter::Cli
   end
 
   def call
-    searcher_url = PrimoCentralCounter::SoapDiscoverer.call(@options[:base_url], logger: @logger)
-    queries = [("a".."z").to_a, (0..9).to_a.map(&:to_s)].flatten(1).map { |_char| "#{_char}*" }
-    result = PrimoCentralCounter::Counter.call(searcher_url, queries, @options.merge(logger: @logger))
-    sum = result.inject(0) do |_sum, (_query, _count)|
-      _sum + _count
-    end
+    if PrimoCentralCounter::ConnectionChecker.call(@options[:base_url], logger: @logger)
+      searcher_url = PrimoCentralCounter::SoapDiscoverer.call(@options[:base_url], logger: @logger)
+      queries = [("a".."z").to_a, (0..9).to_a.map(&:to_s)].flatten(1).map { |_char| "#{_char}*" }
+      result = PrimoCentralCounter::Counter.call(searcher_url, queries, @options.merge(logger: @logger))
+      sum = result.inject(0) do |_sum, (_query, _count)|
+        _sum + _count
+      end
 
-    puts sum
+      puts sum
+    else
+      log_error(@logger, "Cannot connect to Primo Central! Please check the given url and if you are allowed to access the API.")
+      log_error(@logger, "The following primo backoffice settings control the API access privileges:")
+      log_error(@logger, "- Advanced Configuration > All Mapping Tables > WS and XS IP")
+      log_error(@logger, "- Deploy All > All Client IP Ranges (WS and XS IP mapping table)")
+    end
   end
 
   #
   private
   #
+  def log_error(logger, message)
+    logger.error(message) if logger
+  end
+
   def option_parser(result = {})
     PrimoCentralCounter::OptionParser.new(nil, 38) do |_option_parser|
       _option_parser.banner = "Usage: primo_central_counter [options]\n\n"

data/lib/primo_central_counter/connection_checker.rb

@@ -0,0 +1,27 @@
+require "net/http"
+require "uri"
+require_relative "../primo_central_counter"
+
+class PrimoCentralCounter::ConnectionChecker
+  def self.call(primo_base_url, options = {})
+    logger = options[:logger]
+
+    log_info(logger, "Checking connection to Primo Central")
+    url = URI.parse("#{primo_base_url}/PrimoWebServices/services/searcher")
+    response = Net::HTTP.get_response(url)
+
+    if response.body[/IP address rejected/]
+      false
+    else
+      true
+    end
+  rescue Errno::ECONNREFUSED
+    false
+  end
+
+  private
+
+  def self.log_info(logger, message)
+    logger.info(message) if logger
+  end
+end

data/lib/primo_central_counter/version.rb

@@ -1,3 +1,3 @@
 module PrimoCentralCounter
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: primo_central_counter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Sievers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,6 +57,7 @@ files:
 - exe/primo_central_counter
 - lib/primo_central_counter.rb
 - lib/primo_central_counter/cli.rb
+- lib/primo_central_counter/connection_checker.rb
 - lib/primo_central_counter/counter.rb
 - lib/primo_central_counter/option_parser.rb
 - lib/primo_central_counter/soap_discoverer.rb