mastodon_healthchecker 0.1.0.pre.3 → 0.1.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9ba422e815e443deba7d33088b36d196af1978e
-  data.tar.gz: 509627480ba8bcb08ed0c94922d27028445e698d
+  metadata.gz: 7139b9fca5a687201d3ad6556054be99e497d94d
+  data.tar.gz: c9079aa9a4bf572b1f6d6e5e7d092119684a3b15
 SHA512:
-  metadata.gz: d351a0b5a52bcd034224309f297ad1f2f55836d907c5e4b408a3334bb03067ebbb0445cb696330c21c51b7ccadacc4e68e35d37dad114c229109f03c752b5513
-  data.tar.gz: 43998d6a3b27d4638a86983d0e37c7e994d80b55f5bdb37e2a2c824f5b47f8a31a52f13dbdef98f4273d533c42a77f86867289cc5bad224d6cc4763783d2f6ac
+  metadata.gz: 2dbfcbfcd65f852ac6cac0bfeaf73d1195a251be706eb9ad846b49e385121344a7c398ffb9921201c887fa264609d7edc6f1c908b50144755712407d9f6f05c4
+  data.tar.gz: 55d71dc9cee68aae242ef3d6eb6927a325ed0e4b2a2a1d008e7659c861663b42d2fecb7a49dfd0f71f007e1643268e12c5c134d53fc6d319dddcb27d8de61b92

data/lib/mastodon_healthchecker/instance_info.rb

@@ -1,9 +1,9 @@
-require 'json'
-require 'mastodon_healthchecker/hash_hosts'
-require 'nokogiri'
 require 'faraday'
 require 'faraday_middleware'
 require 'faraday/encoding'
+require 'json'
+require 'mastodon_healthchecker/hash_hosts'
+require 'nokogiri'
 require 'resolv'
 require 'resolv-replace'
 
@@ -17,20 +17,17 @@ module MastodonHealthchecker
         hash_hosts = HashHosts.new({ "#{host}" => addresses })
         Resolv::DefaultResolver.replace_resolvers([hash_hosts])
 
-        result = nil
         begin
           info = InstanceInfo.new
           info.parse_about(get(host, '/about'))
           info.parse_about_more(get(host, '/about/more'))
           info.parse_instance(get(host, '/api/v1/instance'))
-          result = info
-        rescue Faraday::ClientError
-        rescue Nokogiri::SyntaxError
-        rescue JSON::ParseError
+          info
+        rescue Faraday::ClientError, Nokogiri::SyntaxError, JSON::ParseError
+          nil
+        ensure
+          Resolv::DefaultResolver.replace_resolvers(default_resolver)
         end
-
-        Resolv::DefaultResolver.replace_resolvers(default_resolver)
-        result
       end
 
       private
@@ -56,12 +53,15 @@ module MastodonHealthchecker
       @description = nil
       @extended_description = nil
       @email = nil
+
       @opened = nil
+      @https_configured = nil
     end
 
     def parse_about(response)
       doc = Nokogiri::HTML.parse(response.body)
       @opened = doc.xpath("//*[@class='closed-registrations-message']").empty?
+      @https_configured = response.to_hash[:url].to_s.start_with?('https://')
     end
 
     def parse_about_more(response)
@@ -81,7 +81,7 @@ module MastodonHealthchecker
       instance = JSON.parse(response.body)
       @version = instance['version']
       @description = instance['description']
-      @email = instance['email']
+      @email = instance['email'] unless instance['email'].empty?
     end
 
     attr_reader :version, :users, :statuses, :connections,

data/lib/mastodon_healthchecker/version.rb

@@ -1,3 +1,3 @@
 module MastodonHealthchecker
-  VERSION = '0.1.0.pre.3'.freeze
+  VERSION = '0.1.0.pre.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mastodon_healthchecker
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.3
+  version: 0.1.0.pre.4
 platform: ruby
 authors:
 - nullkal
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler