From ad82caffdac3cc4e5480656a641eaccda3aeab92 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 10 Aug 2015 01:38:15 +0200
Subject: [PATCH] refactoring: fix some rubocop issues

---
 lib/diaspora_federation/discovery/discovery.rb | 12 ++++++++----
 spec/lib/diaspora_federation_spec.rb           |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/diaspora_federation/discovery/discovery.rb b/lib/diaspora_federation/discovery/discovery.rb
index a1a1279..5693adc 100644
--- a/lib/diaspora_federation/discovery/discovery.rb
+++ b/lib/diaspora_federation/discovery/discovery.rb
@@ -18,10 +18,7 @@ module DiasporaFederation
       def fetch_and_save
         logger.info "Fetch data for #{diaspora_id}"
 
-        unless diaspora_id == clean_diaspora_id(webfinger.acct_uri)
-          raise DiscoveryError, "Diaspora ID does not match: Wanted #{diaspora_id} but got" \
-                                " #{clean_diaspora_id(webfinger.acct_uri)}"
-        end
+        validate_diaspora_id
 
         DiasporaFederation.callbacks.trigger(:save_person_after_webfinger, person)
         logger.info "successfully webfingered #{diaspora_id}"
@@ -30,6 +27,13 @@ module DiasporaFederation
 
       private
 
+      def validate_diaspora_id
+        # validates if the diaspora ID matches the diaspora ID in the webfinger response
+        return if diaspora_id == clean_diaspora_id(webfinger.acct_uri)
+        raise DiscoveryError, "Diaspora ID does not match: Wanted #{diaspora_id} but got" \
+                              " #{clean_diaspora_id(webfinger.acct_uri)}"
+      end
+
       def clean_diaspora_id(diaspora_id)
         diaspora_id.strip.sub("acct:", "").to_s.downcase
       end
diff --git a/spec/lib/diaspora_federation_spec.rb b/spec/lib/diaspora_federation_spec.rb
index 7d6c59f..9e48636 100644
--- a/spec/lib/diaspora_federation_spec.rb
+++ b/spec/lib/diaspora_federation_spec.rb
@@ -35,8 +35,8 @@ module DiasporaFederation
         it "should fail in production if the certificate_authorities file is missing" do
           ::Rails.env = "production"
           DiasporaFederation.certificate_authorities = "/unknown"
-          expect { DiasporaFederation.validate_config }.to raise_error ConfigurationError,
-                                                                       "certificate_authorities: File not found: /unknown"
+          expect { DiasporaFederation.validate_config }
+            .to raise_error ConfigurationError, "certificate_authorities: File not found: /unknown"
         end
 
         after do