mack-notifier 0.7.1.1 → 0.8.0

data/README

@@ -25,7 +25,7 @@ Currently implemented delivery handlers are: SMTP (default), sendmail, and test.
 
 == Testing
 
-When testing you can get access to delivered emails with the delivered_emails
+When testing you can get access to delivered emails with the delivered_notifiers
 method. After each tests these emails will be flushed our of the test handler.
 
 == Rake tasks

data/lib/mack-notifier/delivery_handlers/sendmail.rb

@@ -5,11 +5,10 @@ module Mack
       module Sendmail
         
         def self.deliver(mail)
-          sendmail_settings = app_config.notifier.sendmail_settings
-          sendmail_settings.symbolize_keys!
-          sendmail_args = sendmail_settings[:arguments]
+          sendmail_settings = configatron.mack.notifier.sendmail_settings
+          sendmail_args = sendmail_settings.arguments
           sendmail_args += " -f \"#{mail.reply_to}\"" if mail.reply_to
-          IO.popen("#{sendmail_settings[:location]} #{sendmail_args}","w+") do |sm|
+          IO.popen("#{sendmail_settings.location} #{sendmail_args}","w+") do |sm|
             sm.print(mail.deliverable.gsub(/\r/, ''))
             sm.flush
           end

data/lib/mack-notifier/delivery_handlers/smtp.rb

@@ -6,11 +6,10 @@ module Mack
       module Smtp
         
         def self.deliver(mail)
-          smtp_settings = app_config.notifier.smtp_settings
-          smtp_settings.symbolize_keys!
-          Net::SMTP.start(smtp_settings[:address], smtp_settings[:port], 
-                          smtp_settings[:domain], smtp_settings[:user_name], 
-                          smtp_settings[:password], smtp_settings[:authentication]) do |smtp|
+          smtp_settings = configatron.mack.notifier.smtp_settings
+          Net::SMTP.start(smtp_settings.address, smtp_settings.port, 
+                          smtp_settings.domain, smtp_settings.retrieve(:user_name, nil), 
+                          smtp_settings.retrieve(:password, nil), smtp_settings.retrieve(:authentication, nil)) do |smtp|
             smtp.sendmail(mail.deliverable, mail.reply_to, mail.recipients)
           end
         end

data/lib/mack-notifier/notifier.rb

@@ -127,23 +127,23 @@ module Mack # :nodoc:
     end
     
     # This method returns the adapter that will transform the Mack::Notifier object
-    # and prepare it for delivery. This method returns the app_config.notifier.adapter
+    # and prepare it for delivery. This method returns the configatron.notifier.adapter
     # parameter. Override this in your Mack::Notifier class to specify a different adapter
-    # or change the app_config parameter to globally affect all your Notifiers.
+    # or change the configatron parameter to globally affect all your Notifiers.
     # 
     # Default: :tmail
     def adapter
-      app_config.notifier.adapter
+      configatron.mack.notifier.adapter
     end
     
     # This method returns the delivery handler that will delivers the Mack::Notifier object.
-    # This method returns the app_config.notifier.deliver_with parameter. Override this in 
-    # your Mack::Notifier class to specify a different handler or change the app_config 
+    # This method returns the configatron.mack.notifier.deliver_with parameter. Override this in 
+    # your Mack::Notifier class to specify a different handler or change the configatron 
     # parameter to globally affect all your Notifiers.
     # 
     # Default: :sendmail
     def deliver_with
-      app_config.notifier.deliver_with
+      configatron.mack.notifier.deliver_with
     end
     
     private

data/lib/mack-notifier/notifier_generator/manifest.yml

@@ -10,12 +10,12 @@ html_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "app", "notifiers", "html.erb.template") %>
   output_path: <%= File.join("app", "notifiers", "templates", file_name, "html.erb") %>
-<% if app_config.mack.testing_framework == "test_case" -%>
+<% if configatron.mack.testing_framework.to_s == "test_case" -%>
 test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test", "notifiers", "test_case.rb.template") %>
   output_path: <%= File.join("test", "notifiers", "#{file_name}_test.rb") %>
-<% elsif app_config.mack.testing_framework == "rspec" -%>
+<% elsif configatron.mack.testing_framework.to_s == "rspec" -%>
 test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test", "notifiers", "rspec.rb.template") %>

data/lib/mack-notifier/settings.rb

