Fix various warnings

pixeltrix · Feb 23, 2013 · 29931ce · 29931ce
1 parent 5ba0cfa
commit 29931ce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/lib/prowler/application.rb b/lib/prowler/application.rb
@@ -15,7 +15,8 @@ class ConfigurationError < StandardError; end
 
   class Application
     attr_accessor :service_url, :api_key, :provider_key #:nodoc:
-    attr_accessor :application, :send_notifications #:nodoc:
+    attr_accessor :application #:nodoc:
+    attr_writer :send_notifications #:nodoc:
 
     # Create an instance for sending to different accounts within a single Rails application
     # Pass any of the following options to override the global configuration:
@@ -24,6 +25,8 @@ class Application
     # * :api_key:      Your API key.
     # * :service_url:  Override the configured service url
     def initialize(*args)
+      @send_notifications = true
+
       if args.empty?
         CONFIG_ATTRS.each{ |attr| send("#{attr}=".to_sym, Prowler.send(attr)) }
       elsif args.first.is_a?(Hash)
@@ -139,7 +142,7 @@ def root_certificates #:nodoc:
       end
 
       def send_notifications #:nodoc:
-        @send_notifications.nil? ? true : !!@send_notifications
+        !!@send_notifications
       end
 
       def send_notifications? #:nodoc:
@@ -192,7 +195,7 @@ def perform_request(url, request, klass) #:nodoc:
                 end
               end
             end
-          rescue TimeoutError => e
+          rescue TimeoutError
             logger.error "Timeout while contacting the Prowl server."
             false
           end

diff --git a/lib/prowler/configuration.rb b/lib/prowler/configuration.rb
@@ -1,10 +1,10 @@
 module Prowler
   class << self
-    attr_accessor :service_url, :api_key, :provider_key
-    attr_accessor :application, :send_notifications
-    attr_accessor :read_timeout, :open_timeout #:nodoc:
-    attr_accessor :delayed, :verify_certificate, :root_certificates
-    attr_accessor :raise_errors
+    attr_writer :service_url, :send_notifications, :delayed
+    attr_writer :raise_errors, :root_certificates
+    attr_writer :read_timeout, :open_timeout
+
+    attr_accessor :api_key, :provider_key, :application, :verify_certificate
 
     # Call this method to configure your account details in an initializer.
     def configure