grocer 0.0.12 → 0.0.13

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# CHANGELOG
+
+## 0.0.13
+
+* Fixes a bug where closing a Grocer.server could result in an
+  `Errno::ENOTCONN` being raised (seems isolated to OS X).

data/lib/grocer/ssl_server.rb

@@ -26,12 +26,19 @@ module Grocer
     end
 
     def close
-      if @ssl_socket
-        @ssl_socket.shutdown
+      if @ssl_socket && !@ssl_socket.closed?
+        begin
+          @ssl_socket.shutdown
+        rescue Errno::ENOTCONN
+          # Some platforms raise this if the socket is not connected. Not sure
+          # how to avoid it.
+        end
+
         @ssl_socket.close
-        @ssl_socket = nil
-        @socket = nil
       end
+
+      @ssl_socket = nil
+      @socket = nil
     end
 
     private

data/lib/grocer/version.rb

@@ -1,3 +1,3 @@
 module Grocer
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/spec/grocer/ssl_server_spec.rb

@@ -33,14 +33,30 @@ describe Grocer::SSLServer do
     it "shutdowns the SSL socket" do
       mock_ssl_server.expects(:shutdown)
 
-      subject.accept # "open" socket
+      # Emulate opening the socket
+      subject.accept
+      mock_ssl_server.stubs(:closed? => false)
+
+      subject.close
+    end
+
+    it "ignores Errno::ENOTCONN errors that might be raised when shutting down the socket" do
+      mock_ssl_server.stubs(:shutdown).raises(Errno::ENOTCONN)
+
+      # Emulate opening the socket
+      subject.accept
+      mock_ssl_server.stubs(:closed? => false)
+
       subject.close
     end
 
     it "closes the SSL socket" do
       mock_ssl_server.expects(:close)
 
-      subject.accept # "open" socket
+      # Emulate opening the socket
+      subject.accept
+      mock_ssl_server.stubs(:closed? => false)
+
       subject.close
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grocer
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -110,6 +110,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -167,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1066047643388989879
+      hash: -2773558114449338672
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -176,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1066047643388989879
+      hash: -2773558114449338672
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24