schema/migrations/001_add_mappings_destination_migration.rb @@ -8,7 +8,7 @@ Scans incoming emails for mapped recipients and sends an HTTP POST somewhere. @user.save # set a mapping to accept email for support@example.com - @mapping = @user.mappings.build(:email_user => 'support', :email_domain => 'example.com', :post_url => '...') + @mapping = @user.mappings.build(:email_user => 'support', :email_domain => 'example.com', :destination => '...') @mapping.save # you can also create wildcards for users: README @@ -10,7 +10,8 @@ class Mapping property :user_id, Integer, :nullable => false, :index => true property :email_user, String, :size => 255, :length => 1..255, :index => :email, :format => /^[\w\.\_\%\+\-]*\*?$/ property :email_domain, String, :size => 255, :lenght => 1..255, :index => :email, :format => /^[\w\-\_\.]+$/, :default => lambda { default_domain } - property :post_url, String, :size => 255, :length => 1..255, :unique_index => true, :unique => true, :format => /^https?:\/\/([\w\-\_\.]+)+(\/[\w\-\ \.\/\?\%\&\=\[\]]*)?$/ + property :destination, String, :size => 255, :length => 1..255, :unique_index => true, :unique => true, :format => /^https?:\/\/([\w\-\_\.]+)+(\/[\w\-\ \.\/\?\%\&\=\[\]]*)?$/ + property :transport, String, :size => 255, :set => %w(http_post jabber), :default => 'http_post' validates_is_unique :email_user, :scope => :email_domain @@ -31,7 +32,7 @@ class Mapping end def process(message) - HttpPost.process(message, self) + Transport.process(message, self) log_message(message) end app/models/mapping.rb @@ -12,7 +12,7 @@ class Mapping end def request - @request ||= Curl::Easy.new(@mapping.post_url) + @request ||= Curl::Easy.new(@mapping.destination) end def post_fields app/models/mapping/http_post.rb @@ -6,7 +6,7 @@ class Mapping def process return unless Transport.processing - connection.deliver(@mapping.post_url, content) + connection.deliver(@mapping.destination, content) end def connection app/models/mapping/jabber.rb @@ -8,7 +8,10 @@ class Mapping attr_reader :message, :mapping def self.process(message, mapping) - new(message, mapping).process + case mapping.transport + when 'http_post' then HttpPost.process(message, mapping) + when 'jabber' then Jabber.process(message, mapping) + end end def initialize(message, mapping) @@ -18,5 +21,14 @@ class Mapping def process end + + def self.inherited(child) + super + class << child + def process(message, mapping) + new(message, mapping).process + end + end + end end end \ No newline at end of file app/models/mapping/transport.rb @@ -13,7 +13,7 @@ <td> <%=h mapping.email_user %>@astrotrain.com </td> - <td><%=h mapping.post_url %></td> + <td><%=h mapping.destination %></td> <td>blah</td> <% end -%> </table> app/views/mappings/index.html.erb @@ -2,6 +2,6 @@ <%= form_for @mapping, :action => url(:mappings) do %> <p><%= text_field :email_user, :label => "Email" %>@<%= text_field :email_domain %></p> - <p><%= text_field :post_url, :label => "Destination" %></p> + <p><%= text_field :destination, :label => "Destination" %></p> <p><%= submit "Create" %></p> <% end =%> \ No newline at end of file app/views/mappings/new.html.erb @@ -20,7 +20,4 @@ end Merb::BootLoader.after_app_loads do require 'xmpp4r-simple' - require 'mapping/transport' - require 'mapping/http_post' - require 'mapping/jabber' end config/init.rb @@ -65,8 +65,8 @@ describe Mapping do end %w(http://example.com https://example.com http://example.com/ http://example.com/foo http://example.com/foo/bar.html http://example.com/foo?blah[baz]=1).each do |valid| - it "allows #post_url == #{valid.inspect}" do - valid_mapping(:post_url => valid).should be_valid + it "allows #destination == #{valid.inspect}" do + valid_mapping(:destination => valid).should be_valid end end @@ -84,7 +84,7 @@ describe Mapping do protected def valid_mapping(options = {}) - Mapping.new({:user_id => 1, :post_url => 'http://foo.com', :email_user => 'sample'}.update(options)) + Mapping.new({:user_id => 1, :destination => 'http://foo.com', :email_user => 'sample', :transport => 'http_post'}.update(options)) end end end \ No newline at end of file spec/models/mapping_spec.rb @@ -4,7 +4,7 @@ describe Mapping::HttpPost do before :all do @post = 'http://example.com' @message = Message.parse(mail(:basic)) - @trans = Mapping::HttpPost.new(@message, Mapping.new(:post_url => @post)) + @trans = Mapping::HttpPost.new(@message, Mapping.new(:destination => @post)) end it "sets #post_fields" do @@ -31,7 +31,7 @@ describe Mapping::Jabber do before :all do @dest = 'foo@bar.com' @message = Message.parse(mail(:basic)) - @trans = Mapping::Jabber.new(@message, Mapping.new(:post_url => @dest)) + @trans = Mapping::Jabber.new(@message, Mapping.new(:destination => @dest)) end it "sets #content" do spec/models/transport_spec.rb c8b2e12049201af47ed010c994bb5ba15a695268 rick technoweenie@gmail.com http://github.com/jnunemaker/astrotrain/commit/1bed1ed0a6254af39425f2abe4d48e566a22ab74 1bed1ed0a6254af39425f2abe4d48e566a22ab74 2008-10-19T15:38:27-07:00 2008-10-19T15:37:38-07:00 rename Mapping#post_url => Mapping#destination. use the migration if you can, or DataMapper.auto_upgrade! if migrations are busted for you too a4ef7500fb704225c5fe92db5152b541cb841ffa rick technoweenie@gmail.com