dnssd 1.2 → 1.3

data/test/test_dnssd_reply.rb

@@ -4,72 +4,10 @@ require 'dnssd'
 class TestDNSSDReply < MiniTest::Unit::TestCase
 
   def setup
-    @reply = DNSSD::Reply.new
+    @reply = DNSSD::Reply.new nil, 0, 0
     @fullname = "Eric\\032Hodel._http._tcp.local."
   end
 
-  def test_class_from_service
-    reply = DNSSD::Reply.from_service :service, 4
-
-    assert_equal :service, reply.service
-    assert_equal DNSSD::Flags::Default, reply.flags
-  end
-
-  def test_connect_tcp
-    port = Socket.getservbyname 'blackjack'
-    @reply.set_fullname 'blackjack._http._tcp.local.'
-    @reply.instance_variable_set :@port, port
-    @reply.instance_variable_set :@target, 'localhost'
-
-    server = TCPServer.new 'localhost', port
-
-    socket = @reply.connect
-
-    assert_instance_of TCPSocket, socket
-    assert_equal port,        socket.peeraddr[1]
-    assert_equal 'localhost', socket.peeraddr[2]
-  ensure
-    socket.close
-    server.close
-  end
-
-  def test_connect_tcp_no_port_target
-    port = Socket.getservbyname 'blackjack'
-    server = TCPServer.new nil, port
-    Thread.start do server.accept end
-
-    DNSSD.announce server, 'blackjack no port'
-
-    @reply.set_fullname "blackjack\\032no\\032port._blackjack._tcp.local."
-
-    socket = @reply.connect
-
-    assert_instance_of TCPSocket, socket
-    assert_equal port,        socket.peeraddr[1]
-  ensure
-    socket.close if socket
-    server.close if server
-  end
-
-  def test_connect_udp
-    port = Socket.getservbyname 'blackjack'
-    @reply.set_fullname 'blackjack._http._udp.local.'
-    @reply.instance_variable_set :@port, port
-    @reply.instance_variable_set :@target, 'localhost'
-
-    server = UDPSocket.new
-    server.bind 'localhost', port
-
-    socket = @reply.connect
-
-    assert_instance_of UDPSocket, socket
-    assert_equal port,        socket.peeraddr[1]
-    assert_equal 'localhost', socket.peeraddr[2]
-  ensure
-    socket.close
-    server.close
-  end
-
   def test_fullname
     @reply.set_fullname @fullname
 
@@ -81,15 +19,11 @@ class TestDNSSDReply < MiniTest::Unit::TestCase
   end
 
   def test_inspect
-    flags = DNSSD::Flags.new
-    @reply.instance_variable_set :@fullname,  'blah'
-    @reply.instance_variable_set :@name,      'drbrain@pincer-tip'
-    @reply.instance_variable_set :@interface, 'en2'
-    @reply.instance_variable_set :@domain,    'local'
+    flags = DNSSD::Flags.new DNSSD::Flags::MoreComing
+    @reply.instance_variable_set :@interface, 'lo0'
     @reply.instance_variable_set :@flags,     flags
-    @reply.instance_variable_set :@type,      '_presence._tcp'
 
-    expected = "#<DNSSD::Reply:0x#{@reply.object_id.to_s 16} \"drbrain@pincer-tip\" type: _presence._tcp domain: local interface: en2 flags: #{flags}>"
+    expected = "#<DNSSD::Reply:0x#{@reply.object_id.to_s 16} interface: lo0 flags: #{flags.inspect}>"
     assert_equal expected, @reply.inspect
   end
 
@@ -108,23 +42,23 @@ class TestDNSSDReply < MiniTest::Unit::TestCase
   def test_set_fullname
     @reply.set_fullname @fullname
 
-    assert_equal 'Eric Hodel', @reply.name
-    assert_equal '_http._tcp', @reply.type
-    assert_equal 'local.', @reply.domain
+    assert_equal "Eric Hodel", @reply.instance_variable_get(:@name)
+    assert_equal '_http._tcp',    @reply.instance_variable_get(:@type)
+    assert_equal 'local.',        @reply.instance_variable_get(:@domain)
 
     @reply.set_fullname "Dr\\.\\032Pepper._http._tcp.local."
 
-    assert_equal 'Dr. Pepper', @reply.name
-    assert_equal '_http._tcp', @reply.type
-    assert_equal 'local.', @reply.domain
+    assert_equal "Dr. Pepper", @reply.instance_variable_get(:@name)
+    assert_equal '_http._tcp',    @reply.instance_variable_get(:@type)
+    assert_equal 'local.',        @reply.instance_variable_get(:@domain)
   end
 
   def test_set_names
     @reply.set_names "Dr\\.\032Pepper", '_http._tcp', 'local.'
 
-    assert_equal "Dr.\032Pepper", @reply.name
-    assert_equal '_http._tcp', @reply.type
-    assert_equal 'local.', @reply.domain
+    assert_equal "Dr.\032Pepper", @reply.instance_variable_get(:@name)
+    assert_equal '_http._tcp',    @reply.instance_variable_get(:@type)
+    assert_equal 'local.',        @reply.instance_variable_get(:@domain)
   end
 
 end

data/test/test_dnssd_reply_browse.rb

@@ -0,0 +1,28 @@
+require 'minitest/autorun'
+require 'dnssd'
+
+class TestDNSSDReplyBrowse < MiniTest::Unit::TestCase
+
+  def setup
+    @reply = DNSSD::Reply::Browse.new nil, 0, 0, "blackjack\\032no\\032port",
+                                      '_blackjack._tcp', 'local'
+  end
+
+  def test_connect
+    port = Socket.getservbyname 'blackjack'
+    server = TCPServer.new nil, port
+    Thread.start do server.accept end
+
+    DNSSD.announce server, 'blackjack no port'
+
+    socket = @reply.connect
+
+    assert_instance_of TCPSocket, socket
+    assert_equal port, socket.peeraddr[1]
+  ensure
+    socket.close if socket
+    server.close if server
+  end
+
+end
+

data/test/test_dnssd_reply_query_record.rb

@@ -0,0 +1,92 @@
+require 'minitest/autorun'
+require 'dnssd'
+
+class TestDNSSDReplyQueryRecord < MiniTest::Unit::TestCase
+
+  def setup
+    @fullname = 'blackjack._blackjack._tcp.test.'
+    @IN = DNSSD::Record::IN
+    @ipv4 = "\300\000\002\001"
+    @ipv6 = " \001\r\270\000\000\000\000\000\000\000\000\000\000\000\001"
+    @nowhere = "\007nowhere\007example\000"
+  end
+
+  def test_record_data_A
+    qr = util_qr DNSSD::Record::A, @ipv4
+    
+    assert_equal IPAddr.new_ntoh(@ipv4), qr.record_data
+  end
+
+  def test_record_data_AAAA
+    qr = util_qr DNSSD::Record::A, @ipv6
+    
+    assert_equal IPAddr.new_ntoh(@ipv6), qr.record_data
+  end
+
+  def test_record_data_CNAME
+    qr = util_qr DNSSD::Record::CNAME, @nowhere
+    
+    assert_equal 'nowhere.example.', qr.record_data
+  end
+
+  def test_record_data_MX
+    qr = util_qr DNSSD::Record::MX, "\000\010#{@nowhere}"
+    
+    assert_equal [8, 'nowhere.example.'], qr.record_data
+  end
+
+  def test_record_data_NS
+    qr = util_qr DNSSD::Record::NS, @nowhere
+    
+    assert_equal 'nowhere.example.', qr.record_data
+  end
+
+  def test_record_data_PTR
+    qr = util_qr DNSSD::Record::PTR, @nowhere
+    
+    assert_equal 'nowhere.example.', qr.record_data
+  end
+
+  def test_record_data_SOA
+    serial = 1
+    refresh = 86400
+    rtry = 3600
+    expire = 86400 * 2
+    minimum = 3600 * 12
+
+    data = "#{@nowhere}\002me#{@nowhere}#{[serial, refresh, rtry, expire, minimum].pack 'NNNNN'}"
+
+    qr = util_qr DNSSD::Record::SOA, data
+
+    expected = [
+      'nowhere.example.', 'me.nowhere.example.',
+      serial, refresh, rtry, expire, minimum
+    ]
+    
+    assert_equal expected, qr.record_data
+  end
+
+  def test_record_data_SRV
+    priority = 1
+    weight = 5
+    port = 1025
+
+    data = "#{[priority, weight, port].pack 'nnn'}#{@nowhere}"
+
+    qr = util_qr DNSSD::Record::SRV, data
+    
+    assert_equal [1, 5, 1025, 'nowhere.example.'], qr.record_data
+  end
+
+  def test_record_data_TXT
+    qr = util_qr DNSSD::Record::TXT, "\005Hello\006World!"
+    
+    assert_equal %w[Hello World!], qr.record_data
+  end
+
+  def util_qr(rtype, rdata)
+    DNSSD::Reply::QueryRecord.new nil, 0, 0, @fullname, rtype, @IN, rdata, 120
+  end
+
+end
+

data/test/test_dnssd_reply_resolve.rb

@@ -0,0 +1,47 @@
+require 'minitest/autorun'
+require 'dnssd'
+
+class TestDNSSDReplyResolve < MiniTest::Unit::TestCase
+
+  def setup
+    @port = Socket.getservbyname 'blackjack'
+    @interface = DNSSD::InterfaceAny
+  end
+
+  def test_connect_tcp
+    fullname = "blackjack\\032no\\032port._blackjack._tcp.local."
+    reply = DNSSD::Reply::Resolve.new nil, 0, @interface, fullname,
+                                      'localhost', @port, nil
+
+    server = TCPServer.new nil, @port
+
+    socket = reply.connect
+
+    assert_instance_of TCPSocket, socket
+    assert_equal @port,       socket.peeraddr[1]
+    assert_equal 'localhost', socket.peeraddr[2]
+  ensure
+    socket.close if socket
+    server.close if server
+  end
+
+  def test_connect_udp
+    fullname = "blackjack\\032no\\032port._blackjack._udp.local."
+    reply = DNSSD::Reply::Resolve.new nil, 0, @interface, fullname,
+                                      'localhost', @port, nil
+
+    server = UDPSocket.new
+    server.bind 'localhost', @port
+
+    socket = reply.connect
+
+    assert_instance_of UDPSocket, socket
+    assert_equal @port,       socket.peeraddr[1]
+    assert_equal 'localhost', socket.peeraddr[2]
+  ensure
+    socket.close if socket
+    server.close if server
+  end
+
+end
+

data/test/test_dnssd_service.rb

@@ -0,0 +1,12 @@
+require 'minitest/autorun'
+require 'dnssd'
+
+class TestDNSSDService < MiniTest::Unit::TestCase
+
+  def test_class_get_property
+    assert_kind_of Numeric,
+                   DNSSD::Service.get_property(DNSSD::Service::DaemonVersion)
+  end if DNSSD::Service.respond_to? :get_property
+
+end
+

data/test/test_dnssd_text_record.rb

@@ -68,9 +68,9 @@ class TestDNSSDTextRecord < MiniTest::Unit::TestCase
   end
 
   def test_decode_empty
-    assert_equal({}, @TR.new("").to_hash)
-    assert_equal({}, @TR.new("\x00").to_hash)
-    assert_equal({}, @TR.new("\x00\x00").to_hash)
+    assert_equal({}, @TR.new(""))
+    assert_equal({}, @TR.new("\x00"))
+    assert_equal({}, @TR.new("\x00\x00"))
   end
 
   def test_decode_value

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dnssd
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: "1.3"
 platform: ruby
 authors: 
+- Eric Hodel
+- Aaron Patterson
+- Phil Hagelberg
 - Chad Fowler
 - Charles Mills
 - Rich Kilmer
-- Phil Hagelberg
-- Aaron Patterson
-- Eric Hodel
 autorequire: 
 bindir: bin
 cert_chain: 
@@ -35,7 +35,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2009-08-12 00:00:00 -07:00
+date: 2009-08-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,7 +59,7 @@ dependencies:
         version: "1.4"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rake-complier
+  name: rake-compiler
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -76,18 +76,19 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.3
     version: 
 description: |-
   DNS Service Discovery (aka Bonjour, MDNS) API for Ruby.  Implements browsing,
-  resolving, registration and domain enumeration.
+  resolving, registration and domain enumeration.  Supports avahi's DNSSD
+  compatibility layer for avahi 0.6.25 or newer.
 email: 
+- drbrain@segment.net
+- aaronp@rubyforge.org
+- phil@hagelb.org
 - chad@chadfowler.com
 - ""
 - ""
-- phil@hagelb.org
-- aaronp@rubyforge.org
-- drbrain@segment.net
 executables: []
 
 extensions: 
@@ -107,15 +108,25 @@ files:
 - ext/dnssd/errors.c
 - ext/dnssd/extconf.rb
 - ext/dnssd/flags.c
+- ext/dnssd/record.c
 - ext/dnssd/service.c
 - lib/dnssd.rb
 - lib/dnssd/flags.rb
+- lib/dnssd/record.rb
 - lib/dnssd/reply.rb
+- lib/dnssd/reply/addr_info.rb
+- lib/dnssd/reply/browse.rb
+- lib/dnssd/reply/domain.rb
+- lib/dnssd/reply/query_record.rb
+- lib/dnssd/reply/register.rb
+- lib/dnssd/reply/resolve.rb
 - lib/dnssd/service.rb
 - lib/dnssd/text_record.rb
 - sample/browse.rb
 - sample/enumerate_domains.rb
+- sample/getaddrinfo.rb
 - sample/growl.rb
+- sample/query_record.rb
 - sample/register.rb
 - sample/resolve.rb
 - sample/resolve_ichat.rb
@@ -123,7 +134,12 @@ files:
 - sample/socket.rb
 - test/test_dnssd.rb
 - test/test_dnssd_flags.rb
+- test/test_dnssd_record.rb
 - test/test_dnssd_reply.rb
+- test/test_dnssd_reply_browse.rb
+- test/test_dnssd_reply_query_record.rb
+- test/test_dnssd_reply_resolve.rb
+- test/test_dnssd_service.rb
 - test/test_dnssd_text_record.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/dnssd
@@ -158,5 +174,10 @@ summary: DNS Service Discovery (aka Bonjour, MDNS) API for Ruby
 test_files: 
 - test/test_dnssd.rb
 - test/test_dnssd_flags.rb
+- test/test_dnssd_record.rb
 - test/test_dnssd_reply.rb
+- test/test_dnssd_reply_browse.rb
+- test/test_dnssd_reply_query_record.rb
+- test/test_dnssd_reply_resolve.rb
+- test/test_dnssd_service.rb
 - test/test_dnssd_text_record.rb