eventmachine-email_server 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a217dda0576da20c2bace6cd1320f6bc6662a052
-  data.tar.gz: cf0f814c5b56a830300d89daeff7e43a457017bd
+  metadata.gz: 21e73cc7eef3bcb21a34c103138939f1f9f216cf
+  data.tar.gz: 03f42527251cde1a286b920f1ee50c84a1318596
 SHA512:
-  metadata.gz: 03eb0a117e26b162c41b5a9068687d4224ca7fe39b97378004aab43f81aeb2551b3ee49bd97f346491470fc5c6ef27b0d8133052e5c28e3fa1c8a5a1208eb0a4
-  data.tar.gz: 6c091d1cc691535298fd2f296ac493a46cd3dacbd968a95080ea34ed25aeecb5ecc6804dc2ac836bd39c17524243ce55154dd5899a1cfb57122c9231388f9573
+  metadata.gz: 59518897af038bd1fb86ff14cda06f4ec6cd3c4363b2730af532611d8aab3c16123be073973aa08a253dd7c271112efcb613e70aeabed5bd5112f07ce6d86725
+  data.tar.gz: 40f009d49032f6bba06e0a7b4ba215530c788687f648e49e4e1d89f1075a9d60649ef56d62b35262f09852850dab56c46d6ef5a7284c44948ef8873bf9bbf6ec

data/eventmachine-email_server.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "eventmachine", ">= 0.12.10"
-  spec.add_runtime_dependency "sqlite3", ">= 1.3.6"
   spec.add_runtime_dependency "ratelimit-bucketbased", ">= 0.0.1"
   spec.add_runtime_dependency "eventmachine-dnsbl", ">= 0.0.2"
   spec.add_runtime_dependency "spf", ">= 0.0.44"

data/lib/eventmachine/email_server.rb

@@ -2,7 +2,6 @@ require "eventmachine/email_server/version"
 require 'eventmachine/email_server/base'
 require 'eventmachine/email_server/memory'
 require 'eventmachine/email_server/null'
-require 'eventmachine/email_server/sqlite3'
 require 'eventmachine/email_server/classifier'
 require 'eventmachine/email_server/pop3_server'
 require 'eventmachine/email_server/smtp_server'

data/lib/eventmachine/email_server/pop3_server.rb

@@ -188,9 +188,7 @@ module EventMachine
     	def stat
     		msgs = bytes = 0
     		@emails.each do |e|
-    			p e
-    			p e.body.length
-    			next if e.marked
+    			next if e.marked == 'true'
     			msgs += 1
     			bytes += e.body.length
     		end
@@ -213,7 +211,7 @@ module EventMachine
       
     	def retr(msgid)
     		msgid = msgid.to_i
-    		return false if msgid > @emails.length or @emails[msgid-1].marked
+    		return false if msgid > @emails.length or @emails[msgid-1].marked == 'true'
     		@emails[msgid-1].body
     	end
       

data/lib/eventmachine/email_server/smtp_server.rb

@@ -86,7 +86,7 @@ module EventMachine
         @spf_ok = true
         @reject_ok = true
         @classifier_ok = true
-        @pending_checks = Array.new
+        @pending_checks = [:content]
       end
       
       def post_init
@@ -97,11 +97,7 @@ module EventMachine
 			def receive_data(data)
         puts ">> #{data}" if @debug
         data.split(/\n/).each do |line|
-          ok, op = process_line(line+"\n")
-          if op
-            puts "<< #{op}" if @debug
-            send_data(op+"\r\n")
-          end
+          process_line(line+"\n")
         end
       end
       
@@ -226,11 +222,16 @@ module EventMachine
         end
         if @ptr_ok and @rate_ok and @gray_ok and @reject_ok and @dnsbl_ok and @spf_ok and @classifier_ok
           ans = "250 OK"
+          save
         else
           ans = "451 Requested action aborted: local error in processing"
         end
-        puts "<< #{ans}" if @debug
-        send_data(ans+"\r\n")
+        send(ans)
+      end
+      
+      def send(msg)
+        puts "<< #{msg}" if @debug
+        send_data("#{msg}\r\n")
       end
       
      	def process_line(line)
@@ -238,13 +239,12 @@ module EventMachine
     			@data_mode = false
           check_reject
           check_classifier
+          @pending_checks -= [:content]
           if @pending_checks.length == 0
             send_answer
           end
-          return true, nil
     		elsif @data_mode
     			@email_body += line
-    			return true, nil
     		elsif (line =~ /^(HELO|EHLO) (.*)/)
           helo = $2.chomp
           port, ip = Socket.unpack_sockaddr_in(get_peername)
@@ -252,32 +252,35 @@ module EventMachine
           check_dnsbl(ip)
           check_gray(ip)
           check_ratelimit(ip)
-    			return true, "250 hello #{ip} (#{helo})"
+          send("250 hello #{ip} (#{helo})")
     		elsif (line =~ /^QUIT/)
-    			return false, "221 bye bye"
+          send("221 #{@hostname} ESMTP server closing connection")
+          self.close_connection
     		elsif (line =~ /^MAIL FROM\:/)
     			@mail_from = (/^MAIL FROM\:<(.+)>.*$/).match(line)[1]
           if @@spf_check
             port, ip = Socket.unpack_sockaddr_in(get_peername)
             check_spf(helo, ip, @mail_from)
           end
-    			return true, "250 OK"
+          send("250 OK")
     		elsif (line =~ /^RCPT TO\:/)
     			rcpt_to = (/^RCPT TO\:<(.+)>.*$/).match(line)[1]
     			if @userstore.user_by_emailaddress(rcpt_to.strip)
     				@rcpt_to = rcpt_to
-    				return true, "250 OK"
-    			end
-    			return false, "550 No such user here"
+            send("250 OK")
+          else
+            send("550 No such user here")
+          end
     		elsif (line =~ /^DATA/)
     			if @rcpt_to
     				@data_mode = true
     				@email_body = ''
-    				return true, "354 Enter message, ending with \".\" on a line by itself"
-    			end
-    			return true, "500 ERROR"
+    				send("354 Enter message, ending with \".\" on a line by itself")
+          else
+            send("500 ERROR")
+          end
     		else
-    			return true, "500 ERROR"
+    			send("500 ERROR")
     		end
     	end
       

data/lib/eventmachine/email_server/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module EmailServer
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/test/test_email_server.rb

@@ -12,138 +12,159 @@ require 'net/pop'
 require 'net/smtp'
 require 'ratelimit/bucketbased'
 
-module EventMachine
-  module DNS
-    class Socket < EventMachine::Connection    
-      def send_packet(pkt)
-        send_datagram(pkt, nameserver, 53)
-      end
-    end
+$dns_port = 53
+
+class EventMachine::DNS::Socket < EventMachine::Connection
+  def send_packet(pkt)
+    send_datagram(pkt, nameserver, $dns_port)
   end
 end
 
+class EmailTemplate < Struct.new(:from, :to, :msg); end
+
 class TestEmailServer < Minitest::Test
   def setup
     @test_vector = Proc.new { |test_name|
+      puts "***** #{test_name} *****"
       (test_name.to_s =~ /test/)
     }
+    @spam_email = EmailTemplate.new("friend@example.org", "chris@example.org", "From: friend@example.org
+To: chris@example.org
+Subject: What to do when you're not doing.
+
+Could I interest you in some cialis?
+")
+    @ham_email = EmailTemplate.new("friend@example.org", "chris@example.org", "From: friend@example.org
+To: chris@example.org
+Subject: Good show
+
+Have you seen the latest Peppa Pig?
+")
+    @default_email = EmailTemplate.new("friend@example.org", "chris@example.org", "From: friend@example.org
+To: chris@example.org
+Subject: Can't remember last night
+
+Looks like we had fun!
+")
+    @pool = EM::Pool.new
+    SMTPServer.reset
     remove_scraps
   end
-  
+
   def remove_scraps
     ["test.sqlite3", "email_server.sqlite3"].each do |f|
       if File.exist?("test/#{f}")
         File.unlink("test/#{f}")
       end
     end
-  end    
-  
+  end
+
   def teardown
     remove_scraps
   end
-  
+
   def setup_user(userstore)
     userstore << User.new(1, "chris", "chris", "chris@example.org")
   end
-  
+
   def start_servers(userstore, emailstore)
     pop3 = EventMachine::start_server "0.0.0.0", 2110, POP3Server, "example.org", userstore, emailstore
     smtp = EventMachine::start_server "0.0.0.0", 2025, SMTPServer, "example.org", userstore, emailstore
-  end  
-  
-  def send_email(expected_status="250")
-    from = "friend@example.org"
-    to = "chris@example.org"
-    msg = "From: friend@example.org
-To: chris@example.org
-Subject: Can't remember last night
+  end
 
-Looks like we had fun!
-"
-    Thread.new do
-      smtp = Net::SMTP.start('localhost', 2025)
-      ret = smtp.send_message msg, from, to
-      assert_equal(expected_status, ret.status)
+
+  def send_email(email=@default_email, &callback)
+    smtp_dispatcher = EventMachine::ThreadedResource.new do
+      smtp = Net::SMTP.new('localhost', 2025)
     end
-  end
-  
-  def send_spam(expected_status="451")
-    from = "friend@example.org"
-    to = "chris@example.org"
-    msg = "From: friend@example.org
-To: chris@example.org
-Subject: What to do when you're not doing.
 
-Could I interest you in some cialis?
-"
-    Thread.new do
-      smtp = Net::SMTP.start('localhost', 2025)
-      ret = smtp.send_message msg, from, to
-      assert_equal(expected_status, ret.status)
+    @pool.add smtp_dispatcher
+
+    @pool.perform do |dispatcher|
+      completion = dispatcher.dispatch do |smtp|
+        ret = nil
+        smtp.start do |s|
+          begin
+            ret = s.send_message email.msg, email.from, email.to
+          rescue => e
+            ret = "451"
+          end
+          begin
+            smtp.quit
+          rescue => e
+          end
+        end
+        if ret.respond_to? :status
+          ret = ret.status
+        end
+        ret
+      end
+
+      completion.callback do |result|
+        callback.call(result)
+      end
+
+      completion
     end
-  end    
-  
-  def send_ham(expected_status="250")
-    from = "friend@example.org"
-    to = "chris@example.org"
-    msg = "From: friend@example.org
-To: chris@example.org
-Subject: Good show
+  end
 
-Have you seen the latest Peppa Pig?
-"
-    Thread.new do
-      smtp = Net::SMTP.start('localhost', 2025)
-      ret = smtp.send_message msg, from, to
-      assert_equal(expected_status, ret.status)
+  def pop_email(&callback)
+
+    pop3_dispatcher = EventMachine::ThreadedResource.new do
     end
-  end    
-  
-  def pop_some_email
-    Thread.new do 
-      pop = Net::POP3.APOP(true).new('localhost',2110)
-      pop.start("chris","chris")
-      refute(pop.mails.empty?)
-      pop.each_mail do |m|
-        assert_equal("From: friend@example.org
-To: chris@example.org
-Subject: Can't remember last night
 
-Looks like we had fun!
-", m.mail)
-        m.delete
+    @pool.add pop3_dispatcher
+
+    @pool.perform do |dispatcher|
+      completion = dispatcher.dispatch do |pop|
+        pop = Net::POP3.APOP(true).new('localhost',2110)
+        pop.start("chris","chris")
+        answers = Array.new
+        answers << pop.mails.empty?
+        if not pop.mails.empty?
+          pop.each_mail do |m|
+            answers << m.mail
+            m.delete
+          end
+        end
+        pop.finish
+        answers
       end
-    end
-  end    
 
-  def pop_no_email
-    Thread.new do 
-      pop = Net::POP3.APOP(true).new('localhost',2110)
-      pop.start("chris","chris")
-      assert(pop.mails.empty?)
+      completion.callback do |answers|
+        callback.call(answers)
+      end
+
+      completion
     end
-  end  
+  end
 
   def run_test(userstore, emailstore)
     EM.run {
       start_servers(userstore, emailstore)
-      timer = EventMachine::Timer.new(0.1) do
-        send_email
-      end
-      timer2 = EventMachine::Timer.new(0.2) do
-        pop_some_email
-      end
-      
-      timer3 = EventMachine::Timer.new(0.3) do
-        pop_no_email
-      end
-      
-      timer4 = EventMachine::Timer.new(0.4) do
+      EM::Timer.new(10) do
+        fail "Test timed out"
         EM.stop
       end
-    }  
+      EM::Timer.new(0.1) do
+        pop_email do |answers|
+          assert_equal(true, answers[0])
+          send_email do |result|
+            assert_equal("250", result)
+            pop_email do |answers|
+              assert_equal(false, answers[0])
+              assert_equal(@default_email.msg.gsub(/[\r\n]+/,"\n"), answers[1].gsub(/[\r\n]+/,"\n"))
+              pop_email do |answers|
+                assert_equal(true, answers[0])
+                EM.stop
+              end
+            end
+          end
+        end
+      end
+    }
   end
-  
+
   def test_memory_store
     return unless @test_vector.call(__method__)
     userstore = MemoryUserStore.new
@@ -152,18 +173,8 @@ Looks like we had fun!
     run_test(userstore, emailstore)
   end
   
-  def test_sqlite3_store
-    return unless @test_vector.call(__method__)
-    s = SQLite3::Database.new("test/test.sqlite3")
-    userstore = Sqlite3UserStore.new(s)
-    emailstore = Sqlite3EmailStore.new(s)
-    setup_user(userstore)
-    run_test(userstore, emailstore)
-  end
-  
   def test_graylisting
     return unless @test_vector.call(__method__)
-    SMTPServer.reset
     SMTPServer.graylist(Hash.new)
     userstore = MemoryUserStore.new
     emailstore = MemoryEmailStore.new
@@ -171,20 +182,23 @@ Looks like we had fun!
 
     EM.run {
       smtp = EventMachine::start_server "0.0.0.0", 2025, SMTPServer, "example.org", userstore, emailstore
-      
-      timer = EventMachine::Timer.new(0.1) do
-        send_email("451")
-      end
-      timer2 = EventMachine::Timer.new(0.2) do
-        send_email
-      end
-      timer3 = EventMachine::Timer.new(0.3) do
+      EM::Timer.new(10) do
+        fail "Test timed out"
         EM.stop
       end
-      
+
+      timer = EventMachine::Timer.new(0.1) do
+        send_email do |result|
+          assert_equal("451", result)
+          send_email do |result|
+            assert_equal("250", result)
+            EM.stop
+          end
+        end
+      end
     }
   end
- 
+
   def test_ratelimit
     return unless @test_vector.call(__method__)
     config = {
@@ -192,7 +206,6 @@ Looks like we had fun!
     }
     storage = RateLimit::Memory.new
     rl = RateLimit::BucketBased.new(storage, config, 'default')
-    SMTPServer.reset
     SMTPServer.ratelimiter(rl)
     userstore = MemoryUserStore.new
     emailstore = MemoryEmailStore.new
@@ -200,21 +213,26 @@ Looks like we had fun!
 
     EM.run {
       smtp = EventMachine::start_server "0.0.0.0", 2025, SMTPServer, "example.org", userstore, emailstore
-      
+
+      EM::Timer.new(10) do
+        fail "Test timed out"
+        EM.stop
+      end
       timer = EventMachine::Timer.new(0.1) do
-        Thread.new do
-          2.times do
-            send_email
+        send_email do |result|
+          assert_equal("250", result)
+          send_email do |result|
+            assert_equal("250", result)
+            send_email do |result|
+              assert_equal("451", result)
+              EM.stop
+            end
           end
-          send_email("451")
         end
       end
-      timer2 = EventMachine::Timer.new(0.3) do
-        EM.stop
-      end
     }
   end
-  
+
   def test_reject_list
     return unless @test_vector.call(__method__)
     userstore = MemoryUserStore.new
@@ -223,25 +241,29 @@ Looks like we had fun!
 
     EM.run {
       smtp = EventMachine::start_server "0.0.0.0", 2025, SMTPServer, "example.org", userstore, emailstore
-      
+
+      EM::Timer.new(10) do
+        fail "Test timed out"
+        EM.stop
+      end
       timer = EventMachine::Timer.new(0.1) do
-        Thread.new do
-          send_email
+        send_email do |result|
+          assert_equal("250", result)
           SMTPServer.reject_filters << /remember/
+          send_email do |result|
+            assert_equal("451", result)
+            EM.stop
+          end
         end
       end
-      timer2 = EventMachine::Timer.new(0.2) do
-        send_email("451")
-      end
-      timer3 = EventMachine::Timer.new(0.3) do
-        EM.stop
-      end
-      
     }
   end
-  
+
   def test_dnsbl
     return unless @test_vector.call(__method__)
+
+    $dns_port = 2053
+
     #Monkeypatching for testing
     memzone = EventMachine::DNSBL::Zone::MemoryZone.new
     EM::DNS::Resolver.nameservers = ["127.0.0.1"]
@@ -252,9 +274,8 @@ Looks like we had fun!
         "127.0.0.2" => "Blacklisted as an example"
       }
     })
-    SMTPServer.reset
     SMTPServer.dnsbl_check(true)
-    
+
     userstore = MemoryUserStore.new
     emailstore = MemoryEmailStore.new
     setup_user(userstore)
@@ -262,106 +283,110 @@ Looks like we had fun!
     EM.run {
       EM::open_datagram_socket "0.0.0.0", 2053, EventMachine::DNSBL::Server, memzone
       smtp = EventMachine::start_server "0.0.0.0", 2025, SMTPServer, "example.org", userstore, emailstore
-      timer = EventMachine::Timer.new(0.1) do
-        send_email
+      EM::Timer.new(10) do
+        fail "Test timed out"
+        EM.stop
       end
-      
-      timer2 = EventMachine::Timer.new(1.2) do
-        memzone.add_dnsblresource(
-          EventMachine::DNSBL::Zone::DNSBLResourceRecord.new(
-            "example.com", 
-            /\d+\.0\.0\.127$/, 
-            300, 
-            Resolv::DNS::Resource::IN::A.new("127.0.0.4"),
-            Time.now.to_i + 3600
+      timer = EventMachine::Timer.new(0.1) do
+        send_email do |result|
+          assert_equal("250", result)
+          memzone.add_dnsblresource(
+            EventMachine::DNSBL::Zone::DNSBLResourceRecord.new(
+              "example.com",
+              /\d+\.0\.0\.127$/,
+              300,
+              Resolv::DNS::Resource::IN::A.new("127.0.0.4"),
+              Time.now.to_i + 3600
+            )
           )
-        )
-        Thread.new do
-          send_email("451")
+          send_email do |result|
+            assert_equal("451", result)
+            EM.stop
+          end
         end
       end
-      
-      timer3 = EventMachine::Timer.new(3.0) do
-        EM.stop
-      end
-            
     }
   end
-  
+
   def test_spf
     return unless @test_vector.call(__method__)
     userstore = MemoryUserStore.new
     emailstore = MemoryEmailStore.new
     setup_user(userstore)
-    
-    SMTPServer.reset
+    $dns_port = 53
+
     SMTPServer.spf_check(true)
     EM.run {
       smtp = EventMachine::start_server "0.0.0.0", 2025, SMTPServer, "example.org", userstore, emailstore
-      timer = EventMachine::Timer.new(0.1) do
-        send_email("451")
-      end
-      timer2 = EventMachine::Timer.new(1) do
+      EM::Timer.new(10) do
+        fail "Test timed out"
         EM.stop
       end
+      timer = EventMachine::Timer.new(0.1) do
+        send_email do |result|
+          assert_equal("451", result)
+          EM.stop
+        end
+      end
     }
-    
   end
-  
+
   def test_classifier
     return unless @test_vector.call(__method__)
     userstore = MemoryUserStore.new
     emailstore = MemoryEmailStore.new
     setup_user(userstore)
-    SMTPServer.reset
     classifier = EventMachine::EmailServer::Classifier.new("test/test.classifier", [:spam, :ham], [:spam])
     classifier.train(:spam, "Amazing pillz viagra cialis levitra staxyn")
     classifier.train(:ham, "Big pigs make great bacon")
     SMTPServer.classifier(classifier)
     EM.run {
       smtp = EventMachine::start_server "0.0.0.0", 2025, SMTPServer, "example.org", userstore, emailstore
-      timer = EventMachine::Timer.new(0.1) do
-        send_spam("451")
-        send_ham("250")
-      end
-      timer2 = EventMachine::Timer.new(1) do
+      EM::Timer.new(10) do
+        fail "Test timed out"
         EM.stop
       end
+      timer = EventMachine::Timer.new(0.1) do
+        send_email(@spam_email) do |result|
+          assert_equal("451", result)
+          send_email(@ham_email) do |result|
+            assert_equal("250", result)
+            EM.stop
+          end
+        end
+      end
     }
   end
-    
+
   def test_example
     return unless @test_vector.call(__method__)
     #require 'eventmachine/email_server'
     #include EventMachine::EmailServer
     #require 'ratelimit/bucketbased'
     #require 'dnsbl/client'
-  
-    #require 'sqlite3'
-    s = SQLite3::Database.new("email_server.sqlite3")
-    userstore = Sqlite3UserStore.new(s)
-    emailstore = Sqlite3EmailStore.new(s)
+
+    userstore = MemoryUserStore.new()
+    emailstore = MemoryEmailStore.new()
     userstore << User.new(1, "chris", "chris", "chris@example.org")
-  
+
     config = {
       'default' => RateLimit::Config.new('default', 2, 2, -2, 1, 1, 1),
     }
     storage = RateLimit::Memory.new
     rl = RateLimit::BucketBased.new(storage, config, 'default')
-  
+
     classifier = EventMachine::EmailServer::Classifier.new("test/test.classifier", [:spam, :ham], [:spam])
     classifier.train(:spam, "Amazing pillz viagra cialis levitra staxyn")
     classifier.train(:ham, "Big pigs make great bacon")
-  
-    SMTPServer.reset
+
     SMTPServer.reverse_ptr_check(true)
     SMTPServer.graylist(Hash.new)
     SMTPServer.ratelimiter(rl)
-    SMTPServer.dnsbl_check(true)  
+    SMTPServer.dnsbl_check(true)
     SMTPServer.spf_check(true)
     SMTPServer.reject_filters << /viagra/i
     SMTPServer.classifier(classifier)
-  
+
     EM.run {
       pop3 = EventMachine::start_server "0.0.0.0", 2110, POP3Server, "example.org", userstore, emailstore
       smtp = EventMachine::start_server "0.0.0.0", 2025, SMTPServer, "example.org", userstore, emailstore
@@ -370,5 +395,5 @@ Looks like we had fun!
       end
     }
   end
-   
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine-email_server
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - chrislee35
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.10
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: ratelimit-bucketbased
   requirement: !ruby/object:Gem::Requirement
@@ -191,7 +177,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- email_server.sqlite3
 - eventmachine-email_server.gemspec
 - lib/eventmachine/email_server.rb
 - lib/eventmachine/email_server/base.rb
@@ -201,7 +186,6 @@ files:
 - lib/eventmachine/email_server/null.rb
 - lib/eventmachine/email_server/pop3_server.rb
 - lib/eventmachine/email_server/smtp_server.rb
-- lib/eventmachine/email_server/sqlite3.rb
 - lib/eventmachine/email_server/version.rb
 - test/helper.rb
 - test/test_email_server.rb

data/lib/eventmachine/email_server/sqlite3.rb

@@ -1,153 +0,0 @@
-require_relative 'base'
-require 'sqlite3'
-
-module EventMachine
-  module EmailServer
-    class Sqlite3UserStore < AbstractUserStore
-      def initialize(sqlite3, tablename = "users")
-        @class = User
-        @fields = @class.members.map {|x| x.to_s}.join(", ")
-        @tablename = tablename
-        if sqlite3.class == SQLite3::Database
-          @db = sqlite3
-        else
-          @db = SQLite3::Database.new(sqlite3)
-        end
-        if @db.table_info(tablename).length == 0
-          @db.execute("CREATE TABLE #{@tablename} (#{@fields})")
-        end
-      end
-      
-      def add_user(user)
-        if user.id
-          u = user_by_id(user.id)
-        end
-        if u
-          @db.execute("UPDATE #{@tablename} SET username=?, password=?, address=? WHERE id=?", 
-            user.username,
-            user.password,
-            user.address,
-            user.id)
-        else
-          @db.execute("INSERT INTO #{@tablename} (id,username,password,address) VALUES (?,?,?,?)", 
-            user.id,
-            user.username,
-            user.password,
-            user.address)
-        end
-      end
-      
-      def delete_user(user)
-        if user.id
-          @db.execute("DELETE FROM #{@tablename} WHERE id = ?", user.id)
-        end
-      end
-
-      def user_by_field(field, value)
-    		rs = @db.execute("SELECT #{@fields} FROM #{@tablename} WHERE #{field}='#{value}'")
-    		return nil unless rs
-    		rs.each do |row|
-    			return User.new(*row)
-    		end
-        return nil
-      end
-        
-      def user_by_username(username)
-        user_by_field("username", username)
-      end
-      
-      def user_by_emailaddress(address)
-        user_by_field("address", address)
-      end
-      
-      def user_by_id(id)
-        user_by_field("id", id)
-      end
-    end
-    
-    class Sqlite3EmailStore < AbstractEmailStore
-      def initialize(sqlite3, tablename = "emails")
-        @class = Email
-        @fields = "'"+@class.members.map {|x| x.to_s}.join("', '")+"'"
-        @tablename = tablename
-        if sqlite3.class == SQLite3::Database
-          @db = sqlite3
-        else
-          @db = SQLite3::Database.new(sqlite3)
-        end
-        if @db.table_info(tablename).length == 0
-          fields = @fields.gsub(/'id'/, 'id integer primary key autoincrement')
-          @db.execute("CREATE TABLE #{@tablename} (#{fields})")
-        end
-      end
-      
-      def emails_by_field(field, value)
-    		rs = @db.execute("SELECT #{@fields} FROM #{@tablename} WHERE ?=?", field, value)
-    		return nil unless rs
-        emails = Array.new
-    		rs.each do |row|
-    			emails << Email.new(*row)
-    		end
-        emails
-      end
-      
-      def emails_by_userid(uid)
-        emails_by_field("uid", uid)
-      end
-      
-      def quote( string )
-        string.gsub( /'/, "''" )
-      end
-      private :quote
-      
-      def save_email(email)
-        if email.id
-          # I'm being too crafty here.. this is bad style
-          args = (@class.members - [:id]).map{|f| email.send(f)}
-          args << email.send(:id)
-          @db.execute("UPDATE #{@tablename} SET " +
-            (@class.members - [:id]).map { |field| "#{field} = ?"}.join(", ") +
-            " WHERE id = ?", *args)
-        else
-          email.id = "NULL"
-          args = (@class.members).map{|f| email.send(f)}
-          qs = args.map{|x| "'#{quote(x.to_s)}'"}.join(",").gsub(/'NULL'/, "NULL")
-          @db.execute("INSERT INTO #{@tablename} (#{@fields}) VALUES (#{qs})")
-          rs = @db.execute("SELECT last_insert_rowid()")
-          rs.each do |row|
-            email.id = *row
-          end
-        end
-        email.id
-      end
-      
-      def delete_email(email)
-        if email.id
-          @db.execute("DROP FROM #{@tablename} WHERE id = ?", email.id)
-        end
-      end
-      
-      def delete_by_field(field, value)
-        @db.execute("DROP FROM #{@tablename} WHERE #{field} = ?", value)
-      end
-      
-      def delete_id(id)
-        delete_by_field("id", id)
-      end
-      
-      def delete_user(uid)
-        delete_by_field("uid", uid)
-      end
-      
-      def count
-        sql = "SELECT COUNT(*) FROM #{@tablename}"
-        rs = @db.execute(sql)
-        c = 0
-        rs.each do |row|
-          c = row[0]
-        end
-        c
-      end
-    end
-  end
-end