discodactyl 0.3.0 → 0.4.1

data/Gemfile

@@ -1,8 +1,3 @@
 source :rubygems
 
-gem 'actionpack', '~>2.3.8'
-gem 'feedzirra', '~>0.0.23'
-gem 'mofo', '~>0.2.16'
-gem 'nokogiri', '~>1.4.2'
-gem 'rake', '~>0.8.7'
-gem 'rr', '~>0.10.11'
+gemspec

data/MANIFEST

@@ -5,7 +5,7 @@ Gemfile
 INSTALL
 MANIFEST
 NEWS
-README
+README.rdoc
 Rakefile
 TODO
 bin/webfinger
@@ -13,7 +13,13 @@ discodactyl.gemspec
 lib/discodactyl.rb
 lib/discodactyl/acct_uri.rb
 lib/discodactyl/host_meta.rb
+lib/discodactyl/host_meta_jrd.rb
+lib/discodactyl/jrd.rb
+lib/discodactyl/jrd/document.rb
+lib/discodactyl/jrd/link.rb
+lib/discodactyl/known_rels.rb
 lib/discodactyl/link_header.rb
+lib/discodactyl/log.rb
 lib/discodactyl/resource_discovery.rb
 lib/discodactyl/uri_template.rb
 lib/discodactyl/xrd.rb
@@ -22,6 +28,8 @@ lib/discodactyl/xrd/link.rb
 test/test_acct_uri.rb
 test/test_helper.rb
 test/test_host_meta.rb
+test/test_host_meta_jrd.rb
+test/test_jrd_document.rb
 test/test_link_header.rb
 test/test_resource_discovery.rb
 test/test_uri_template.rb

data/{README → README.rdoc}

@@ -1,9 +1,10 @@
 = Discodactyl
 
-* http://dactylo.us
-* http://github.com/josephholsten/discodactyl
-* http://josephholsten.lighthouseapp.com/projects/36040-discodactyl
-* mailto:joseph@josephholsten.com
+Code :: http://github.com/josephholsten/discodactyl
+Bugs :: http://josephholsten.lighthouseapp.com/projects/36040-discodactyl
+Tests :: http://discodactyl-ci.heroku.com/
+Docs :: http://rdoc.info/projects/josephholsten/discodactyl
+Author :: mailto:joseph@josephholsten.com
 
 == DESCRIPTION:
 
@@ -18,9 +19,22 @@ Discodactyl is an experimental toolkit for XRD service discovery documents and r
 * acct: URI parsing.
 * Minimal URI Template parsing and application.
 * Probably filled with bugs. Don't forget your bug powder.
+* JRD parsing, querying.
+* Yahoo 'webfinger' doesn't work. Sadly, they need to update their format to the most recent one.
 
 == SYNOPSIS:
 
+For command-line fiends:
+
+  $ webfinger bradfitz@gmail.com
+  Profile: http://www.google.com/profiles/bradfitz
+  Profile data: http://www-opensocial.googleusercontent.com/api/people/115863474911002159675/
+  describedby: http://www.google.com/profiles/bradfitz
+  Contacts: http://www-opensocial.googleusercontent.com/api/people/
+  Status: Hah... about 4 hours ago
+
+For ruby mongers:
+
   # All of WebFinger! In very few, if long and pointy, lines!
   require 'discodactyl'
 
@@ -46,7 +60,7 @@ This software is also available in a permissive license. Please contact Joseph H
 
 (The GNU Affero General Public License)
 
-Copyright (c) 2009, 2010 Joseph Anthony Pasquale Holsten
+Copyright (c) 2009, 2010, 2011 Joseph Anthony Pasquale Holsten
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by

data/TODO

@@ -14,11 +14,28 @@
 * REXML support
 * collect common rel values into a enum module
 * put license info in every file
+* find out if ruby has a default debug flag
+* find well known uris via WellKnown.find(uri, :host_meta)
 
 Reference Specs
-* host meta http://tools.ietf.org/html/draft-hammer-hostmeta-05
+* host meta http://tools.ietf.org/html/draft-hammer-hostmeta-13
 * webfinger
-* xrd http://www.oasis-open.org/committees/download.php/36542/xrd-1.0-wd15.html
-* lrdd http://tools.ietf.org/html/draft-hammer-discovery-04
-* link header http://tools.ietf.org/html/draft-nottingham-http-link-header-08
-* versioning-rels http://tools.ietf.org/html/draft-brown-versioning-link-relations-07
+* xrd http://docs.oasis-open.org/xri/xrd/v1.0/xrd-1.0.html
+* lrdd http://tools.ietf.org/html/draft-hammer-discovery-06
+* link header http://tools.ietf.org/html/rfc5988
+* versioning-rels http://tools.ietf.org/html/rfc5829
+
+Interesting webfinger variants
+* joseph@josephholsten.com
+* romeda@gmail.com
+* will@willmeyer.com
+* dclinton@gmail.com
+* bradfitz@gmail.com
+* dclinton@yahoo.com
+* beestage@yahoo.com
+* gffletch@aol.com
+
+other clients
+* webfingerclient-dclinton.appspot.com/
+* webfinger.org/lookup/darron@froese.org
+* web.mailana.com/labs/findbyemail/

data/bin/webfinger

@@ -7,14 +7,27 @@ require 'open-uri'
 require 'action_view'
 require 'mofo'
 require 'feedzirra'
+require 'logger'
+
+log = Logger.new(STDOUT)
+Discodactyl.log = log
 
 if ARGV.length == 0
 	puts "Usage: #{__FILE__} user@host"
 	exit 0
 end
 
+if ARGV[0].match /^-d/
+  log.level = Logger::DEBUG
+  # ARGV.unshift
+  ARGV.shift
+else
+  log.level = Logger::WARN
+end
+
 # parse identifier
-acct = URI::ACCT.parse(ARGV[0])
+raw_acct = ARGV[0]
+acct = URI::ACCT.parse(raw_acct)
 
 # Perform LRDD discovery on acct with the webfinger relation
 finger_rel = "lrdd"
@@ -22,41 +35,73 @@ begin
   webfinger_uris = Discodactyl::ResourceDiscovery.get_uris_by_rel(acct, finger_rel, 'uri' => acct)
 rescue Discodactyl::HostMetaHTTPError => error
   if error.io.status[1] == 'Not Found'
-    abort "No host meta webfinger information found at #{error.io.base_uri}"
+    abort "No host meta webfinger information found at #{error.io.base_uri}. Is the file there?"
   else
     raise
   end
+rescue Discodactyl::HostMetaSocketError => error
+  abort "Could not connect to #{error.host}:#{error.port}. Is your internet connection working?"
 end
 
 abort "URI didn't have any linked webfinger URIs" if webfinger_uris.empty?
 
 # retrieve user disco doc
-disco_res = open(webfinger_uris.first)
+begin
+  disco_uri = webfinger_uris.first
+  disco_res = open(disco_uri)
+rescue OpenURI::HTTPError
+  abort "Couldn't open the disco doc at #{disco_uri}. Is your host-meta pointed at the right place?"
+end
 
 # parse disco doc
-disco = Discodactyl::XRD::Document.parse(disco_res)
+begin
+  disco = Discodactyl::JRD::Document.parse(disco_res)
+  log.debug "disco doc <#{webfinger_uris.first}>:\n#{disco.inspect}\n"
+rescue Discodactyl::JRD::ParseError => e
+  log.debug "disco doc doesn't seem to be a JRD #{e.message}"
+  disco_res.rewind
+  disco = Discodactyl::XRD::Document.parse(disco_res)
+  log.debug "disco doc <#{webfinger_uris.first}>:\n#{disco}\n"
+end
+
+log.debug "links: #{disco.links.map{|r| [r.rel, r.type, r.href]}.inspect}"
+log.debug "rels: #{disco.rels.inspect}"
+
+if disco.subject
+  log.debug "subject: #{disco.subject}"
+  unless acct.to_s == disco.subject.to_s
+    abort "Disco doc's subject <#{disco.subject}> doesn't match account we're webfingering <#{acct}>"
+  end
+else
+  log.warn("Disco doc didn't list a subject. Assuming everything is well.")
+end
 
 hcard_uri = disco.uris_by_rel('http://microformats.org/profile/hcard').first
-hcard = hCard.find(:first => hcard_uri)
+hcard = hCard.find(:first => hcard_uri) rescue
 if hcard
   puts "Name: #{hcard.fn.gsub(/\s+/, ' ')}" if hcard.properties.include?('fn')
   puts "Title: #{hcard.title}" if hcard.properties.include?('title')
   puts "Organization: #{hcard.org}" if hcard.properties.include?('org')
 end
 
-openid = disco.uris_by_rel('http://specs.openid.net/auth/').first
-puts "OpenID: #{openid}" if openid
-
-profile = disco.uris_by_rel('http://webfinger.net/rel/profile-page').first
-puts "Profile: #{profile}" if profile
+links_with_titles = disco.links.select{|l| l.title.present? }
+links_with_titles.each do |link|
+  puts "#{link.title}: #{link.to_uri}"
+end
 
-contacts = disco.uris_by_rel('http://portablecontacts.net/spec/1.0').first
-puts "Contacts: #{contacts}" if contacts
+Discodactyl::KNOWN_RELS.each do |name, rel|
+  uri = disco.uris_by_rel(rel).first
+  puts "#{name}: #{uri}" if uri
+end
 
 activities = disco.uris_by_rel('http://schemas.google.com/g/2010#updates-from').first
 if activities
   feed = Feedzirra::Feed.fetch_and_parse(activities)
   entry = feed.entries.first
-  include ActionView::Helpers::DateHelper
-  puts "Status: #{Loofah::Helpers.strip_tags(entry.content)} #{time_ago_in_words(entry.published)} ago" 
+  if entry
+    include ActionView::Helpers::DateHelper
+    silence_warnings do
+      puts "Status: #{Loofah::Helpers.strip_tags(entry.content)} #{time_ago_in_words(entry.published)} ago"
+    end
+  end
 end

data/discodactyl.gemspec

@@ -7,17 +7,19 @@ Gem::Specification.new do |spec|
   spec.email = "joseph@josephholsten.com"
   spec.homepage = "http://dactylo.us"
   spec.description = %q{Discodactyl is an experimental toolkit for XRD service discovery documents and related protocols. It includes implementations of XRD URITemplate Link-Patterns, basic site-meta support, HTTP Link header parsing, acct: URIs and a webfinger poking stick.}
-  spec.extra_rdoc_files = %w[ AUTHORS CHANGELOG COPYING INSTALL NEWS README TODO ]
+  spec.extra_rdoc_files = %w[ AUTHORS CHANGELOG COPYING INSTALL NEWS README.rdoc TODO ]
   spec.rdoc_options << "--charset=UTF-8" <<
                        "--title" << "Discodactyl Documentation" <<
-                       "--main"  << "README"
+                       "--main"  << "README.rdoc"
   spec.version = version
   spec.summary = spec.description.split(/\.\s+/).first
   spec.files = File.read("MANIFEST").split(/\r?\n\r?/)
   spec.executables = spec.files.grep(/^bin/) { |f| File.basename(f) }
   spec.test_files = spec.files.grep(/^test\/.*test_.*\.rb$/)
-  spec.add_runtime_dependency 'nokogiri', '~>1.4.0'
-  spec.add_runtime_dependency 'actionpack', '~>2.3.0'
+  spec.add_runtime_dependency 'nokogiri', '~>1.4.2'
+  spec.add_runtime_dependency 'actionpack', '~>3.0.0'
   spec.add_runtime_dependency 'feedzirra', '~>0.0.23'
-  spec.add_runtime_dependency 'mofo', '~>0.2.0'
+  spec.add_runtime_dependency 'mofo', '~>0.2.16'
+  spec.add_development_dependency 'rr', '~>0.10.11'
+  spec.add_development_dependency 'rake', '~>0.8.7'
 end

data/lib/discodactyl/acct_uri.rb

@@ -13,7 +13,9 @@ module URI # :nodoc:
       /^(acct:)?(.*)$/ =~ str
       scheme = 'acct'
       opaque = $2
-      self.new(scheme, nil, nil, nil, nil, nil, opaque, nil, nil)
+      acct = self.new(scheme, nil, nil, nil, nil, nil, opaque, nil, nil)
+      Discodactyl.log.debug("Parsed #{str.inspect} into URI #{acct.inspect}") if Discodactyl.log
+      acct
     end
 
 

data/lib/discodactyl/host_meta.rb

@@ -1,5 +1,6 @@
 require 'discodactyl/xrd'
 require 'open-uri'
+require 'socket'
 
 module Discodactyl # :nodoc
   # Convienient access to host metadata and individual resources controlled by 
@@ -15,6 +16,7 @@ module Discodactyl # :nodoc
       # Take a URI and retrieve its HostMeta document
       def from_uri(uri)
         uri = get_uri_from_uri(uri)
+        Discodactyl.log.debug("got xrd host-meta uri: #{uri}") if Discodactyl.log
         begin
           raw = uri.open
         rescue OpenURI::HTTPError => error
@@ -24,6 +26,8 @@ module Discodactyl # :nodoc
           else
             raise
           end
+        rescue ::SocketError => error
+          raise HostMetaSocketError.new(error.message, uri.host, uri.port)
         end
         self.parse raw
       end
@@ -31,4 +35,12 @@ module Discodactyl # :nodoc
   end
   class HostMetaHTTPError < OpenURI::HTTPError # :nodoc:
   end
+  class HostMetaSocketError < StandardError # :nodoc:
+    attr_accessor :host, :port
+    def initialize(msg = nil, host = nil, port = nil)
+      message = msg
+      @host = host
+      @port = port
+    end
+  end
 end

data/lib/discodactyl/host_meta_jrd.rb

