malm 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/malm_smtp_server.rb

@@ -22,19 +22,21 @@ class MalmSMTPServer < GServer
     puts "Connected"
     io.print "220 hello\r\n"
     loop do
-      if IO.select([io], nil, nil, 0.1)
-        data = io.readpartial(4096)
-        puts ">>" + data
-        ok, op = process_line(data, session)
-        break unless ok
-        puts "<<" + op
-        io.print op
-      end
+      data = io.gets
+      puts ">>" + data
+      ok, op = process_line(data, session)
+      puts "<<" + op 
+      io.print op               
+      break unless ok
       break if io.closed?
     end
-    db_insert(session)
-    io.print "221 bye\r\n"
-    io.close
+    begin
+      io.close
+      db_insert(session)
+    rescue => e
+      log "something screwed up..."
+      log e.backtrace
+    end
   end
 
   def process_line(line, session)
@@ -47,7 +49,7 @@ class MalmSMTPServer < GServer
     elsif (line =~ /^(HELO|EHLO)/)
       return true, "250 and..?\r\n"
     elsif (line =~ /^QUIT/)
-      return false, "bye\r\n"
+      return false, "221 bye\r\n"
     elsif (line =~ /^MAIL FROM\:/)
       session.mail_from = (/^MAIL FROM\:<(.+)>.*$/).match(line)[1]
       return true, "250 OK\r\n"
@@ -65,7 +67,8 @@ class MalmSMTPServer < GServer
   def db_insert(session)
     subject_regex = /^Subject\: (.+)$/
 
-    subject = subject_regex.match(session.email_body)[1] || ""
+    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}
@@ -86,4 +89,5 @@ class MalmSMTPServer < GServer
     @mail_log_fd.close if @mail_log_fd
     super
   end
+  
 end

data/lib/malm_web.rb

@@ -3,12 +3,18 @@ require 'sinatra/base'
 require 'json'
 
 class MalmWeb < Sinatra::Base
-  get("/") do
+  get "/" do
     "Hello World\n"
   end
   
-  get ("/messages") do
+  get "/messages" do
     content_type :json
     settings.message_db.find_all.to_json
   end
+  
+  get "/messages/:id" do
+    content_type :json
+    id = Integer(params[:id])
+    settings.message_db.find(id).to_json
+  end
 end

data/lib/message_db.rb

@@ -10,6 +10,7 @@ class MessageDb
   
   def create(message)
     @sempahore.synchronize do
+      message[:id] = @message_db.size
       @message_db << message
       @message_db.size
     end
@@ -20,5 +21,11 @@ class MessageDb
       @message_db.dup
     end
   end
+  
+  def find(id)
+    @sempahore.synchronize do
+      @message_db[id]
+    end
+  end
 
 end

data/malm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{malm}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{madlep}]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "lib/malm_web.rb",
     "lib/message_db.rb",
     "malm.gemspec",
+    "spec/bin/malm_test_message",
     "spec/help_spec.rb",
     "spec/spec_helper.rb"
   ]

data/spec/bin/malm_test_message

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require 'net/smtp'
+
+message = <<-END_OF_MESSAGE
+From: francis <francis@example.com>
+To: bill <bill@example.com>
+Subject: zombies
+Date: Thu, 14 Jul 2011 15:16:43 +1000
+Message-Id: <unique.message.id.string@example.com>
+
+You know what I don't hate? I don't hate vests.
+END_OF_MESSAGE
+
+Net::SMTP.start('localhost', 2525) do |smtp|
+  smtp.send_message(message,'francis@example.com','bill@example.com')
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: malm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2155923580 !ruby/object:Gem::Requirement
+  requirement: &2156099220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *2155923580
+  version_requirements: *2156099220
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &2155917200 !ruby/object:Gem::Requirement
+  requirement: &2156093140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2155917200
+  version_requirements: *2156093140
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2153512200 !ruby/object:Gem::Requirement
+  requirement: &2156089540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153512200
+  version_requirements: *2156089540
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &2153511600 !ruby/object:Gem::Requirement
+  requirement: &2156079880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *2153511600
+  version_requirements: *2156079880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153511100 !ruby/object:Gem::Requirement
+  requirement: &2156074560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2153511100
+  version_requirements: *2156074560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153510460 !ruby/object:Gem::Requirement
+  requirement: &2156068940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153510460
+  version_requirements: *2156068940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153509960 !ruby/object:Gem::Requirement
+  requirement: &2156057980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2153509960
+  version_requirements: *2156057980
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2153509300 !ruby/object:Gem::Requirement
+  requirement: &2156054800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153509300
+  version_requirements: *2156054800
 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.
@@ -121,6 +121,7 @@ files:
 - lib/malm_web.rb
 - lib/message_db.rb
 - malm.gemspec
+- spec/bin/malm_test_message
 - spec/help_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/madlep/malm
@@ -138,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4176688025386378385
+      hash: -3447905791693919556
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: