redfinger 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/redfinger/client.rb

@@ -7,13 +7,17 @@ module Redfinger
     attr_accessor :account, :domain, :uri_template
 
     def initialize(email, uri_template = nil)
-      self.account = urify(email)
+      self.account = normalize(email)
       self.domain = account.split('@').last
     end
 
     def finger
       self.uri_template ||= retrieve_template_from_xrd
-      Finger.new RestClient.get(swizzle).body
+      begin
+        return Finger.new self.account, RestClient.get(swizzle).body
+      rescue RestClient::ResourceNotFound
+        return Finger.new self.account, RestClient.get(swizzle(account_with_scheme)).body
+      end
     end
 
     def xrd_url(ssl = true)
@@ -22,21 +26,19 @@ module Redfinger
 
     private
 
-    def swizzle
+    def swizzle(account = nil)
+      account ||= self.account
       uri_template.gsub '{uri}', URI.escape(self.account)
     end
 
     def retrieve_template_from_xrd(ssl = true)
       doc = Nokogiri::XML::Document.parse(RestClient.get(xrd_url(ssl)).body)
-      if doc.namespaces["xmlns:hm"] != "http://host-meta.net/xrd/1.0"
+      if doc.namespaces["xmlns"] != "http://docs.oasis-open.org/ns/xri/xrd-1.0"
         # it's probably not finger, let's try without ssl
         # http://code.google.com/p/webfinger/wiki/WebFingerProtocol
         # says first ssl should be tried then without ssl, should fix issue #2
         doc = Nokogiri::XML::Document.parse(RestClient.get(xrd_url(false)).body)
       end
-      unless doc.at_xpath('.//hm:Host').content == self.domain
-        raise Redfinger::SecurityException, "The XRD document's host did not match the account's host."
-      end
 
       doc.at('Link[rel=lrdd]').attribute('template').value
     rescue Errno::ECONNREFUSED, RestClient::ResourceNotFound
@@ -47,9 +49,13 @@ module Redfinger
       end
     end
 
-    def urify(email)
-      email = "acct:#{email}" unless email.include?("acct:")
-      email
+    def normalize(email)
+      email.sub! /^acct:/, ''
+      email.downcase
+    end
+
+    def account_with_scheme
+      "acct:" + account
     end
   end
 end

data/lib/redfinger/finger.rb

@@ -5,9 +5,9 @@ module Redfinger
   # special helpers that are availale to pull specific types
   # of URLs, see Redfinger::LinkHelpers
   class Finger
-    def initialize(xml) # :nodoc:
+    def initialize(subject, xml) # :nodoc:
       @doc = Nokogiri::XML::Document.parse(xml)
-      @subject = @doc.at_css('Subject').content
+      @subject = subject
     end
     
     # All of the links provided by the Webfinger response.

data/redfinger.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redfinger}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
-  s.date = %q{2010-06-24}
+  s.date = %q{2010-08-10}
   s.description = %q{A Ruby Webfinger client}
   s.email = %q{michael@intridea.com}
   s.extra_rdoc_files = [
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/mbleigh/redfinger}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Ruby WebFinger client.}
   s.test_files = [
     "spec/redfinger/client_spec.rb",
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rest-client>, [">= 1.5.0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.0"])
       s.add_runtime_dependency(%q<hashie>, [">= 0"])

data/spec/redfinger/client_spec.rb

@@ -4,12 +4,8 @@ class HaltSuccessError < StandardError; end
 
 describe Redfinger::Client do
   describe '#new' do
-    it 'should add acct: if it is not in URI form' do
-      Redfinger::Client.new('abc@example.com').account.should == 'acct:abc@example.com'
-    end
-    
-    it 'should not add acct: if it is already in URI form' do
-      Redfinger::Client.new('acct:abc@example.com').account.should == 'acct:abc@example.com'
+    it 'should remove acct: if it is already in URI form' do
+      Redfinger::Client.new('acct:abc@example.com').account.should == 'abc@example.com'
     end
     
     it 'should set the domain to whatevers after the @ sign' do
@@ -45,11 +41,6 @@ describe Redfinger::Client do
       stub_request(:get, 'https://example.com/.well-known/host-meta').to_return(:status => 200, :body => host_xrd)
       Redfinger::Client.new('acct:abc@example.com').send(:retrieve_template_from_xrd).should == 'http://example.com/webfinger/?q={uri}'
     end
-    
-    it 'should raise a SecurityException if there is a host mismatch' do
-      stub_request(:get, 'https://franklin.com/.well-known/host-meta').to_return(:status => 200, :body => host_xrd)
-      lambda{Redfinger::Client.new('acct:abc@franklin.com').send(:retrieve_template_from_xrd)}.should raise_error(Redfinger::SecurityException)
-    end
   end
   
   describe '#finger' do

data/spec/spec_helper.rb

@@ -12,11 +12,7 @@ include WebMock
 def host_xrd
   <<-XML
   <?xml version='1.0' encoding='UTF-8'?>
-  <!-- NOTE: this host-meta end-point is a pre-alpha work in progress.   Don't rely on it. -->
-  <!-- Please follow the list at http://groups.google.com/group/webfinger -->
-  <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0' 
-       xmlns:hm='http://host-meta.net/xrd/1.0'>
-    <hm:Host xmlns='http://host-meta.net/xrd/1.0'>example.com</hm:Host>
+  <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'>
     <Link rel='lrdd' 
           template='http://example.com/webfinger/?q={uri}'>
       <Title>Resource Descriptor</Title>
@@ -29,7 +25,6 @@ def finger_xrd
   <<-XML
   <?xml version='1.0'?>
   <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'>
-  	<Subject>acct:abc@example.com</Subject>
   	<Alias>http://www.google.com/profiles/abc</Alias>
   	<Link rel='http://portablecontacts.net/spec/1.0' href='http://www-opensocial.googleusercontent.com/api/people/'/>
   	<Link rel='http://webfinger.net/rel/profile-page' href='http://www.google.com/profiles/abc' type='text/html'/>
@@ -43,9 +38,9 @@ def finger_xrd
   XML
 end
 
-def stub_success
+def stub_success(address = 'abc@example.com')
   stub_request(:get, 'https://example.com/.well-known/host-meta').to_return(:status => 200, :body => host_xrd)
-  stub_request(:get, /webfinger\/\?q=.*/).to_return(:status => 200, :body => finger_xrd)
+  stub_request(:get, /webfinger\/\?q=#{address}/).to_return(:status => 200, :body => finger_xrd)
 end
 
 Spec::Runner.configure do |config|

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redfinger
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 -04:00
+date: 2010-08-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 5
@@ -35,9 +38,11 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
@@ -49,9 +54,11 @@ dependencies:
   name: hashie
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -61,9 +68,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -75,9 +84,11 @@ dependencies:
   name: webmock
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -119,23 +130,27 @@ rdoc_options:
 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.3.7
 signing_key: 
 specification_version: 3
 summary: A Ruby WebFinger client.