malm 0.0.6 → 0.1.0

data/Gemfile

@@ -5,9 +5,6 @@ gem "clamp", "0.2.1"
 gem "sinatra", "1.2.6"
 gem "thin", "1.2.11"
 gem "mail", "2.3.0"
-gem "therubyracer", "0.9.2"
-gem "execjs", "1.2.0"
-gem "coffee-script", "2.2.0"
 gem "daemons", "1.1.4"
 
 group :development do

data/Gemfile.lock

@@ -2,15 +2,9 @@ GEM
   remote: http://rubygems.org/
   specs:
     clamp (0.2.1)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.1.1)
     daemons (1.1.4)
     diff-lcs (1.1.2)
     eventmachine (0.12.10)
-    execjs (1.2.0)
-      multi_json (~> 1.0)
     git (1.2.5)
     i18n (0.6.0)
     jeweler (1.6.4)
@@ -18,13 +12,11 @@ GEM
       git (>= 1.2.5)
       rake
     json (1.5.3)
-    libv8 (3.3.10.2)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    multi_json (1.0.3)
     polyglot (0.3.1)
     rack (1.3.1)
     rake (0.9.2)
@@ -39,9 +31,7 @@ GEM
     rspec-mocks (2.3.0)
     sinatra (1.2.6)
       rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
-    therubyracer (0.9.2)
-      libv8 (~> 3.3.10)
+      tilt (>= 1.2.2, < 2.0)
     thin (1.2.11)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -56,14 +46,11 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   clamp (= 0.2.1)
-  coffee-script (= 2.2.0)
   daemons (= 1.1.4)
-  execjs (= 1.2.0)
   jeweler (~> 1.6.2)
   json (= 1.5.3)
   mail (= 2.3.0)
   rcov
   rspec (~> 2.3.0)
   sinatra (= 1.2.6)
-  therubyracer (= 0.9.2)
   thin (= 1.2.11)

data/Rakefile

@@ -36,4 +36,26 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :default => :spec
+task :default => [:coffee, :spec]
+
+task :release => ["coffee", "gemspec:release","git:release","gemcutter:release"]
+
+desc "Clean out yucky dev stuff"
+task :clean => "coffee:clean"
+
+desc "compile coffeescript"
+task :coffee  => "coffee:compile"
+
+namespace :coffee do
+  
+  coffee_src_dir = File.join(File.dirname(__FILE__), "web", "src", "coffee")
+  coffee_out_dir = File.join(File.dirname(__FILE__), "web", "public", "js")
+  
+  task :compile do
+    `coffee -o #{coffee_out_dir} #{coffee_src_dir}/*.coffee`
+  end
+  
+  task :clean do
+    `rm #{coffee_out_dir}/*.js`
+  end
+end

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.1.0

data/bin/malm

@@ -19,7 +19,7 @@ class MalmCommand < Clamp::Command
   
   def execute    
     malm_proc = proc{
-      malm = Malm.new(:log => log, :smtpport => smtpport, :webport => webport)
+      malm = Malm::Main.new(:log => log, :smtpport => smtpport, :webport => webport)
       malm.run!      
     }
     

data/lib/malm/main.rb

@@ -0,0 +1,40 @@
+module Malm
+  class Main
+    attr_accessor :log, :smtpport, :webport
+  
+    def initialize(options={})
+      options.each{|k,v| send("#{k}=", v)}
+    end
+  
+    def run!
+      create_db
+      run_smtp!
+      run_web!
+    end
+  
+    private
+    def create_db
+      @db = Malm::MessageDb.new
+    end
+
+    def run_smtp!
+      smtp_server = Malm::SMTPServer.new(@smtpport)
+      smtp_server.mail_log = @log
+      smtp_server.message_db = @db
+
+      begin
+        smtp_server.start
+      rescue Errno::EACCES
+        STDERR.puts("Don't have permission to start SMTP server on port #{smtpport}. Maybe run with sudo?")
+        exit 1
+      end
+      smtp_server
+    end
+
+    def run_web!
+      Malm::Web.set :port, @webport
+      Malm::Web.set :message_db, @db
+      Malm::Web.run!
+    end
+  end
+end

data/lib/malm/message.rb

@@ -0,0 +1,87 @@
+module Malm
+  class Message
+    attr_reader :state, :email_body, :mail_from, :rcpt_to
+
+    def initialize
+      @email_body = ""
+      @rcpt_to = []
+      @state = :init_state
+    end
+  
+    def process_line(line=nil)    
+      if line =~ /QUIT/
+        return quit!
+      end
+      
+      # state machine pattern. Delegate to state handler for where we're at in SMTP conversation
+      response = send(@state, line)
+      return error! unless response
+      
+      # transition if state handler returned a new state
+      new_state = response.delete(:state)
+      @state = new_state if new_state
+      
+      response
+    end
+  
+    def subject
+      if @email_body =~ /^Subject\: (.+)$/
+        $1.strip
+      end
+    end
+  
+    private
+    def init_state(_ignore_line=nil)
+      {:output => "220 hello\r\n", :state => :helo_state}
+    end
+    
+    def helo_state(line)
+      if (line =~ /^(HELO|EHLO)/)
+        ok!(:mail_state)
+      end
+    end
+    
+    def mail_state(line)
+      if (line =~ /^MAIL FROM\:<(.+)>.*$/)
+        @mail_from = $1
+        ok!(:rcpt_state)
+      end
+    end
+    
+    def rcpt_state(line)
+      if (line =~ /^RCPT TO\:<(.+)>.*$/)
+        @rcpt_to << $1
+        ok!
+      elsif (line =~ /^DATA/)
+        {:output => "354 Enter message, ending with \".\" on a line by itself\r\n", :state => :data_state}
+      end
+    end
+    
+    def data_state(line)
+      if (line.chomp =~ /^\.$/)
+        ok!(:quit_state)
+      else
+        @email_body << line
+        {}
+      end
+    end
+  
+    def quit_state(_ignore)
+      error!
+    end
+  
+    def quit!
+      {:output => "221 bye\r\n", :state => :quit_state, :done => true}
+    end
+  
+    def error!
+      {:output => "500 ERROR\r\n", :state => :quit_state, :done => true}
+    end
+  
+    def ok!(state=nil)
+      {:output => "250 OK\r\n", :state => state}
+    end
+    
+    
+  end
+end

data/lib/malm/message_db.rb

@@ -1,6 +1,6 @@
 require 'thread'
 
-class Malm
+module Malm
   class MessageDb
   
     def initialize

data/lib/malm/smtp_server.rb

@@ -1,83 +1,36 @@
 # based on copy + paste from http://snippets.dzone.com/posts/show/5152
 require 'gserver'
 
-class Malm
+module Malm
   class SMTPServer < GServer
   
     attr_accessor :mail_log
     attr_accessor :message_db
-  
-    class Session
-      attr_accessor :data_mode, :data_mode, :email_body, :mail_from, :rcpt_to, :subject
-      alias :data_mode? :data_mode
     
-      def initialize
-        @data_mode = false
-        @email_body = ""
-      end
-        
-    end
-  
     def serve(io)
-      session = Session.new
-      puts "Connected"
-      io.print "220 hello\r\n"
+      message = Message.new
+      io.print message.process_line[:output]
       loop do
         data = io.gets
-        puts ">>" + data
-        ok, op = process_line(data, session)
-        puts "<<" + op 
-        io.print op               
-        break unless ok
+        response = message.process_line(data)
+        io.print response[:output] if response[:output]
+        break if response[:done]
         break if io.closed?
       end
       begin
         io.close
-        db_insert(session)
+        db_insert(message)
       rescue => e
         log "something screwed up..."
         log e.backtrace
       end
     end
-
-    def process_line(line, session)
-      if (session.data_mode?) && (line.chomp =~ /^\.$/)
-        session.data_mode = false
-        return true, "250 OK\r\n"
-      elsif session.data_mode?
-        session.email_body += line
-        return true, ""
-      elsif (line =~ /^(HELO|EHLO)/)
-        return true, "250 and..?\r\n"
-      elsif (line =~ /^QUIT/)
-        return false, "221 bye\r\n"
-      elsif (line =~ /^MAIL FROM\:/)
-        session.mail_from = (/^MAIL FROM\:<(.+)>.*$/).match(line)[1]
-        return true, "250 OK\r\n"
-      elsif (line =~ /^RCPT TO\:/)
-        session.rcpt_to = (/^RCPT TO\:<(.+)>.*$/).match(line)[1]
-        return true, "250 OK\r\n"
-      elsif (line =~ /^DATA/)
-        session.data_mode = true
-        return true, "354 Enter message, ending with \".\" on a line by itself\r\n"
-      else
-        return true, "500 ERROR\r\n"
-      end
-    end
   
-    def db_insert(session)
-      subject_regex = /^Subject\: (.+)$/
-
-      subject_match = subject_regex.match(session.email_body)
-      subject = subject_match ? subject_match[1] : ""
-      subject.strip!
-    
-      message = {:subject => subject, :from => session.mail_from, :to => session.rcpt_to, :body => session.email_body}
-    
-      @mail_log_fd.puts(message.inspect) if @mail_log_fd
-      @message_db.create(message) if @message_db
+    def db_insert(message)    
+      message_data = {:subject => message.subject, :from => message.mail_from, :to => message.rcpt_to, :body => message.email_body}
     
-      log("Message received: #{message.inspect}")
+      @mail_log_fd.puts(message_data.inspect) if @mail_log_fd
+      @message_db.create(message_data) if @message_db
     end
   
     protected

data/lib/malm/web.rb

@@ -1,18 +1,19 @@
 require 'thin'
 require 'sinatra/base'
 require 'json'
-require 'v8'
-require 'execjs'
-require 'coffee_script'
 require 'mail'
 
-class Malm
+module Malm
   class Web < Sinatra::Base
   
-    set :public, File.join(File.dirname(__FILE__), "..", "..", "web", "static")
+    set :public, File.join(File.dirname(__FILE__), "..", "..", "web", "public")
     set :views, File.join(File.dirname(__FILE__), "..", "..", "web", "views")
   
-    get "/messages.json" do
+    get "/" do
+      erb :'index.html'
+    end
+  
+    get "/messages" do
       content_type :json
       settings.message_db.find_all.map{|m|
         m = m.dup
@@ -22,7 +23,7 @@ class Malm
       }.to_json
     end
   
-    get "/messages/:id.json" do
+    get "/messages/:id" do
       content_type :json
       find_message(params[:id]).to_json
     end
@@ -30,12 +31,7 @@ class Malm
     get "/messages/:id/body.:type" do
       render_message(params[:id], params[:type])
     end
-    
-    get "/coffee/:script.coffee" do
-      content_type "text/javascript"
-      coffee params[:script].to_sym
-    end
-  
+      
     private
     def find_message(id)
       id = Integer(id)
@@ -53,7 +49,8 @@ class Malm
     
       msg_obj = find_message(id)
       if msg_obj
-        Mail::Message.new(msg_obj[:body]).send("#{type}_part".to_sym).body.to_s
+        content_type_body = Mail::Message.new(msg_obj[:body]).send("#{type}_part".to_sym)
+        content_type_body ? content_type_body.body.to_s : msg_obj[:body]
       else
         status 404
         "don't know about message #{id}"

data/lib/malm.rb

@@ -1,42 +1,5 @@
+require 'malm/message'
 require 'malm/message_db'
 require 'malm/smtp_server'
 require 'malm/web'
-
-class Malm
-  attr_accessor :log, :smtpport, :webport
-  
-  def initialize(options={})
-    options.each{|k,v| send("#{k}=", v)}
-  end
-  
-  def run!
-    create_db
-    run_smtp!
-    run_web!
-  end
-  
-  private
-  def create_db
-    @db = Malm::MessageDb.new
-  end
-
-  def run_smtp!
-    smtp_server = Malm::SMTPServer.new(@smtpport)
-    smtp_server.mail_log = @log
-    smtp_server.message_db = @db
-
-    begin
-      smtp_server.start
-    rescue Errno::EACCES
-      STDERR.puts("Don't have permission to start SMTP server on port #{smtpport}. Maybe run with sudo?")
-      exit 1
-    end
-    smtp_server
-  end
-
-  def run_web!
-    Malm::Web.set :port, @webport
-    Malm::Web.set :message_db, @db
-    Malm::Web.run!
-  end
-end
+require 'malm/main'

data/malm.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{malm}
-  s.version = "0.0.6"
+  s.name = "malm"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["madlep"]
-  s.date = %q{2011-07-25}
-  s.default_executable = %q{malm}
-  s.description = %q{SMTP server with web interface for easy local development. Sets up a little mail server that you can send messages to, and provides a web front end to let you see what your app did.}
-  s.email = %q{julian.doherty.ml@gmail.com}
+  s.date = "2011-10-31"
+  s.description = "SMTP server with web interface for easy local development. Sets up a little mail server that you can send messages to, and provides a web front end to let you see what your app did."
+  s.email = "julian.doherty.ml@gmail.com"
   s.executables = ["malm"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -29,27 +28,29 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/malm",
     "lib/malm.rb",
+    "lib/malm/main.rb",
+    "lib/malm/message.rb",
     "lib/malm/message_db.rb",
     "lib/malm/smtp_server.rb",
     "lib/malm/web.rb",
     "malm.gemspec",
     "spec/bin/malm_test_message",
-    "spec/help_spec.rb",
+    "spec/malm/message_spec.rb",
+    "spec/malm/smtp_server_spec.rb",
     "spec/spec_helper.rb",
-    "web/static/css/style.css",
-    "web/static/favicon.ico",
-    "web/static/index.html",
-    "web/static/js/backbone-min.js",
-    "web/static/js/backbone.js",
-    "web/static/js/jquery-1.6.2.js",
-    "web/static/js/jquery-1.6.2.min.js",
-    "web/views/hello_world.coffee"
+    "web/public/css/style.css",
+    "web/public/favicon.ico",
+    "web/public/js/.gitignore",
+    "web/public/js/lib/backbone-min.js",
+    "web/public/js/lib/jquery-1.6.2.min.js",
+    "web/src/coffee/malm.coffee",
+    "web/views/index.html.erb"
   ]
-  s.homepage = %q{http://github.com/madlep/malm}
+  s.homepage = "http://github.com/madlep/malm"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Easy SMTP server for local development}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Easy SMTP server for local development"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -60,9 +61,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sinatra>, ["= 1.2.6"])
       s.add_runtime_dependency(%q<thin>, ["= 1.2.11"])
       s.add_runtime_dependency(%q<mail>, ["= 2.3.0"])
-      s.add_runtime_dependency(%q<therubyracer>, ["= 0.9.2"])
-      s.add_runtime_dependency(%q<execjs>, ["= 1.2.0"])
-      s.add_runtime_dependency(%q<coffee-script>, ["= 2.2.0"])
       s.add_runtime_dependency(%q<daemons>, ["= 1.1.4"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -74,9 +72,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sinatra>, ["= 1.2.6"])
       s.add_dependency(%q<thin>, ["= 1.2.11"])
       s.add_dependency(%q<mail>, ["= 2.3.0"])
-      s.add_dependency(%q<therubyracer>, ["= 0.9.2"])
-      s.add_dependency(%q<execjs>, ["= 1.2.0"])
-      s.add_dependency(%q<coffee-script>, ["= 2.2.0"])
       s.add_dependency(%q<daemons>, ["= 1.1.4"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -89,9 +84,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sinatra>, ["= 1.2.6"])
     s.add_dependency(%q<thin>, ["= 1.2.11"])
     s.add_dependency(%q<mail>, ["= 2.3.0"])
-    s.add_dependency(%q<therubyracer>, ["= 0.9.2"])
-    s.add_dependency(%q<execjs>, ["= 1.2.0"])
-    s.add_dependency(%q<coffee-script>, ["= 2.2.0"])
     s.add_dependency(%q<daemons>, ["= 1.1.4"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/spec/bin/malm_test_message

@@ -205,10 +205,40 @@ ICAgICAgICAgPC90cj4NCiAgICAgICAgPC90YWJsZT4NCiAgICA8L2JvZHk+DQo8L2h0bWw+DQo=
 --_000_4e1f79598aac0508010ee224app01groupsdevintlpotmail_--
 END_OF_MESSAGE
 
+message3 = <<-END_OF_MESSAGE
+Delivered-To: julian.doherty.ml@gmail.com
+Received: by 10.205.65.11 with SMTP id xk11cs235015bkb;
+        Fri, 8 Jul 2011 04:13:29 -0700 (PDT)
+Received: by 10.236.180.38 with SMTP id i26mr2405055yhm.205.1310123608196;
+        Fri, 08 Jul 2011 04:13:28 -0700 (PDT)
+Return-Path: <qybsao@galeriestills.nl>
+Received: from kiver.site5.com (kiver.site5.com [174.132.150.130])
+        by mx.google.com with ESMTPS id g63si36654835yhn.48.2011.07.08.04.13.26
+        (version=TLSv1/SSLv3 cipher=OTHER);
+        Fri, 08 Jul 2011 04:13:26 -0700 (PDT)
+Received-SPF: neutral (google.com: 174.132.150.130 is neither permitted nor denied by best guess record for domain of qybsao@galeriestills.nl) client-ip=174.132.150.130;
+Authentication-Results: mx.google.com; spf=neutral (google.com: 174.132.150.130 is neither permitted nor denied by best guess record for domain of qybsao@galeriestills.nl) smtp.mail=qybsao@galeriestills.nl
+Received: from akf90.internetdsl.tpnet.pl ([83.17.9.90] helo=galeriestills.nl)
+	by kiver.site5.com with esmtp (Exim 4.69)
+	(envelope-from <qybsao@galeriestills.nl>)
+	id 1Qf8zt-0007aO-I9
+	for madlep@ubercharged.net; Fri, 08 Jul 2011 06:13:26 -0500
+Message-ID: <2ac901cc3d5f$2983c8b0$3b29bc19@galeriestills.nl>
+From: "Precision Crafted and Low Priced Watches" <qybsao@galeriestills.nl>
+To: <madlep@ubercharged.net>
+Subject: No fancy HTML...
+Date: Fri, 8 Jul 2011 13:11:17 +0200
+Yeah, I just got plain text sorry.
+END_OF_MESSAGE
+
 Net::SMTP.start('localhost', 2525) do |smtp|
   smtp.send_message(message1,"francis@example.com","bill@example.com")
 end
 
 Net::SMTP.start('localhost', 2525) do |smtp|
   smtp.send_message(message2,"registration@lonelyplanet.com.au","madlep0715@devint.lpo")
+end
+
+Net::SMTP.start('localhost', 2525) do |smtp|
+  smtp.send_message(message3,"boring@example.com","unimpressed@example.com")
 end