coap 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36ea360829046ce72e968fe067c38e687bf3de8c
-  data.tar.gz: c9c5ab0540425a325cba51a5063b12c4f0416189
+  metadata.gz: c4fa88769ab252aa9e46a96259925a550baa4b31
+  data.tar.gz: d44c5df8e6655814f7c94ff9154556f74e26dc7b
 SHA512:
-  metadata.gz: 2c341257f415a5cf47b59c4878898984e5e9adfd8d14a696c0d9cc4678f621e8912e5b8ba79df52b735e39eccf2a300f9c4ef5ea688fc9d752a19cb06fdde5a7
-  data.tar.gz: f4b6bcb900c0130c53a2f234d111a0c2af0022811f425b02a36e3145a84d0aaf2d1e8645a238bd9037fdbe8dd5283718a1decc9669d39fc68954d774e92af740
+  metadata.gz: bfc70277f16981ea5418b8e4a445761ae49d47c6379d1027a36380f87b1001ee29890eeb4df8e87068b09a6667374633908e07f9b81505c834eae5603aba8d53
+  data.tar.gz: 1642b287ef80007426bee50b503c5c8cf3859e9e31d426384a09da99c5c42993ec532464b1bc9c4a846f868b961fbc5272070f5d4a480e9de97614ad5aa81bd2

data/README.md

@@ -40,14 +40,24 @@ Or install it yourself as:
 
 ## Usage
 
-### In your Ruby (on Rails) application
+### In your Application
 
 	require 'coap'
+
     CoAP::Client.new.get_by_uri('coap://coap.me/hello').payload
+	=> "world"
+
+	CoAP::Client.new.get('/hello', 'coap.me')
+	=> #<struct CoRE::CoAP::Message ver=1, tt=:ack, mcode=[2, 5], mid=51490, options={:max_age=>60, :token=>366862489, :content_format=>0}, payload="world">
+
+	c = CoAP::Client.new(host: 'coap.me')
+	c.get('/hello')
 
