dnssd 1.3.1 → 1.3.2

data/History.txt

@@ -1,6 +1,11 @@
+=== 1.3.2 / 2010-08-28
+
+* Bug fixes
+  * 1.9 compatibility
+
 === 1.3.1 / 2009-10-13
 
-* 1 bug fix
+* Bug fixes
   * Fix regexp for parsing the fullname.  Patch by James Sadler.
 
 === 1.3 / 2009-08-18

data/Manifest.txt

@@ -34,6 +34,7 @@ sample/server.rb
 sample/socket.rb
 test/test_dnssd.rb
 test/test_dnssd_flags.rb
+test/test_dnssd_getaddrinfo.rb
 test/test_dnssd_record.rb
 test/test_dnssd_reply.rb
 test/test_dnssd_reply_browse.rb

data/lib/dnssd.rb

@@ -13,7 +13,7 @@ module DNSSD
   ##
   # The version of DNSSD you're using.
 
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 
   ##
   # Registers +socket+ with DNSSD as +name+.  If +service+ is omitted it is

data/lib/dnssd/service.rb

@@ -116,7 +116,7 @@ class DNSSD::Service
   # setup your /etc/nsswitch.conf correctly.  See
   # http://avahi.org/wiki/AvahiAndUnicastDotLocal for details
 
-  def getaddrinfo(host, protocol = nil, flags = 0,
+  def getaddrinfo(host, protocol = 0, flags = 0,
                   interface = DNSSD::InterfaceAny, &block)
     interface = DNSSD.interface_index interface unless Integer === interface
 
@@ -137,9 +137,9 @@ class DNSSD::Service
 
       addrinfo = Socket.getaddrinfo host, nil, family
 
-      addrinfo.each do |_, _, host, ip, _|
+      addrinfo.each do |_, _, a_host, ip, _|
         sockaddr = Socket.pack_sockaddr_in 0, ip
-        @replies << DNSSD::Reply::AddrInfo.new(self, 0, 0, host, sockaddr, 0)
+        @replies << DNSSD::Reply::AddrInfo.new(self, 0, 0, a_host, sockaddr, 0)
       end
     end
   end

data/lib/dnssd/text_record.rb

@@ -32,14 +32,16 @@ class DNSSD::TextRecord < DelegateClass(Hash)
   def decode(text_record)
     record = {}
 
-    until text_record.empty? do
-      size = text_record.slice! 0
+    tr = text_record.unpack 'C*'
+
+    until tr.empty? do
+      size  = tr.shift
+
       next if size.zero?
 
-      raise ArgumentError, 'ran out of data in text record' if
-        text_record.length < size
+      raise ArgumentError, 'ran out of data in text record' if tr.length < size
 
-      entry = text_record.slice! 0, size
+      entry = tr.shift(size).pack('C*')
 
       raise ArgumentError, 'key not found' unless entry =~ /^[^=]/
 

data/test/test_dnssd_getaddrinfo.rb

@@ -0,0 +1,23 @@
+require 'minitest/autorun'
+require 'dnssd'
+require 'socket'
+
+class TestDNSSD < MiniTest::Unit::TestCase
+
+  def test_getaddrinfo
+    service = DNSSD::Service.new
+
+    addresses = []
+    begin
+      service.getaddrinfo 'localhost' do |addrinfo|
+        addresses << addrinfo.address
+        break unless addrinfo.flags.more_coming?
+      end
+    ensure
+      service.stop
+    end
+    assert addresses.index('127.0.0.1')
+  end
+
+end
+

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dnssd
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  hash: 31
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Eric Hodel
@@ -35,49 +41,102 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2009-10-13 00:00:00 -07:00
+date: 2010-08-28 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe-seattlerb
+  name: rubyforge
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
+        version: 1.5.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hoe-seattlerb
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
         version: "1.2"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: minitest
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
         version: "1.4"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
         version: "0.6"
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+        hash: 21
+        segments: 
+        - 2
+        - 6
+        - 1
+        version: 2.6.1
+  type: :development
+  version_requirements: *id006
 description: |-
   DNS Service Discovery (aka Bonjour, MDNS) API for Ruby.  Implements browsing,
   resolving, registration and domain enumeration.  Supports avahi's DNSSD
@@ -134,6 +193,7 @@ files:
 - sample/socket.rb
 - test/test_dnssd.rb
 - test/test_dnssd_flags.rb
+- test/test_dnssd_getaddrinfo.rb
 - test/test_dnssd_record.rb
 - test/test_dnssd_reply.rb
 - test/test_dnssd_reply_browse.rb
@@ -151,29 +211,35 @@ rdoc_options:
 - README.txt
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: dnssd
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: DNS Service Discovery (aka Bonjour, MDNS) API for Ruby
 test_files: 
 - test/test_dnssd.rb
 - test/test_dnssd_flags.rb
+- test/test_dnssd_getaddrinfo.rb
 - test/test_dnssd_record.rb
 - test/test_dnssd_reply.rb
 - test/test_dnssd_reply_browse.rb