@@ -0,0 +1,35 @@
+require 'open-uri'
+require 'active_support'
+require 'socket'
+require "discodactyl/uri_template"
+require "discodactyl/jrd"
+require 'discodactyl/log'
+
+module Discodactyl
+  class HostMetaJRD < Discodactyl::JRD::Document
+    # Take a URI and return the URI for its HostMeta document
+    def self.get_uri_from_uri(uri)
+      host = uri.respond_to?('host') ? uri.host : uri
+      URI.parse('http://'+ host + '/.well-known/host-meta.json')
+    end
+
+    # Take a URI and retrieve its HostMeta document
+    def self.from_uri(uri)
+      uri = get_uri_from_uri(uri)
+      Discodactyl.log.debug("got jrd host-meta uri: #{uri}") if Discodactyl.log
+      begin
+        raw = uri.open
+      rescue OpenURI::HTTPError => error
+        if error.io.status[1] == 'Not Found'
+          error.io.base_uri = uri
+          raise HostMetaHTTPError.new(error.message, error.io)
+        else
+          raise
+        end
+      rescue ::SocketError => error
+        raise HostMetaSocketError.new(error.message, uri.host, uri.port)
+      end
+      self.parse raw
+    end
+  end
+end

data/lib/discodactyl/jrd/document.rb

@@ -0,0 +1,49 @@
+require 'nokogiri'
+require 'active_support'
+require 'discodactyl/jrd/link'
+require "discodactyl/uri_template"
+
+module Discodactyl # :nodoc:
+module JRD # :nodoc:
+  class Document < Hash
+    def self.parse(raw)
+      begin
+        Discodactyl.log.debug("parsing jrd: #{raw}") if Discodactyl.log
+        decoded = ActiveSupport::JSON.decode(raw)
+      rescue => e
+        raise ParseError.new(e.message)
+      end
+      self.[](decoded)
+    end
+
+    def uris_by_rel(rel, params={})
+      links_by_rel(rel).map do |link|
+        link.href || link.template.to_uri(params)
+      end
+    end
+    
+    def links_by_rel(rel)
+      if self.has_key? 'links' and self['links'].has_key? rel
+        self['links'][rel].map{|link| Link.parse(link.merge('rel'=>rel)) }
+      else
+        []
+      end
+    end
+    
+    def links
+      rels.map do |rel, links|
+        links.map {|link| Link.parse(link.merge('rel' => rel)) }
+      end.flatten
+    end
+
+    def rels
+      self['links'] || []
+    end
+    
+    def subject
+      self['subject']
+    end
+  end
+  class ParseError < StandardError; end
+end
+end

data/lib/discodactyl/jrd/link.rb

@@ -0,0 +1,25 @@
+require 'discodactyl/uri_template'
+
+module Discodactyl # :nodoc:
+module JRD # :nodoc:
+  class Link < Struct.new(:href, :template, :rel, :title, :type)
+    attr_accessor :raw
+    class << self
+      def parse(element)
+        self.new.tap do |link|
+          begin
+            link.rel = element['rel']
+            link.type = element['type']
+            link.href = element['href']
+            link.title = element['title']
+            link.template = URITemplate.new(element['template']) unless link.href
+            link.raw = element
+          rescue
+            raise "Couldn't parse #{link} into a JRD Link"
+          end
+        end
+      end
+    end
+  end
+end
+end

data/lib/discodactyl/jrd.rb

@@ -0,0 +1,2 @@
+require 'discodactyl/jrd/document'
+require 'discodactyl/jrd/link'

data/lib/discodactyl/known_rels.rb

@@ -0,0 +1,12 @@
+module Discodactyl # :nodoc:
+  KNOWN_RELS = {
+    'OpenID' => 'http://specs.openid.net/auth/',
+    'OpenID Provider' => 'http://specs.openid.net/auth/2.0/provider',
+    'OpenID Provider' => 'openid2.provider',
+    "Profile" => 'http://webfinger.net/rel/profile-page',
+    "Profile data" => 'http://portablecontacts.net/spec/1.0#me',
+    "Contacts" => 'http://portablecontacts.net/spec/1.0',
+    "describedby" => 'describedby', # from POWDER
+    "Webfinger/LRDD" => 'lrdd'
+  }
+end

data/lib/discodactyl/link_header.rb

@@ -1,4 +1,4 @@
-require 'active_support/core_ext/object/misc'
+# require 'active_support/core_ext/object/misc'
 
 module Discodactyl # :nodoc:
   # Access to web links stored in HTTP Link header-fields. See also: 
@@ -14,7 +14,7 @@ module Discodactyl # :nodoc:
       #   link[:href] # '/'
       #   link[:rel] # ['http://example.net/foo']
       def parse(string)
-        returning(params = LinkHeader.new) do
+        LinkHeader.new.tap do |params|
           if string =~ /^<([^>]+)>(.*)$/
             params[:href] = $1
             $2.split(/;\s*/).each do |part|

