eventmachine 1.0.1-x86-mswin32-60 → 1.0.2-x86-mswin32-60

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Changelog
 
+## 1.0.2 (March 8, 2013)
+* binary win32 gems now include fastfilereader shim [#222]
+* fix long-standing connection timeout issues [27fdd5b, igrigorik/em-http-request#222]
+* http and line protocol cleanups [#193, #151]
+* reactor return value cleanup [#225]
+* fix double require from gemspec [#284]
+* fix smtp server reset behavior [#351]
+* fix EM.system argument handling [#322]
+* ruby 1.9 compat in smtp server and stomp protocols [#349, #315]
+* fix pause from post_init [#380]
+
 ## 1.0.1 (February 27, 2013)
-* use rb_wait_for_single_fd() on ruby 2.0 to fix rb_thread_select() deprecation
+* use rb_wait_for_single_fd() on ruby 2.0 to fix rb_thread_select() deprecation [#363]
 * fix epoll/kqueue mode in ruby 2.0 by removing calls to rb_enable_interrupt() [#248, #389]
 * fix memory leak when verifying ssl cerificates [#403]
 * fix initial connection delay [#393, #374]
+* fix build on windows [#371]

data/eventmachine.gemspec

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/em/version', __FILE__)
+$:.unshift File.expand_path("../lib", __FILE__)
+require "em/version"
+
 
 Gem::Specification.new do |s|
   s.name = 'eventmachine'
@@ -15,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake-compiler', '~> 0.8.3'
   s.add_development_dependency 'yard', ">= 0.8.5.2"
-  s.add_development_dependency 'bluecloth'
+  s.add_development_dependency 'bluecloth' unless RUBY_PLATFORM =~ /java/
 
   s.summary = 'Ruby/EventMachine library'
   s.description = "EventMachine implements a fast, single-threaded engine for arbitrary network

data/ext/ed.cpp

@@ -460,8 +460,7 @@ ConnectionDescriptor::SetConnectPending
 void ConnectionDescriptor::SetConnectPending(bool f)
 {
 	bConnectPending = f;
-	if (f == false && NextHeartbeat)
-		MyEventMachine->ClearHeartbeat(NextHeartbeat, this);
+	MyEventMachine->QueueHeartbeat(this);
 	_UpdateEvents();
 }
 
@@ -1447,14 +1446,16 @@ void AcceptorDescriptor::Read()
 			(*EventCallback) (GetBinding(), EM_CONNECTION_ACCEPTED, NULL, cd->GetBinding());
 		}
 		#ifdef HAVE_EPOLL
-		cd->GetEpollEvent()->events = EPOLLIN | (cd->SelectForWrite() ? EPOLLOUT : 0);
+		cd->GetEpollEvent()->events =
+			(cd->SelectForRead() ? EPOLLIN : 0) | (cd->SelectForWrite() ? EPOLLOUT : 0);
 		#endif
 		assert (MyEventMachine);
 		MyEventMachine->Add (cd);
 		#ifdef HAVE_KQUEUE
 		if (cd->SelectForWrite())
 			MyEventMachine->ArmKqueueWriter (cd);
-		MyEventMachine->ArmKqueueReader (cd);
+		if (cd->SelectForRead())
+			MyEventMachine->ArmKqueueReader (cd);
 		#endif
 	}
 

data/ext/em.cpp

@@ -482,8 +482,7 @@ void EventMachine_t::Run()
 		_AddNewDescriptors();
 		_ModifyDescriptors();
 
-		if (!_RunOnce())
-			break;
+		_RunOnce();
 		if (bTerminateSignalReceived)
 			break;
 	}
@@ -494,27 +493,24 @@ void EventMachine_t::Run()
 EventMachine_t::_RunOnce
 ************************/
 
-bool EventMachine_t::_RunOnce()
+void EventMachine_t::_RunOnce()
 {
-	bool ret;
 	if (bEpoll)
-		ret = _RunEpollOnce();
+		_RunEpollOnce();
 	else if (bKqueue)
-		ret = _RunKqueueOnce();
+		_RunKqueueOnce();
 	else
-		ret = _RunSelectOnce();
+		_RunSelectOnce();
 	_DispatchHeartbeats();
 	_CleanupSockets();
-	return ret;
 }
 
 
-
 /*****************************
 EventMachine_t::_RunEpollOnce
 *****************************/
 
-bool EventMachine_t::_RunEpollOnce()
+void EventMachine_t::_RunEpollOnce()
 {
 	#ifdef HAVE_EPOLL
 	assert (epfd != -1);
@@ -539,7 +535,7 @@ bool EventMachine_t::_RunEpollOnce()
 			assert(errno != EINVAL);
 			assert(errno != EBADF);
 		}
-		return true;
+		return;
 	}
 
 	TRAP_BEG;
@@ -577,8 +573,6 @@ bool EventMachine_t::_RunEpollOnce()
 		timeval tv = {0, ((errno == EINTR) ? 5 : 50) * 1000};
 		EmSelect (0, NULL, NULL, NULL, &tv);
 	}
-
-	return true;
 	#else
 	throw std::runtime_error ("epoll is not implemented on this platform");
 	#endif
@@ -589,7 +583,7 @@ bool EventMachine_t::_RunEpollOnce()
 EventMachine_t::_RunKqueueOnce
 ******************************/
 
-bool EventMachine_t::_RunKqueueOnce()
+void EventMachine_t::_RunKqueueOnce()
 {
 	#ifdef HAVE_KQUEUE
 	assert (kqfd != -1);
@@ -618,7 +612,7 @@ bool EventMachine_t::_RunKqueueOnce()
 			assert(errno != EINVAL);
 			assert(errno != EBADF);
 		}
-		return true;
+		return;
 	}
 
 	TRAP_BEG;
@@ -669,8 +663,6 @@ bool EventMachine_t::_RunKqueueOnce()
 		rb_thread_schedule();
 	}
 	#endif
-
-	return true;
 	#else
 	throw std::runtime_error ("kqueue is not implemented on this platform");
 	#endif
@@ -843,37 +835,17 @@ int SelectData_t::_Select()
 EventMachine_t::_RunSelectOnce
 ******************************/
 
-bool EventMachine_t::_RunSelectOnce()
+void EventMachine_t::_RunSelectOnce()
 {
 	// Crank the event machine once.
 	// If there are no descriptors to process, then sleep
 	// for a few hundred mills to avoid busy-looping.
-	// Return T/F to indicate whether we should continue.
 	// This is based on a select loop. Alternately provide epoll
 	// if we know we're running on a 2.6 kernel.
 	// epoll will be effective if we provide it as an alternative,
 	// however it has the same problem interoperating with Ruby
 	// threads that select does.
 
-	//cerr << "X";
-
-	/* This protection is now obsolete, because we will ALWAYS
-	 * have at least one descriptor (the loop-breaker) to read.
-	 */
-	/*
-	if (Descriptors.size() == 0) {
-		#ifdef OS_UNIX
-		timeval tv = {0, 200 * 1000};
-		EmSelect (0, NULL, NULL, NULL, &tv);
-		return true;
-		#endif
-		#ifdef OS_WIN32
-		Sleep (200);
-		return true;
-		#endif
-	}
-	*/
-
 	SelectData_t SelectData;
 	/*
 	fd_set fdreads, fdwrites;
@@ -975,8 +947,6 @@ bool EventMachine_t::_RunSelectOnce()
 			}
 		}
 	}
-
-	return true;
 }
 
 void EventMachine_t::_CleanBadDescriptors()

data/ext/em.h

@@ -145,7 +145,7 @@ class EventMachine_t
 		uint64_t GetRealTime();
 
 	private:
-		bool _RunOnce();
+		void _RunOnce();
 		void _RunTimers();
 		void _UpdateTime();
 		void _AddNewDescriptors();
@@ -153,9 +153,9 @@ class EventMachine_t
 		void _InitializeLoopBreaker();
 		void _CleanupSockets();
 
-		bool _RunSelectOnce();
-		bool _RunEpollOnce();
-		bool _RunKqueueOnce();
+		void _RunSelectOnce();
+		void _RunEpollOnce();
+		void _RunKqueueOnce();
 
 		void _ModifyEpollEvent (EventableDescriptor*);
 		void _DispatchHeartbeats();

data/lib/em/processes.rb

@@ -114,7 +114,7 @@ module EventMachine
     init = args.pop if args.last.is_a? Proc
 
     # merge remaining arguments into the command
-    cmd = ([cmd] + args.map{|a|a.to_s.dump}).join(' ')
+    cmd = [cmd, *args]
 
     EM.get_subprocess_pid(EM.popen(cmd, SystemCmd, cb) do |c|
       init[c] if init

data/lib/em/protocols.rb

@@ -32,5 +32,6 @@ module EventMachine
     autoload :Postgres3, 'em/protocols/postgres3'
     autoload :ObjectProtocol, 'em/protocols/object_protocol'
     autoload :Socks4, 'em/protocols/socks4'
+    autoload :LineProtocol, 'em/protocols/line_protocol'
   end
 end

data/lib/em/protocols/httpclient.rb

@@ -127,7 +127,7 @@ module EventMachine
         # Allow an override for the host header if it's not the connect-string.
         host = args[:host_header] || args[:host] || "_"
         # For now, ALWAYS tuck in the port string, although we may want to omit it if it's the default.
-        port = args[:port]
+        port = args[:port].to_i != 80 ? ":#{args[:port]}" : ""
 
         # POST items.
         postcontenttype = args[:contenttype] || "application/octet-stream"
@@ -138,7 +138,7 @@ module EventMachine
         # TODO: We ASSUME the caller wants to send a 1.1 request. May not be a good assumption.
         req = [
           "#{verb} #{request}#{qs} HTTP/#{version}",
-          "Host: #{host}:#{port}",
+          "Host: #{host}#{port}",
           "User-agent: Ruby EventMachine",
         ]
 

data/lib/em/protocols/line_protocol.rb

@@ -15,8 +15,8 @@ module EventMachine
       def receive_data data
         (@buf ||= '') << data
 
-        while line = @buf.slice!(/(.*)\r?\n/)
-          receive_line(line)
+        while @buf.slice!(/(.*?)\r?\n/)
+          receive_line($1)
         end
       end
 

data/lib/em/protocols/smtpserver.rb

@@ -506,11 +506,13 @@ module EventMachine
       # Since we clear the chunk array every time we submit it, the caller needs to be
       # aware to do things like dup it if he wants to keep it around across calls.
       #
-      # DON'T reset the transaction upon disposition of the incoming message.
-      # This means another DATA command can be accepted with the same sender and recipients.
-      # If the client wants to reset, he can call RSET.
-      # Not sure whether the standard requires a transaction-reset at this point, but it
-      # appears not to.
+      # Resets the transaction upon disposition of the incoming message.
+      # RFC5321 says this about the MAIL FROM command:
+      #  "This command tells the SMTP-receiver that a new mail transaction is
+      #   starting and to reset all its state tables and buffers, including any
+      #   recipients or mail data."
+      #
+      # Equivalent behaviour is implemented by resetting after a completed transaction.
       #
       # User-written code can return a Deferrable as a response from receive_message.
       #
@@ -524,11 +526,12 @@ module EventMachine
 
           succeeded = proc {
             send_data "250 Message accepted\r\n"
+            reset_protocol_state
           }
           failed = proc {
             send_data "550 Message rejected\r\n"
+            reset_protocol_state
           }
-
           d = receive_message
 
           if d.respond_to?(:set_deferred_status)
@@ -541,7 +544,7 @@ module EventMachine
           @state.delete :data
         else
           # slice off leading . if any
-          ln.slice!(0...1) if ln[0] == 46
+          ln.slice!(0...1) if ln[0] == ?.
           @databuffer << ln
           if @databuffer.length > @@parms[:chunksize]
             receive_data_chunk @databuffer

data/lib/em/protocols/stomp.rb

@@ -104,12 +104,15 @@ module EventMachine
 
       # @private
       def send_frame verb, headers={}, body=""
+        body = body.to_s
         ary = [verb, "\n"]
+        body_bytesize = body.bytesize if body.respond_to? :bytesize
+        body_bytesize ||= body.size
         headers.each {|k,v| ary << "#{k}:#{v}\n" }
-        ary << "content-length: #{body.to_s.length}\n"
+        ary << "content-length: #{body_bytesize}\n"
         ary << "content-type: text/plain; charset=UTF-8\n" unless headers.has_key? 'content-type'
         ary << "\n"
-        ary << body.to_s
+        ary << body
         ary << "\0"
         send_data ary.join
       end

data/lib/em/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/eventmachine.rb

@@ -1156,7 +1156,12 @@ module EventMachine
     # Perhaps misnamed since the underlying function uses socketpair and is full-duplex.
 
     klass = klass_from_handler(Connection, handler, *args)
-    w = Shellwords::shellwords( cmd )
+    w = case cmd
+        when Array
+          cmd
+        when String
+          Shellwords::shellwords( cmd )
+        end
     w.unshift( w.first ) if w.first
     s = invoke_popen( w )
     c = klass.new s, *args

data/lib/fastfilereaderext.rb

@@ -0,0 +1,2 @@
+  RUBY_VERSION =~ /(\d+.\d+)/
+  require "#{$1}/fastfilereaderext"

data/rakelib/package.rake

@@ -26,24 +26,29 @@ else
     unless RUBY_PLATFORM =~ /mswin|mingw/
       ext.cross_compile = true
       ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
-
-      # inject 1.8/1.9 pure-ruby entry point
-      ext.cross_compiling do |spec|
-        spec.files += ["lib/#{ext.name}.rb"]
-      end
+    end
+  end
+  def hack_cross_compilation(ext)
+    # inject 1.8/1.9 pure-ruby entry point
+    # HACK: add these dependencies to the task instead of using cross_compiling
+    ext.cross_platform.each do |platform|
+      Rake::Task["native:#{GEMSPEC.name}:#{platform}"].prerequisites.unshift "lib/#{ext.name}.rb"
     end
   end
 
-  Rake::ExtensionTask.new("rubyeventmachine", GEMSPEC) do |ext|
+  em = Rake::ExtensionTask.new("rubyeventmachine", GEMSPEC) do |ext|
     ext.ext_dir = 'ext'
     ext.source_pattern = '*.{h,c,cpp}'
     setup_cross_compilation(ext)
   end
-  Rake::ExtensionTask.new("fastfilereaderext", GEMSPEC) do |ext|
+  hack_cross_compilation em
+
+  ff = Rake::ExtensionTask.new("fastfilereaderext", GEMSPEC) do |ext|
     ext.ext_dir = 'ext/fastfilereader'
     ext.source_pattern = '*.{h,c,cpp}'
     setup_cross_compilation(ext)
   end
+  hack_cross_compilation ff
 end
 
 # Setup shim files that require 1.8 vs 1.9 extensions in win32 bin gems

data/tests/test_line_protocol.rb

@@ -0,0 +1,33 @@
+require 'em_test_helper'
+
+class TestLineProtocol < Test::Unit::TestCase
+  class LineProtocolTestClass
+    include EM::Protocols::LineProtocol
+
+    def lines
+      @lines ||= []
+    end
+
+    def receive_line(line)
+      lines << line
+    end
+  end
+
+  def setup
+    @proto = LineProtocolTestClass.new
+  end
+
+  def test_simple_split_line
+    @proto.receive_data("this is")
+    assert_equal([], @proto.lines)
+
+    @proto.receive_data(" a test\n")
+    assert_equal(["this is a test"], @proto.lines)
+  end
+
+  def test_simple_lines
+    @proto.receive_data("aaa\nbbb\r\nccc\nddd")
+    assert_equal(%w(aaa bbb ccc), @proto.lines)
+  end
+
+end

data/tests/test_stomp.rb

@@ -0,0 +1,37 @@
+require 'em_test_helper'
+
+class TestStomp < Test::Unit::TestCase
+  CONTENT_LENGTH_REGEX = /^content-length: (\d+)$/
+
+  def bytesize(str)
+    str = str.to_s
+    size = str.bytesize if str.respond_to?(:bytesize) # bytesize added in 1.9
+    size || str.size
+  end
+
+  def test_content_length_in_bytes
+    connection = Object.new
+    connection.instance_eval do 
+      extend EM::P::Stomp
+
+      def last_sent_content_length
+        @sent && Integer(@sent[CONTENT_LENGTH_REGEX, 1])
+      end
+
+      def send_data(string)
+        @sent = string
+      end
+    end
+
+    queue = "queue"
+    failure_message = "header content-length is not the byte size of last sent body"
+
+    body = "test"
+    connection.send queue, body
+    assert_equal bytesize(body), connection.last_sent_content_length, failure_message
+
+    body = "test\u221A"
+    connection.send queue, body
+    assert_equal bytesize(body), connection.last_sent_content_length, failure_message
+  end
+end

data/tests/test_system.rb

@@ -0,0 +1,28 @@
+# coding: utf-8
+require 'em_test_helper'
+
+class TestSystem < Test::Unit::TestCase
+  def setup
+    @filename = File.expand_path("../я манал dump.txt", __FILE__)
+    @test_data = 'a' * 100
+    File.open(@filename, 'w'){|f| f.write(@test_data)}
+  end
+
+  def test_system
+    result = nil
+    status = nil
+    EM.run {
+      EM.system('cat', @filename){|out, state|
+        result = out
+        status = state.exitstatus
+        EM.stop
+      }
+    }
+    assert_equal(0, status)
+    assert_equal(@test_data, result)
+  end
+
+  def teardown
+    File.unlink(@filename)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eventmachine
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: x86-mswin32-60
 authors: 
 - Francis Cianfrocca
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-28 00:00:00 Z
+date: 2013-03-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
@@ -232,6 +232,7 @@ files:
 - tests/test_idle_connection.rb
 - tests/test_inactivity_timeout.rb
 - tests/test_kb.rb
+- tests/test_line_protocol.rb
 - tests/test_ltp.rb
 - tests/test_ltp2.rb
 - tests/test_next_tick.rb
@@ -257,16 +258,21 @@ files:
 - tests/test_ssl_args.rb
 - tests/test_ssl_methods.rb
 - tests/test_ssl_verify.rb
+- tests/test_stomp.rb
+- tests/test_system.rb
 - tests/test_threaded_resource.rb
 - tests/test_tick_loop.rb
 - tests/test_timers.rb
 - tests/test_ud.rb
 - tests/test_unbind_reason.rb
+- lib/fastfilereaderext.rb
+- lib/rubyeventmachine.rb
 - lib/1.8/rubyeventmachine.so
 - lib/1.9/rubyeventmachine.so
+- lib/2.0/rubyeventmachine.so
 - lib/1.8/fastfilereaderext.so
 - lib/1.9/fastfilereaderext.so
-- lib/rubyeventmachine.rb
+- lib/2.0/fastfilereaderext.so
 homepage: http://rubyeventmachine.com
 licenses: []