pdm-rails 0.0.5 → 0.0.6

data/lib/pdm-rails/delivery.rb

@@ -31,13 +31,14 @@ module Pdm
         
         begin
           if (res = pdm_mail.deliver)
-            case res
-            when Net::HTTPSuccess
+            case res.code
+            when 200
               logger.debug("Delivered #{mail.subject.inspect} to #{mail.to.inspect} " +
                            "via PDM #{pdm_mail.guid}.")
               return mail
             else
-              logger.error("Unable to deliver mail via PDM: Got response #{res.inspect}.")
+              logger.error("Unable to deliver mail via PDM: Got response #{res.code}, " +
+                           res.inspect)
             end
           else
             logger.error("Unable to deliver mail via PDM. No response? :-(")

data/lib/pdm-rails/ext/action_mailer/base.rb

@@ -10,22 +10,20 @@ module ActionMailer
     end
     alias_method_chain :view_assigns, :pdm
     
-    def assign_pdm_template(template)
-      return unless template.formats.include?(:html)
-      message.template_html = template.source
-      message.template_assigns = view_assigns_with_pdm
+    def apply_personalization
+      message.personalization = view_assigns_with_pdm
     end
-    
+
+    # The result of this method is shoved in 'message.body'
     def render_with_pdm(opts)
       if ::Pdm::Rails::Delivery === message.delivery_method &&
           message.delivery_method.personalization?
-        assign_pdm_template(opts[:template])
-        return("") # The result of this method is shoved in 'body'
+        apply_personalization
+        return opts[:template].source
       end
 
       return render_without_pdm(opts)
     end
-    
+    alias_method_chain :render, :pdm    
   end
-  alias_method_chain :render, :pdm
 end

data/lib/pdm-rails/version.rb

@@ -2,7 +2,7 @@ module Pdm
   module Rails
 
     def version
-      "0.0.5"
+      "0.0.6"
     end
     module_function :version
   end

metadata

@@ -1,76 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pdm-rails
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.0.6
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - PipeDevMail
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id001
-  type: :development
+date: 2012-03-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &20829820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: *id002
-  type: :runtime
+  version_requirements: *20829820
+- !ruby/object:Gem::Dependency
   name: rails
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &20827420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
+  prerelease: false
+  version_requirements: *20827420
+- !ruby/object:Gem::Dependency
   name: pdm
+  requirement: &20825940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *20825940
 description: Use the PipeDevMail gem within Rails
-email: 
+email:
 - support@pipedevmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Rakefile
@@ -80,38 +60,34 @@ files:
 - lib/pdm-rails/railtie.rb
 - lib/pdm-rails/version.rb
 - pdm-rails.gemspec
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2900027422427818904
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2900027422427818904
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Interact with the PDM API from Rails
 test_files: []
-