moneta 0.7.18 → 0.7.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e5bf4f97796468cef521c2b103f72d7be29811
-  data.tar.gz: d9ab4368e38146049f4e92a0cf2337b2148fcf10
+  metadata.gz: 54ab5446cbb72cf10100e2e72680c4624113aaa0
+  data.tar.gz: c3337a129506fdeab6624542b37ada15a9c16c20
 SHA512:
-  metadata.gz: 2fadbaee29f91f2259b44cf7140d64e3ab12196ee2e29c6c9ccc5db2518b0a06a4db0d81f654e7625dceaa3ead6a7636aeb2240d9cff0bd17161b2f1865a6f19
-  data.tar.gz: f1751faff2cef9302fa0b3125e421e6632fa580978ab548fb13afd53f7dc37fe0e586821a657b3c79298a44b9ba66ccf68edacbf6efcc89e3b134176dfa2b7c9
+  metadata.gz: dc94d4af7c904ad023cee82ee3ec408e9685273362a94a6cf620ba0d108ea69b660ea8a737bd91491faacd10c09d0e5b1942f429b19fb010df806980e9f1f88b
+  data.tar.gz: 50a2df5e71906df99c2954ed1efb8ca2986234db51f21565c53bbbbdf93e2b07f123d041c6c165a0b24e9876852cbc23d2b4877e94261cf0f8b4bda946da53c1

data/.travis.yml

@@ -24,31 +24,31 @@ env:
   global:
     - secure: "dtM4n7FP8P0UI9Iq+nsvQ7/yfDqsxhfCO9i8zMxm/f9Kxj5Z/4C7jsXsLA+e\n/7FZ9+ld2QjPSPU0LUiDpj/z81bxyZHwqocQ7Nb0DVvO3JRHpr4/iBQQQHd3\n0jvou3mRbu5mBlUjf1/ALaZA+b+vcnsF9fd86UnkY+ChriylGnM="
   matrix:
-    - "TASK=test TEST_GROUP=1/10"
-    - "TASK=test TEST_GROUP=2/10"
-    - "TASK=test TEST_GROUP=3/10"
-    - "TASK=test TEST_GROUP=4/10"
-    - "TASK=test TEST_GROUP=5/10"
-    - "TASK=test TEST_GROUP=6/10"
-    - "TASK=test TEST_GROUP=7/10"
-    - "TASK=test TEST_GROUP=8/10"
-    - "TASK=test TEST_GROUP=9/10"
-    - "TASK=test TEST_GROUP=10/10"
-    - "TASK=test TEST_GROUP=unstable"
-    - "TASK=benchmarks CONFIG=uniform_small"
-    - "TASK=benchmarks CONFIG=uniform_medium"
-    - "TASK=benchmarks CONFIG=uniform_large"
-    - "TASK=benchmarks CONFIG=normal_small"
-    - "TASK=benchmarks CONFIG=normal_medium"
-    - "TASK=benchmarks CONFIG=normal_large"
+    - "SCRIPT='parallel-tests 1/10'"
+    - "SCRIPT='parallel-tests 2/10'"
+    - "SCRIPT='parallel-tests 3/10'"
+    - "SCRIPT='parallel-tests 4/10'"
+    - "SCRIPT='parallel-tests 5/10'"
+    - "SCRIPT='parallel-tests 6/10'"
+    - "SCRIPT='parallel-tests 7/10'"
+    - "SCRIPT='parallel-tests 8/10'"
+    - "SCRIPT='parallel-tests 9/10'"
+    - "SCRIPT='parallel-tests 10/10'"
+    - "SCRIPT='parallel-tests unstable'"
+    - "SCRIPT='benchmarks uniform_small'"
+    - "SCRIPT='benchmarks uniform_medium'"
+    - "SCRIPT='benchmarks uniform_large'"
+    - "SCRIPT='benchmarks normal_small'"
+    - "SCRIPT='benchmarks normal_medium'"
+    - "SCRIPT='benchmarks normal_large'"
 matrix:
   allow_failures:
     - rvm: jruby-18mode
     - rvm: jruby-19mode
     - rvm: rbx-18mode
     - rvm: rbx-19mode
-    - env: "TASK=test TEST_GROUP=unstable"
-script: "bundle exec rake $TASK"
+    - env: "SCRIPT='parallel-tests unstable'"
+script: "eval bundle exec ruby script/$SCRIPT"
 branches:
   only:
     - master

data/CHANGES

@@ -1,3 +1,9 @@
+0.7.19
+
+* ActionDispatch::Session::MonetaStore fixed for Rails 4
+* Moneta::Server: Tries now to remove stale unix socket
+* Moneta::Server: More robust and better performance
+
 0.7.18
 
 * Adapters::File#increment and #create fixed on JRuby

data/CONTRIBUTORS

@@ -16,6 +16,7 @@ lakshan <lakshan@web2media.net>
 Piotr Murach <pmurach@gmail.com>
 Potapov Sergey <blake131313@gmail.com>
 Quin Hoxie <quin@aboutus.org>
+Ryan T. Hosford <tad.hosford@gmail.com>
 Scott Wadden <scott.wadden@gmail.com>
 Tom Meier <ozmeier@yahoo.co.uk>
 Xavier Shay <xavier@rhnh.net>

data/Gemfile

@@ -1,8 +1,14 @@
+# Rails 4 requires Ruby >= 1.9
+def rails_version
+  v = ['>= 3.2.11']
+  v << '< 4.0.0' unless RUBY_VERSION >= '1.9'
+  v
+end
+
 source 'https://rubygems.org'
 gemspec
 
 # Testing
-gem 'rake'
 gem 'rspec'
 gem 'rspec-retry'
 
@@ -38,7 +44,7 @@ gem 'dm-migrations'
 gem 'dm-mysql-adapter'
 # FIXME: Use fog master because of failing tests, fixed after 1.11.1
 gem 'fog', :github => 'fog/fog'
-gem 'activerecord', '>= 3.2.11'
+gem 'activerecord', *rails_version
 gem 'redis'
 gem 'mongo'
 gem 'sequel'
@@ -74,5 +80,5 @@ gem 'rack'
 gem 'rack-cache'
 
 # Rails integration testing
-gem 'actionpack', '>= 3.2.11'
+gem 'actionpack', *rails_version
 gem 'minitest', '~> 4.7.4'

data/SPEC.md

@@ -65,7 +65,7 @@ Closes the store
 
 ### <code>features => Array&lt;Symbol&gt;</code> and <code>supports?(Symbol) => [TrueClass, FalseClass]</code>
 
-Feature detection. Adapters MUST return <code>:create</code> and <code>:increment</code> if these methods are supported. 
+Feature detection. Adapters MUST return <code>:create</code> and <code>:increment</code> if these methods are supported.
 
 ## Additional Options Hashes
 

data/lib/action_dispatch/middleware/session/moneta_store.rb

@@ -6,6 +6,7 @@ module ActionDispatch
     class MonetaStore < Rack::Session::Moneta
       include Compatibility
       include StaleSessionCheck
+      include SessionObject if defined?(SessionObject)
     end
   end
 end

data/lib/moneta.rb

@@ -10,7 +10,6 @@ module Moneta
   autoload :Lock,              'moneta/lock'
   autoload :Logger,            'moneta/logger'
   autoload :Mutex,             'moneta/synchronize'
-  autoload :Net,               'moneta/mixins'
   autoload :OptionMerger,      'moneta/optionmerger'
   autoload :OptionSupport,     'moneta/mixins'
   autoload :Pool,              'moneta/pool'

data/lib/moneta/adapters/client.rb

@@ -5,7 +5,6 @@ module Moneta
     # Moneta client backend
     # @api public
     class Client
-      include Net
       include Defaults
 
       # @param [Hash] options
@@ -14,50 +13,50 @@ module Moneta
       # @option options [String] :socket Unix socket file name as alternative to `:port` and `:host`
       def initialize(options = {})
         @socket = options[:socket] ? UNIXSocket.open(options[:socket]) :
-          TCPSocket.open(options[:host] || '127.0.0.1', options[:port] || DEFAULT_PORT)
+          TCPSocket.open(options[:host] || '127.0.0.1', options[:port] || 9000)
       end
 
       # (see Proxy#key?)
       def key?(key, options = {})
-        write(@socket, [:key?, key, options])
-        read_result
+        write(:key?, key, options)
+        read
       end
 
       # (see Proxy#load)
       def load(key, options = {})
-        write(@socket, [:load, key, options])
-        read_result
+        write(:load, key, options)
+        read
       end
 
       # (see Proxy#store)
       def store(key, value, options = {})
-        write(@socket, [:store, key, value, options])
-        read_result
+        write(:store, key, value, options)
+        read
         value
       end
 
       # (see Proxy#delete)
       def delete(key, options = {})
-        write(@socket, [:delete, key, options])
-        read_result
+        write(:delete, key, options)
+        read
       end
 
       # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
-        write(@socket, [:increment, key, amount, options])
-        read_result
+        write(:increment, key, amount, options)
+        read
       end
 
       # (see Proxy#create)
       def create(key, value, options = {})
-        write(@socket, [:create, key, value, options])
-        read_result
+        write(:create, key, value, options)
+        read
       end
 
       # (see Proxy#clear)
       def clear(options = {})
-        write(@socket, [:clear, options])
-        read_result
+        write(:clear, options)
+        read
         self
       end
 
@@ -71,16 +70,22 @@ module Moneta
       def features
         @features ||=
           begin
-            write(@socket, [:features])
-            read_result.freeze
+            write(:features)
+            read.freeze
           end
       end
 
       private
 
-      def read_result
-        result = read(@socket)
-        raise result if Error === result
+      def write(*args)
+        s = Marshal.dump(args)
+        @socket.write([s.bytesize].pack('N') << s)
+      end
+
+      def read
+        size = @socket.read(4).unpack('N').first
+        result = Marshal.load(@socket.read(size))
+        raise result if Exception === result
         result
       end
     end

data/lib/moneta/adapters/memcached/dalli.rb

@@ -52,7 +52,7 @@ module Moneta
       def increment(key, amount = 1, options = {})
         # FIXME: There is a Dalli bug, load(key) returns a wrong value after increment
         # therefore we set default = nil and create the counter manually
-	# See https://github.com/mperham/dalli/issues/309
+        # See https://github.com/mperham/dalli/issues/309
         result =
           if amount >= 0
             @backend.incr(key, amount, expires_value(options) || nil, nil)

data/lib/moneta/adapters/memcached/native.rb

@@ -64,7 +64,7 @@ module Moneta
           @backend.decrement(key, -amount)
         end
         # HACK: Throw error if applied to invalid value
-	# see https://github.com/evan/memcached/issues/110
+        # see https://github.com/evan/memcached/issues/110
         Utils.to_int((@backend.get(key, false) rescue nil)) if result == 0
         result
       rescue ::Memcached::NotFound => ex

data/lib/moneta/mixins.rb

@@ -284,27 +284,6 @@ module Moneta
     end
   end
 
-  # @api private
-  module Net
-    DEFAULT_PORT = 9000
-
-    class Error < RuntimeError; end
-
-    def pack(o)
-      s = Marshal.dump(o)
-      [s.bytesize].pack('N') << s
-    end
-
-    def read(io)
-      size = io.read(4).unpack('N').first
-      Marshal.load(io.read(size))
-    end
-
-    def write(io, o)
-      io.write(pack(o))
-    end
-  end
-
   # This mixin handles the calculation of expiration times.
   #
   #

data/lib/moneta/pool.rb

@@ -27,7 +27,7 @@ module Moneta
 
     def close
       @mutex.synchronize do
-        raise '#close can only when no thread is using the pool' if @all.size != @pool.size
+        raise '#close can only be called when no thread is using the pool' if @all.size != @pool.size
         @all.each(&:close)
         @all = @pool = nil
       end

data/lib/moneta/server.rb

@@ -1,7 +1,7 @@
 require 'socket'
 
 module Moneta
-  # Moneta server
+  # Moneta server to be used together with Moneta::Adapters::Client
   # @api public
   class Server
     # @param [Hash] options
@@ -9,13 +9,9 @@ module Moneta
     # @option options [String] :socket Alternative Unix socket file name
     def initialize(store, options = {})
       @store = store
-      @server =
-        if @socket = options[:socket]
-          UNIXServer.open(@socket)
-        else
-          TCPServer.open(options[:port] || DEFAULT_PORT)
-        end
-      @clients = [@server]
+      @server = start(options)
+      @ios = [@server]
+      @clients = {}
       @running = false
     end
 
@@ -52,54 +48,89 @@ module Moneta
 
     private
 
-    include Net
     TIMEOUT = 1
+    MAXSIZE = 0x100000
 
     def mainloop
-      client = accept
-      handle(client) if client
+      if ios = IO.select(@ios, nil, @ios, TIMEOUT)
+        ios[2].each do |io|
+          io.close
+          delete_client(io)
+        end
+        ios[0].each do |io|
+          if io == @server
+            if client = @server.accept
+              @ios << client
+              @clients[client] = ''
+            end
+          elsif io.closed? || io.eof?
+            delete_client(io)
+          else
+            handle(io, @clients[io] << io.readpartial(0xFFFF))
+          end
+        end
+      end
     rescue SignalException => ex
       warn "Moneta::Server - #{ex.message}"
-      raise if ex.signo == 15 # SIGTERM
-    rescue IOError => ex
-      warn "Moneta::Server - #{ex.message}" unless ex.message =~ /closed/
-      @clients.delete(client) if client
-      @clients.reject!(&:closed?)
+      raise if ex.signo == 15 || ex.signo == 2 # SIGTERM or SIGINT
     rescue Exception => ex
       warn "Moneta::Server - #{ex.message}"
-      write(client, Error.new(ex.message)) if client
     end
 
-    def accept
-      ios = IO.select(@clients, nil, @clients, TIMEOUT)
-      return nil unless ios
-      ios[2].each do |io|
-        io.close
-        @clients.delete(io)
-      end
-      ios[0].each do |io|
-        if io == @server
-          client = @server.accept
-          @clients << client if client
-        else
-          return io unless io.eof?
-          @clients.delete(io)
-        end
-      end
-      nil
+    def delete_client(io)
+      @ios.delete(io)
+      @clients.delete(io)
+    end
+
+    def pack(o)
+      s = Marshal.dump(o)
+      [s.bytesize].pack('N') << s
     end
 
-    def handle(client)
-      method, *args = read(client)
+    def handle(io, buffer)
+      buffer = @clients[io]
+      return if buffer.bytesize < 8 # At least 4 bytes for the marshalled array
+      size = buffer[0,4].unpack('N').first
+      if size > MAXSIZE
+        delete_client(io)
+        return
+      end
+      return if buffer.bytesize < 4 + size
+      buffer.slice!(0, 4)
+      method, *args = Marshal.load(buffer.slice!(0, size))
       case method
       when :key?, :load, :delete, :increment, :create, :features
-        write(client, @store.send(method, *args))
+        io.write(pack @store.send(method, *args))
       when :store, :clear
         @store.send(method, *args)
-        client.write(@nil ||= pack(nil))
+        io.write(@nil ||= pack(nil))
       else
         raise 'Invalid method call'
       end
+    rescue IOError => ex
+      warn "Moneta::Server - #{ex.message}" unless ex.message =~ /closed/
+      delete_client(io)
+    rescue Exception => ex
+      warn "Moneta::Server - #{ex.message}"
+      io.write(pack Exception.new(ex.message))
+    end
+
+    def start(options)
+      if @socket = options[:socket]
+        begin
+          UNIXServer.open(@socket)
+        rescue Errno::EADDRINUSE
+          if client = (UNIXSocket.open(@socket) rescue nil)
+            client.close
+            raise
+          end
+          File.unlink(@socket)
+          tries ||= 0
+          (tries += 1) < 3 ? retry : raise
+        end
+      else
+        TCPServer.open(options[:host] || '127.0.0.1', options[:port] || 9000)
+      end
     end
   end
 end