coap 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56fd9991ac9ab886355fcce10739897c5ead898c
-  data.tar.gz: 53cf80a9babac55dd80aebe62741be8d13b3b1f4
+  metadata.gz: 36ea360829046ce72e968fe067c38e687bf3de8c
+  data.tar.gz: c9c5ab0540425a325cba51a5063b12c4f0416189
 SHA512:
-  metadata.gz: 01be6617acec7d215ddf15fdd34e443f6114f6677d5d2de3292298bd7e28c30c90f5a97f66f7aa3b08fd2d4853c3451f0159b41ef09ae1d675fcaa43727006ad
-  data.tar.gz: be1e122636bf35da1cd884cfaa663bd48539879b8607a96de3c53190045e10307193d84847048e981abe04f727cf621fb9041baa347d02856cbad004ece38ef0
+  metadata.gz: 2c341257f415a5cf47b59c4878898984e5e9adfd8d14a696c0d9cc4678f621e8912e5b8ba79df52b735e39eccf2a300f9c4ef5ea688fc9d752a19cb06fdde5a7
+  data.tar.gz: f4b6bcb900c0130c53a2f234d111a0c2af0022811f425b02a36e3145a84d0aaf2d1e8645a238bd9037fdbe8dd5283718a1decc9669d39fc68954d774e92af740

data/bin/coap

@@ -11,13 +11,14 @@ def usage
   $stderr.puts <<EOF
 Usage: #{File.basename($0)} [options] <method> <uri>
 
-  --debug, -d                   Extra debug output.
-  --output, -o        <target>  Redirect payload output. Target can be "-" for
-                                STDOUT or a file path.
-  --payload, -p       <string>  Payload for POST and PUT as string.
-  --payload-file, -f  <file>    Read payload for POST and PUT from file.
-  --type, -t          <type>    Message type (con, non, ack, rst).
-  --help, -h                    This usage message.
+  --content-format, -c  <string>  Content format.
+  --debug, -d                     Extra debug output.
+  --output, -o          <target>  Redirect payload output. Target can be "-" for
+                                  STDOUT or a file path.
+  --payload, -p         <string>  Payload for POST and PUT as string.
+  --payload-file, -f    <file>    Read payload for POST and PUT from file.
+  --type, -t            <type>    Message type (con, non, ack, rst).
+  --help, -h                      This usage message.
 
 EOF
   exit 1
@@ -26,12 +27,13 @@ end
 METHODS = CoAP::METHODS + [:observe]
 
 opts = GetoptLong.new(
-  ['--debug',        '-d', GetoptLong::NO_ARGUMENT],
-  ['--output',       '-o', GetoptLong::REQUIRED_ARGUMENT],
-  ['--payload',      '-p', GetoptLong::REQUIRED_ARGUMENT],
-  ['--payload-file', '-f', GetoptLong::REQUIRED_ARGUMENT],
-  ['--type',         '-t', GetoptLong::REQUIRED_ARGUMENT],
-  ['--help',         '-h', GetoptLong::NO_ARGUMENT]
+  ['--content-format',  '-c', GetoptLong::REQUIRED_ARGUMENT],
+  ['--debug',           '-d', GetoptLong::NO_ARGUMENT],
+  ['--output',          '-o', GetoptLong::REQUIRED_ARGUMENT],
+  ['--payload',         '-p', GetoptLong::REQUIRED_ARGUMENT],
+  ['--payload-file',    '-f', GetoptLong::REQUIRED_ARGUMENT],
+  ['--type',            '-t', GetoptLong::REQUIRED_ARGUMENT],
+  ['--help',            '-h', GetoptLong::NO_ARGUMENT]
 )
 
 $DEBUG  = false
@@ -41,6 +43,9 @@ options = {}
 
 opts.each do |opt, arg|
   case opt
+  when '--content-format'
+    cf = CoAP::Registry.convert_content_format(arg)
+    options[:content_format] = cf
   when '--debug'
     $DEBUG = true
   when '--output'
@@ -108,4 +113,12 @@ if output
   output.puts answer.payload
 else
   pp answer
+  case answer.options[:content_format]
+  when 50
+    require 'json'
+    pp JSON.parse(answer.payload)
+  when 60
+    require 'cbor'
+    pp CBOR.load(answer.payload)
+  end
 end

data/lib/core/coap/client.rb

@@ -269,13 +269,15 @@ module CoRE
       end
 
       def initialize_message(method, path, query = nil, payload = nil)
-        mid   = SecureRandom.random_number(0xffff)
-        token = SecureRandom.random_number(0xff)
+        mid = SecureRandom.random_number(0xffff)
 
         options = {
-          uri_path: CoAP.path_decode(path),
-          token: token
+          uri_path: CoAP.path_decode(path)
         }
+        
+        unless @options[:token] == false
+          options[:token] = SecureRandom.random_number(0xffffffff)
+        end
 
         unless query.nil?
           options[:uri_query] = CoAP.query_decode(query)

data/lib/core/coap/message.rb

@@ -77,16 +77,14 @@ module CoRE
         path  = CoAP.path_encode(self.options[:uri_path])
         query = CoAP.query_encode(self.options[:uri_query])
 
-        [mcode_readable, path, query].join(' ')
+        [tt, mcode_readable, path, query].join(' ').rstrip
       end
 
       def to_wire
         # check and encode option values
         prepared_options = prepare_options
-        # puts "prepared_options: #{prepared_options}"
 
         token = (prepared_options.delete(CoAP::TOKEN_ON) || [nil])[0] || ''
-        puts "TOKEN: #{token.inspect}" unless token
 
         b1 = 0x40 | TTYPES_I[tt] << 4 | token.bytesize
         b2 = METHODS_I[mcode] || (mcode[0] << 5) + mcode[1]

data/lib/core/coap/transmission.rb

@@ -62,8 +62,6 @@ module CoRE
           Timeout.timeout(1) { @socket.recvfrom(1152) }
         end
 
-        return if answer.nil?
-
         if answer.tt == :con
           message = Message.new(:ack, 0, answer.mid, nil,
             {token: answer.options[:token]})

data/lib/core/coap/version.rb

@@ -1,5 +1,5 @@
 module CoRE
   module CoAP
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coap
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Carsten Bormann
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler