postageapp 1.0.9 → 1.0.10

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.0.10

data/lib/postageapp.rb

@@ -4,6 +4,7 @@ require 'digest'
 require 'logger'
 
 require 'json'
+require 'base64'
 
 require 'postageapp/utils'
 require 'postageapp/version'

data/lib/postageapp/failed_request.rb

@@ -24,7 +24,9 @@ module PostageApp::FailedRequest
       request = initialize_request(filename)
       
       receipt_response = PostageApp::Request.new(:get_message_receipt, :uid => filename).send(true)
-      if receipt_response.ok?
+      if receipt_response.fail?
+        return
+      elsif receipt_response.ok?
         PostageApp.logger.info "NOT RESENDING FAILED REQUEST [#{filename}]"
         File.delete(file_path(filename)) rescue nil
         
@@ -35,9 +37,11 @@ module PostageApp::FailedRequest
         # Not a fail, so we can remove this file, if it was then
         # there will be another attempt to resend
         File.delete(file_path(filename)) rescue nil if !response.fail?
+      else
+        PostageApp.logger.info "NOT RESENDING FAILED REQUEST [#{filename}], RECEIPT CANNOT BE PROCESSED"
+        File.delete(file_path(filename)) rescue nil
       end
     end
-    
     return
   end
   

data/lib/postageapp/request.rb

@@ -54,7 +54,11 @@ class PostageApp::Request
     PostageApp.logger.info(response)
     
     unless skip_failed_requests_processing
-      response.fail?? PostageApp::FailedRequest.store(self) : PostageApp::FailedRequest.resend_all
+      if response.fail?
+        PostageApp::FailedRequest.store(self)
+      elsif response.ok?
+        PostageApp::FailedRequest.resend_all
+      end
     end
     
     response

data/postageapp.gemspec

@@ -1,95 +1,93 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{postageapp}
-  s.version = "1.0.9"
+  s.version = "1.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov, The Working Group Inc"]
-  s.date = %q{2010-11-26}
+  s.date = %q{2011-01-06}
   s.description = %q{Gem that interfaces with PostageApp.com service to send emails from web apps}
   s.email = %q{oleg@twg.ca}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "generators/postageapp/postageapp_generator.rb",
-     "generators/postageapp/templates/initializer.rb",
-     "generators/postageapp/templates/postageapp_tasks.rake",
-     "lib/generators/postageapp/postageapp_generator.rb",
-     "lib/postageapp.rb",
-     "lib/postageapp/configuration.rb",
-     "lib/postageapp/failed_request.rb",
-     "lib/postageapp/logger.rb",
-     "lib/postageapp/mailer.rb",
-     "lib/postageapp/mailer/mailer_2.rb",
-     "lib/postageapp/mailer/mailer_3.rb",
-     "lib/postageapp/rails/rails.rb",
-     "lib/postageapp/rails/railtie.rb",
-     "lib/postageapp/request.rb",
-     "lib/postageapp/response.rb",
-     "lib/postageapp/utils.rb",
-     "lib/postageapp/version.rb",
-     "postageapp.gemspec",
-     "rails/init.rb",
-     "test/configuration_test.rb",
-     "test/failed_request_test.rb",
-     "test/helper.rb",
-     "test/live_test.rb",
-     "test/mailer/action_mailer_2/notifier.rb",
-     "test/mailer/action_mailer_2/notifier/with_body_and_attachment.erb",
-     "test/mailer/action_mailer_2/notifier/with_custom_postage_variables.text.html.erb",
-     "test/mailer/action_mailer_2/notifier/with_custom_postage_variables.text.plain.erb",
-     "test/mailer/action_mailer_2/notifier/with_html_and_text_views.text.html.erb",
-     "test/mailer/action_mailer_2/notifier/with_html_and_text_views.text.plain.erb",
-     "test/mailer/action_mailer_2/notifier/with_simple_view.erb",
-     "test/mailer/action_mailer_2/notifier/with_text_only_view.text.plain.erb",
-     "test/mailer/action_mailer_3/notifier.rb",
-     "test/mailer/action_mailer_3/notifier/with_custom_postage_variables.html.erb",
-     "test/mailer/action_mailer_3/notifier/with_custom_postage_variables.text.erb",
-     "test/mailer/action_mailer_3/notifier/with_html_and_text_views.html.erb",
-     "test/mailer/action_mailer_3/notifier/with_html_and_text_views.text.erb",
-     "test/mailer/action_mailer_3/notifier/with_old_api.html.erb",
-     "test/mailer/action_mailer_3/notifier/with_old_api.text.erb",
-     "test/mailer/action_mailer_3/notifier/with_simple_view.erb",
-     "test/mailer/action_mailer_3/notifier/with_text_only_view.text.erb",
-     "test/mailer_2_test.rb",
-     "test/mailer_3_test.rb",
-     "test/mailer_helper_methods_test.rb",
-     "test/postageapp_test.rb",
-     "test/rails_initialization_test.rb",
-     "test/request_test.rb",
-     "test/response_test.rb"
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "generators/postageapp/postageapp_generator.rb",
+    "generators/postageapp/templates/initializer.rb",
+    "generators/postageapp/templates/postageapp_tasks.rake",
+    "lib/generators/postageapp/postageapp_generator.rb",
+    "lib/postageapp.rb",
+    "lib/postageapp/configuration.rb",
+    "lib/postageapp/failed_request.rb",
+    "lib/postageapp/logger.rb",
+    "lib/postageapp/mailer.rb",
+    "lib/postageapp/mailer/mailer_2.rb",
+    "lib/postageapp/mailer/mailer_3.rb",
+    "lib/postageapp/rails/rails.rb",
+    "lib/postageapp/rails/railtie.rb",
+    "lib/postageapp/request.rb",
+    "lib/postageapp/response.rb",
+    "lib/postageapp/utils.rb",
+    "lib/postageapp/version.rb",
+    "postageapp.gemspec",
+    "rails/init.rb",
+    "test/configuration_test.rb",
+    "test/failed_request_test.rb",
+    "test/helper.rb",
+    "test/live_test.rb",
+    "test/mailer/action_mailer_2/notifier.rb",
+    "test/mailer/action_mailer_2/notifier/with_body_and_attachment.erb",
+    "test/mailer/action_mailer_2/notifier/with_custom_postage_variables.text.html.erb",
+    "test/mailer/action_mailer_2/notifier/with_custom_postage_variables.text.plain.erb",
+    "test/mailer/action_mailer_2/notifier/with_html_and_text_views.text.html.erb",
+    "test/mailer/action_mailer_2/notifier/with_html_and_text_views.text.plain.erb",
+    "test/mailer/action_mailer_2/notifier/with_simple_view.erb",
+    "test/mailer/action_mailer_2/notifier/with_text_only_view.text.plain.erb",
+    "test/mailer/action_mailer_3/notifier.rb",
+    "test/mailer/action_mailer_3/notifier/with_custom_postage_variables.html.erb",
+    "test/mailer/action_mailer_3/notifier/with_custom_postage_variables.text.erb",
+    "test/mailer/action_mailer_3/notifier/with_html_and_text_views.html.erb",
+    "test/mailer/action_mailer_3/notifier/with_html_and_text_views.text.erb",
+    "test/mailer/action_mailer_3/notifier/with_old_api.html.erb",
+    "test/mailer/action_mailer_3/notifier/with_old_api.text.erb",
+    "test/mailer/action_mailer_3/notifier/with_simple_view.erb",
+    "test/mailer/action_mailer_3/notifier/with_text_only_view.text.erb",
+    "test/mailer_2_test.rb",
+    "test/mailer_3_test.rb",
+    "test/mailer_helper_methods_test.rb",
+    "test/postageapp_test.rb",
+    "test/rails_initialization_test.rb",
+    "test/request_test.rb",
+    "test/response_test.rb"
   ]
   s.homepage = %q{http://github.com/postageapp/postageapp-ruby}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Easier way to send email from web apps}
   s.test_files = [
     "test/configuration_test.rb",
-     "test/failed_request_test.rb",
-     "test/helper.rb",
-     "test/live_test.rb",
-     "test/mailer/action_mailer_2/notifier.rb",
-     "test/mailer/action_mailer_3/notifier.rb",
-     "test/mailer_2_test.rb",
-     "test/mailer_3_test.rb",
-     "test/mailer_helper_methods_test.rb",
-     "test/postageapp_test.rb",
-     "test/rails_initialization_test.rb",
-     "test/request_test.rb",
-     "test/response_test.rb"
+    "test/failed_request_test.rb",
+    "test/helper.rb",
+    "test/live_test.rb",
+    "test/mailer/action_mailer_2/notifier.rb",
+    "test/mailer/action_mailer_3/notifier.rb",
+    "test/mailer_2_test.rb",
+    "test/mailer_3_test.rb",
+    "test/mailer_helper_methods_test.rb",
+    "test/postageapp_test.rb",
+    "test/rails_initialization_test.rb",
+    "test/request_test.rb",
+    "test/response_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/failed_request_test.rb

@@ -66,7 +66,7 @@ class FailedRequestTest < Test::Unit::TestCase
     
     request = PostageApp::Request.new(:get_project_info)
     
-    message_receipt_response = stub(:ok? => false, :not_found? => true)
+    message_receipt_response = stub(:fail? => false, :ok? => false, :not_found? => true)
     message_receipt_request = stub(:send => message_receipt_response)
     PostageApp::Request.stubs(:new).with{|a,b| a == :get_message_receipt}.returns(message_receipt_request)
     
@@ -76,4 +76,25 @@ class FailedRequestTest < Test::Unit::TestCase
     assert !File.exists?(file_path)
   end
   
+  def test_resend_all_failure
+    mock_failed_send
+    request = PostageApp::Request.new(:send_message, {
+      :headers    => { 'from'     => 'sender@test.test',
+                       'subject'  => 'Test Message'},
+      :recipients => 'test@test.test',
+      :content    => {
+        'text/plain'  => 'text content',
+        'text/html'   => 'html content'
+      }
+    })
+    response = request.send
+    assert response.fail?
+    file_path = File.join(PostageApp::FailedRequest.store_path, request.uid)
+    assert File.exists?(file_path)
+    
+    # Forcing to resend. Should quit right away as we can't connect
+    PostageApp::FailedRequest.resend_all
+    
+    assert File.exists?(file_path)
+  end
 end

data/test/helper.rb

@@ -35,12 +35,12 @@ class Test::Unit::TestCase
     end
   end
   
-  def mock_successful_send
+  def mock_successful_send(status = 'ok')
     Net::HTTP.any_instance.stubs(:post).returns(Net::HTTPResponse.new(nil, nil, nil))
     Net::HTTPResponse.any_instance.stubs(:body).returns({
       :response => { 
         :uid    => 'sha1hashuid23456789012345678901234567890',
-        :status => 'ok'
+        :status => status
       },
       :data => {
         :message => { :id => 999 }

data/test/mailer_helper_methods_test.rb

@@ -15,7 +15,8 @@ class MailerHelperMethodsTest < Test::Unit::TestCase
     assert_equal ['test@test.test'], request.to
     assert_equal ['sender@test.test'], request.from
     assert_equal 'Test Message', request.subject
-    assert_equal "html content\n\ntext content", request.body
+    assert_match 'html content', request.body
+    assert_match 'text content', request.body
   end
   
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: postageapp
 version: !ruby/object:Gem::Version 
-  hash: 5
   prerelease: false
   segments: 
   - 1
   - 0
-  - 9
-  version: 1.0.9
+  - 10
+  version: 1.0.10
 platform: ruby
 authors: 
 - Oleg Khabarov, The Working Group Inc
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 -05:00
+date: 2011-01-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 4
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 9
@@ -61,7 +58,6 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.md
 - Rakefile
@@ -118,8 +114,8 @@ homepage: http://github.com/postageapp/postageapp-ruby
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -127,7 +123,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -136,7 +131,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/.gitignore

@@ -1,24 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-
-test/tmp
-test/log