david 0.4.5 → 0.5.0

data/spec/server_spec.rb

@@ -10,7 +10,7 @@ describe Server do
   let!(:server) { supervised_server(:Port => port) }
 
   context 'ordinary request' do
-    subject { client.get('/hello', '::1') }
+    subject { client.get('/hello', localhost) }
 
     it 'should be plausible' do
       expect(subject).to be_a(CoAP::Message)
@@ -22,7 +22,7 @@ describe Server do
   end
 
   context 'missing resource' do
-    subject { client.get('/404', '::1') }
+    subject { client.get('/404', localhost) }
 
     it 'should be 4.04' do
       expect(subject).to be_a(CoAP::Message)
@@ -34,7 +34,7 @@ describe Server do
   end
 
   context 'unsupported method' do
-    subject { client.delete('/hello', '::1') }
+    subject { client.delete('/hello', localhost) }
 
     it 'should be 4.05' do
       expect(subject).to be_a(CoAP::Message)
@@ -135,7 +135,7 @@ describe Server do
 
   context 'block' do
     context 'block2.more set' do
-      subject { client.get('/', '::1', nil, nil, block2: 14) }
+      subject { client.get('/', localhost, nil, nil, block2: 14) }
 
       it 'should be an error' do
         expect(subject).to be_a(CoAP::Message)
@@ -154,7 +154,7 @@ describe Server do
           recv_timeout: 0.1
       end
 
-      subject { client.get('/hello', '::1', nil, nil, block2: 16) }
+      subject { client.get('/hello', localhost, nil, nil, block2: 16) }
 
       it 'should be an error' do
         expect { subject }.to raise_error(Timeout::Error)
@@ -164,7 +164,7 @@ describe Server do
     context 'transfer' do
       subject do
         [0, 16].map do |x|
-          client.get('/block', '::1', nil, nil, block2: x)
+          client.get('/block', localhost, nil, nil, block2: x)
         end
       end
 
@@ -178,7 +178,7 @@ describe Server do
 
   context 'accept' do
     context 'unset' do
-      subject { client.get('/hello', '::1') }
+      subject { client.get('/hello', localhost) }
 
       it 'should return resource' do
         expect(subject).to be_a(CoAP::Message)
@@ -191,7 +191,7 @@ describe Server do
     end
 
     context 'default' do
-      subject { client.get('/echo/accept', '::1') }
+      subject { client.get('/echo/accept', localhost) }
 
       it 'should return default' do
         expect(subject).to be_a(CoAP::Message)
@@ -204,7 +204,7 @@ describe Server do
     end
 
     context 'right' do
-      subject { client.get('/echo/accept', '::1', nil, nil, accept: 40) }
+      subject { client.get('/echo/accept', localhost, nil, nil, accept: 40) }
 
       it 'should echo' do
         expect(subject).to be_a(CoAP::Message)
@@ -217,7 +217,7 @@ describe Server do
     end
 
     context 'wrong' do
-      subject { client.get('/hello', '::1', nil, nil, accept: 40) }
+      subject { client.get('/hello', localhost, nil, nil, accept: 40) }
 
       it 'should be an error' do
         expect(subject).to be_a(CoAP::Message)
@@ -232,7 +232,7 @@ describe Server do
   context 'deduplication' do
     context 'duplicates' do
       let(:a) do
-        ([0]*3).map { client.get('/value', '::1', nil, nil, mid: 1, token: 1) }
+        ([0]*3).map { client.get('/value', localhost, nil, nil, mid: 1, token: 1) }
       end
 
       it 'matching mid' do
@@ -253,7 +253,7 @@ describe Server do
 
     context 'different' do
       let(:a) do
-        ([0]*3).map { client.get('/value', '::1') }
+        ([0]*3).map { client.get('/value', localhost) }
       end
 
       it 'matching mid' do
@@ -274,7 +274,7 @@ describe Server do
   end
 
   context 'proxy' do
-    subject { client.get('/', '::1', nil, nil, proxy_uri: 'coap://[::1]/') }
+    subject { client.get('/', localhost, nil, nil, proxy_uri: 'coap://[::1]/') }
 
     it 'should return 5.05' do
       expect(subject).to be_a(CoAP::Message)
@@ -290,7 +290,7 @@ describe Server do
 
     let(:cbor) { {'Hello' => 'World!'}.to_cbor }
 
-    subject { client.get('/cbor', '::1', nil, cbor, content_format: 60) }
+    subject { client.get('/cbor', localhost, nil, cbor, content_format: 60) }
 
     context 'incoming' do
       context 'string key' do
@@ -326,13 +326,13 @@ describe Server do
           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!"}')
+          expect(subject.payload).to eq('{"Hello":"World!"}')
         end
       end
     end
 
     context 'outgoing' do
-      subject { client.get('/json', '::1') }
+      subject { client.get('/json', localhost) }
 
       it 'should return CBOR' do
         expect(subject).to be_a(CoAP::Message)

data/spec/spec_helper.rb

@@ -21,6 +21,14 @@ module David
       @debug ||= ENV['DEBUG'].nil? ? 'none' : 'debug'
     end
 
+    def ipv4?
+      @ipv4 ||= !ENV['IPV4'].nil?
+    end
+
+    def localhost
+      ipv4? ? '127.0.0.1' : '::1'
+    end
+
     def random_port
       rand((2**10+1)..(2**16-1))
     end
@@ -30,20 +38,21 @@ module David
 
       payload = options.delete(:payload)
       port    = options.delete(:port) || random_port
+      host    = ipv4? ? '127.0.0.1' : '::1'
 
       options.merge!(mid: mid)
 
       client = CoAP::Client.new(retransmit: false, recv_timeout: 0.1,
         token: false)
 
-      response = client.send(method, path, '::1', port, payload, options)
+      response = client.send(method, path, host, port, payload, options)
 
       [mid, response]
     end
 
     def supervised_server(options)
       defaults = {
-        :Host => '::1',
+        :Host => localhost,
         :Port => CoAP::PORT,
         :Log => debug
       }
@@ -52,13 +61,15 @@ module David
 
       app = options.delete(:app) || Rack::HelloWorld
 
-      g = Celluloid::SupervisionGroup.run!
+      g = Celluloid::Supervision::Container.run!
+
+      g.supervise(as: :server, type: ::David::Server,
+        args: [app, defaults.merge(options)])
 
-      g.supervise_as(:server, ::David::Server, app, defaults.merge(options))
-      g.supervise_as(:gc, ::David::GarbageCollector)
+      g.supervise(as: :gc, type: ::David::GarbageCollector)
 
       unless options[:Observe] == 'false'
-        g.supervise_as(:observe, ::David::Observe)
+        g.supervise(as: :observe, type: ::David::Observe)
       end
 
       Celluloid::Actor[:server].async.run

metadata

@@ -1,67 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: david
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - henning mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.17.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.17.3
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.16.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.17.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.16.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.17.3
 - !ruby/object:Gem::Dependency
   name: coap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
@@ -70,26 +58,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -180,6 +168,7 @@ files:
 - lib/david/etsi/mandatory/hobbit.rb
 - lib/david/etsi/mandatory/nyny.rb
 - lib/david/etsi/mandatory/rack.rb
+- lib/david/etsi/mandatory/roda.rb
 - lib/david/etsi/mandatory/sinatra.rb
 - lib/david/etsi/optional.rb
 - lib/david/etsi/optional/rack.rb
@@ -234,7 +223,6 @@ files:
 - 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
@@ -282,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CoAP server with Rack interface.
@@ -312,7 +300,6 @@ test_files:
 - 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

data/spec/dummy/config/initializers/assets.rb

@@ -1,8 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )