Merge pull request #228 from joeadcock/master

wingrunr21 · wingrunr21 · commit 57bc70e8d510 · 2016-02-25T07:36:24.000-07:00
Sets default configuration without a config file
diff --git a/lib/griddler/configuration.rb b/lib/griddler/configuration.rb
@@ -16,25 +16,22 @@ def self.configuration
   end
 
   class Configuration
-    attr_accessor :processor_class, :processor_method, :reply_delimiter
+    attr_accessor :processor_method
 
     def processor_class
       @processor_class ||=
         begin
-          if Kernel.const_defined?(:EmailProcessor)
-            "EmailProcessor"
-          else
-            raise NameError.new(<<-ERROR.strip_heredoc, 'EmailProcessor')
-              To use Griddler, you must either define `EmailProcessor` or configure a
-              different processor. See https://github.com/thoughtbot/griddler#defaults for
-              more information.
-            ERROR
-          end
+          EmailProcessor.to_s
+        rescue NameError
+          raise NameError.new(<<-ERROR.strip_heredoc, 'EmailProcessor')
+            To use Griddler, you must either define `EmailProcessor` or configure a
+            different processor. See https://github.com/thoughtbot/griddler#defaults for
+            more information.
+          ERROR
         end
-        
       @processor_class.constantize
     end
-    
+
     def processor_class=(klass)
       @processor_class = klass.to_s
     end
@@ -48,7 +45,9 @@ def reply_delimiter
     end
 
     def email_service
-      @email_service_adapter ||= Griddler.adapter_registry[:default]
+      @email_service_adapter ||=
+        Griddler.adapter_registry[:default] ||
+          raise(Griddler::Errors::EmailServiceAdapterNotFound)
     end
 
     def email_service=(new_email_service)
diff --git a/spec/griddler/configuration_spec.rb b/spec/griddler/configuration_spec.rb
@@ -14,9 +14,17 @@
     end
 
     it 'raises a helpful error if EmailProcessor is undefined' do
-      allow(Kernel).to receive_messages(const_defined?: false)
+      # temporarily undefine EmailProcessor
+      ep = EmailProcessor
+      Object.send(:remove_const, :EmailProcessor)
+      allow(ActiveSupport::Dependencies).to(
+        receive_messages(search_for_file: nil))
 
-      expect { Griddler.configuration.processor_class }.to raise_error(NameError, %r{https://github\.com/thoughtbot/griddler#defaults})
+      expect { Griddler.configuration.processor_class }.to raise_error(
+        NameError, %r{https://github\.com/thoughtbot/griddler#defaults})
+
+      # restore EmailProcessor
+      EmailProcessor = ep
     end
   end
 
