From db749039ac8a314831b01fa237bcd9eb1f2fb2ec Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Fri, 26 Jun 2015 02:53:36 +0200
Subject: [PATCH] log configuration error

---
 lib/diaspora_federation.rb           | 15 ++++++++++-----
 spec/lib/diaspora_federation_spec.rb | 24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 spec/lib/diaspora_federation_spec.rb

diff --git a/lib/diaspora_federation.rb b/lib/diaspora_federation.rb
index 45f5214..70191bb 100644
--- a/lib/diaspora_federation.rb
+++ b/lib/diaspora_federation.rb
@@ -63,7 +63,7 @@ module DiasporaFederation
     # called from after_initialize
     # @raise [ConfigurationError] if the configuration is incomplete or invalid
     def validate_config
-      raise ConfigurationError, "missing server_uri" unless @server_uri.respond_to? :host
+      configuration_error "missing server_uri" unless @server_uri.respond_to? :host
       validate_class(@person_class, "person_class", %i(
         find_local_by_diaspora_handle
         webfinger_hash
@@ -74,17 +74,22 @@ module DiasporaFederation
     private
 
     def validate_class(klass, name, methods)
-      raise ConfigurationError, "missing #{name}" unless klass
+      configuration_error "missing #{name}" unless klass
       entity = const_get(klass)
 
       return logger.warn "table for #{entity} doesn't exist, skip validation" unless entity.table_exists?
 
-      methods.each {|method| entity_respond_to?(entity, method) }
+      methods.each {|method| entity_respond_to?(entity, name, method) }
     end
 
-    def entity_respond_to?(entity, method)
+    def entity_respond_to?(entity, name, method)
       valid = entity.respond_to?(method) || entity.column_names.include?(method.to_s) || entity.method_defined?(method)
-      raise ConfigurationError, "the configured class #{entity} for #{name} doesn't respond to #{method}" unless valid
+      configuration_error "the configured class #{entity} for #{name} doesn't respond to #{method}" unless valid
+    end
+
+    def configuration_error(message)
+      logger.fatal("diaspora federation configuration error: #{message}")
+      raise ConfigurationError, message
     end
   end
 
diff --git a/spec/lib/diaspora_federation_spec.rb b/spec/lib/diaspora_federation_spec.rb
new file mode 100644
index 0000000..1bb17aa
--- /dev/null
+++ b/spec/lib/diaspora_federation_spec.rb
@@ -0,0 +1,24 @@
+module DiasporaFederation
+  describe DiasporaFederation do
+    context "validate_config" do
+      it "should validate the config" do
+        expect(DiasporaFederation).to receive(:validate_class)
+        DiasporaFederation.validate_config
+      end
+
+      it "should fails if the server_uri is missing" do
+        temp = DiasporaFederation.server_uri
+        DiasporaFederation.server_uri = nil
+        expect { DiasporaFederation.validate_config }.to raise_error ConfigurationError
+        DiasporaFederation.server_uri = temp
+      end
+
+      it "should fails if the person_class is missing" do
+        temp = DiasporaFederation.person_class
+        DiasporaFederation.person_class = nil
+        expect { DiasporaFederation.validate_config }.to raise_error ConfigurationError
+        DiasporaFederation.person_class = temp.to_s
+      end
+    end
+  end
+end