@@ -1,15 +1,7 @@
-if app_config.notifier.nil? || app_config.notifier.smtp_settings.nil?
-  app_config.load_file(File.join(File.dirname(__FILE__), "configs", "smtp_settings.yml"))
-end
-
-if app_config.notifier.nil? || app_config.notifier.sendmail_settings.nil?
-  app_config.load_file(File.join(File.dirname(__FILE__), "configs", "sendmail_settings.yml"))
-end
-
-if app_config.notifier.nil? || app_config.notifier.deliver_with.nil?
-  app_config.load_hash({"notifier::deliver_with" => (Mack.env == "test" ? "test" : "smtp")}, String.randomize)
-end
-
-if app_config.notifier.nil? || app_config.notifier.adapter.nil?
-  app_config.load_hash({"notifier::adapter" => "tmail"}, String.randomize)
-end
+configatron.mack.notifier.sendmail_settings.set_default(:location, '/usr/sbin/sendmail')
+configatron.mack.notifier.sendmail_settings.set_default(:arguments, '-i -t')
+configatron.mack.notifier.smtp_settings.set_default(:address, 'localhost')
+configatron.mack.notifier.smtp_settings.set_default(:port, 25)
+configatron.mack.notifier.smtp_settings.set_default(:domain, 'localhost.localdomain')
+configatron.mack.notifier.set_default(:deliver_with, (Mack.env == "test" ? "test" : "smtp"))
+configatron.mack.notifier.set_default(:adapter, 'tmail')

data/lib/mack-notifier/testing.rb

@@ -1,7 +1,5 @@
 if Mack.env == "test"
   
-  alias_deprecated_method :delivered_emails, :delivered_notifiers, '0.7.1', '0.8.0'
-  
   # Used for testing this method will return any emails that have been 'sent' using Mack::Notifier::DeliveryHandlers::Test.
   # These emails will get 'flushed' after each test.
   def delivered_notifiers
@@ -13,8 +11,8 @@ if Mack.env == "test"
       module ExampleMethods # :nodoc:
         include Mack::Routes::Urls
         include Mack::Testing::Helpers
-
-        alias_method :email_spec_execute, :execute
+        
+        alias_instance_method :execute, :email_spec_execute
 
         def execute(options, instance_variables)
           @__res = email_spec_execute(options, instance_variables)
@@ -32,7 +30,7 @@ if Mack.env == "test"
 
         # Let's alias the run method in the class above us so we can create a new one here
         # but still reference it.
-        alias_method :super_run, :run # :nodoc:
+        alias_instance_method :run, :super_run
 
         # We need to wrap the run method so we can do things like
         # run a cleanup method if it exists

data/lib/mack-notifier/validations.rb

@@ -11,18 +11,18 @@ module Mack
         end
         
         base.class_eval do
+
+          # Alias the Validatable methods to look like DataMapper methods,
+          # if that's the kind of thing you're used to. :)          
+          alias_class_method :validates_acceptance_of, :validates_is_accepted
+          alias_class_method :validates_confirmation_of, :validates_is_confirmed
+          alias_class_method :validates_format_of, :validates_format
+          alias_class_method :validates_length_of, :validates_length
+          alias_class_method :validates_numericality_of, :validates_is_number
+          alias_class_method :validates_presence_of, :validates_present
           
           class << self
             
-            # Alias the Validatable methods to look like DataMapper methods,
-            # if that's the kind of thing you're used to. :)
-            alias_method :validates_is_accepted, :validates_acceptance_of
-            alias_method :validates_is_confirmed, :validates_confirmation_of
-            alias_method :validates_format, :validates_format_of
-            alias_method :validates_length, :validates_length_of
-            alias_method :validates_is_number, :validates_numericality_of
-            alias_method :validates_present, :validates_presence_of
-            
             # Adds common validations to your Mack::Notifier class.
             # These include:
             #   validates_presence_of :to

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-notifier
 version: !ruby/object:Gem::Version 
-  version: 0.7.1.1
+  version: 0.8.0
 platform: ruby
 authors: 
 - Mark Bates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-14 00:00:00 -04:00
+date: 2008-10-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,8 +44,6 @@ files:
 - lib/mack-notifier/adapters/base.rb
 - lib/mack-notifier/adapters/tmail.rb
 - lib/mack-notifier/attachment.rb
-- lib/mack-notifier/configs/sendmail_settings.yml
-- lib/mack-notifier/configs/smtp_settings.yml
 - lib/mack-notifier/delivery_handlers/sendmail.rb
 - lib/mack-notifier/delivery_handlers/smtp.rb
 - lib/mack-notifier/delivery_handlers/test.rb
@@ -89,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: magrathea
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Notifier functionality for Mack applications.

data/lib/mack-notifier/configs/sendmail_settings.yml

@@ -1,3 +0,0 @@
-notifier::sendmail_settings:
-  location: "/usr/sbin/sendmail"
-  arguments: "-i -t"

data/lib/mack-notifier/configs/smtp_settings.yml

@@ -1,7 +0,0 @@
-notifier::smtp_settings:
-  address: localhost
-  port: 25
-  domain: "localhost.localdomain"
-  # user_name:
-  # password:
-  # authentication: