radiodns 0.0.3 → 0.1.0

data/README.md

@@ -18,8 +18,8 @@ Then if you already have the Fully Qualified Domain Name as specified
 in the [RadioDNS spec](http://radiodns.org/wp-content/uploads/2009/03/rdns011.pdf), you
 can resolve it into a CNAME like so
 
-    cname = RadioDNS::Resolver.resolve('09580.c586.ce1.fm.radiodns.org')
-    puts cname #=> 'rdns.musicradio.com'
+    service = RadioDNS::Resolver.resolve('09580.c586.ce1.fm.radiodns.org')
+    puts service.cname #=> 'rdns.musicradio.com'
 
 You can also pass in the parameters required to construct the FQDN to
 the resolve method
@@ -30,10 +30,29 @@ the resolve method
       :ecc => 'ce1',
       :bearer => 'fm'
     }
-    cname = RadioDNS::Resolver.resolve(params)
+    service = RadioDNS::Resolver.resolve(params)
 
 The bearers `fm`, `dab`, `drm`, `amss` and `hd` are supported.
 
+Once you have a service you can perform application discovery
+
+    radiovis_application = service.radiovis
+
+    radiovis_application.host #=> "_radiovis._tcp.rdns.musicradio.com"
+    radiovis_application.port #=> 61613
+
+Or to get an array of supported applications
+
+    service.applications
+
+Returns an array of Applications
+
+   [#<RadioDNS::Application @host="_radioepg._tcp.rdns.musicradio.com", @port=61613>,
+    #<RadioDNS::Application @host="_radiovis._tcp.rdns.musicradio.com", @port=61613>]
+
+In the future these may become instances of specific classes that
+implement the application-specific behaviour.
+
 ## TODO
 
  - better error checking of supplied parameters. The code current
@@ -43,5 +62,3 @@ The bearers `fm`, `dab`, `drm`, `amss` and `hd` are supported.
 
  - return an appropriate error if DNS look-up does not resolve to
    CNAME.
-
- - service discovery

data/lib/radiodns.rb

@@ -1,6 +1,56 @@
 require 'resolv'
 
 module RadioDNS
+  class Service
+    attr_accessor :cname
+    def initialize(cname)
+      @cname = cname
+    end
+
+    def radiovis
+      application(:radiovis)
+    end
+
+    def radioepg
+      application(:radioepg)
+    end
+
+    def radiotag
+      application(:radiotag)
+    end
+
+    def applications
+      applications = []
+      [:radiotag, :radioepg, :radiovis].each do |method_name|
+        application = self.send(method_name)
+        applications << application if application
+      end
+      applications
+    end
+
+    def application(service)
+      resolver = Resolv::DNS.new
+
+      prefix = "_#{service.to_s}._tcp."
+      host = prefix + cname
+      begin
+        resource = resolver.getresource(host,
+                                        Resolv::DNS::Resource::IN::SRV)
+        Application.new :host => host, :port => resource.port
+      rescue Resolv::ResolvError
+        nil
+      end
+    end
+  end
+
+  class Application
+    attr_accessor :host, :port
+    def initialize(params)
+      @host = params[:host]
+      @port = params[:port]
+    end
+  end
+
   class Resolver
     def self.resolve(fqdn)
       if fqdn.is_a? Hash
@@ -9,7 +59,7 @@ module RadioDNS
 
       resolver = Resolv::DNS.new
       cname = resolver.getresource(fqdn, Resolv::DNS::Resource::IN::CNAME)
-      cname.name.to_s
+      Service.new(cname.name.to_s)
     end
 
     def self.construct_fqdn(params)

data/lib/radiodns/version.rb

@@ -1,3 +1,3 @@
 module Radiodns
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/radiodns_spec.rb

@@ -3,6 +3,65 @@ require 'minitest/autorun'
 require 'mocha'
 require 'radiodns'
 
+describe "RadioDNS::Service" do
+  before(:each) do
+    @service = RadioDNS::Service.new('rdns.musicradio.com')
+  end
+
+  it "has a cname" do
+    assert @service.respond_to? :cname
+  end
+
+  it "looks up radiovis application" do
+    @service.expects(:application).with(:radiovis).returns(nil)
+    @service.radiovis
+  end
+
+  it "looks up radiotag application" do
+    @service.expects(:application).with(:radiotag).returns(nil)
+    @service.radiotag
+  end
+
+  it "looks up radioepg application" do
+    @service.expects(:application).with(:radioepg).returns(nil)
+    @service.radioepg
+  end
+
+  it "has an array of supported applications" do
+    @service.expects(:application).with(:radioepg).returns(:epg)
+    @service.expects(:application).with(:radiovis).returns(:vis)
+    @service.expects(:application).with(:radiotag).returns(:tag)
+    assert_equal [:tag, :epg, :vis], @service.applications
+  end
+
+  it "performs SVR lookups" do
+    mock_resolver = mock()
+    mock_resource = mock()
+    mock_resolver.expects(:getresource).
+      with('_some_application._tcp.rdns.musicradio.com', Resolv::DNS::Resource::IN::SRV).once.
+      returns(mock_resource)
+    mock_resource.expects(:port).returns(1234)
+    Resolv::DNS.expects(:new).returns(mock_resolver)
+
+    application = @service.application(:some_application)
+
+    assert_equal application.host, "_some_application._tcp.rdns.musicradio.com"
+    assert_equal application.port, 1234
+  end
+
+  it "returns nil when lookup fails" do
+    mock_resolver = mock()
+    mock_resource = mock()
+    mock_resolver.expects(:getresource).
+      with('_some_application._tcp.rdns.musicradio.com', Resolv::DNS::Resource::IN::SRV).once.
+      raises(Resolv::ResolvError)
+    Resolv::DNS.expects(:new).returns(mock_resolver)
+
+    application = @service.application(:some_application)
+    assert application.nil?
+  end
+end
+
 describe "RadioDNS::Resolver" do
   describe "resolve" do
     before(:each) do
@@ -16,8 +75,8 @@ describe "RadioDNS::Resolver" do
       Resolv::DNS.expects(:new).returns(mock_resolver)
     end
     it "should query radiodns.org" do
-      cname = RadioDNS::Resolver.resolve('09580.c586.ce1.fm.radiodns.org')
-      assert_equal 'rdns.musicradio.com', cname
+      service = RadioDNS::Resolver.resolve('09580.c586.ce1.fm.radiodns.org')
+      assert_equal 'rdns.musicradio.com', service.cname
     end
 
     it "should accept hash params too" do
@@ -27,8 +86,8 @@ describe "RadioDNS::Resolver" do
         :ecc => 'ce1',
         :bearer => 'fm'
       }
-      cname = RadioDNS::Resolver.resolve(params)
-      assert_equal 'rdns.musicradio.com', cname
+      service = RadioDNS::Resolver.resolve(params)
+      assert_equal 'rdns.musicradio.com', service.cname
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: radiodns
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Chris Lowis