contact-data 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02f12affd6398a987478d1af10e6b77a95b8006f
-  data.tar.gz: f96ffd14ef3ccc1eef50167f36823374f1e8908b
+  metadata.gz: 92710752e40c09411abd997d9476c3095398eb3a
+  data.tar.gz: 77a5b04868616c15d5f5371e7dace6f333ec6e60
 SHA512:
-  metadata.gz: f0d026e6e60dc586c96a0b78d8ca8a3b1bb4981d88b1c5d1a97150d70969992c20a3ac043c829dda379213ab531b391fab6da3888c81ccbf559eb953be2388e6
-  data.tar.gz: 2ebdca617744711b7621b4afcde177d58bbe89bd238a1a61e0206a21f5268e0bb8301b88c23791fa5e03f003c3692867d1fc9ae8a22e7a82732db1d49c496258
+  metadata.gz: 68cac8c97cc721963cd46ab4c2161ba944139ae03345cd1bf7dd705305ae59fe9f895191b6677f3e0f79028a52449d152e91c18ed02c3066402c0d2307fae71c
+  data.tar.gz: 52a83068bb801a2c0c8269302de09dc80d556358496fe192e8c0cf88fd9ceaf0c402de9456bea0d0c53a2d2210ebcb0645a83114740b9dc32172518afb4c42ab

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.3.1

data/bin/ssl_doctor.rb

@@ -12,16 +12,15 @@ port ||= 443
 
 ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
 ruby_version = RUBY_VERSION
-if patch = RbConfig::CONFIG['PATCHLEVEL']
-  ruby_version += "-p#{patch}"
-end
-puts "%s (%s)" % [ruby, ruby_version]
+patch = RbConfig::CONFIG['PATCHLEVEL']
+ruby_version += "-p#{patch}" if patch
+puts format('%s (%s)', ruby, ruby_version)
 
 openssl_dir = OpenSSL::X509::DEFAULT_CERT_AREA
 mac_openssl = '/System/Library/OpenSSL' == openssl_dir
-puts "%s: %s" % [OpenSSL::OPENSSL_VERSION, openssl_dir]
+puts format('%s: %s', OpenSSL::OPENSSL_VERSION, openssl_dir)
 [OpenSSL::X509::DEFAULT_CERT_DIR_ENV, OpenSSL::X509::DEFAULT_CERT_FILE_ENV].each do |key|
-  puts "%s=%s" % [key, ENV[key].to_s.inspect]
+  puts format('%s=%s', key, ENV[key].to_s.inspect)
 end
 
 ca_file = ENV[OpenSSL::X509::DEFAULT_CERT_FILE_ENV] || OpenSSL::X509::DEFAULT_CERT_FILE
@@ -47,9 +46,9 @@ if mac_openssl
   # cert verification fail for requests that would otherwise be successful.
 else
   http.verify_callback = lambda { |verify_ok, store_context|
-    if !verify_ok
+    unless verify_ok
       failed_cert = store_context.current_cert
-      failed_cert_reason = "%d: %s" % [ store_context.error, store_context.error_string ]
+      failed_cert_reason = format('%d: %s', store_context.error, store_context.error_string)
     end
     verify_ok
   }
@@ -61,9 +60,9 @@ req = Net::HTTP::Head.new('/', 'user-agent' => user_agent)
 begin
   res = http.start { http.request(req) }
   abort res.inspect if res.code.to_i >= 500
-  puts "OK"
+  puts 'OK'
 rescue Errno::ECONNREFUSED
-  puts "Error: connection refused"
+  puts 'Error: connection refused'
   exit 1
 rescue OpenSSL::SSL::SSLError => e
   puts "#{e.class}: #{e.message}"
@@ -72,7 +71,7 @@ rescue OpenSSL::SSL::SSLError => e
     puts "\nThe server presented a certificate that could not be verified:"
     puts "  subject: #{failed_cert.subject}"
     puts "  issuer: #{failed_cert.issuer}"
-    puts "  error code %s" % failed_cert_reason
+    puts format('  error code %s', failed_cert_reason)
   end
 
   ca_file_missing = !File.exist?(ca_file) && !mac_openssl
@@ -80,8 +79,8 @@ rescue OpenSSL::SSL::SSLError => e
 
   if ca_file_missing || ca_path_empty
     puts "\nPossible causes:"
-    puts "  `%s' does not exist" % ca_file if ca_file_missing
-    puts "  `%s/' is empty" % ca_path if ca_path_empty
+    puts format("  `%s' does not exist", ca_file) if ca_file_missing
+    puts format("  `%s/' is empty", ca_path) if ca_path_empty
   end
 
   exit 1

data/contact-data.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock', '~> 1.21'
   spec.add_development_dependency 'byebug', '~> 5.0'
   spec.add_development_dependency 'rubocop', '~> 0.31'
+  spec.add_development_dependency 'listen', '~> 3.0', '< 3.1' # Dependency of guard, 3.1 requires Ruby 2.2+
   spec.add_development_dependency 'guard', '~> 2.12'
   spec.add_development_dependency 'guard-rspec', '~> 4.5'
   spec.add_development_dependency 'guard-rubocop', '~> 1.2'

data/lib/contact-data/fetcher.rb

@@ -62,8 +62,9 @@ module ContactData
       return @json if @json
       logger.info { "Using #{display_method} for #{url}" }
       @json = RestClient::Request.new(args).execute
-    rescue RestClient::Exception, SocketError => e
-      raise ContactData::FetchError, "#{e.message} when trying to #{display_method} url: #{url}", e.backtrace
+    rescue RestClient::Exception, SocketError, Net::HTTPBadGateway => e
+      message = "#{e.message} when trying to #{display_method} url: #{url} with options #{options}"
+      raise ContactData::FetchError, message, e.backtrace
     end
 
     def args
@@ -76,7 +77,7 @@ module ContactData
         :method, :url, :headers, :cookies, :payload, :user, :password, :timeout, :max_redirects, :open_timeout,
         :raw_response, :processed_headers, :ssl_opts, :verify_ssl, :ssl_client_cert, :ssl_client_key, :ssl_ca_file,
         :ssl_ca_path, :ssl_cert_store, :ssl_verify_callback, :ssl_verify_callback_warnings, :ssl_version, :ssl_ciphers
-      ].each { |key| @args[key] = options[key] if options.key? key }
+      ].each { |key| @args[key] = options[key] if options.key? key } # TODO: surely this is just a merge?
 
       @args
     end

data/lib/contact-data/version.rb

@@ -1,4 +1,4 @@
 # Gem version
 module ContactData
-  VERSION = '0.4.8'.freeze
+  VERSION = '0.4.9'.freeze
 end

data/spec/fetcher_spec.rb

@@ -12,7 +12,8 @@ describe ContactData::Fetcher do
 
     expect { ContactData::Fetcher.get(method) }.to raise_error { |e|
       expect(e).to be_an(ContactData::FetchError)
-      message = "500 Internal Server Error when trying to GET url: #{ContactData::Fetcher::URL}/#{method}.json"
+      message = '500 Internal Server Error when trying to GET ' \
+                "url: #{ContactData::Fetcher::URL}/#{method}.json with options {}"
       expect(e.message).to eq(message)
     }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contact-data
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Xenapto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -164,6 +164,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.31'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: 'Example: ContactData.search(''John Smith III'')'