sendgrid 1.0.0 → 1.0.1

data/README.md

@@ -56,14 +56,14 @@ Here is an example of what typical usage may look like:
     class MyMailer < ActionMailer::Base
       include SendGrid
       sendgrid_category :use_subject_lines
-      sendgrid_enable   :ganalytics, :opentracking
+      sendgrid_enable   :ganalytics, :opentrack
   
       def welcome_message(user)
         sendgrid_category "Welcome"
         mail :to => user.email, :subject => "Welcome #{user.name} :-)"
       end
   
-      def goodbye_message(to_user)
+      def goodbye_message(user)
         sendgrid_disable :ganalytics
         mail :to => user.email, :subject => "Fare thee well :-("
       end

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/sendgrid.rb

@@ -133,38 +133,39 @@ module SendGrid
     @sg_unique_args = args
   end
 
-  # only override the appropriet methods for the current rails version
-  if Rails.version < '3.0.0'
+  # only override the appropriate methods for the current ActionMailer version
+  if ActionMailer::Base.respond_to?(:mail)
+
+    protected
 
     # Sets the custom X-SMTPAPI header after creating the email but before delivery
-    # NOTE: This override is used for Rails 2 ActionMailer classes. 
-    def create!(method_name, *parameters)
+    # NOTE: This override is used for Rails 3 ActionMailer classes.
+    def mail(headers={}, &block)
       super
       if @sg_substitutions && !@sg_substitutions.empty?
         @sg_substitutions.each do |find, replace|
           raise ArgumentError.new("Array for #{find} is not the same size as the recipient array") if replace.size != @sg_recipients.size
         end
       end
-      puts "SendGrid X-SMTPAPI: #{sendgrid_json_headers(mail)}" if Object.const_defined?("SENDGRID_DEBUG_OUTPUT") && SENDGRID_DEBUG_OUTPUT
-      @mail['X-SMTPAPI'] = sendgrid_json_headers(mail)
+      puts "SendGrid X-SMTPAPI: #{sendgrid_json_headers(message)}" if Object.const_defined?("SENDGRID_DEBUG_OUTPUT") && SENDGRID_DEBUG_OUTPUT
+      self.headers['X-SMTPAPI'] = sendgrid_json_headers(message)
     end
 
   else
 
-    protected
-
     # Sets the custom X-SMTPAPI header after creating the email but before delivery
-    # NOTE: This override is used for Rails 3 ActionMailer classes.
-    def mail(headers={}, &block)
+    # NOTE: This override is used for Rails 2 ActionMailer classes. 
+    def create!(method_name, *parameters)
       super
       if @sg_substitutions && !@sg_substitutions.empty?
         @sg_substitutions.each do |find, replace|
           raise ArgumentError.new("Array for #{find} is not the same size as the recipient array") if replace.size != @sg_recipients.size
         end
       end
-      puts "SendGrid X-SMTPAPI: #{sendgrid_json_headers(message)}" if Object.const_defined?("SENDGRID_DEBUG_OUTPUT") && SENDGRID_DEBUG_OUTPUT
-      self.headers['X-SMTPAPI'] = sendgrid_json_headers(message)
+      puts "SendGrid X-SMTPAPI: #{sendgrid_json_headers(mail)}" if Object.const_defined?("SENDGRID_DEBUG_OUTPUT") && SENDGRID_DEBUG_OUTPUT
+      @mail['X-SMTPAPI'] = sendgrid_json_headers(mail)
     end
+
   end
 
   private

data/sendgrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sendgrid}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stephen Blankenship"]
-  s.date = %q{2011-06-09}
+  s.date = %q{2011-09-08}
   s.description = %q{This gem allows simple integration between ActionMailer and SendGrid. 
                          SendGrid is an email deliverability API that is affordable and has lots of bells and whistles.}
   s.email = %q{stephenrb@gmail.com}
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/stephenb/sendgrid}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A gem that allows simple integration of ActionMailer with SendGrid (http://sendgrid.com)}
   s.test_files = [
     "test/sendgrid_test.rb",
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sendgrid
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Stephen Blankenship
@@ -15,69 +14,61 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 -05:00
+date: 2011-09-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
   name: json
   version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
   name: bundler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
   requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
   name: jeweler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 5
         - 1
         version: 1.5.1
   requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :runtime
   name: json
   version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   requirement: *id004
+  prerelease: false
 description: |-
   This gem allows simple integration between ActionMailer and SendGrid. 
                            SendGrid is an email deliverability API that is affordable and has lots of bells and whistles.
@@ -111,27 +102,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A gem that allows simple integration of ActionMailer with SendGrid (http://sendgrid.com)