data/lib/discodactyl/log.rb

@@ -0,0 +1,5 @@
+require 'active_support/core_ext/module/attribute_accessors'
+
+module Discodactyl # :nodoc:
+  mattr_accessor :log
+end

data/lib/discodactyl/resource_discovery.rb

@@ -1,6 +1,7 @@
 require 'open-uri'
 require 'nokogiri'
 require 'discodactyl/link_header'
+require 'discodactyl/log'
 
 module Discodactyl # :nodoc:
   class ResourceDiscovery
@@ -20,6 +21,7 @@ module Discodactyl # :nodoc:
       def get_uris_by_rel(uri, rel, params = {})
         begin
           uri = URI.parse(uri.to_s) unless uri.respond_to?('open')
+          Discodactyl.log.debug "Getting uris for uri #{uri.inspect} by rel #{rel.inspect} with params #{params.inspect}" if Discodactyl.log
           resource = uri.open
         rescue OpenURI::HTTPError => e
           status = e.io.status[0] # => 3xx, 4xx, or 5xx
@@ -61,9 +63,28 @@ module Discodactyl # :nodoc:
           end
         end
         unless uris
-          host_meta = Discodactyl::HostMeta.from_uri uri
+          Discodactyl.log.debug("getting jrd host-meta") if Discodactyl.log
+          begin
+            host_meta = Discodactyl::HostMetaJRD.from_uri uri
+          rescue => error
+            Discodactyl.log.debug("Error parsing jrd host-meta: #{error}") if Discodactyl.log
+          end
+          Discodactyl.log.debug("finding uris in jrd host-meta") if Discodactyl.log
+          uris = host_meta.uris_by_rel(rel, params) if host_meta
+        end
+        
+        unless uris
+          Discodactyl.log.debug("Getting xrd host-meta") if Discodactyl.log
+          begin
+            host_meta = Discodactyl::HostMeta.from_uri uri
+          rescue => error
+            Discodactyl.log.debug("Error getting xrd host-meta: #{error}") if Discodactyl.log
+            raise
+          end
+          Discodactyl.log.debug("finding uris in host-meta") if Discodactyl.log
           uris = host_meta.uris_by_rel(rel, params)
         end
+        Discodactyl.log.debug "URIs: #{uris.inspect}" if Discodactyl.log
         uris
       end
 

data/lib/discodactyl/xrd/document.rb

@@ -8,6 +8,7 @@ module XRD # :nodoc:
     class << self
       def parse(string)
         raw = Nokogiri::XML(string)
+        Discodactyl.log.debug("parsing xrd: #{raw}") if Discodactyl.log
         doc = self.new
 
         doc.raw = raw
@@ -29,7 +30,8 @@ module XRD # :nodoc:
     end
 
     def links_by_rel(rel)
-      linkelems_by_rel(rel).map {|e| Link.parse(e) }
+      # linkelems_by_rel(rel).map {|e| Link.parse(e) }
+      find_all_links_by_rel(rel)
     end
 
     def uris_by_rel(rel, params = {})
@@ -54,6 +56,10 @@ module XRD # :nodoc:
     def find_link_by_id(link_id)
         links.find {|link| link.id == link_id}
     end
+    
+    def find_all_links_by_rel(rel)
+        links.find_all {|link| link.rel == rel }
+    end
 
     def ids
       links.map(&:id).reject(&:nil?)
@@ -62,6 +68,10 @@ module XRD # :nodoc:
     def to_s
       raw.to_s
     end
+    
+    def rels
+      links.map(&:rel).reject(&:nil?).uniq
+    end
 
     def generate_tag_uri
       scheme = 'tag'
@@ -70,6 +80,10 @@ module XRD # :nodoc:
       specific = "/xrd/link/#{rand(2**10)}"
       "#{scheme}:#{authority},#{date}:#{specific}"
     end
+    
+    def subject
+      raw.xpath('/xrd:XRD/xrd:Subject', XMLNS).text
+    end
   end
 end
 end

data/lib/discodactyl/xrd/link.rb

@@ -1,26 +1,25 @@
 require 'nokogiri'
-require 'active_support/core_ext/object/misc'
 require 'discodactyl/uri_template'
 
 module Discodactyl # :nodoc:
 module XRD # :nodoc:
-  class Link
+  class Link < Struct.new(:href, :template, :rel, :title, :type)
+    attr_accessor :raw
     class << self
       def parse(element)
-        returning(link = self.new) do
+        self.new.tap do |link|
           link.rel = element['rel']
           link.type = element['type']
           link.href = element['href']
+          link.title = element['title']
           link.template = URITemplate.new(element['template']) unless link.href
           link.raw = element
         end
       end
     end
 
-    attr_accessor :href, :template, :rel, :type, :raw
-
     def to_uri(params = {})
-      @href || @template.to_uri(params)
+      href || template.to_uri(params)
     end
 
     def id

data/lib/discodactyl.rb

@@ -1,9 +1,13 @@
 require 'discodactyl/acct_uri'
 require 'discodactyl/host_meta'
+require 'discodactyl/host_meta_jrd'
+require 'discodactyl/jrd'
+require 'discodactyl/known_rels'
+require 'discodactyl/log'
 require 'discodactyl/resource_discovery'
 require 'discodactyl/uri_template'
 require 'discodactyl/xrd'
 
 module Discodactyl # :nodoc:
-  VERSION = '0.3.0'
+  VERSION = '0.4.1'
 end

data/test/test_host_meta_jrd.rb

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby -w
+libdir = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+require "test/unit"
+require "discodactyl/host_meta_jrd"
+require 'discodactyl/acct_uri'
+
+class TestHostMetaJRD < Test::Unit::TestCase
+  def test_get_uri_from_host
+    uri = 'host.example'
+    expected = URI.parse 'http://host.example/.well-known/host-meta.json'
+    assert_equal expected, Discodactyl::HostMetaJRD.get_uri_from_uri(uri)
+  end
+
+  def test_get_uri_from_http
+    uri = URI.parse 'http://host.example/some/path'
+    expected = URI.parse 'http://host.example/.well-known/host-meta.json'
+    assert_equal expected, Discodactyl::HostMetaJRD.get_uri_from_uri(uri)
+  end
+
+  def test_get_uri_from_acct
+    uri = URI.parse 'acct:user@host.example'
+    expected = URI.parse 'http://host.example/.well-known/host-meta.json'
+    assert_equal expected, Discodactyl::HostMetaJRD.get_uri_from_uri(uri)
+  end
+  
+  def test_from_uri
+    uri = URI.parse 'acct:josephholsten@localhost'
+    assert_equal({"links"=>{"lrdd"=>[{"href"=>"http://localhost/discovery.jrd"}]}}, Discodactyl::HostMetaJRD.from_uri(uri))
+  end
+
+  def test_parse
+    json = <<JSON
+{ "links": {
+    "lrdd": [{
+      "href":"http://host.example/discovery.jrd" }]}}
+JSON
+    assert_equal({"links"=>{"lrdd"=>[{"href"=>"http://host.example/discovery.jrd"}]}}, Discodactyl::HostMetaJRD.parse(json))
+  end
+
+  def test_links_by_rel
+    jrd = Discodactyl::HostMetaJRD[{"links"=>{"lrdd"=>[{"href"=>"http://host.example/discovery.jrd"}]}}]
+    expected = [Discodactyl::JRD::Link.parse({'href'=>'http://host.example/discovery.jrd', 'rel' => 'lrdd'})]
+    assert_equal(expected, jrd.links_by_rel('lrdd'))
+  end
+  
+  # links by rel when links is missing, when rel is missing
+  def test_links_by_rel_when_missing
+    jrd = Discodactyl::HostMetaJRD[{}]
+    assert_equal([], jrd.links_by_rel('lrdd'))
+  end
+
+  def test_uris_by_rel
+    jrd = Discodactyl::HostMetaJRD[{"links"=>{"lrdd"=>[{"href"=>"http://host.example/discovery.jrd"}]}}]
+    assert_equal(['http://host.example/discovery.jrd'], jrd.uris_by_rel('lrdd'))
+  end
+
+  def test_uris_by_rel_with_template
+    jrd = Discodactyl::HostMetaJRD[{"links"=>{"lrdd"=>[{"template"=>"http://host.example/{id}"}]}}]
+    assert_equal(['http://host.example/foo'], jrd.uris_by_rel('lrdd', 'id' => 'foo'))
+  end
+end

data/test/test_jrd_document.rb

