Rubinius Specs

Appraisals

@@ -1,7 +1,14 @@
 appraise 'rails3' do
   gem 'rails', '>= 3', '< 4'
+
+  gem 'rubysl', '~> 2.0', :platform => :rbx
+  gem 'rubinius-developer_tools', :platform => :rbx
+
 end
 
 appraise 'rails4' do
   gem 'rails', '>= 4.0.0.beta', '< 5'
+
+  gem 'rubysl', '~> 2.0', :platform => :rbx
+  gem 'rubinius-developer_tools', :platform => :rbx
 end

Gemfile

@@ -7,6 +7,9 @@ gem 'kgio', :platform => :mri
 gem 'appraisal'
 gem 'connection_pool'
 
+gem 'rubysl', '~> 2.0', :platform => :rbx
+gem 'rubinius-developer_tools', :platform => :rbx
+
 group :test do
   gem 'simplecov'
 end

gemfiles/rails3.gemfile

@@ -8,4 +8,7 @@ gem "kgio", :platform=>:mri
 gem "appraisal"
 gem "rails", ">= 3", "< 4"
 
+gem 'rubysl', '~> 2.0', :platform => :rbx
+gem 'rubinius-developer_tools', :platform => :rbx
+
 gemspec :path=>"../"

gemfiles/rails4.gemfile

@@ -8,4 +8,7 @@ gem "kgio", :platform=>:mri
 gem "appraisal"
 gem "rails", ">= 4.0.0.beta", "< 5"
 
+gem 'rubysl', '~> 2.0', :platform => :rbx
+gem 'rubinius-developer_tools', :platform => :rbx
+
 gemspec :path=>"../"

lib/dalli/server.rb

@@ -58,6 +58,8 @@ def request(op, *args)
       raise Dalli::NetworkError, "#{hostname}:#{port} is down: #{@error} #{@msg}. If you are sure it is running, ensure memcached version is > 1.4." unless alive?
       begin
         send(op, *args)
+      rescue Timeout::Error
+        raise
       rescue Dalli::NetworkError
         raise
       rescue Dalli::MarshalError => ex
@@ -391,6 +393,8 @@ def serialize(key, value, options=nil)
         marshalled = true
         begin
           self.serializer.dump(value)
+        rescue Timeout::Error
+          raise
         rescue => ex
           # Marshalling can throw several different types of generic Ruby exceptions.
           # Convert to a specific exception so we can special case it higher up the stack.

test/helper.rb

@@ -1,9 +1,8 @@
 $TESTING = true
-require 'rubygems'
 # require 'simplecov'
 # SimpleCov.start
-require 'minitest/pride'
 require 'minitest/autorun'
+# require 'minitest/pride'
 require 'mocha/setup'
 require 'memcached_mock'