david 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b97cbebfb17845f2a5fa678fa026b40c2a843c40
-  data.tar.gz: 8cee683c847e3ea1f1a93a501904dcdcb7be2312
+  metadata.gz: ef49e2a7d5047bfbaf7a2146d2998495c7571f74
+  data.tar.gz: cc09675dd5021fe2a49c43224f0e5d5b713f5d9c
 SHA512:
-  metadata.gz: 43be48293b3b0c45eabfe106aadbb6dc120db4224d01b09d752dedddb7525e22f03289b1497d28aa5e3c2c5a0a6ea614e9f433df1789b14bda8c5183b904fa1b
-  data.tar.gz: fa3af2ac69c7a12c4f9d67c70c0f261ef4a7dc3a216e4b6054f719233b45d30877335679baaf664a1f3e4eee80cce67fd943871f2d33d5090d49b57963f94349
+  metadata.gz: 21ffffe1fd57e7444916ee097205cfee75d1c560bddd672ece840f6a22836a13739a3755e438a70880660b9fcc81e7b93833e99d5bc13e8c83e40d5e50022f2e
+  data.tar.gz: d3de9b5d60d1f13cf43fa47f05c49fd6dee9cb8ceeec8693e512fb3c0196dfca258d64930dc176d010c72165abdd6a5428029f11e13790465773c077e21dadf0

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    david (0.4.0)
+    david (0.4.1)
       celluloid-io (~> 0.16, >= 0.16.1)
-      coap (~> 0.1)
-      rack (~> 1.5)
+      coap (>= 0.1)
+      rack (~> 1.6)
 
 GEM
   remote: https://rubygems.org/
@@ -73,7 +73,7 @@ GEM
     docile (1.1.5)
     equalizer (0.0.9)
     erubis (2.7.0)
-    globalid (0.3.0)
+    globalid (0.3.1)
       activesupport (>= 4.1.0)
     grape (0.10.1)
       activesupport
@@ -171,7 +171,7 @@ GEM
       rspec-expectations (~> 3.2.0)
       rspec-mocks (~> 3.2.0)
       rspec-support (~> 3.2.0)
-    rspec-support (3.2.0)
+    rspec-support (3.2.1)
     ruby-prof (0.15.3)
     simplecov (0.9.1)
       docile (~> 1.1.0)
@@ -221,7 +221,7 @@ DEPENDENCIES
   nyny
   rails (~> 4.2.0)
   rake
-  rspec (~> 3.1)
+  rspec (~> 3.2)
   rspec-rails (~> 3.2.0)
   ruby-prof
   sinatra

data/README.md

@@ -8,7 +8,8 @@
 
 David is a CoAP server with Rack interface to bring the illustrious family of
 Rack compatible web frameworks into the Internet of Things. **Currently, it is
-in a development state and probably not ready for use in production.**
+in a development state and probably not ready for use in production.** It is
+tested with MRI >= 1.9, JRuby, and Rubinius.
 
 ## Usage
 
@@ -20,19 +21,34 @@ It will hook into Rack and make itself the default handler, so running `rails
 s` starts David. If you want to start WEBrick for example, you can do so by
 executing `rails s webrick`.
 
+After the server is started, the Rails application is available at
+`coap://[::1]:3000/` by default.
+
+[Copper](https://addons.mozilla.org/de/firefox/addon/copper-270430/) is a CoAP
+client for Firefox and can be used for development. The [Ruby coap
+gem](https://github.com/nning/coap) is used by David for example for message
+parsing and also includes a command line utility (named `coap`) that can also
+be used for development.
+
 As [CoAP](https://tools.ietf.org/html/rfc7252) is a protocol for constrained
 environments and machine to machine communications, returning HTML from your
 controllers will not be of much use. JSON for example is more suitable in that
-context. You can also utilize [JBuilder
-templates](https://github.com/rails/jbuilder) for easy JSON generation.
+context. The Accept header is set to "application/json" by default, so that
+Rails responds with the JSON resource representation. David works well with the
+default ways to handle JSON responses from controllers such as `render json:`.
+You can also utilize [Jbuilder templates](https://github.com/rails/jbuilder)
+for easy generation of more complex JSON structures.
 
 [CBOR](https://tools.ietf.org/html/rfc7049) can be used to compress your JSON.
-You can activate automatic transcoding between JSON and CBOR by setting the
-Rack environment option `CBOR` or `config.coap.cbor` in your Rails application
+Automatic transcoding between JSON and CBOR is activated by setting the Rack
+environment option `CBOR` or `config.coap.cbor` in your Rails application
 config to `true`.
 
 ## Tested Rack Frameworks
 
+By providing a Rack interface, David does not only work with Rails but also
+with the following Rack compatible web frameworks.
+
 * [Grape](https://github.com/intridea/grape)
 * [Hobbit](https://github.com/patriciomacadden/hobbit)
 * [NYNY](https://github.com/alisnic/nyny)
@@ -42,20 +58,45 @@ config to `true`.
 
 ## Configuration
 
+The following table lists available configuration options for the CoAP server.
+Rack keys can be specified with the `-O` option of `rackup`. The listed Rails
+keys can be accessed for example from the `config/application.rb` file of your
+Rails application.
+
 | Rack key			| Rails key					| Default	| Semantics							|
 |---				|---						|---		|---								|
-| Block				| coap.block				| true		| Blockwise transfers				|
+| Block				| coap.block				| true		| [Blockwise transfers](https://tools.ietf.org/html/draft-ietf-core-block-16) |
 | CBOR				| coap.cbor					| false		| JSON/CBOR transcoding				|
 | DefaultFormat		| coap.default_format		|			| Default Content-Type				|
 | Host				|							| ::1 / ::	| Server listening host				|
 | Log				|							| info		| Log level (none or debug)			|
 | MinimalMapping	|							| false		| Minimal HTTP status codes mapping	|
 | Multicast			| coap.multicast			| true		| Multicast support					|
-| Observe			| coap.observe				| true		| Observe support					|
+| Observe			| coap.observe				| true		| [Observe support](https://tools.ietf.org/html/draft-ietf-core-observe-16) |
 |					| coap.only					| true		| Removes (HTTP) middleware			|
 | Port				|							| 5683		| Server listening port				|
 |					| coap.resource_discovery	| true		| Provision of `.well-known/core`	|
 
+The server can be started with debug log level for example with the following
+command provided that a rackup config file (`config.ru`) exists like in a Rails
+application.
+
+    rackup -O Log=debug
+
+In a Rails application, CBOR transcoding is activated for any controller and
+action by inserting the third line of the following code into
+`config/application.rb`.
+
+    module Example
+	  class Application < Rails::Application
+	    config.coap.cbor = true
+	  end
+	end
+
+In Copper for example the default block size for Blockwise Transfers is set to
+64 bytes. That's even small for most exception messages. It is recommended to
+set the block size to the maximum (1024B) during development.
+
 ## Discovery
 
 The [CoAP Discovery](https://tools.ietf.org/html/rfc7252#section-7) will be
@@ -82,6 +123,9 @@ further documentation.)
 
 ## Rack environment
 
+David sets the following server (and protocol) specific Rack environment
+entries that can be read from your Rack application if necessary.
+
 | Key				| Value class	| Semantics |
 |---				|---			|--- |
 | coap.version		| Integer		| Protocol version of CoAP request |
@@ -92,7 +136,7 @@ further documentation.)
 
 ## Benchmarks
 
-David handles about 10.000 requests per second (tested in MRI 2.2.0 with up to
+David handles about 11.000 requests per second (tested in MRI 2.2.0 with up to
 10.000 concurrent clients on a single core of a Core i7-3520M CPU running Linux
 3.18.5).
 

data/benchmarks/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../coap
   specs:
-    coap (0.1.0)
+    coap (0.1.1)
       celluloid-io (~> 0.16, >= 0.16.1)
       resolv-ipv6favor (~> 0)
 
@@ -11,9 +11,9 @@ GEM
     benchmark-ips (2.1.1)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    celluloid-io (0.16.1)
+    celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
-      nio4r (>= 1.0.0)
+      nio4r (>= 1.1.0)
     hitimes (1.2.2)
     hitimes (1.2.2-java)
     nio4r (1.1.0)

data/benchmarks/plot.r

@@ -0,0 +1,24 @@
+#!/usr/lib/R/bin/Rscript
+
+library(methods)
+library(ggplot2)
+
+args   = commandArgs(TRUE)
+values = read.table(file=args[1], sep=",", header=T)
+
+x  = values$concurrent
+y1 = values$throughput
+y2 = values$loss
+
+df = data.frame(x, y1)
+
+g = ggplot(df, aes(x, y1)) +
+	scale_x_log10() +
+    geom_line(aes(y=y1)) +
+    ylab("Requests per second") +
+	xlab("Concurrent clients (log.)") +
+	theme(panel.background = element_rect(fill='white', colour='black'))
+
+path = paste(args[1], "pdf", sep=".")
+print(path)
+ggsave(g, file=path)

data/benchmarks/rackup/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: ../..
   specs:
-    david (0.4.0.pre)
+    david (0.4.1.pre)
       celluloid-io (~> 0.16, >= 0.16.1)
-      coap (~> 0.1)
-      rack (~> 1.5)
+      coap (>= 0.1)
+      rack (~> 1.6)
 
 GEM
   remote: https://rubygems.org/
@@ -55,7 +55,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    coap (0.1.0)
+    coap (0.1.1)
       celluloid-io (~> 0.16, >= 0.16.1)
       resolv-ipv6favor (~> 0)
     coercible (1.0.0)

data/benchmarks/stress.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 # (60+(28*3*(30+15)))/60=64
 
+ulimit -n 10240
+
 uri="coap://[::1]:5683/hello"
 
 ./coapbench.sh -c 1000 -t 60 $uri > /dev/null 2>&1

data/benchmarks/tocsv.rb

@@ -0,0 +1,22 @@
+require 'csv'
+
+def process_line(line)
+  line.split(', ').map { |x| x.split('=')[1] }
+end
+
+def process_lines(lines)
+  lines.map! { |line| process_line(line) }
+  lines[0].zip(*lines[1..2]).map { |x| avg(*x.map(&:to_f)) }
+end
+
+def avg(*args)
+  args.reduce(:+) / args.size.to_f
+end
+
+CSV.open(ARGV[0] + '.csv', 'wb') do |csv|
+  csv << %w[concurrent loss throughput]
+  File.readlines(ARGV[0]).each_slice(3) do |lines|
+    conc, _, total, loss, throughput = process_lines(lines)
+    csv << [conc, (loss/total)*100, throughput].map { |x| x.round(5) }
+  end
+end

data/david.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'celluloid-io', '~> 0.16', '>= 0.16.1'
-  s.add_dependency 'coap',         '~> 0.1'
-  s.add_dependency 'rack',         '~> 1.5'
+  s.add_dependency 'coap',         '>= 0.1'
+  s.add_dependency 'rack',         '~> 1.6'
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 3.1'
+  s.add_development_dependency 'rspec', '~> 3.2'
 end

data/lib/david/app_config.rb

@@ -1,5 +1,3 @@
-require 'david/fake_logger'
-
 module David
   class AppConfig < Hash
     DEFAULT_OPTIONS = {
@@ -47,12 +45,11 @@ module David
     end
 
     def choose_log(value)
-      return FakeLogger.new if value == 'none'
-
       log = ::Logger.new($stderr)
 
       log.level = ::Logger::INFO
       log.level = ::Logger::DEBUG if value == 'debug'
+      log.level = ::Logger::FATAL if value == 'none'
 
       log.formatter = proc do |sev, time, prog, msg|
         "#{time.strftime('[%Y-%m-%d %H:%M:%S]')} #{sev}  #{msg}\n"

data/lib/david/exchange.rb

@@ -1,10 +1,6 @@
 module David
   class Exchange < Struct.new(:host, :port, :message, :ancillary, :options)
     include Registry
-
-    def ==(other)
-      mid == other.mid && token == other.token
-    end
    
     def accept
       message.options[:accept]
@@ -77,6 +73,10 @@ module David
       !message.options[:observe].nil?
     end
 
+    def ping?
+      con? && message.mcode == [0, 0]
+    end
+
     def post?
       message.mcode == :post
     end

data/lib/david/fake_logger.rb

@@ -1,11 +1,12 @@
 module David
-  class FakeLogger
-    def initialize
-      Celluloid.logger = nil
-    end
+ class FakeLogger
+   def initialize
+     Celluloid.logger = nil
+   end
 
-    [:info, :debug, :warn, :error, :fatal].each do |method|
-      define_method(method) { |*args| }
-    end
-  end
+   [:info, :debug, :warn, :error, :fatal].each do |method|
+     define_method(method) { |*args| }
+     define_method("#{method}?".to_sym) { false }
+   end
+ end
 end

data/lib/david/guerilla/rack/handler.rb

@@ -14,8 +14,20 @@ module Rack
       elsif ENV.include?("RACK_HANDLER")
         self.get(ENV["RACK_HANDLER"])
       else
-        pick ['david', 'thin', 'puma', 'webrick']
+        # Return David as handler unless Rails is loaded and config.coap.only
+        # is set to false.
+        return Rack::Handler::David unless rails_coap_only
+
+        # Original Rack handler order.
+        pick ['thin', 'puma', 'webrick']
       end
     end
+
+    private
+
+    def self.rails_coap_only
+      defined?(Rails) && Rails.application &&
+        !Rails.application.config.coap.only
+    end
   end
 end

data/lib/david/observe.rb

@@ -73,11 +73,11 @@ module David
     end
 
     def transmit(exchange, message, options)
-      log.debug message.inspect
+      log.debug(message.inspect)
 
       begin
         server.socket.send(message.to_wire, 0, exchange.host, exchange.port)
-      rescue Timeout::Error, RuntimeError
+      rescue Timeout::Error, RuntimeError, Errno::ENETUNREACH
       end
     end
 
@@ -85,13 +85,19 @@ module David
       every(@tick_interval) { tick }
     end
 
-    def tick
+    def tick(fiber = true)
       unless self.empty?
         log.debug 'Observe tick'
         log.debug self
       end
 
-      self.each_key { |key| async.handle_update(key) }
+      self.each_key do |key|
+        if fiber
+          async.handle_update(key)
+        else
+          handle_update(key)
+        end
+      end
     end
   end
 end

data/lib/david/registry.rb

@@ -1,19 +1,23 @@
+require 'david/fake_logger'
+
 module David
   module Registry
     protected
 
     def log
-      @log ||= Celluloid.logger 
-      @log ||= ::Logger.new(nil)
+      @log ||= server.log
+    # In some tests no server actor is present
+    rescue NoMethodError
+      @log ||= FakeLogger.new
     end
 
-    def gc
-      Celluloid::Actor[:gc]
-    end
+    # def gc
+    #   Celluloid::Actor[:gc]
+    # end
 
-    def observe
-      Celluloid::Actor[:observe]
-    end
+    # def observe
+    #   Celluloid::Actor[:observe]
+    # end
 
     def server
       Celluloid::Actor[:server]

data/lib/david/server/constants.rb

@@ -44,6 +44,8 @@ module David
       HTTP_CONTENT_TYPE   = 'Content-Type'.freeze
       HTTP_ETAG           = 'ETag'.freeze
       HTTP_LOCATION       = 'Location'.freeze
+
+      ASCII_8BIT = 'ASCII-8BIT'.freeze
     end
   end
 end

data/lib/david/server/mapping.rb

@@ -98,6 +98,11 @@ module David
         nil
       end
 
+      def media_type_strip(media_type)
+        return nil if media_type.nil?
+        media_type.split(';')[0]
+      end
+
       def method_to_http(method)
         method.to_s.upcase
       end

data/lib/david/server/multicast.rb

@@ -3,7 +3,7 @@ module David
     # See https://tools.ietf.org/html/rfc7252#section-12.8
     module Multicast
       def multicast_initialize!
-        @socket.to_io.setsockopt(:SOL_SOCKET, :SO_REUSEADDR, 1)
+        @socket.to_io.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1)
 
         if ipv6?
           maddrs = ['ff02::fd', 'ff05::fd']
@@ -18,17 +18,17 @@ module David
           setsockopts_ipv4
         end
 
-        log.debug "Joined multicast groups: #{maddrs.join(', ')}"
+        log.debug("Joined multicast groups: #{maddrs.join(', ')}")
       rescue Errno::ENODEV, Errno::EADDRNOTAVAIL
-        log.warn 'Multicast initialization failure: Device not found.'
+        log.warn('Multicast initialization failure: Device not found.')
         @options[:Multicast] = false
       end
 
       private
 
       def multicast_listen_ipv4(address)
-        mreq = IPAddr.new(address).hton + IPAddr.new('0.0.0.0').hton
-        @socket.to_io.setsockopt(:IPPROTO_IP, :IP_ADD_MEMBERSHIP, mreq)
+        @socket.to_io.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP,
+          IPAddr.new(address).hton + IPAddr.new('0.0.0.0').hton)
       end
 
       def multicast_listen_ipv6(address)
@@ -40,16 +40,17 @@ module David
           ifindex = Socket.if_nametoindex(ifname)
         end
 
-        mreq = IPAddr.new(address).hton + [ifindex].pack('i_')
-        @socket.to_io.setsockopt(:IPPROTO_IPV6, :IPV6_JOIN_GROUP, mreq)
+        @socket.to_io.setsockopt(Socket::IPPROTO_IPV6, Socket::IPV6_JOIN_GROUP,
+          IPAddr.new(address).hton + [ifindex].pack('i_'))
       end
 
       def setsockopts_ipv4
-        @socket.to_io.setsockopt(:IPPROTO_IP, :IP_PKTINFO, 1)
+        @socket.to_io.setsockopt(Socket::IPPROTO_IP, Socket::IP_PKTINFO, 1)
       end
 
       def setsockopts_ipv6
-        @socket.to_io.setsockopt(:IPPROTO_IPV6, :IPV6_RECVPKTINFO, 1)
+        @socket.to_io.setsockopt(Socket::IPPROTO_IPV6,
+          Socket::IPV6_RECVPKTINFO, 1)
       end
     end
   end

data/lib/david/server/respond.rb

@@ -31,7 +31,7 @@ module David
             cbor = CBOR.load(exchange.message.payload)
 
             body = body_to_json(cbor)
-            body = body.force_encoding('ASCII-8BIT') # Rack::Lint insisted...
+            body = body.force_encoding(ASCII_8BIT) # Rack::Lint insisted...
 
             env[COAP_CBOR]      = cbor
             env[CONTENT_LENGTH] = body.bytesize
@@ -46,7 +46,7 @@ module David
         # No error responses on multicast exchanges.
         return if exchange.multicast? && !(200..299).include?(code)
 
-        ct = headers[HTTP_CONTENT_TYPE]
+        ct = media_type_strip(headers[HTTP_CONTENT_TYPE])
         body = body_to_string(body)
 
         if @options[:CBOR] && ct == CONTENT_TYPE_JSON

data/lib/david/server.rb

@@ -11,7 +11,7 @@ module David
     include Multicast
     include Respond
 
-    attr_reader :socket
+    attr_reader :log, :socket
 
     finalizer :shutdown
 
@@ -19,6 +19,7 @@ module David
       @app        = app.respond_to?(:new) ? app.new : app
       @mid_cache  = {}
       @options    = AppConfig.new(options)
+      @log        = @options[:Log]
 
       host, port  = @options.values_at(:Host, :Port)
 
@@ -50,6 +51,18 @@ module David
 
     private
 
+    def answer(exchange, key = nil)
+      @socket.send(exchange.message.to_wire, 0, exchange.host, exchange.port)
+
+      if log.info?
+        log.info('-> ' + exchange.to_s)
+        log.debug(exchange.message.inspect)
+      end
+
+      key ||= exchange.key
+      cache_add(key, exchange.message) if exchange.ack?
+    end
+
     def dispatch(*args)
       data, sender, _, anc = args
 
@@ -67,6 +80,8 @@ module David
       log.info('<- ' + exchange.to_s)
       log.debug(message.inspect)
 
+      pong(exchange) and return if exchange.ping?
+
       key = exchange.key
       cached = cache_get(key)
 
@@ -86,13 +101,8 @@ module David
       end
 
       unless response.nil?
-        @socket.send(response.to_wire, 0, exchange.host, exchange.port)
-
-        exchange.message = response if log.info?
-        log.info('-> ' + exchange.to_s)
-        log.debug(response.inspect)
-
-        cache_add(key, response) if response.tt == :ack
+        exchange.message = response
+        answer(exchange, key) 
       end
     end
 
@@ -100,6 +110,11 @@ module David
       IPAddr.new(@options[:Host]).ipv6?
     end
 
+    def pong(exchange)
+      exchange.message.tt = :ack
+      answer(exchange)
+    end
+
     def shutdown
       @socket.close unless @socket.nil?
     end

data/lib/david/version.rb

@@ -1,7 +1,7 @@
 module David
   MAJOR = 0
   MINOR = 4
-  PATCH = 0
+  PATCH = 1
   SUFFIX = nil
 
   VERSION = [MAJOR, MINOR, PATCH, SUFFIX].compact.join('.')

data/lib/rack/hello_world.rb

@@ -1,7 +1,5 @@
 module Rack
   class HelloWorld
-#   include Celluloid
-
     def call(env)
       dup._call(env)
     end
@@ -12,11 +10,6 @@ module Rack
       end
 
       return case env['PATH_INFO']
-      when '/.well-known/core'
-        [200,
-          {'Content-Type' => 'application/link-format'},
-          ['</hello>;rt="hello";ct=0']
-        ]
       when '/echo/accept'
         [200,
           {'Content-Type' => env['HTTP_ACCEPT'], 'Content-Length' => '0'},
@@ -28,12 +21,6 @@ module Rack
           {'Content-Type' => 'text/plain', 'Content-Length' => '12'},
           ['Hello World!']
         ]
-      when '/wait'
-        sleep 10
-        [200,
-          {'Content-Type' => 'text/plain'},
-          ['You waited!']
-        ]
       when '/value'
         @@value ||= 0
         @@value  += 1
@@ -80,7 +67,7 @@ module Rack
 
         [200,
           {
-            'Content-Type' => 'application/json',
+            'Content-Type' => 'application/json; charset=utf8',
             'Content-Length' => body.bytesize.to_s
           },
           [body]

data/spec/observe_spec.rb

@@ -19,8 +19,13 @@ describe Observe do
     end
   end
 
-  let(:dummy1) { [@exchange1, {'PATH_INFO' => '/'}, '1'] }
-  let(:dummy2) { [@exchange2, {'PATH_INFO' => '/'}, '1'] }
+  let(:dummy1) do
+    [@exchange1, {'REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/'}, '1']
+  end
+
+  let(:dummy2) do
+    [@exchange2, {'REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/hello'}, '1']
+  end
 
   subject { Celluloid::Actor[:observe] }
 
@@ -30,6 +35,11 @@ describe Observe do
     let!(:key) { [dummy1[0].host, dummy1[0].token] }
     let!(:value) { subject[key] }
 
+    it '#to_s' do
+      s = '["127.0.0.1", ' + dummy1[0].token.to_s + ', "/", 0]'
+      expect(subject.to_s).to eq(s)
+    end
+
     context 'key' do
       it 'presence' do
         expect(subject.size).to eq(1)
@@ -109,4 +119,79 @@ describe Observe do
   describe '#tick' do
     # Couldn't get mocking to work decently.
   end
+
+  describe '#bump' do
+    let!(:key) { [dummy1[0].host, dummy1[0].token] }
+
+    let(:n)         { rand(0xff) }
+    let(:response)  { dummy1[0].message }
+
+    before { subject.add(*dummy1) }
+
+    it 'shall change entry' do
+      subject.send(:bump, key, n, response)
+
+      expect(subject[key][0]).to eq(n)
+      expect(subject[key][3]).to eq(response.options[:etag])
+      expect(subject[key][4]).to be <= Time.now.to_i
+    end
+  end
+
+  describe '#handle_update' do
+    let(:port) { random_port }
+
+    let!(:server) { supervised_server(:Port => port) }
+
+    context 'error (4.04)' do
+      let!(:key) { [dummy1[0].host, dummy1[0].token] }
+
+      before do
+        dummy1[0].port = port
+        subject.add(*dummy1)
+        subject.send(:handle_update, key)
+      end
+
+      it 'delete' do
+        expect(subject[key]).to eq(nil)
+      end
+    end
+
+    context 'update (2.05)' do
+      let!(:key) { [dummy2[0].host, dummy2[0].token] }
+
+      before do
+        dummy2[0].port = port
+        subject.add(*dummy2)
+        subject.send(:handle_update, key)
+      end
+
+      it 'bumped' do
+        expect(subject[key][0]).to eq(1)
+        expect(subject[key][3]).to eq(dummy2[0].message.options[:etag])
+        expect(subject[key][4]).to be <= Time.now.to_i
+      end
+    end
+  end
+
+  describe '#tick' do
+    let(:port) { random_port }
+
+    let!(:server) { supervised_server(:Port => port) }
+
+    context 'update (2.05)' do
+      let!(:key) { [dummy2[0].host, dummy2[0].token] }
+
+      before do
+        dummy2[0].port = port
+        subject.add(*dummy2)
+        subject.send(:tick, false)
+      end
+
+      it 'bumped' do
+        expect(subject[key][0]).to eq(1)
+        expect(subject[key][3]).to eq(dummy2[0].message.options[:etag])
+        expect(subject[key][4]).to be <= Time.now.to_i
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -51,7 +51,9 @@ module David
 
       app = options.delete(:app) || Rack::HelloWorld
 
-      server = David::Server.new(app, defaults.merge(options))
+      David::Server.supervise_as(:server, app, defaults.merge(options))
+
+      server = Celluloid::Actor[:server]
       server.async.run
 
       server

metadata

@@ -1,91 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: david
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - henning mueller
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.1
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.1
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: coap
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rack
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  prerelease: false
+        version: '1.6'
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-  prerelease: false
+        version: '3.2'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: |-
   David is a CoAP server with Rack interface to bring the
       illustrious family of Rack compatible web frameworks into the Internet of
@@ -96,8 +96,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -107,6 +107,7 @@ files:
 - benchmarks/Gemfile
 - benchmarks/Gemfile.lock
 - benchmarks/coapbench.sh
+- benchmarks/plot.r
 - benchmarks/quick.sh
 - benchmarks/rackup/Gemfile
 - benchmarks/rackup/Gemfile.lock
@@ -115,6 +116,7 @@ files:
 - benchmarks/rackup/rails.ru
 - benchmarks/rps.rb
 - benchmarks/stress.sh
+- benchmarks/tocsv.rb
 - bin/david
 - config.ru
 - david.gemspec
@@ -220,24 +222,24 @@ homepage: https://github.com/nning/david
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5
+signing_key: 
 specification_version: 4
 summary: CoAP server with Rack interface.
 test_files: