david 0.3.0 → 0.4.0

data/spec/observe_spec.rb

@@ -7,19 +7,20 @@ describe Observe do
 
   # TODO Replace this with factory.
   before do
-    [:@request1, :@request2].each do |var|
+    [:@exchange1, :@exchange2].each do |var|
+      mid     = SecureRandom.random_number(0xffff)
       token   = SecureRandom.random_number(0xff)
       options = { uri_path: [], token: token }
 
-      message = CoAP::Message.new(:con, :get, nil, '', options)
-      request = Request.new('127.0.0.1', CoAP::PORT, message)
+      message  = CoAP::Message.new(:con, :get, mid, '', options)
+      exchange = Exchange.new('127.0.0.1', CoAP::PORT, message)
 
-      instance_variable_set(var, request)
+      instance_variable_set(var, exchange)
     end
   end
 
-  let(:dummy1) { [@request1, {'PATH_INFO' => '/'}, '1'] }
-  let(:dummy2) { [@request2, {'PATH_INFO' => '/'}, '1'] }
+  let(:dummy1) { [@exchange1, {'PATH_INFO' => '/'}, '1'] }
+  let(:dummy2) { [@exchange2, {'PATH_INFO' => '/'}, '1'] }
 
   subject { Celluloid::Actor[:observe] }
 
@@ -36,7 +37,7 @@ describe Observe do
       end
     end
 
-    # [n, request, env, etag, timestamp]
+    # [n, exchange, env, etag, timestamp]
     context 'value' do
       let!(:time) { Time.now.to_i }
 

data/spec/resource_discovery_spec.rb

@@ -8,7 +8,7 @@ describe David::ResourceDiscovery do
   end
 
   let!(:server) do
-    supervised_server(:Port => port, :Log => debug, :app => Dummy::Application)
+    supervised_server(:Port => port, :Log => debug, :app => Rails.application)
   end
 
   context 'ordinary request' do
@@ -25,11 +25,11 @@ describe David::ResourceDiscovery do
       end
 
       it 'CoRE::Link' do
-        expect(links.size).to eq(4)
+        expect(links.size).to eq(9)
         expect(links.map(&:uri).uniq.size).to eq(links.size)
 
         links.each do |link|
-          expect(link.uri).to match(/^\/things/)
+          expect(link.uri).to match(/^\/(cbor|hello|query|seg.*|test|things)/)
         end
       end
     end

data/spec/server_spec.rb

@@ -273,21 +273,6 @@ describe Server do
     end
   end
 
-  context 'options' do
-    describe 'default_to_true' do
-      let(:method) do
-        ->(*args) { Server::Options.send(:default_to_true, *args) }
-      end
-
-      it { expect(method.call(:block, nil)).to eq(true) }
-      it { expect(method.call(:block, true)).to eq(true) }
-      it { expect(method.call(:block, 'true')).to eq(true) }
-
-      it { expect(method.call(:block, false)).to eq(false) }
-      it { expect(method.call(:block, 'false')).to eq(false) }
-    end
-  end
-
   context 'proxy' do
     subject { client.get('/', '::1', nil, nil, proxy_uri: 'coap://[::1]/') }
 
@@ -300,6 +285,66 @@ describe Server do
     end
   end
 
+  context 'transcoding' do
+    let!(:server) { supervised_server(:Port => port, :CBOR => true) }
+
+    let(:cbor) { {'Hello' => 'World!'}.to_cbor }
+
+    subject { client.get('/cbor', '::1', nil, cbor, content_format: 60) }
+
+    context 'incoming' do
+      context 'string key' do
+        it 'should return text' do
+          expect(subject).to be_a(CoAP::Message)
+          expect(subject.ver).to eq(1)
+          expect(subject.tt).to eq(:ack)
+          expect(subject.mcode).to eq([2, 5])
+          expect(subject.payload).to eq('{"Hello"=>"World!"}{"Hello"=>"World!"}')
+        end
+      end
+
+      context 'int key' do
+        let(:cbor) { {1 => 2}.to_cbor }
+
+        it 'should return text' do
+          expect(subject).to be_a(CoAP::Message)
+          expect(subject.ver).to eq(1)
+          expect(subject.tt).to eq(:ack)
+          expect(subject.mcode).to eq([2, 5])
+          expect(subject.payload).to eq('{"1"=>2}{1=>2}')
+        end
+      end
+
+      context 'rails' do
+        let!(:server) do
+          supervised_server(:Port => port, :Log => debug, :CBOR => true,
+            :app => Rails.application)
+        end
+
+        it 'should return text' do
+          expect(subject).to be_a(CoAP::Message)
+          expect(subject.ver).to eq(1)
+          expect(subject.tt).to eq(:ack)
+          expect(subject.mcode).to eq([2, 5])
+          expect(subject.payload).to eq('{"Hello"=>"World!"}')
+        end
+      end
+    end
+
+    context 'outgoing' do
+      subject { client.get('/json', '::1') }
+
+      it 'should return CBOR' do
+        expect(subject).to be_a(CoAP::Message)
+        expect(subject.ver).to eq(1)
+        expect(subject.tt).to eq(:ack)
+        expect(subject.mcode).to eq([2, 5])
+        expect(CBOR.load(subject.payload)).to eq({'Hello' => 'World!'})
+        expect(subject.options[:content_format]).to eq(60)
+      end
+    end
+  end
+
   after do
     server.terminate
   end

data/spec/spec_helper.rb

@@ -6,13 +6,14 @@ SimpleCov.start { add_filter 'spec/dummy' }
 # Rails
 ENV['RAILS_ENV'] ||= 'test'
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require File.expand_path("../dummy/config/environment",  __FILE__)
 require 'rspec/rails'
 
 # David
 $:.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
 
 require 'david'
+require 'david/interop'
 
 module David
   module TestHelper
@@ -24,6 +25,21 @@ module David
       rand((2**10+1)..(2**16-1))
     end
 
+    def req(method, path, options = {})
+      mid = rand(0xffff) unless respond_to?(:mid)
+      port = random_port unless respond_to?(:port)
+
+      payload = options.delete(:payload)
+      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)
+
+      [mid, response]
+    end
+
     def supervised_server(options)
       defaults = {
         :Host => '::1',
@@ -35,7 +51,10 @@ module David
 
       app = options.delete(:app) || Rack::HelloWorld
 
-      David::Server.supervise_as(:david, app, defaults.merge(options))
+      server = David::Server.new(app, defaults.merge(options))
+      server.async.run
+
+      server
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: david
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - henning mueller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -86,34 +86,6 @@ dependencies:
         version: '3.1'
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: rails
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  prerelease: false
-  type: :development
 description: |-
   David is a CoAP server with Rack interface to bring the
       illustrious family of Rack compatible web frameworks into the Internet of
@@ -134,43 +106,73 @@ files:
 - TODO.md
 - benchmarks/Gemfile
 - benchmarks/Gemfile.lock
+- benchmarks/coapbench.sh
+- benchmarks/quick.sh
+- benchmarks/rackup/Gemfile
+- benchmarks/rackup/Gemfile.lock
+- benchmarks/rackup/grape.ru
+- benchmarks/rackup/rack.ru
+- benchmarks/rackup/rails.ru
 - benchmarks/rps.rb
+- benchmarks/stress.sh
 - bin/david
 - config.ru
 - david.gemspec
+- experiments/Gemfile
+- experiments/concurrency/Gemfile
+- experiments/concurrency/stub.rb
+- experiments/hash_key.rb
 - experiments/mcast.rb
+- experiments/string_concat.rb
 - experiments/structs.rb
+- experiments/symbol_to_proc.rb
 - experiments/test.rb
+- experiments/thread_safe.rb
 - lib/david.rb
 - lib/david/actor.rb
+- lib/david/app_config.rb
+- lib/david/exchange.rb
+- lib/david/fake_logger.rb
 - lib/david/garbage_collector.rb
 - lib/david/guerilla/rack/handler.rb
+- lib/david/guerilla/rack/utils.rb
+- lib/david/interop.rb
+- lib/david/interop/mandatory_etsi.rb
+- lib/david/interop/mandatory_etsi/grape.rb
+- lib/david/interop/mandatory_etsi/hobbit.rb
+- lib/david/interop/mandatory_etsi/nyny.rb
+- lib/david/interop/mandatory_etsi/rack.rb
+- lib/david/interop/mandatory_etsi/sinatra.rb
 - lib/david/observe.rb
 - lib/david/rails/action_controller/base.rb
 - lib/david/railties/config.rb
 - lib/david/railties/middleware.rb
-- lib/david/request.rb
+- lib/david/registry.rb
 - lib/david/resource_discovery.rb
 - lib/david/resource_discovery_proxy.rb
 - lib/david/server.rb
 - lib/david/server/constants.rb
-- lib/david/server/deduplication.rb
 - lib/david/server/mapping.rb
+- lib/david/server/mid_cache.rb
 - lib/david/server/multicast.rb
-- lib/david/server/options.rb
 - lib/david/server/respond.rb
 - lib/david/server/utility.rb
 - lib/david/show_exceptions.rb
+- lib/david/transmitter.rb
+- lib/david/trap.rb
 - lib/david/version.rb
 - lib/rack/handler/coap.rb
 - lib/rack/handler/david.rb
 - lib/rack/hello_world.rb
+- spec/app_config_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
+- spec/dummy/app/controllers/etsis_controller.rb
+- spec/dummy/app/controllers/tests_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
@@ -206,6 +208,7 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/guerilla_rack_handler_spec.rb
+- spec/interop/mandatory_spec.rb
 - spec/mapping_spec.rb
 - spec/observe_spec.rb
 - spec/perf/server_perf_spec.rb
@@ -238,12 +241,15 @@ signing_key:
 specification_version: 4
 summary: CoAP server with Rack interface.
 test_files:
+- spec/app_config_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
+- spec/dummy/app/controllers/etsis_controller.rb
+- spec/dummy/app/controllers/tests_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
@@ -279,6 +285,7 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/guerilla_rack_handler_spec.rb
+- spec/interop/mandatory_spec.rb
 - spec/mapping_spec.rb
 - spec/observe_spec.rb
 - spec/perf/server_perf_spec.rb

data/lib/david/request.rb

@@ -1,80 +0,0 @@
-class Request < Struct.new(:host, :port, :message, :ancillary, :options)
-  def accept
-    message.options[:accept]
-  end
-
-  def block
-    @block ||= if message.options[:block2].nil?
-      CoAP::Block.new(0, false, 1024)
-    else
-      CoAP::Block.new(message.options[:block2]).decode
-    end
-  end
-
-  def con?
-    message.tt == :con
-  end
-
-  def delete?
-    message.mcode == :delete
-  end
-
-  def etag
-    message.options[:etag]
-  end
-
-  def get_etag?
-    message.options[:etag].nil? && get?
-  end
-
-  def get?
-    message.mcode == :get
-  end
-
-  def idempotent?
-    get? || put? || delete?
-  end
-
-  def mid
-    message.mid
-  end
-
-  def multicast?
-    a = ancillary
-    return false if a.nil?
-
-    return @multicast unless @multicast.nil?
-
-    @multicast =
-      a.cmsg_is?(:IP, :PKTINFO) && a.ip_pktinfo[0].ipv4_multicast? ||
-      a.cmsg_is?(:IPV6, :PKTINFO) && a.ipv6_pktinfo[0].ipv6_multicast?
-  end
-
-  def non?
-    message.tt == :non
-  end
-
-  def observe?
-    !message.options[:observe].nil?
-  end
-
-  def post?
-    message.mcode == :post
-  end
-
-  def proxy?
-    !(message.options[:proxy_uri].nil? && message.options[:proxy_scheme].nil?)
-  end
-
-  def put?
-    message.mcode == :put
-  end
-
-  def token
-    message.options[:token]
-  end
-
-  def valid_method?
-    CoAP::METHODS.include?(message.mcode)
-  end
-end

data/lib/david/server/deduplication.rb

@@ -1,21 +0,0 @@
-module David
-  module Deduplication
-    def self.included(base)
-      attr_reader :dedup_cache
-    end
-
-    def cache_response(request, response)
-      return if duplicate?(request)
-      @dedup_cache[[request.host, request.mid]] = [response, Time.now.to_i]
-    end
-
-    def cached_response(request)
-      response = @dedup_cache[[request.host, request.mid]]
-      [response[0], response[0].options] if response
-    end
-
-    def duplicate?(request)
-      return !!cached_response(request)
-    end
-  end
-end