-See `test/test_client.rb` for more examples.
+See [the API documentation at
+rubydoc.info](http://www.rubydoc.info/github/nning/coap/master/CoRE/CoAP/Client)
+or `test/test_client.rb` for more examples.
 
-### Command Line Client
+### On the Command Line
 
 The command line client supports the basic CoAP methods.
 

data/coap.gemspec

@@ -33,6 +33,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake',      '~> 10.3'
   s.add_development_dependency 'rspec',     '~> 3.0'
 
-  s.add_dependency 'celluloid-io', '~> 0.16', '>= 0.16.1'
+  s.add_dependency 'celluloid-io', '>= 0.16.1', '< 0.17'
   s.add_dependency 'resolv-ipv6favor', '~> 0'
 end

data/lib/core/coap/client.rb

@@ -217,6 +217,8 @@ module CoRE
         # Preserve user options.
         message.options[:block2] = options[:block2] unless options[:block2] == nil
         message.options[:observe] = options[:observe] unless options[:observe] == nil
+
+        options.delete(:block1)
         message.options.merge!(options)
 
         log_message(:sending_message, message)

data/lib/core/coap/resolver.rb

@@ -1,8 +1,8 @@
 module CoRE
   module CoAP
     class Resolver
-      def self.address(host)
-        a = if ENV['IPv4'].nil?
+      def self.address(host, force_ipv6 = false)
+        a = if force_ipv6
           IPv6FavorResolv.getaddress(host).to_s
         else
           Resolv.getaddress(host).to_s

data/lib/core/coap/transmission.rb

@@ -11,6 +11,7 @@ module CoRE
         @max_retransmit   = options[:max_retransmit] || 4
         @recv_timeout     = options[:recv_timeout]   || DEFAULT_RECV_TIMEOUT
         @socket           = options[:socket]
+        @force_ipv6       = !!options[:force_ipv6]
 
         @retransmit       = if options[:retransmit].nil?
                               true
@@ -128,7 +129,7 @@ module CoRE
           end
         # MRI throws IPAddr::InvalidAddressError, JRuby an ArgumentError
         rescue ArgumentError
-          host = Resolver.address(host)
+          host = Resolver.address(host, options[:force_ipv6])
           retry
         end
 

data/lib/core/coap/version.rb

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

data/spec/client_spec.rb

@@ -17,6 +17,8 @@ describe Client do
 
   describe 'modifying methods' do
     subject { Client.new(max_payload: 512) }
+
+    let(:host) { 'coap.me' }
     let(:payload) { Faker::Lorem.paragraphs(5).join("\n") }
     let(:payload_utf8) { '♥' + payload }
 
@@ -24,19 +26,19 @@ describe Client do
       describe 'with block1 option' do
         describe 'creating resource' do
           it 'should work with ASCII payload' do
-            answer = subject.post('/large-create', 'coap.me', nil, payload)
+            answer = subject.post('/large-create', host, nil, payload)
             expect(answer.mcode).to eq([2, 1])
 
-            answer = subject.get('/large-create', 'coap.me')
+            answer = subject.get('/large-create', host)
             expect(answer.mcode).to eq([2, 5])
             expect(answer.payload).to eq(payload)
           end
 
           it 'should work with UTF8 payload' do
-            answer = subject.post('/large-create', 'coap.me', nil, payload_utf8)
+            answer = subject.post('/large-create', host, nil, payload_utf8)
             expect(answer.mcode).to eq([2, 1])
 
-            answer = subject.get('/large-create', 'coap.me')
+            answer = subject.get('/large-create', host)
             expect(answer.mcode).to eq([2, 5])
             expect(answer.payload.force_encoding('utf-8')).to eq(payload_utf8)
           end
@@ -48,10 +50,10 @@ describe Client do
       describe 'with block1 option' do
         describe 'updating resource' do
           it 'should work with ASCII payload' do
-            answer = subject.put('/large-update', 'coap.me', nil, payload)
+            answer = subject.put('/large-update', host, nil, payload)
             expect(answer.mcode).to eq([2, 4])
 
-            answer = subject.get('/large-update', 'coap.me')
+            answer = subject.get('/large-update', host)
             expect(answer.mcode).to eq([2, 5])
             expect(answer.payload).to eq(payload)
           end

data/spec/resolver_spec.rb

@@ -1,19 +1,26 @@
 require 'spec_helper'
 
 describe Resolver do
-  if ENV['IPv4'].nil?
-    context 'ipv6' do
-      subject { IPAddr.new(Resolver.address('orgizm.net')) }
+  context 'ipv6' do
+    subject { IPAddr.new(Resolver.address('orgizm.net', true)) }
 
-      it { expect { subject }.not_to raise_error }
-      it { expect(subject.ipv6?).to be(true) }
-    end
+    it { expect { subject }.not_to raise_error }
+    it { expect(subject.ipv6?).to be(true) }
   end
 
   context 'ipv4' do
-    subject { IPAddr.new(Resolver.address('ipv4.orgizm.net')) }
+    context 'from dns' do
+      subject { IPAddr.new(Resolver.address('ipv4.orgizm.net')) }
 
-    it { expect { subject }.not_to raise_error }
-    it { expect(subject.ipv4?).to be(true) }
+      it { expect { subject }.not_to raise_error }
+      it { expect(subject.ipv4?).to be(true) }
+    end
+
+    context 'default' do
+      subject { IPAddr.new(Resolver.address('orgizm.net')) }
+
+      it { expect { subject }.not_to raise_error }
+      it { expect(subject.ipv4?).to be(true) }
+    end
   end
 end

data/spec/transmission_spec.rb

@@ -59,10 +59,8 @@ describe Transmission do
           expect(Transmission.from_host('ipv4.orgizm.net').ipv6?).to be(false)
         end
 
-        if ENV['IPv4'].nil?
-          it 'ipv6' do
-            expect(Transmission.from_host('orgizm.net').ipv6?).to be(true)
-          end
+        it 'ipv6' do
+          expect(Transmission.from_host('orgizm.net', force_ipv6: true).ipv6?).to be(true)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Carsten Bormann
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,22 +100,22 @@ dependencies:
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: resolv-ipv6favor
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Pure Ruby implementation of RFC 7252 (Constrained Application Protocol (CoAP))