david 0.3.0 → 0.4.0

data/lib/david/server/utility.rb

@@ -6,7 +6,8 @@ module David
       # This can only use each on body and currently does not support streaming.
       def body_to_string(body)
         s = ''
-        body.each { |line| s << line + "\r\n" }
+        body.each { |line| s << line << "\r\n" }
+        body.close if body.respond_to?(:close)
         s.chomp
       end
     end

data/lib/david/show_exceptions.rb

@@ -22,18 +22,23 @@ module David
 
     private
 
-    def render_exception(exception)
+    def render_exception(e)
       body = {
-        error: exception.class.to_s,
-        message: exception.message
+        error:    e.class.to_s,
+        message:  e.message
       }
 
-      log(:info, [body[:error], body[:message]].join("\n"))
+      log.error([body[:error], body[:message]].join(': '))
       
       body = body.to_json
 
-      code = 500
-      code = 404 if exception.is_a?(ActiveRecord::RecordNotFound)
+      code = if defined?(ActiveRecord) && e.is_a?(ActiveRecord::RecordNotFound)
+        404
+      elsif e.is_a?(ActionController::RoutingError)
+        404
+      else
+        500
+      end
 
       [code,
         {
@@ -44,9 +49,8 @@ module David
       ]
     end
 
-    def log(level, message)
+    def log
       @logger ||= @env['rack.logger']
-      @logger.send(level, message) if @logger
     end
   end
 end

data/lib/david/transmitter.rb

@@ -0,0 +1,44 @@
+module David
+  class Transmitter
+    include Registry
+
+    AF_INET6 = 'AF_INET6'.freeze
+
+    def initialize(socket)
+      @log = Celluloid.logger
+      @socket = socket || server.socket
+    end
+
+    # TODO Retransmissions
+    def send(exchange)
+      host = normalize_host(exchange.host)
+
+      @socket.send(exchange.message.to_wire, 0, host, exchange.port)
+
+      @log.info('-> ' + exchange.to_s)
+      @log.debug(exchange.message.inspect)
+    end
+
+    private
+    
+    def ipv6?
+      @socket.addr[0] == AF_INET6
+    end
+
+    def normalize_host(host)
+      ip = IPAddr.new(host)
+
+      if ipv6? && ip.ipv4?
+        ip = ip.ipv4_mapped
+      end
+    rescue ArgumentError
+      begin
+        host = Resolv.getaddress(host)
+        retry
+      rescue Resolv::ResolvError
+      end
+    else 
+      ip.to_s
+    end
+  end
+end

data/lib/david/trap.rb

@@ -0,0 +1,10 @@
+class Trap
+  def initialize(value)
+    @value = value
+  end
+
+  def method_missing(method, *args)
+    p method, caller[0]
+    @value.send(method, *args)
+  end
+end

data/lib/david/version.rb

@@ -1,6 +1,6 @@
 module David
   MAJOR = 0
-  MINOR = 3
+  MINOR = 4
   PATCH = 0
   SUFFIX = nil
 

data/lib/rack/handler/david.rb

@@ -1,22 +1,18 @@
 module Rack
   module Handler
     class David
-      DEFAULT_OPTIONS = {
-        :Host => ENV['RACK_ENV'] == 'development' ? '::1' : '::',
-        :Port => ::CoAP::PORT
-      }
-
       def self.run(app, options={})
-        options = DEFAULT_OPTIONS.merge(options)
-
         g = Celluloid::SupervisionGroup.run!
 
         g.supervise_as(:server, ::David::Server, app, options)
-        g.supervise_as(:observe, ::David::Observe) if options[:Observe] != false
         g.supervise_as(:gc, ::David::GarbageCollector)
 
+        unless options[:Observe] == 'false'
+          g.supervise_as(:observe, ::David::Observe)
+        end
+
         begin
-          sleep
+          Celluloid::Actor[:server].run
         rescue Interrupt
           Celluloid.logger.info 'Terminated'
           Celluloid.logger = nil
@@ -25,7 +21,7 @@ module Rack
       end
 
       def self.valid_options
-        host, port = DEFAULT_OPTIONS.values_at(:Host, :Port)
+        host, port = AppConfig::DEFAULT_OPTIONS.values_at(:Host, :Port)
 
         {
           'Block=BOOLEAN'     => 'Support for blockwise transfer (default: true)',

data/lib/rack/hello_world.rb

@@ -60,6 +60,31 @@ module Rack
           {'Content-Type' => 'text/plain'},
           [Time.now.to_s]
         ]
+      when '/cbor'
+        require 'json'
+
+        body = JSON.parse(env['rack.input'].read).to_s +
+               env['coap.cbor'].to_s
+
+        [200,
+          {
+            'Content-Type' => 'text/plain',
+            'Content-Length' => body.bytesize.to_s
+          },
+          [body]
+        ]
+      when '/json'
+        require 'json'
+
+        body = {'Hello' => 'World!'}.to_json
+
+        [200,
+          {
+            'Content-Type' => 'application/json',
+            'Content-Length' => body.bytesize.to_s
+          },
+          [body]
+        ]
       else
         [404, {}, ['']]
       end

data/spec/app_config_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe AppConfig do
+  let(:port) { random_port }
+
+  let!(:server) { supervised_server(:Port => port, :CBOR => true) }
+
+  it { expect(subject).to be_a(Hash) }
+
+  describe '#choose_host' do
+    let(:method) do
+      ->(*args) { subject.send(:choose_host, *args) }
+    end
+
+    it { expect(method.call(nil)).to eq(nil) }
+    it { expect(method.call('::')).to eq('::') }
+    it { expect(method.call('::1')).to eq('::1') }
+    it { expect(method.call('localhost')).to eq('::1') }
+  end
+
+  describe '#choose_port' do
+    let(:method) do
+      ->(*args) { subject.send(:choose_port, *args) }
+    end
+
+    it { expect(method.call(nil)).to eq(nil) }
+    it { expect(method.call('1')).to be_a(Fixnum) }
+    it { expect(method.call('1')).to eq(1) }
+  end
+
+  describe '#default_to_true' do
+    let(:method) do
+      ->(*args) { subject.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
+
+  describe '#default_to_false' do
+    let(:method) do
+      ->(*args) { subject.send(:default_to_false, *args) }
+    end
+
+    it { expect(method.call(:cbor, nil)).to eq(false) }
+    it { expect(method.call(:cbor, false)).to eq(false) }
+    it { expect(method.call(:cbor, 'false')).to eq(false) }
+
+    it { expect(method.call(:cbor, true)).to eq(true) }
+    it { expect(method.call(:cbor, 'true')).to eq(true) }
+  end
+end

data/spec/dummy/app/controllers/etsis_controller.rb

@@ -0,0 +1,26 @@
+class EtsisController < ActionController::Base
+  def show
+    headers['Content-Type'] = 'text/plain'
+    head 2.05
+  end
+
+  def update
+    head 2.01
+  end
+
+  def create
+    head 2.04
+  end
+
+  def destroy
+    head 2.02
+  end
+
+  def seg
+    show
+  end
+
+  def query
+    show
+  end
+end

data/spec/dummy/app/controllers/tests_controller.rb

@@ -0,0 +1,9 @@
+class TestsController < ActionController::Base
+  def benchmark
+    render text: 'Hello World!'
+  end
+
+  def cbor
+    render text: params['test'].to_s
+  end
+end

data/spec/dummy/config/application.rb

@@ -1,11 +1,11 @@
 require File.expand_path('../boot', __FILE__)
 
 # Pick the frameworks you want:
-require "active_record/railtie"
+# require "active_record/railtie"
 require "action_controller/railtie"
-require "action_mailer/railtie"
-require "action_view/railtie"
-require "sprockets/railtie"
+# require "action_mailer/railtie"
+# require "action_view/railtie"
+# require "sprockets/railtie"
 
 Bundler.require(*Rails.groups)
 
@@ -22,8 +22,6 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    config.coap.cbor = false
   end
 end
 

data/spec/dummy/config/environments/development.rb

@@ -14,13 +14,13 @@ Rails.application.configure do
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
+  # config.action_mailer.raise_delivery_errors = false
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations.
-  config.active_record.migration_error = :page_load
+  # config.active_record.migration_error = :page_load
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large

data/spec/dummy/config/environments/test.rb

@@ -21,7 +21,7 @@ Rails.application.configure do
   config.action_controller.perform_caching = false
 
   # Raise exceptions instead of rendering exception templates.
-  config.action_dispatch.show_exceptions = false
+  config.action_dispatch.show_exceptions = true
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
@@ -29,7 +29,7 @@ Rails.application.configure do
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
+  # config.action_mailer.delivery_method = :test
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr

data/spec/dummy/config/routes.rb

@@ -1,58 +1,18 @@
 Rails.application.routes.draw do
-  # The priority is based upon order of creation: first created -> highest priority.
-  # See how all your routes lay out with "rake routes".
-
-  # You can have the root of your site routed with "root"
-  # root 'welcome#index'
-
-  # Example of regular route:
-  #   get 'products/:id' => 'catalog#view'
-
-  # Example of named route that can be invoked with purchase_url(id: product.id)
-  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
-  # Example resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Example resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Example resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Example resource route with more complex sub-resources:
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', on: :collection
-  #     end
-  #   end
+  # For testing resource discovery middleware
+  resources :things
 
-  # Example resource route with concerns:
-  #   concern :toggleable do
-  #     post 'toggle'
-  #   end
-  #   resources :posts, concerns: :toggleable
-  #   resources :photos, concerns: :toggleable
+  # Requests per second benchmark
+  get 'hello' => 'tests#benchmark'
 
-  # Example resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
+  # CBOR transcoding tests
+  get 'cbor'  => 'tests#cbor'
 
-  resources :things
+  # ETSI Plugtests
+  get     'test'            => 'etsis#show'
+  post    'test'            => 'etsis#update'
+  put     'test'            => 'etsis#create'
+  delete  'test'            => 'etsis#destroy'
+  get     'seg1/seg2/seg3'  => 'etsis#seg'
+  get     'query'           => 'etsis#query'
 end

data/spec/interop/mandatory_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+
+[
+  Interop::MandatoryETSI::Grape,
+  Interop::MandatoryETSI::Hobbit,
+  Interop::MandatoryETSI::NYNY,
+  Interop::MandatoryETSI::Rack,
+  Interop::MandatoryETSI::Sinatra,
+  Rails.application
+].each do |app|
+  describe "ETSI Plugstests, Mandatory, #{app.to_s.split('::').last}" do
+    let!(:server) { supervised_server(: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)
+
+          expect(response).to be_a(CoAP::Message)
+          expect(response.mcode).to eq([2, 5])
+          expect(response.mid).to eq(mid)
+          expect(response.options[:content_format]).to eq(0)
+        end
+
+        it 'TD_COAP_CORE_0{2,6}' do
+          mid, response = req(:post, '/test', tt: tt, payload: 'foo',
+            content_format: 0)
+
+          expect(response).to be_a(CoAP::Message)
+          expect(response.mcode).to eq([2, 1])
+          expect(response.mid).to eq(mid)
+        end
+
+        it 'TD_COAP_CORE_0{3,7}' do
+          mid, response = req(:put, '/test', tt: tt, payload: 'foo',
+            content_format: 0)
+
+          expect(response).to be_a(CoAP::Message)
+          expect(response.mcode).to eq([2, 4])
+          expect(response.mid).to eq(mid)
+        end
+
+        it 'TD_COAP_CORE_0{4,8}' do
+          mid, response = req(:delete, '/test', tt: tt)
+
+          expect(response).to be_a(CoAP::Message)
+          expect(response.mcode).to eq([2, 2])
+          expect(response.mid).to eq(mid)
+        end
+      end
+    end
+
+    context 'TD_COAP_CORE_09' do
+      pending
+    end
+
+    it 'TD_COAP_CORE_10' do
+      token = rand(0xffffffff)
+      mid, response = req(:get, '/test', token: token)
+
+      expect(response).to be_a(CoAP::Message)
+      expect(response.mcode).to eq([2, 5])
+      expect(response.mid).to eq(mid)
+      expect(response.options[:content_format]).to eq(0)
+      expect(response.options[:token]).to eq(token)
+    end
+
+    it 'TD_COAP_CORE_11' do
+      mid, response = req(:get, '/test')
+
+      expect(response).to be_a(CoAP::Message)
+      expect(response.mcode).to eq([2, 5])
+      expect(response.mid).to eq(mid)
+      expect(response.options[:content_format]).to eq(0)
+      expect(response.options[:token]).to eq(0)
+    end
+
+    it 'TD_COAP_CORE_12' do
+      mid, response = req(:get, '/seg1/seg2/seg3')
+
+      expect(response).to be_a(CoAP::Message)
+      expect(response.mcode).to eq([2, 5])
+      expect(response.mid).to eq(mid)
+      expect(response.options[:content_format]).to eq(0)
+    end
+
+    it 'TD_COAP_CORE_13' do
+      mid, response = req(:get, '/query', uri_query: ['foo=1', 'bar=2'])
+
+      expect(response).to be_a(CoAP::Message)
+      expect(response.mcode).to eq([2, 5])
+      expect(response.mid).to eq(mid)
+      expect(response.options[:content_format]).to eq(0)
+    end
+
+    after do
+      server.terminate
+    end
+  end
+end