redfinger 0.0.6 → 0.1.0

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format nested

data/Rakefile

@@ -22,15 +22,10 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.1.0

data/lib/redfinger/client.rb

@@ -4,11 +4,14 @@ require 'uri'
 
 module Redfinger
   class Client
-    attr_accessor :account, :domain, :uri_template
+    attr_accessor :account, :domain, :uri_template, :xrd_timeout, :xrd_open_timeout
 
     def initialize(email, uri_template = nil)
       self.account = normalize(email)
       self.domain = account.split('@').last
+
+      self.xrd_timeout = 10
+      self.xrd_open_timeout = 5
     end
 
     def finger
@@ -32,7 +35,12 @@ module Redfinger
     end
 
     def retrieve_template_from_xrd(ssl = true)
-      doc = Nokogiri::XML::Document.parse(RestClient.get(xrd_url(ssl)).body)
+      xrd_client =  RestClient::Resource.new(xrd_url(ssl),
+                      :timeout => self.xrd_timeout,
+                      :open_timeout => self.xrd_open_timeout
+                    )
+
+      doc = Nokogiri::XML::Document.parse(xrd_client.get.body)
       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
@@ -41,7 +49,8 @@ module Redfinger
       end
 
       doc.at('Link[rel=lrdd]').attribute('template').value
-    rescue Errno::ECONNREFUSED, RestClient::ResourceNotFound
+    rescue  Errno::ECONNREFUSED, Errno::ETIMEDOUT,
+            RestClient::RequestTimeout, RestClient::ResourceNotFound, RestClient::Forbidden
       if ssl
         retrieve_template_from_xrd(false)
       else

data/lib/redfinger/finger.rb

@@ -12,7 +12,7 @@ module Redfinger
     
     # All of the links provided by the Webfinger response.
     def links
-      @links ||= @doc.css('Link').map{|l| Link.new(l)}
+      @links ||= @doc.css('Link').map{|l| Link.from_xml(l)}
     end
     
     def inspect # :nodoc:

data/lib/redfinger/link.rb

@@ -3,10 +3,12 @@ require 'hashie'
 
 module Redfinger
   class Link < Hashie::Mash
-    def initialize(xml_link)
-      self[:rel] = xml_link['rel']
-      self[:href] = xml_link['href']
-      self[:type] = xml_link['type']
+    def self.from_xml(xml_link)
+      new_link = Link.new
+      new_link[:rel]  = xml_link['rel']
+      new_link[:href] = xml_link['href']
+      new_link[:type] = xml_link['type']
+      new_link
     end
     
     # Outputs the URL of the link, useful for using 

data/lib/redfinger/link_helpers.rb

@@ -25,7 +25,7 @@ module Redfinger
     protected
     
     def relmap(uri, substring=false)
-      @doc.css("Link[rel#{'^' if substring}=\"#{uri}\"]").map{|e| Link.new(e)}
+      @doc.css("Link[rel#{'^' if substring}=\"#{uri}\"]").map{|e| Link.from_xml(e)}
     end
   end
 end

data/redfinger.gemspec

@@ -1,52 +1,50 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{redfinger}
-  s.version = "0.0.6"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
-  s.date = %q{2010-08-10}
+  s.date = %q{2011-02-07}
   s.description = %q{A Ruby Webfinger client}
   s.email = %q{michael@intridea.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/redfinger.rb",
-     "lib/redfinger/client.rb",
-     "lib/redfinger/finger.rb",
-     "lib/redfinger/link.rb",
-     "lib/redfinger/link_helpers.rb",
-     "redfinger.gemspec",
-     "spec/redfinger/client_spec.rb",
-     "spec/redfinger_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    ".rspec",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/redfinger.rb",
+    "lib/redfinger/client.rb",
+    "lib/redfinger/finger.rb",
+    "lib/redfinger/link.rb",
+    "lib/redfinger/link_helpers.rb",
+    "redfinger.gemspec",
+    "spec/redfinger/client_spec.rb",
+    "spec/redfinger_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/mbleigh/redfinger}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{A Ruby WebFinger client.}
   s.test_files = [
     "spec/redfinger/client_spec.rb",
-     "spec/redfinger_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/redfinger_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/redfinger/client_spec.rb

@@ -25,6 +25,24 @@ describe Redfinger::Client do
       stub_request(:get, 'http://example.com/.well-known/host-meta').to_raise(HaltSuccessError)
       lambda{Redfinger::Client.new('acct:abc@example.com').send(:retrieve_template_from_xrd)}.should raise_error(HaltSuccessError)
     end
+
+    it 'should make an HTTP request if the HTTPS request times out in Net::HTTP' do
+      stub_request(:get, 'https://example.com/.well-known/host-meta').to_raise(Errno::ETIMEDOUT)
+      stub_request(:get, 'http://example.com/.well-known/host-meta').to_raise(HaltSuccessError)
+      lambda{Redfinger::Client.new('acct:abc@example.com').send(:retrieve_template_from_xrd)}.should raise_error(HaltSuccessError)
+    end
+
+    it 'should make an HTTP request if the HTTPS request times out in RestClient' do
+      stub_request(:get, 'https://example.com/.well-known/host-meta').to_raise(RestClient::RequestTimeout)
+      stub_request(:get, 'http://example.com/.well-known/host-meta').to_raise(HaltSuccessError)
+      lambda{Redfinger::Client.new('acct:abc@example.com').send(:retrieve_template_from_xrd)}.should raise_error(HaltSuccessError)
+    end
+
+    it 'should make an HTTP request if the server throws a 403 forbidden on the HTTPS request' do
+      stub_request(:get, 'https://example.com/.well-known/host-meta').to_return(:status => [403, "Forbidden"])
+      stub_request(:get, 'http://example.com/.well-known/host-meta').to_raise(HaltSuccessError)
+      lambda{Redfinger::Client.new('acct:abc@example.com').send(:retrieve_template_from_xrd)}.should raise_error(HaltSuccessError)
+    end
     
     it 'should raise Redfinger::ResourceNotFound if HTTP fails as well' do
       stub_request(:get, 'https://example.com/.well-known/host-meta').to_raise(Errno::ECONNREFUSED)

data/spec/spec_helper.rb

@@ -3,11 +3,11 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
 require 'redfinger'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 require 'webmock/rspec'
 
-include WebMock
+include WebMock::API
 
 def host_xrd
   <<-XML
@@ -43,6 +43,6 @@ def stub_success(address = 'abc@example.com')
   stub_request(:get, /webfinger\/\?q=#{address}/).to_return(:status => 200, :body => finger_xrd)
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: redfinger
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
+  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 -05:00
+date: 2011-02-07 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
         version: 1.5.0
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
         version: 1.4.0
   type: :runtime
   version_requirements: *id002
@@ -58,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -72,11 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
         version: 1.2.9
   type: :development
   version_requirements: *id004
@@ -88,9 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -105,7 +79,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
+- .rspec
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -125,8 +99,8 @@ homepage: http://github.com/mbleigh/redfinger
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -134,23 +108,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A Ruby WebFinger client.

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC