david 0.3.0.pre → 0.3.0

data/spec/spec_helper.rb

@@ -1,2 +1,44 @@
-require_relative '../lib/david'
+# Coveralls
+require 'coveralls'
+Coveralls.wear!
+SimpleCov.start { add_filter 'spec/dummy' }
+
+# Rails
+ENV['RAILS_ENV'] ||= 'test'
+
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require 'rspec/rails'
+
+# David
+$:.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
+
+require 'david'
+
+module David
+  module TestHelper
+    def debug
+      @debug ||= ENV['DEBUG'].nil? ? 'none' : 'debug'
+    end
+
+    def random_port
+      rand((2**10+1)..(2**16-1))
+    end
+
+    def supervised_server(options)
+      defaults = {
+        :Host => '::1',
+        :Port => CoAP::PORT,
+        :Log => debug
+      }
+
+      defaults[:Multicast] = false if defined?(JRuby)
+
+      app = options.delete(:app) || Rack::HelloWorld
+
+      David::Server.supervise_as(:david, app, defaults.merge(options))
+    end
+  end
+end
+
 include David
+include David::TestHelper

data/spec/utility_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+include Server::Utility
+describe Server::Utility do
+  context 'body_to_string' do
+    it { expect(body_to_string(['foo', 'bar', 'baz'])).to eq("foo\r\nbar\r\nbaz") }
+  end
+end

metadata

@@ -1,71 +1,119 @@
 --- !ruby/object:Gem::Specification
 name: david
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre
+  version: 0.3.0
 platform: ruby
 authors:
 - henning mueller
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cbor
+  name: celluloid-io
+  version_requirements: !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
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
+        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.5'
-- !ruby/object:Gem::Dependency
-  name: celluloid-io
+        version: '0.1'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :runtime
+        version: '0.1'
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.5'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: coap
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        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: rack
+  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: '1.5'
-  type: :runtime
+        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: '1.5'
+        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
@@ -76,56 +124,165 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
+- benchmarks/Gemfile
+- benchmarks/Gemfile.lock
+- benchmarks/rps.rb
 - bin/david
 - config.ru
 - david.gemspec
+- experiments/mcast.rb
+- experiments/structs.rb
+- experiments/test.rb
 - lib/david.rb
+- lib/david/actor.rb
+- lib/david/garbage_collector.rb
 - lib/david/guerilla/rack/handler.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/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/multicast.rb
 - lib/david/server/options.rb
-- lib/david/server/response.rb
+- lib/david/server/respond.rb
 - lib/david/server/utility.rb
+- lib/david/show_exceptions.rb
 - lib/david/version.rb
-- lib/david/well_known.rb
 - lib/rack/handler/coap.rb
 - lib/rack/handler/david.rb
 - lib/rack/hello_world.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/helpers/application_helper.rb
+- spec/dummy/app/mailers/.keep
+- spec/dummy/app/models/.keep
+- spec/dummy/app/models/concerns/.keep
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/db/test.sqlite3
+- spec/dummy/lib/assets/.keep
+- spec/dummy/log/.keep
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/guerilla_rack_handler_spec.rb
+- spec/mapping_spec.rb
+- spec/observe_spec.rb
 - spec/perf/server_perf_spec.rb
+- spec/resource_discovery_spec.rb
+- spec/server_spec.rb
 - spec/spec_helper.rb
-- test.rb
+- spec/utility_spec.rb
 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: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: CoAP server with Rack interface.
 test_files:
+- 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/helpers/application_helper.rb
+- spec/dummy/app/mailers/.keep
+- spec/dummy/app/models/.keep
+- spec/dummy/app/models/concerns/.keep
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/db/test.sqlite3
+- spec/dummy/lib/assets/.keep
+- spec/dummy/log/.keep
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/guerilla_rack_handler_spec.rb
+- spec/mapping_spec.rb
+- spec/observe_spec.rb
 - spec/perf/server_perf_spec.rb
+- spec/resource_discovery_spec.rb
+- spec/server_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/utility_spec.rb

data/lib/david/server/response.rb

@@ -1,124 +0,0 @@
-require 'david/server/mapping'
-require 'david/server/utility'
-
-module David
-  class Server
-    module Response
-      include Mapping
-      include Utility
-
-      # Freeze some WSGI env keys.
-      REMOTE_ADDR     = 'REMOTE_ADDR'.freeze
-      REMOTE_PORT     = 'REMOTE_PORT'.freeze
-      REQUEST_METHOD  = 'REQUEST_METHOD'.freeze
-      SCRIPT_NAME     = 'SCRIPT_NAME'.freeze
-      PATH_INFO       = 'PATH_INFO'.freeze
-      QUERY_STRING    = 'QUERY_STRING'.freeze
-      SERVER_NAME     = 'SERVER_NAME'.freeze
-      SERVER_PORT     = 'SERVER_PORT'.freeze
-      CONTENT_LENGTH  = 'CONTENT_LENGTH'.freeze
-      CONTENT_TYPE    = 'CONTENT_TYPE'.freeze
-      HTTP_ACCEPT     = 'HTTP_ACCEPT'.freeze
-
-      # Freeze some Rack env keys.
-      RACK_VERSION      = 'rack.version'.freeze
-      RACK_URL_SCHEME   = 'rack.url_scheme'.freeze
-      RACK_INPUT        = 'rack.input'.freeze
-      RACK_ERRORS       = 'rack.errors'.freeze
-      RACK_MULTITHREAD  = 'rack.multithread'.freeze
-      RACK_MULTIPROCESS = 'rack.multiprocess'.freeze
-      RACK_RUN_ONCE     = 'rack.run_once'.freeze
-      RACK_LOGGER       = 'rack.logger'.freeze
-
-      # Freeze some Rack env values.
-      EMPTY_STRING          = ''.freeze
-      CONTENT_TYPE_JSON     = 'application/json'.freeze
-      CONTENT_TYPE_CBOR     = 'application/cbor'.freeze
-      RACK_URL_SCHEME_HTTP  = 'http'.freeze
-
-      protected
-
-      def respond(host, port, request)
-        block = CoAP::Block.new(request.options[:block2]).decode
-        block.size = 1024 if request.options[:block2] == 0
-
-        # Fail if m set.
-        if block.more
-          response = initialize_response(request)
-          response.mcode = 4.05
-          return response
-        end
-
-        env = basic_env(host, port, request)
-        logger.debug env
-
-        code, options, body = @app.call(env)
-
-        ct = content_type(options)
-        body = body_to_string(body)
-
-        body.close if body.respond_to?(:close)
-
-        if @cbor
-          body = body_to_cbor(body)
-          ct = CONTENT_TYPE_CBOR
-        end
-
-        mcode = http_to_coap_code(code)
-        etag  = etag(options, 4)
-        cf    = CoAP::Registry.convert_content_format(ct)
-
-        response = initialize_response(request)
-
-        response.mcode = mcode
-        response.payload = block.chunk(body)
-
-        response.options[:etag] = etag
-        response.options[:content_format] = cf
-
-        block.more = !block.last?(body)
-
-        response.options[:block2] = block.encode
-
-        logger.debug block.inspect
-
-        response
-      end
-
-      def basic_env(host, port, request)
-        {
-          REMOTE_ADDR       => host,
-          REMOTE_PORT       => port.to_s,
-          REQUEST_METHOD    => coap_to_http_method(request.mcode),
-          SCRIPT_NAME       => EMPTY_STRING,
-          PATH_INFO         => path_encode(request.options[:uri_path]),
-          QUERY_STRING      => query_encode(request.options[:uri_query])
-                                  .gsub(/^\?/, ''),
-          SERVER_NAME       => @host,
-          SERVER_PORT       => @port.to_s,
-          CONTENT_LENGTH    => request.payload.size.to_s,
-          CONTENT_TYPE      => CONTENT_TYPE_JSON,
-          HTTP_ACCEPT       => CONTENT_TYPE_JSON,
-          RACK_VERSION      => [1, 2],
-          RACK_URL_SCHEME   => RACK_URL_SCHEME_HTTP,
-          RACK_INPUT        => StringIO.new(request.payload),
-          RACK_ERRORS       => $stderr,
-          RACK_MULTITHREAD  => true,
-          RACK_MULTIPROCESS => true,
-          RACK_RUN_ONCE     => false,
-          RACK_LOGGER       => @logger,
-        }
-      end
-
-      def initialize_response(request)
-        type = request.tt == :con ? :ack : :non
-
-        CoAP::Message.new \
-          tt: type,
-          mcode: 2.00,
-          mid: request.mid,
-          token: request.options[:token]
-      end
-    end
-  end
-end