@@ -0,0 +1,142 @@
+#!/usr/bin/env ruby -w
+libdir = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+testdir = File.expand_path('../../test', __FILE__)
+$LOAD_PATH.unshift(testdir) unless $LOAD_PATH.include?(testdir)
+
+require 'test_helper'
+require 'discodactyl/jrd/document'
+
+class TestJRDParsing < Test::Unit::TestCase
+  def setup
+    @minimal_jrd_string =<<eos
+{
+  "subject":"http://host.example/"
+}
+eos
+
+#     @full_jrd_string =<<eos
+# {"subject":"http://host.example/","links":{"describedby":[{"href":"http://host.example/endpoint"},{"template":"http://host.example/descriptor?q={%id}"}],"webfinger":[{"href":"http://host.example/endpoint"}],"feed":[{"template":"http://host.example/descriptor?q={%id}"}]}}
+# eos
+# <"{\"subject\":\"http://host.example/\",\"links\":{\"describedby\":[{\"href\":\"http://host.example/endpoint\"},{\"template\":\"http://host.example/descriptor?q={%id}\"}],\"webfinger\":[{\"href\":\"http://host.example/endpoint\"}],\"feed\":[{\"template\":\"http://host.example/descriptor?q={%id}\"}]}}\n"> expected but was
+# <"{\"subject\":\"http://host.example/\",\"links\":{\"webfinger\":[{\"href\":\"http://host.example/endpoint\"}],\"describedby\":[{\"href\":\"http://host.example/endpoint\"},{\"template\":\"http://host.example/descriptor?q={%id}\"}],\"feed\":[{\"template\":\"http://host.example/descriptor?q={%id}\"}]}}">.
+
+    @full_jrd_string =<<eos
+{"subject":"http://host.example/","links":{"webfinger":[{"href":"http://host.example/endpoint"}],"describedby":[{"href":"http://host.example/endpoint"},{"template":"http://host.example/descriptor?q={%id}"}],"feed":[{"template":"http://host.example/descriptor?q={%id}"}]}}
+eos
+
+    @raw_link_without_id = '<Link rel="http://oexchange.org/spec/0.8/rel/user-target" type="application/xrd+xml" href="http://www.example.com/linkeater/oexchange.xrd"/>'
+    
+    @raw_link_without_id = '{"http://oexchange.org/spec/0.8/rel/user-target":[{"type":"application/xrd+xml", "href":"http://www.example.com/linkeater/oexchange.xrd"}]}'
+    @raw_link_with_id = '{"http://oexchange.org/spec/0.8/rel/user-target":[{"id":"foo","type":"application/xrd+xml", "href":"http://www.example.com/linkeater/oexchange.xrd"}]}'
+
+    @jrd = Discodactyl::JRD::Document.parse(@full_jrd_string)
+  end
+  def test_parse
+    doc = Discodactyl::JRD::Document.parse(@full_jrd_string)
+    assert_not_nil(doc)
+  end
+  def test_parse_links
+    assert_equal(4, @jrd.links.length)
+  end
+
+  # def test_linkelems_by_rel
+  #   link_elems = @jrd.linkelems_by_rel 'describedby'
+  # 
+  #   assert_length(2, link_elems)
+  # 
+  #   assert_equal 'http://host.example/endpoint', link_elems[0]['href']
+  #   assert_equal 'http://host.example/descriptor?q={%id}', link_elems[1]['template']
+  # end
+
+  # def test_linkelems_by_rel_with_multiple_rels
+  #   link_elems = @jrd.linkelems_by_rel 'describedby'
+  # 
+  #   assert_length(2, link_elems)
+  # 
+  #   assert_equal 'http://host.example/endpoint', link_elems[0]['href']
+  #   assert_equal 'http://host.example/descriptor?q={%id}', link_elems[1]['template']
+  # end
+
+  def test_uris_by_rel
+    uris = @jrd.uris_by_rel 'describedby', 'id' => 'bradfitz@gmail.com'
+
+    assert_length(2, uris)
+
+    assert_equal 'http://host.example/endpoint', uris[0]
+    assert_equal 'http://host.example/descriptor?q=bradfitz@gmail.com', uris[1]
+  end
+
+  def test_links_by_rel
+    links = @jrd.links_by_rel('feed')
+
+    assert_length(1, links)
+    expected = Discodactyl::URITemplate.new('http://host.example/descriptor?q={%id}')
+    assert_equal(expected, links[0].template)
+  end
+
+  def test_uris_by_rel
+    links = @jrd.uris_by_rel('feed', 'id' => 'dclinton@gmail.com')
+
+    assert_length(1, links)
+    assert_include?('http://host.example/descriptor?q=dclinton@gmail.com', links)
+  end
+
+#   def test_update
+#     jrd_str =<<eos
+# <?xml version=\"1.0\"?>
+# <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+#   <Subject>http://host.example/</Subject>
+#   <Link rel="webfinger" href="http://host.example/endpoint"/>
+#   <Link rel="describedby" href="http://host.example/endpoint"/>
+#   <Link rel="feed" template="http://host.example/descriptor?q={%id}"/>
+#   <Link rel="describedby" template="http://host.example/descriptor?q={%id}"/>
+#   <Link href="http://www.example.com/linkeater/oexchange.xrd" rel="http://oexchange.org/spec/0.8/rel/user-target" type="application/xrd+xml"/>
+#  </XRD>
+# eos
+#     doc = Discodactyl::JRD::Document.parse jrd_str
+#
+#     link = "<Link rel='http://oexchange.org/spec/0.8/rel/user-target' type='application/xrd+xml' href='updated' />"
+#
+#     doc.raw.xpath('//xrd:Link',Discodactyl::XRD::XMLNS).after(link)
+#
+#     expected =<<eos
+# <?xml version=\"1.0\"?>
+# <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+#   <Subject>http://host.example/</Subject>
+#   <Link rel="webfinger" href="http://host.example/endpoint"/>
+#   <Link rel="describedby" href="http://host.example/endpoint"/>
+#   <Link rel="feed" template="http://host.example/descriptor?q={%id}"/>
+#   <Link rel="describedby" template="http://host.example/descriptor?q={%id}"/>
+#   <Link href="updated" rel="http://oexchange.org/spec/0.8/rel/user-target" type="application/xrd+xml"/>
+#  </XRD>
+# eos
+#
+#     assert_equal expected, doc.to_s
+#   end
+
+#   def test_delete
+#     xrd_str =<<eos
+# <?xml version=\"1.0\"?>
+# <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+#   <Subject>http://host.example/</Subject>
+#   <Link xml:id='1' href="http://example.com/" rel="user-target" type="application/xrd+xml"/>
+#  </XRD>
+# eos
+#     doc = Discodactyl::XRD::Document.parse xrd_str
+#
+#     link = "<Link rel='http://oexchange.org/spec/0.8/rel/user-target' type='application/xrd+xml' href='updated' />"
+#
+#     doc.raw.xpath('//xrd:Link',Discodactyl::XRD::XMLNS).after(link)
+#
+#     expected =<<eos
+# <?xml version=\"1.0\"?>
+# <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+#   <Subject>http://host.example/</Subject>
+#  </XRD>
+# eos
+#
+#     assert_equal expected, doc.to_s
+#     assert !doc.include?(link)
+#   end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: discodactyl
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 0
-  version: 0.3.0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Joseph Anthony Pasquale Holsten
@@ -14,44 +15,50 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -05:00
+date: 2011-03-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
-        - 0
-        version: 1.4.0
+        - 2
+        version: 1.4.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: actionpack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
-        - 2
         - 3
         - 0
