astrotrain 0.5.4 → 0.6.0

data/test/test_helper.rb

@@ -1,51 +1,29 @@
-$testing = true
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
-require "rubygems"
-require "context"
-require 'rr'
+require 'rubygems'
 require 'astrotrain'
-require 'astrotrain/api'
-require 'rack/test'
-
-module Astrotrain
-  load File.dirname(__FILE__) do
-    DataMapper.setup(:default, 'sqlite3::memory:')
+require 'test/unit'
+
+class Test::Unit::TestCase
+  ##
+  # test/spec/mini
+  # http://gist.github.com/307649
+  # chris@ozmm.org
+  #
+  def self.test(name, &block) 
+    define_method("test_#{name.gsub(/\W/,'_')}", &block) 
   end
+  def self.xtest(*args) end
+  def self.setup(&block)    define_method(:setup,    &block) end
+  def self.teardown(&block) define_method(:teardown, &block) end
 
-  LoggedMail.auto_migrate!
-  Mapping.auto_migrate!
-
-  LoggedMail.log_path = Astrotrain.root / 'messages'
-  FileUtils.rm_rf   LoggedMail.log_path
-  FileUtils.mkdir_p LoggedMail.log_path
-
-  Message.queue_path = root / 'fixtures' / 'queue'
-  FileUtils.rm_rf   Message.queue_path
-  FileUtils.mkdir_p Message.queue_path
-
-  class TestCase < Test::Unit::TestCase
-    include RR::Adapters::RRMethods
-
-    before do
-      RR.reset
-    end
-
-    after do
-      RR.verify
-    end
-
-    def mail(filename)
-      IO.read(File.join(File.dirname(__FILE__), 'fixtures', "#{filename}.txt"))
-    end
+  def mail(filename)
+    File.join(File.dirname(__FILE__), 'fixtures', "#{filename}.txt")
   end
 
-  class ApiTestCase < TestCase
-    def app
-      Sinatra::Application
-    end
-
-    include Rack::Test::Methods
+  PARSED = {}
+  def astrotrain(filename)
+    PARSED[filename] ||= Astrotrain::Message.read(mail(filename))
   end
 end
 
@@ -53,4 +31,4 @@ begin
   require 'ruby-debug'
   Debugger.start
 rescue LoadError
-end
+end

data/test/transport_test.rb

@@ -1,113 +1,111 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
-class Astrotrain::TransportTest < Astrotrain::TestCase
-  describe "HttpPost" do
-    before :all do
-      @post    = 'http://example.com'
-      @message = Astrotrain::Message.parse(mail(:custom))
-      @mapping = Astrotrain::Mapping.new(:destination => @post, :transport => 'http_post')
-    end
+Astrotrain::Transports.load :http
+Astrotrain::Transports.load :resque
 
-    before do
-      @trans           = Astrotrain::Mapping::HttpPost.new(@message, @mapping, @message.recipients(%w(delivered_to)).first)
-      @expected_fields = @trans.fields.merge(:emails => @message.recipients(%w(original_to to)) * ",")
-    end
-
-    it "sets #fields" do
-      expected = {:subject => @message.subject, :from => @message.sender, :to => @message.recipients(%w(delivered_to)).first, :body => @message.body, :html => @message.html, :emails => @message.recipients(%w(original_to to)),
-        "headers[reply-to]" => "reply-to-me@example.com", 'headers[message-id]' => '<a16be7390810161014n52b603e9k1aa6bb803c6735aa@mail.gmail.com>', 'headers[to]' => "processor@astrotrain.com",
-        "headers[mime-version]"=>"1.0", "headers[content-type]"=>"text/plain; charset=ISO-8859-1", "headers[content-disposition]"=>"inline", "headers[content-transfer-encoding]"=>"7bit"}
-      assert_equal expected, @trans.fields
-    end
-
-    it "adds attachments to #fields" do
-      @multipart = Astrotrain::Message.parse(mail(:multipart))
-      @trans     = Astrotrain::Mapping::HttpPost.new(@multipart, @mapping, @multipart.recipients.first)
-      assert_equal @multipart.attachments.first, @trans.fields[:attachments_0]
-    end
-
-    it "sets fields with mapping separator set" do
-      @message = Astrotrain::Message.parse(mail(:reply))
-      @mapping.separator = "=" * 5
-      @trans   = Astrotrain::Mapping::HttpPost.new(@message, @mapping, @message.recipients.first)
-      assert_equal "blah blah", @trans.fields[:body]
-    end
-
-    describe "when processing" do
-      before do
-        stub(Astrotrain::Mapping::HttpPost).new {@trans}
-      end
-
-      it "makes http post request" do
-        mock(RestClient).post(@mapping.destination, @expected_fields)
-        @trans.process
-      end
-
-      it "makes http post request from Transport" do
-        mock(RestClient).post(@mapping.destination, @expected_fields)
-        Astrotrain::Mapping::Transport.process(@message, @mapping, @message.recipients.first)
-      end
-
-      before :all do
-        Astrotrain::Mapping::Transport.processing = true
-      end
-
-      after :all do
-        Astrotrain::Mapping::Transport.processing = false
-      end
-    end
+class TransportTest < Test::Unit::TestCase
+  class Job
   end
 
-  if Astrotrain::Mapping.const_defined?(:Jabber)
-    describe "jabber" do
-      before :all do
-        @dest    = 'foo@bar.com'
-        @message = Astrotrain::Message.parse(mail(:custom))
-        @mapping = Astrotrain::Mapping.new(:destination => @dest, :transport => 'jabber')
-      end
-
-      before do
-        @trans   = Astrotrain::Mapping::Jabber.new(@message, @mapping, @message.recipients(%w(delivered_to)).first)
-      end
-
-      it "sets #content" do
-        expected = "From: %s\nTo: %s\nSubject: %s\nEmails: %s\n%s" % [@message.sender, @message.recipients(%w(delivered_to)).first, @message.subject, @message.recipients(%w(original_to to)) * ", ", @message.body]
-        assert_equal expected, @trans.content
-      end
+  def teardown
+    Astrotrain::Transports::HttpPost.connection = nil
+  end
 
-      it "sets content with mapping separator set" do
-        @message = Astrotrain::Message.parse(mail(:reply))
-        @mapping.separator = "=" * 5
-        @trans   = Astrotrain::Mapping::Jabber.new(@message, @mapping, @message.recipients(%w(delivered_to)).first)
-        expected = "From: %s\nTo: %s\nSubject: %s\nEmails: %s\n%s" % [@message.sender, @message.recipients(%w(delivered_to)).first, @message.subject, '', "blah blah"]
-        assert_equal expected, @trans.content
-      end
+  test "posts email to webhook" do
+    msg = astrotrain(:multipart)
+
+    stub_http
+    Astrotrain.deliver(msg, "http://localhost/foo", 
+                       :payload => {:a => 1})
+    params = @last_http_env[:body]
+    assert_equal 1,                    params[:a]
+    assert_equal 'foo@example.com',    params[:to][0][:address]
+    assert_equal 'rick@example.com',   params[:from][0][:address]
+    assert_equal 'Rick Olson',         params[:from][0][:name]
+    assert_equal msg.subject,          params[:subject]
+    assert_equal msg.body,             params[:body]
+    assert_equal msg.recipients.first, params[:emails]
+    assert_equal 'bandit.jpg',         params[:attachments][0].filename
+    assert_match 'image/jpeg',         params[:attachments][0].content_type
+    assert_equal '<ddf0a08f0812091503x4696425eid0fa5910ad39bce1@mail.examle.com>', params[:headers]['message-id']
+  end
 
-      describe "when processing" do
-        before do
-          @conn = Object.new
-          stub(@trans).connection { @conn }
-          stub(Astrotrain::Mapping::Jabber).new { @trans }
-        end
+  test "queues email in resque" do
+    queue = "astrotrain-test"
+    klass = "TransportTest::Job"
+    msg   = astrotrain(:basic)
+    Astrotrain.deliver(msg, "resque://#{queue}/#{klass}", :payload => {:a => 1})
+    job = Resque.reserve(queue)
+    assert_equal TransportTest::Job, job.payload_class
+    payload = job.args[0]
+    assert_equal 1,                          payload['a']
+    assert_equal 'processor@astrotrain.com', payload['to'][0]['address']
+    assert_equal 'Processor',                payload['to'][0]['name']
+    assert_equal 'user@example.com',         payload['from'][0]['address']
+    assert_equal 'Bob',                      payload['from'][0]['name']
+    assert_equal 'fred@example.com',         payload['cc'][0]['address']
+    assert_equal 'Fred',                     payload['cc'][0]['name']
+    assert_equal msg.subject,                payload['subject']
+    assert_equal msg.body,                   payload['body']
+    assert_equal msg.recipients.first,       payload['emails']
+  end
 
-        it "makes jabber delivery" do
-          mock(@conn).deliver(@mapping.destination, @trans.content)
-          @trans.process
-        end
+  test "building http params with attachment" do
+    msg = astrotrain(:multipart)
+    params = Astrotrain::Transports::HttpPost.create_hash(msg, 'bar@example.com')
+
+    assert_equal 'foo@example.com',    params[:to][0][:address]
+    assert_equal 'rick@example.com',   params[:from][0][:address]
+    assert_equal 'Rick Olson',         params[:from][0][:name]
+    assert_equal msg.subject,          params[:subject]
+    assert_equal msg.body,             params[:body]
+    assert_equal msg.recipients.first, params[:emails]
+    assert_equal 'bandit.jpg',         params[:attachments][0].filename
+    assert_match 'image/jpeg',         params[:attachments][0].content_type
+    assert_equal '<ddf0a08f0812091503x4696425eid0fa5910ad39bce1@mail.examle.com>', params[:headers]['message-id']
+  end
 
-        it "makes jabber delivery from Transport" do
-          mock(@conn).deliver(@mapping.destination, @trans.content)
-          Astrotrain::Mapping::Transport.process(@message, @mapping, @message.recipients(%w(delivered_to)).first)
-        end
+  test "building http params without attachment" do
+    msg = astrotrain(:basic)
+    params = Astrotrain::Transports::HttpPost.create_hash(msg, 'bar@example.com')
+
+    assert_equal 'processor@astrotrain.com', params[:to][0][:address]
+    assert_equal 'Processor',                params[:to][0][:name]
+    assert_equal 'user@example.com',         params[:from][0][:address]
+    assert_equal 'Bob',                      params[:from][0][:name]
+    assert_equal 'fred@example.com',         params[:cc][0][:address]
+    assert_equal 'Fred',                     params[:cc][0][:name]
+    assert_equal msg.subject,                params[:subject]
+    assert_equal msg.body,                   params[:body]
+    assert_equal msg.recipients.first,       params[:emails]
+    assert !params.key?(:attachments)
+  end
 
-        before :all do
-          Astrotrain::Mapping::Transport.processing = true
-        end
+  test "building resque params" do
+    msg = astrotrain(:basic)
+    params = Astrotrain::Transports::Resque.create_hash(msg, 'bar@example.com')
+
+    assert_equal 'processor@astrotrain.com', params[:to][0][:address]
+    assert_equal 'Processor',                params[:to][0][:name]
+    assert_equal 'user@example.com',         params[:from][0][:address]
+    assert_equal 'Bob',                      params[:from][0][:name]
+    assert_equal 'fred@example.com',         params[:cc][0][:address]
+    assert_equal 'Fred',                     params[:cc][0][:name]
+    assert_equal msg.subject,                params[:subject]
+    assert_equal msg.body,                   params[:body]
+    assert_equal msg.recipients.first,       params[:emails]
+    assert !params.key?(:attachments)
+  end
 
-        after :all do
-          Astrotrain::Mapping::Transport.processing = false
+  def stub_http
+    Astrotrain::Transports::HttpPost.connection =
+      Faraday::Connection.new do |builder|
+        builder.adapter :test do |stub|
+          stub.post('/foo') do |env|
+            @last_http_env = env.dup
+            [200, {}, 'ok']
+          end
         end
       end
-    end
   end
-end
+end

metadata

@@ -1,243 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: astrotrain
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 4
-  version: 0.5.4
+version: !ruby/object:Gem::Version
+  version: 0.6.0
+  prerelease: 
 platform: ruby
-authors: 
-- technoweenie
+authors:
+- Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-04-01 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: addressable
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 2
-        version: 2.0.2
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: tmail
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 3
-        - 1
-        version: 1.2.3.1
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: data_objects
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 11
-        version: 0.9.11
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 11
-        version: 0.9.11
+date: 2012-04-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: utf8
+  requirement: &70356293558240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.8
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: dm-aggregates
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 11
-        version: 0.9.11
+  version_requirements: *70356293558240
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: &70356293557420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: dm-timestamps
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 11
-        version: 0.9.11
+  version_requirements: *70356293557420
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70356293547400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: dm-types
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 11
-        version: 0.9.11
+  version_requirements: *70356293547400
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: &70356293546660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: dm-validations
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 11
-        version: 0.9.11
+  version_requirements: *70356293546660
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: &70356293545960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.4
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: context
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: sinatra
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70356293545960
+- !ruby/object:Gem::Dependency
+  name: charlock_holmes
+  requirement: &70356293544900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rack-test
+      - !ruby/object:Gem::Version
+        version: 0.6.8
+  type: :runtime
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70356293544900
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: &70356293544140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: xmppr4-simple
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id013
-description: 
+  version_requirements: *70356293544140
+description: email => http post
 email: technoweenie@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README
-files: 
-- .gitignore
+extra_rdoc_files: []
+files:
+- Gemfile
 - LICENSE
-- README
 - Rakefile
-- VERSION
 - astrotrain.gemspec
-- config/sample.rb
 - lib/astrotrain.rb
-- lib/astrotrain/api.rb
-- lib/astrotrain/logged_mail.rb
-- lib/astrotrain/mapping.rb
-- lib/astrotrain/mapping/http_post.rb
-- lib/astrotrain/mapping/jabber.rb
-- lib/astrotrain/mapping/transport.rb
+- lib/astrotrain/attachment.rb
 - lib/astrotrain/message.rb
-- lib/astrotrain/tmail.rb
-- lib/astrotrain/worker.rb
-- lib/vendor/rest-client/README.rdoc
-- lib/vendor/rest-client/Rakefile
-- lib/vendor/rest-client/bin/restclient
-- lib/vendor/rest-client/foo.diff
-- lib/vendor/rest-client/lib/rest_client.rb
-- lib/vendor/rest-client/lib/rest_client/net_http_ext.rb
-- lib/vendor/rest-client/lib/rest_client/payload.rb
-- lib/vendor/rest-client/lib/rest_client/request_errors.rb
-- lib/vendor/rest-client/lib/rest_client/resource.rb
-- lib/vendor/rest-client/rest-client.gemspec
-- lib/vendor/rest-client/spec/base.rb
-- lib/vendor/rest-client/spec/master_shake.jpg
-- lib/vendor/rest-client/spec/payload_spec.rb
-- lib/vendor/rest-client/spec/request_errors_spec.rb
-- lib/vendor/rest-client/spec/resource_spec.rb
-- lib/vendor/rest-client/spec/rest_client_spec.rb
-- test/api_test.rb
+- lib/astrotrain/transports/http_post.rb
+- lib/astrotrain/transports/resque.rb
 - test/fixtures/apple_multipart.txt
 - test/fixtures/bad_content_type.txt
+- test/fixtures/bad_email_format.txt
 - test/fixtures/basic.txt
 - test/fixtures/custom.txt
 - test/fixtures/fwd.txt
@@ -255,45 +123,34 @@ files:
 - test/fixtures/reply.txt
 - test/fixtures/undisclosed.txt
 - test/fixtures/utf-8.txt
-- test/logged_mail_test.rb
-- test/mapping_test.rb
 - test/message_test.rb
 - test/test_helper.rb
 - test/transport_test.rb
-has_rdoc: true
-homepage: http://github.com/entp/astrotrain
+homepage: http://github.com/technoweenie/astrotrain
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -621490843432909131
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: astrotrain
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: email => http post
-test_files: 
-- test/api_test.rb
-- test/logged_mail_test.rb
-- test/mapping_test.rb
-- test/message_test.rb
-- test/test_helper.rb
-- test/transport_test.rb
+test_files: []