david 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c05ae2be9159cd26324a9b57084f305f29c94ae
-  data.tar.gz: 8012add91aff3749cea0b3b909b38e48c5e93440
+  metadata.gz: 9290eb9d9985ad49903395efb724f8042e2942e3
+  data.tar.gz: 6dcfc403652e20f71ae2fd05983aab6101810e81
 SHA512:
-  metadata.gz: 71268e41025f6eef51bda0b0417195d9467871228f0cd02e0c0641dca2c655ab9490c703926b2d3a4129c8537d028a0daa40e839c1b681356bd8015641bd1157
-  data.tar.gz: 6663bf64eb9c89000773b6632675323ff0e4593d0bbf524f6fc26389f84c9814e9943dab9bd3efac970dfaa393a1b9b373199bb9ba8f83ec47753fee28cddbcd
+  metadata.gz: 2de6801e0ae8e344dc88e4d64d5980c595738424314b739d49388163a77194f4bb56c15bc021fa17431ec489554a026b1fd8c791b42a91f451e05d3543ff1af2
+  data.tar.gz: 7cdb306f81d1baddafdaadf5a37435cc3ee393095762951a028a8b56ce42bd778857562cda44b2b3f4441b380ffe9448f453546cf4cbda3ad0d917c9b7a7102e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    david (0.4.2)
+    david (0.4.3)
       celluloid-io (~> 0.16, >= 0.16.1)
       coap (>= 0.1)
       rack (~> 1.6)

data/benchmarks/rackup/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    david (0.4.2.pre)
+    david (0.4.3.pre)
       celluloid-io (~> 0.16, >= 0.16.1)
       coap (>= 0.1)
       rack (~> 1.6)

data/benchmarks/rackup/interop.ru

@@ -1,4 +1,4 @@
-#\ -o ::1 -p 5683 -O Block=true -O Multicast=false -O Observe=false -O Log=debug -E none
+#\ -o ::1 -p 5683 -O Multicast=false -O Log=debug -E none
 
 module David; module ETSI; end; end
 
@@ -10,8 +10,8 @@ require 'david/etsi/mandatory/rack'
 require 'david/etsi/optional/rack'
 
 apps = [
-  David::ETSI::Optional::Rack.new,
   David::ETSI::Mandatory::Rack.new,
+  David::ETSI::Optional::Rack.new,
 ]
 
 run Rack::Cascade.new(apps)

data/lib/david/observe.rb

@@ -9,12 +9,10 @@ module David
       @tick_interval = tick_interval
       async.run
 
-      log.debug 'Observe initialized'
+      log.debug('Observe initialized')
     end
 
     def add(exchange, env, etag)
-      exchange.message.tt = :non
-      exchange.message.mid = nil
       exchange.message.options.delete(:observe)
 
       self[[exchange.host, exchange.token]] ||=
@@ -58,7 +56,10 @@ module David
       end
 
       if etag != response.options[:etag]
+        response.tt = :con
+        response.mid = SecureRandom.random_number(0xffff)
         response.options[:observe] = n
+
         transmit(exchange, response, options)
 
         # TODO Implement removing of observe relationship on RST answer to
@@ -73,10 +74,9 @@ module David
     end
 
     def transmit(exchange, message, options)
-      log.debug(message.inspect)
-
       begin
         server.socket.send(message.to_wire, 0, exchange.host, exchange.port)
+        log.debug(message.inspect)
       rescue Timeout::Error, RuntimeError, Errno::ENETUNREACH
       end
     end
@@ -87,8 +87,8 @@ module David
 
     def tick(fiber = true)
       unless self.empty?
-        log.debug 'Observe tick'
-        log.debug self
+        log.debug('Observe tick')
+        log.debug(self)
       end
 
       self.each_key do |key|

data/lib/david/server.rb

@@ -52,8 +52,6 @@ module David
       end
     end
 
-    private
-
     def answer(exchange, key = nil)
       @socket.send(exchange.message.to_wire, 0, exchange.host, exchange.port)
 
@@ -62,10 +60,11 @@ module David
         log.debug(exchange.message.inspect)
       end
 
-      key ||= exchange.key
-      cache_add(key, exchange.message) if exchange.ack?
+      cache_add(exchange.key, exchange.message) if exchange.ack?
     end
 
+    private
+
     def dispatch(*args)
       data, sender, _, anc = args
 

data/lib/david/version.rb

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

data/lib/rack/handler/david.rb

@@ -36,6 +36,6 @@ module Rack
       end
     end
 
-    register :david, David
+    register(:david, David)
   end
 end

data/lib/rack/hello_world.rb

@@ -26,7 +26,7 @@ module Rack
         @@value  += 1
 
         [200,
-          {'Content-Type' => 'text/plain'},
+          {'Content-Type' => 'text/plain', 'ETag' => rand(0xffff).to_s},
           ["#{@@value}"]
         ]
       when '/block'

data/spec/interop/mandatory_spec.rb

@@ -9,12 +9,13 @@ require 'spec_helper'
   Rails.application
 ].each do |app|
   describe "ETSI Plugstests, Mandatory, #{app.to_s.split('::').last}" do
-    let!(:server) { supervised_server(:MinimalMapping => true, app: app) }
+    let!(:port) { random_port }
+    let!(:server) { supervised_server(:Port => port, :MinimalMapping => true, app: app) }
 
     [:con, :non].each do |tt|
       context tt do
         it 'TD_COAP_CORE_0{1,5}' do
-          mid, response = req(:get, '/test', tt: tt)
+          mid, response = req(:get, '/test', port: port, tt: tt)
 
           expect(response).to be_a(CoAP::Message)
           expect(response.mcode).to eq([2, 5])
@@ -23,8 +24,8 @@ require 'spec_helper'
         end
 
         it 'TD_COAP_CORE_0{2,6}' do
-          mid, response = req(:post, '/test', tt: tt, payload: 'foo',
-            content_format: 0)
+          mid, response = req(:post, '/test', port: port, tt: tt, payload:
+            'foo', content_format: 0)
 
           expect(response).to be_a(CoAP::Message)
           expect(response.mcode).to eq([2, 1])
@@ -32,8 +33,8 @@ require 'spec_helper'
         end
 
         it 'TD_COAP_CORE_0{3,7}' do
-          mid, response = req(:put, '/test', tt: tt, payload: 'foo',
-            content_format: 0)
+          mid, response = req(:put, '/test', port: port, tt: tt, payload:
+            'foo', content_format: 0)
 
           expect(response).to be_a(CoAP::Message)
           expect(response.mcode).to eq([2, 4])
@@ -41,7 +42,7 @@ require 'spec_helper'
         end
 
         it 'TD_COAP_CORE_0{4,8}' do
-          mid, response = req(:delete, '/test', tt: tt)
+          mid, response = req(:delete, '/test', port: port, tt: tt)
 
           expect(response).to be_a(CoAP::Message)
           expect(response.mcode).to eq([2, 2])
@@ -52,7 +53,7 @@ require 'spec_helper'
 
     it 'TD_COAP_CORE_10' do
       token = rand(0xffffffff)
-      mid, response = req(:get, '/test', token: token)
+      mid, response = req(:get, '/test', port: port, token: token)
 
       expect(response).to be_a(CoAP::Message)
       expect(response.mcode).to eq([2, 5])
@@ -62,7 +63,7 @@ require 'spec_helper'
     end
 
     it 'TD_COAP_CORE_11' do
-      mid, response = req(:get, '/test')
+      mid, response = req(:get, '/test', port: port)
 
       expect(response).to be_a(CoAP::Message)
       expect(response.mcode).to eq([2, 5])
@@ -72,7 +73,7 @@ require 'spec_helper'
     end
 
     it 'TD_COAP_CORE_12' do
-      mid, response = req(:get, '/seg1/seg2/seg3')
+      mid, response = req(:get, '/seg1/seg2/seg3', port: port)
 
       expect(response).to be_a(CoAP::Message)
       expect(response.mcode).to eq([2, 5])
@@ -81,7 +82,7 @@ require 'spec_helper'
     end
 
     it 'TD_COAP_CORE_13' do
-      mid, response = req(:get, '/query', uri_query: ['foo=1', 'bar=2'])
+      mid, response = req(:get, '/query', port: port, uri_query: ['foo=1', 'bar=2'])
 
       expect(response).to be_a(CoAP::Message)
       expect(response.mcode).to eq([2, 5])

data/spec/interop/optional_spec.rb

@@ -4,11 +4,12 @@ require 'spec_helper'
   ETSI::Optional::Rack,
 ].each do |app|
   describe "ETSI Plugstests, Optional, #{app.to_s.split('::').last}" do
-    let!(:server) { supervised_server(:MinimalMapping => true, app: app) }
+    let(:port) { random_port }
+    let!(:server) { supervised_server(:Port => port, :MinimalMapping => true, app: app) }
 
     context 'TD_COAP_BLOCK_01' do
       it 'block 0' do
-        mid, response = req(:get, '/large', block2: 0) # 0, false, 16
+        mid, response = req(:get, '/large', port: port, block2: 0) # 0, false, 16
         block = CoAP::Block.new(response.options[:block2]).decode
 
         expect(response).to be_a(CoAP::Message)
@@ -21,7 +22,7 @@ require 'spec_helper'
       end
 
       it 'block 1' do
-        mid, response = req(:get, '/large', block2: 16) # 1, false, 16
+        mid, response = req(:get, '/large', port: port, block2: 16) # 1, false, 16
         block = CoAP::Block.new(response.options[:block2]).decode
 
         expect(response).to be_a(CoAP::Message)
@@ -34,7 +35,7 @@ require 'spec_helper'
       end
 
       it 'block 64' do
-        mid, response = req(:get, '/large', block2: 1024) # 65, false, 16
+        mid, response = req(:get, '/large', port: port, block2: 1024) # 65, false, 16
         block = CoAP::Block.new(response.options[:block2]).decode
 
         expect(response).to be_a(CoAP::Message)
@@ -50,7 +51,7 @@ require 'spec_helper'
 
     context 'TD_COAP_BLOCK_02' do
       it 'block 0' do
-        mid, response = req(:get, '/large')
+        mid, response = req(:get, '/large', port: port)
         block = CoAP::Block.new(response.options[:block2]).decode
 
         expect(response).to be_a(CoAP::Message)
@@ -63,7 +64,7 @@ require 'spec_helper'
       end
 
       it 'block 1' do
-        mid, response = req(:get, '/large', block2: 22) # 1, false, 1024
+        mid, response = req(:get, '/large', port: port, block2: 22) # 1, false, 1024
         block = CoAP::Block.new(response.options[:block2]).decode
 
         expect(response).to be_a(CoAP::Message)
@@ -82,7 +83,7 @@ require 'spec_helper'
 
         @t1 = Thread.start do
           CoAP::Client.new.observe \
-            '/obs', '::1', nil,
+            '/obs', '::1', port,
             ->(s, m) { @answers << m }
         end
 

data/spec/observe_spec.rb

@@ -194,4 +194,37 @@ describe Observe do
       end
     end
   end
+
+  describe 'integration' do
+    let(:port) { random_port }
+
+    let!(:server) { supervised_server(:Port => port) }
+    let!(:client) do
+      CoAP::Client.new(port: port, retransmit: false, recv_timeout: 0.1)
+    end
+
+    before do
+      @answers = []
+
+      @t1 = Thread.start do
+        client.observe \
+          '/value', '::1', nil,
+          ->(s, m) { @answers << m }
+      end
+
+      Timeout.timeout(12) do
+        sleep 0.25 while !(@answers.size > 2)
+      end
+    end
+    
+    it 'should receive updates' do
+      expect(@answers.size).to be > 2
+      expect(@answers.map(&:mid).uniq.size).to eq(3)
+    end
+
+    after do
+      @t1.kill
+      server.terminate
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -27,15 +27,16 @@ module David
 
     def req(method, path, options = {})
       mid = rand(0xffff) unless respond_to?(:mid)
-      port = random_port unless respond_to?(:port)
 
       payload = options.delete(:payload)
+      port    = options.delete(:port) || random_port
+
       options.merge!(mid: mid)
 
       client = CoAP::Client.new(retransmit: false, recv_timeout: 0.1,
         token: false)
 
-      response = client.send(method, path, '::1', nil, payload, options)
+      response = client.send(method, path, '::1', port, payload, options)
 
       [mid, response]
     end
@@ -51,12 +52,18 @@ module David
 
       app = options.delete(:app) || Rack::HelloWorld
 
-      David::Server.supervise_as(:server, app, defaults.merge(options))
+      g = Celluloid::SupervisionGroup.run!
+
+      g.supervise_as(:server, ::David::Server, app, defaults.merge(options))
+      g.supervise_as(:gc, ::David::GarbageCollector)
+
+      unless options[:Observe] == 'false'
+        g.supervise_as(:observe, ::David::Observe)
+      end
 
-      server = Celluloid::Actor[:server]
-      server.async.run
+      Celluloid::Actor[:server].async.run
 
-      server
+      g 
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: david
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - henning mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io