-        version: 2.3.0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: feedzirra
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 0
@@ -63,16 +70,50 @@ dependencies:
   name: mofo
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 55
         segments: 
         - 0
         - 2
-        - 0
-        version: 0.2.0
+        - 16
+        version: 0.2.16
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 33
+        segments: 
+        - 0
+        - 10
+        - 11
+        version: 0.10.11
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
+  version_requirements: *id006
 description: "Discodactyl is an experimental toolkit for XRD service discovery documents and related protocols. It includes implementations of XRD URITemplate Link-Patterns, basic site-meta support, HTTP Link header parsing, acct: URIs and a webfinger poking stick."
 email: joseph@josephholsten.com
 executables: 
@@ -85,7 +126,7 @@ extra_rdoc_files:
 - COPYING
 - INSTALL
 - NEWS
-- README
+- README.rdoc
 - TODO
 files: 
 - AUTHORS
@@ -95,7 +136,7 @@ files:
 - INSTALL
 - MANIFEST
 - NEWS
-- README
+- README.rdoc
 - Rakefile
 - TODO
 - bin/webfinger
@@ -103,7 +144,13 @@ files:
 - lib/discodactyl.rb
 - lib/discodactyl/acct_uri.rb
 - lib/discodactyl/host_meta.rb
+- lib/discodactyl/host_meta_jrd.rb
+- lib/discodactyl/jrd.rb
+- lib/discodactyl/jrd/document.rb
+- lib/discodactyl/jrd/link.rb
+- lib/discodactyl/known_rels.rb
 - lib/discodactyl/link_header.rb
+- lib/discodactyl/log.rb
 - lib/discodactyl/resource_discovery.rb
 - lib/discodactyl/uri_template.rb
 - lib/discodactyl/xrd.rb
@@ -112,6 +159,8 @@ files:
 - test/test_acct_uri.rb
 - test/test_helper.rb
 - test/test_host_meta.rb
+- test/test_host_meta_jrd.rb
+- test/test_jrd_document.rb
 - test/test_link_header.rb
 - test/test_resource_discovery.rb
 - test/test_uri_template.rb
@@ -128,27 +177,31 @@ rdoc_options:
 - --title
 - Discodactyl Documentation
 - --main
-- README
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Discodactyl is an experimental toolkit for XRD service discovery documents and related protocols
@@ -156,6 +209,8 @@ test_files:
 - test/test_acct_uri.rb
 - test/test_helper.rb
 - test/test_host_meta.rb
+- test/test_host_meta_jrd.rb
+- test/test_jrd_document.rb
 - test/test_link_header.rb
 - test/test_resource_discovery.rb
 - test/test_uri_template.rb