zeroconf 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a6933171abe1ab052bf99d2bdb6efa5bd0378f536859e0cf812f2dd68b23461
-  data.tar.gz: 9c016607692b33ed3a516a872aa80117a119f3ac138a997a19a845684914890c
+  metadata.gz: 7f58175fb721fb08fa2a5abb36b0b2165d9b38592bb7ff66bd3a3f4c303ed2f9
+  data.tar.gz: afd32fb72b31c90e84aaea02db2f81e603b872f8f81c1f6f147d15c13ce3713e
 SHA512:
-  metadata.gz: bdc315b09c4ada48b56f6f102c24b5c0a51740c6163ccb3b9a96e67c7f262a35e95126c950bb1efd394b4cbea06ec0b29e1ae3e55bd02bbd63b42b4159faa06f
-  data.tar.gz: 663cc13801926e626a61aea7aebe75d51e92e07ab5133723c53be48259dc19bec30c42cbe10348c3a6881028fac9124afb8c50a697203736f8e394060b479b99
+  metadata.gz: 2e4faed4b18775a5fec2faf0b4064556356699b049c6ca1d6d2d4c03b685cd8702e3ba8591d098799d3ec6ee54efdb9aee1f0e5ea68578b92c1df7ea8fbbba7b
+  data.tar.gz: 210e338f7d21bbe98df962e4785e0716e2364e538fb44c1029217465fca0fe6ea2f414986d4bb7ce0f3588efd5bfbbd8caeb140ef5f1028b5e75b58648de57e6

data/README.md

@@ -108,12 +108,14 @@ to run an HTTP server and simultaneously advertise the server:
 
 ```ruby
 require "zeroconf"
-require 'webrick'
+require "webrick"
 
 port = 8080
 host = "test-hostname"
 
-Thread.new { ZeroConf.service "_http._tcp.local.", port, host }
+Ractor.new(port, host) { |port, host|
+  ZeroConf.service "_http._tcp.local.", port, host
+}
 
 server = WEBrick::HTTPServer.new(:Port => port,
                                  :SSLEnable => false,

data/lib/zeroconf/service.rb

@@ -9,14 +9,21 @@ module ZeroConf
     attr_reader :service, :service_port, :hostname, :service_interfaces,
       :service_name, :qualified_host, :text, :abort_on_malformed_requests
 
-    def initialize service, service_port, hostname = Socket.gethostname, service_interfaces: ZeroConf.service_interfaces, text: [""], abort_on_malformed_requests: false, started_callback: nil
+    def initialize service, service_port, hostname = Socket.gethostname, service_interfaces: ZeroConf.service_interfaces, instance_name: nil, text: [""], abort_on_malformed_requests: false, started_callback: nil
       @service = service
       @service_port = service_port
-      @hostname = hostname
+
+      @hostname = strip_dot_local(hostname) # We re-add .local anyway, later on
       @service_interfaces = service_interfaces
       @abort_on_malformed_requests = abort_on_malformed_requests
-      @service_name = "#{hostname}.#{service}"
-      @qualified_host = "#{hostname}.local."
+
+      instance_name ||= @hostname
+      if instance_name.include?(".")
+        raise ArgumentError, "instance_name must not contain dots (is #{instance_name.inspect})" 
+      end
+
+      @service_name = "#{instance_name}.#{@service}"
+      @qualified_host = "#{@hostname}.local."
       @started_callback = started_callback
       @text = text
       @started = false

data/lib/zeroconf/utils.rb

@@ -69,8 +69,8 @@ module ZeroConf
       sock
     end
 
-    BROADCAST_V4 = Addrinfo.new Socket.sockaddr_in(Resolv::MDNS::Port, Resolv::MDNS::AddressV4)
-    BROADCAST_V6 = Addrinfo.new Socket.sockaddr_in(Resolv::MDNS::Port, Resolv::MDNS::AddressV6)
+    BROADCAST_V4 = Addrinfo.new(Socket.sockaddr_in(Resolv::MDNS::Port, Resolv::MDNS::AddressV4)).freeze
+    BROADCAST_V6 = Addrinfo.new(Socket.sockaddr_in(Resolv::MDNS::Port, Resolv::MDNS::AddressV6)).freeze
 
     def multicast_send sock, query
       dest = if sock.local_address.ipv4?
@@ -94,6 +94,10 @@ module ZeroConf
       sock.send(data, 0, Addrinfo.new(to))
     end
 
+    def strip_dot_local(from_string)
+      from_string.to_s.gsub(/\.local\.?$/, "")
+    end
+
     def open_ipv6 saddr, port
       sock = UDPSocket.new Socket::AF_INET6
       sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)

data/lib/zeroconf/version.rb

@@ -1,3 +1,3 @@
 module ZeroConf
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/service_test.rb

@@ -26,6 +26,37 @@ module ZeroConf
       assert_equal [""], s.text
     end
 
+    def test_raises_when_creating_a_service_with_dot_in_the_name
+      assert_raises ArgumentError do
+        Service.new "_test-mdns._tcp.local.", 42424,
+          "some.subdomain.workstation"
+      end
+
+      assert_raises ArgumentError do
+        Service.new "_test-mdns._tcp.local.", 42424,
+          "ruby-mdns", instance_name: "ruby.test"
+      end
+    end
+
+    def test_sets_correct_service_name_from_instance_name
+      s = Service.new "_test-mdns._tcp.local.", 42424,
+        "my-rb-service", instance_name: "My RB service"
+      assert_equal "my-rb-service.local.", s.qualified_host
+      assert_equal "My RB service._test-mdns._tcp.local.", s.service_name
+    end
+
+    def test_removes_dot_local_tld_from_passed_hostname
+      s = Service.new "_test-mdns._tcp.local.", 42424,
+        "ThisMac.local"
+      assert_equal "ThisMac.local.", s.qualified_host
+      assert_equal "ThisMac._test-mdns._tcp.local.", s.service_name
+
+      s = Service.new "_test-mdns._tcp.local.", 42424,
+        "ThisMac.local."
+      assert_equal "ThisMac.local.", s.qualified_host
+      assert_equal "ThisMac._test-mdns._tcp.local.", s.service_name
+    end
+
     def test_unicast_service_instance_answer
       latch = Queue.new
       s = make_server iface, started_callback: -> { latch << :start }

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: zeroconf
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Aaron Patterson
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resolv
@@ -80,7 +79,6 @@ homepage: https://github.com/tenderlove/zeroconf
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,8 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.7.0.dev
 specification_version: 4
 summary: Multicast DNS client and server
 test_files: