avatar 0.0.5 → 0.2.0

data/History.txt

@@ -1,3 +1,10 @@
+== 0.0.6 2008-06-09
+* 1 major fix:
+  * removed all task files (./task/*.rake) for Rails plugin compatability
+
+* 1 minor enhancement
+  * removed redundant Hoe dependencies, since the gem is only hosted on GitHub
+
 == 0.0.5 2008-04-01
 * 4 major enhancements:
   * added PaperclipSource for use with the Paperclip plugin

data/{README.txt → README.rdoc}

@@ -9,6 +9,7 @@ Avatar is a collection of Ruby utilities for displaying avatars.
 
 Avatar currently supports the following sources:
 * Gravatar (see http://www.gravatar.com)
+* Initial Pavatar support (see http://pavatar.com/spec/)
 * a constant URL (e.g. http://mysite.com/images/default_icon.png)
 * parameterized URLs (e.g. http://mysite.com/images/famfamfam/user_#{color}.png)
 * file_column (see http://www.kanthak.net/opensource/file_column/)
@@ -18,15 +19,22 @@ Avatar currently supports the following views:
 * ActionView (Rails), through avatar_tag
 * AbstractView (any framework), through avatar_url_for
 
-== SYNOPSIS:
+== BUG REPORTING:
+
+Submit bugs to https://gcnovus.fogbugz.com/default.asp?pg=pgPublicEdit under the "Avatar Gem" project,
+or discuss at http://groups.google.com/group/ruby-avatar/.
+
+== BASICS:
+
+in RAILS_ROOT/app/helpers/people_helper.rb:
 
-in RAILS_ROOT/app/helpers/people_helper.rb
 require 'avatar/view/action_view_support'
 class PeopleHelper
 	include Avatar::View::ActionViewSupport
 end  
 
 in RAILS_ROOT/app/views/people/show.html.erb:
+
 <%= avatar_tag(@current_user, :size => 40) %>
 
 == REQUIREMENTS:
@@ -43,7 +51,7 @@ in RAILS_ROOT/app/views/people/show.html.erb:
 
 (The MIT License)
 
-Copyright (c) 2008 Universal Presenece, Inc.
+Copyright (c) 2008 James Rosen
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -62,4 +70,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/init.rb

@@ -0,0 +1,5 @@
+# Old Rails style init:
+if Object.const_defined?(:RAILS_ENV)
+  # redirect to the new style
+  require File.expand_path(File.join(File.dirname(__FILE__), 'lib', 'rails', 'init'))
+end

data/lib/avatar.rb

@@ -1,6 +1,7 @@
 $:.unshift File.expand_path(File.dirname(__FILE__))
 require 'avatar/source/abstract_source'
 require 'avatar/source/gravatar_source'
+require 'avatar/source/pavatar_source'
 
 # Helpers for displaying avatars.
 # Usage in Rails:
@@ -31,7 +32,7 @@ module Avatar
   
   def self.default_avatar_options=(options)
     raise ArgumentError.new("#{options} is not a Hash") unless options.kind_of?(Hash)
-    @@options = options
+    @@default_avatar_options = options
   end
   
-end
+end

data/lib/avatar/source/pavatar_source.rb

@@ -0,0 +1,109 @@
+require 'net/http'
+require 'uri'
+
+module Avatar # :nodoc:
+  module Source # :nodoc:
+    # Implements http://pavatar.com/spec/
+    class PavatarSource
+      include AbstractSource
+
+      PAVATAR_REGEXP = /^((?:http|https):\/\/.+)$/ix
+      
+      attr_accessor :http_connection_factory
+      
+      # Create a new PAvatar source.
+      #
+      # Options:
+      # * <code>:http_connection_factory</code> - the Object used to start new HTTP connections. By default, 
+      #                                           the <code>Net::HTTP</code> class. To use a proxy, pass 
+      #                                           <code>:http_connection_factory => Net::HTTP::Proxy(...)</code>
+      def initialize(options = {})
+        self.http_connection_factory = options.delete(:http_connection_factory) || Net::HTTP
+      end
+
+      # Discovers pavatar URL.  Returns nil if person is nil.
+      #
+      # Options: 
+      # * <code>:pavatar_field (Symbol)</code> - the field to call from person.  By default, <code>:blog_url</code>.
+      def avatar_url_for(person, options = {})
+        return nil if person.nil?
+        options = options.merge! ::Avatar.default_avatar_options
+        field = options.delete(:pavatar_field) || :blog_url
+        raise ArgumentError.new('No field specified; either specify a default field or pass in a value for :pavatar_field (probably :blog_url)') unless field
+
+        pavatar_url = autodiscover_pavatar_url_from person.send(field)
+        
+        (pavatar_url.nil? || pavatar_url.to_s.blank?) ? nil : pavatar_url
+      end
+      
+      private
+      
+      # Autodiscover PAvatar URL from a +profile_url+.
+      # 
+      # See http://pavatar.com/spec/#autodiscovery
+      #
+      # Returns +nil+ if +profile_url+ is blank.
+      def autodiscover_pavatar_url_from(profile_url)
+        return nil if profile_url.blank?
+        uri = URI.parse(profile_url)
+        begin
+          self.http_connection_factory.start(uri.host, uri.port) do |http|
+            return avatar_from_header(http) || avatar_from_link_element(http) || direct_avatar(profile_url, http) || nil
+          end
+        rescue Errno::ECONNREFUSED => e
+          nil
+        end
+      end
+      
+      
+        # Autodisciover using http headers.
+        #
+        # See http://pavatar.com/spec/#http-header
+        #
+        # Returns the URL if found; +nil+ otherwise.
+        def avatar_from_header(http)
+          resp = http.head('/')
+          resp.kind_of?(Net::HTTPSuccess) && resp['X-Pavatar']
+        end
+      
+      
+        # Autodiscover using link element.
+        #
+        # See http://pavatar.com/spec/#link-element
+        #
+        # Returns the URL if found; +nil+ otherwise.
+        def avatar_from_link_element(http)
+          resp = http.get('/')
+          resp.kind_of?(Net::HTTPSuccess) && parse_html_for_pavatar(resp.body)
+        end
+        
+        
+          # Look for a <link rel='pavatar' href='...' />
+          #
+          # Returns the URL if found; +nil+ otherwise.
+          def parse_html_for_pavatar(doc)
+            return nil if doc.nil? or doc.empty?
+
+            # 4.a 2 http://pavatar.com/spec/#autodiscovery-algorithm
+            # recommends following regexp /<link rel="pavatar" href="([^""]+)" ?/?>/
+            # but it will not always match valid xhtml link element. 
+            #
+            if result = doc.match(/<link(.+)rel=["']pavatar["'](.+)>/)
+              result.to_a[1..-1].map { |s| s.split(/["']/) }.flatten.find { |url| url =~ PAVATAR_REGEXP }
+            end
+          end
+      
+      
+        # Autodiscover using direct URL.
+        #
+        # See http://pavatar.com/spec/#direct-url
+        #
+        # Returns the URL if found; +nil+ otherwise.
+        def direct_avatar(profile_url, http)
+          resp = http.head('/pavatar.png')
+          profile_url + (profile_url =~ /\/$/ ? '' : '/') + 'pavatar.png' if resp.kind_of?(Net::HTTPSuccess)
+        end
+
+    end
+  end
+end

data/lib/avatar/source/wrapper/rails_asset_source_wrapper.rb

@@ -1,4 +1,5 @@
 require 'avatar/source/wrapper/abstract_source_wrapper'
+require 'action_view/helpers/tag_helper' 
 require 'action_view/helpers/asset_tag_helper'
 
 module Avatar # :nodoc:
@@ -33,4 +34,5 @@ module Avatar # :nodoc:
       end
     end
   end
-end
+end
+

data/lib/avatar/version.rb

@@ -1,8 +1,8 @@
 module Avatar #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 0
-    TINY  = 5
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rails/init.rb

@@ -0,0 +1 @@
+# File so gem can act like Rails plugin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: avatar
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - James Rosen
@@ -9,134 +9,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-01 00:00:00 -04:00
+date: 2009-07-16 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: helpers for displaying avatars
-email: 
-- james@u-presence.com
+description: Adds support for rendering avatars from a variety of sources.
+email: james.a.rosen@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- README.txt
-- website/index.txt
+extra_rdoc_files: []
+
 files: 
-- .gitignore
 - History.txt
 - License.txt
-- Manifest.txt
-- README.txt
-- Rakefile
-- config/hoe.rb
-- config/requirements.rb
-- lib/avatar.rb
+- README.rdoc
+- init.rb
+- rails/init.rb
 - lib/avatar/object_support.rb
-- lib/avatar/source.rb
 - lib/avatar/source/abstract_source.rb
 - lib/avatar/source/file_column_source.rb
 - lib/avatar/source/gravatar_source.rb
 - lib/avatar/source/nil_source.rb
 - lib/avatar/source/paperclip_source.rb
+- lib/avatar/source/pavatar_source.rb
 - lib/avatar/source/source_chain.rb
 - lib/avatar/source/static_url_source.rb
-- lib/avatar/source/wrapper.rb
 - lib/avatar/source/wrapper/abstract_source_wrapper.rb
 - lib/avatar/source/wrapper/rails_asset_source_wrapper.rb
 - lib/avatar/source/wrapper/string_substitution_source_wrapper.rb
+- lib/avatar/source/wrapper.rb
+- lib/avatar/source.rb
 - lib/avatar/version.rb
-- lib/avatar/view.rb
 - lib/avatar/view/abstract_view_support.rb
 - lib/avatar/view/action_view_support.rb
-- script/destroy
-- script/generate
-- script/txt2html
-- setup.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/testing.rake
-- tasks/website.rake
-- test/.gitignore
-- test/lib/database.rb
-- test/lib/database.yml
-- test/lib/file_column/CHANGELOG
-- test/lib/file_column/README
-- test/lib/file_column/Rakefile
-- test/lib/file_column/TODO
-- test/lib/file_column/init.rb
-- test/lib/file_column/lib/file_column.rb
-- test/lib/file_column/lib/file_column_helper.rb
-- test/lib/file_column/lib/file_compat.rb
-- test/lib/file_column/lib/magick_file_column.rb
-- test/lib/file_column/lib/rails_file_column.rb
-- test/lib/file_column/lib/test_case.rb
-- test/lib/file_column/lib/validations.rb
-- test/lib/file_column/test/abstract_unit.rb
-- test/lib/file_column/test/connection.rb
-- test/lib/file_column/test/file_column_helper_test.rb
-- test/lib/file_column/test/file_column_test.rb
-- test/lib/file_column/test/fixtures/entry.rb
-- test/lib/file_column/test/fixtures/invalid-image.jpg
-- test/lib/file_column/test/fixtures/kerb.jpg
-- test/lib/file_column/test/fixtures/mysql.sql
-- test/lib/file_column/test/fixtures/schema.rb
-- test/lib/file_column/test/fixtures/skanthak.png
-- test/lib/file_column/test/magick_test.rb
-- test/lib/file_column/test/magick_view_only_test.rb
-- test/lib/paperclip/README
-- test/lib/paperclip/Rakefile
-- test/lib/paperclip/generators/paperclip/USAGE
-- test/lib/paperclip/generators/paperclip/paperclip_generator.rb
-- test/lib/paperclip/generators/paperclip/templates/paperclip_migration.rb
-- test/lib/paperclip/init.rb
-- test/lib/paperclip/lib/paperclip.rb
-- test/lib/paperclip/lib/paperclip/attachment.rb
-- test/lib/paperclip/lib/paperclip/geometry.rb
-- test/lib/paperclip/lib/paperclip/iostream.rb
-- test/lib/paperclip/lib/paperclip/thumbnail.rb
-- test/lib/paperclip/lib/paperclip/upfile.rb
-- test/lib/paperclip/tasks/paperclip_tasks.rake
-- test/lib/paperclip/test/database.yml
-- test/lib/paperclip/test/fixtures/12k.png
-- test/lib/paperclip/test/fixtures/5k.png
-- test/lib/paperclip/test/fixtures/bad.png
-- test/lib/paperclip/test/helper.rb
-- test/lib/paperclip/test/test_attachment.rb
-- test/lib/paperclip/test/test_geometry.rb
-- test/lib/paperclip/test/test_integration.rb
-- test/lib/paperclip/test/test_iostream.rb
-- test/lib/paperclip/test/test_paperclip.rb
-- test/lib/paperclip/test/test_thumbnail.rb
-- test/lib/schema.rb
-- test/lib/user_suit.png
-- test/test_abstract_view_support.rb
-- test/test_action_view_support.rb
-- test/test_avatar.rb
-- test/test_file_column_source.rb
-- test/test_gravatar_source.rb
-- test/test_helper.rb
-- test/test_nil_source.rb
-- test/test_paperclip_source.rb
-- test/test_rails_asset_source_wrapper.rb
-- test/test_source_chain.rb
-- test/test_static_url_source.rb
-- test/test_string_substitution_source_wrapper.rb
-- website/index.html
-- website/index.txt
-- website/javascripts/rounded_corners_lite.inc.js
-- website/stylesheets/screen.css
-- website/template.rhtml
+- lib/avatar/view.rb
+- lib/avatar.rb
 has_rdoc: true
-homepage: http://avatar.rubyforge.org
+homepage: http://github.com/gcnovus/avatar
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --line-numbers
+- --inline-source
+- --title
+- Grammar RDoc
+- --charset
+- utf-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -153,28 +74,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: avatar
-rubygems_version: 1.0.1
+rubyforge_project: 
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 2
-summary: helpers for displaying avatars
-test_files: 
-- test/lib/file_column/lib/test_case.rb
-- test/lib/paperclip/test/test_attachment.rb
-- test/lib/paperclip/test/test_geometry.rb
-- test/lib/paperclip/test/test_integration.rb
-- test/lib/paperclip/test/test_iostream.rb
-- test/lib/paperclip/test/test_paperclip.rb
-- test/lib/paperclip/test/test_thumbnail.rb
-- test/test_abstract_view_support.rb
-- test/test_action_view_support.rb
-- test/test_avatar.rb
-- test/test_file_column_source.rb
-- test/test_gravatar_source.rb
-- test/test_helper.rb
-- test/test_nil_source.rb
-- test/test_paperclip_source.rb
-- test/test_rails_asset_source_wrapper.rb
-- test/test_source_chain.rb
-- test/test_static_url_source.rb
-- test/test_string_substitution_source_wrapper.rb
+summary: Multi-source avatar support
+test_files: []
+

data/.gitignore

@@ -1,8 +0,0 @@
-#ignore all .diff files
-/*.diff
-
-#ignore generated files:
-/coverage
-/doc
-/log/*.log
-/pkg

data/Manifest.txt

@@ -1,104 +0,0 @@
-.gitignore
-History.txt
-License.txt
-Manifest.txt
-README.txt
-Rakefile
-config/hoe.rb
-config/requirements.rb
-lib/avatar.rb
-lib/avatar/object_support.rb
-lib/avatar/source.rb
-lib/avatar/source/abstract_source.rb
-lib/avatar/source/file_column_source.rb
-lib/avatar/source/gravatar_source.rb
-lib/avatar/source/nil_source.rb
-lib/avatar/source/paperclip_source.rb
-lib/avatar/source/source_chain.rb
-lib/avatar/source/static_url_source.rb
-lib/avatar/source/wrapper.rb
-lib/avatar/source/wrapper/abstract_source_wrapper.rb
-lib/avatar/source/wrapper/rails_asset_source_wrapper.rb
-lib/avatar/source/wrapper/string_substitution_source_wrapper.rb
-lib/avatar/version.rb
-lib/avatar/view.rb
-lib/avatar/view/abstract_view_support.rb
-lib/avatar/view/action_view_support.rb
-script/destroy
-script/generate
-script/txt2html
-setup.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/testing.rake
-tasks/website.rake
-test/.gitignore
-test/lib/database.rb
-test/lib/database.yml
-test/lib/file_column/CHANGELOG
-test/lib/file_column/README
-test/lib/file_column/Rakefile
-test/lib/file_column/TODO
-test/lib/file_column/init.rb
-test/lib/file_column/lib/file_column.rb
-test/lib/file_column/lib/file_column_helper.rb
-test/lib/file_column/lib/file_compat.rb
-test/lib/file_column/lib/magick_file_column.rb
-test/lib/file_column/lib/rails_file_column.rb
-test/lib/file_column/lib/test_case.rb
-test/lib/file_column/lib/validations.rb
-test/lib/file_column/test/abstract_unit.rb
-test/lib/file_column/test/connection.rb
-test/lib/file_column/test/file_column_helper_test.rb
-test/lib/file_column/test/file_column_test.rb
-test/lib/file_column/test/fixtures/entry.rb
-test/lib/file_column/test/fixtures/invalid-image.jpg
-test/lib/file_column/test/fixtures/kerb.jpg
-test/lib/file_column/test/fixtures/mysql.sql
-test/lib/file_column/test/fixtures/schema.rb
-test/lib/file_column/test/fixtures/skanthak.png
-test/lib/file_column/test/magick_test.rb
-test/lib/file_column/test/magick_view_only_test.rb
-test/lib/paperclip/README
-test/lib/paperclip/Rakefile
-test/lib/paperclip/generators/paperclip/USAGE
-test/lib/paperclip/generators/paperclip/paperclip_generator.rb
-test/lib/paperclip/generators/paperclip/templates/paperclip_migration.rb
-test/lib/paperclip/init.rb
-test/lib/paperclip/lib/paperclip.rb
-test/lib/paperclip/lib/paperclip/attachment.rb
-test/lib/paperclip/lib/paperclip/geometry.rb
-test/lib/paperclip/lib/paperclip/iostream.rb
-test/lib/paperclip/lib/paperclip/thumbnail.rb
-test/lib/paperclip/lib/paperclip/upfile.rb
-test/lib/paperclip/tasks/paperclip_tasks.rake
-test/lib/paperclip/test/database.yml
-test/lib/paperclip/test/fixtures/12k.png
-test/lib/paperclip/test/fixtures/5k.png
-test/lib/paperclip/test/fixtures/bad.png
-test/lib/paperclip/test/helper.rb
-test/lib/paperclip/test/test_attachment.rb
-test/lib/paperclip/test/test_geometry.rb
-test/lib/paperclip/test/test_integration.rb
-test/lib/paperclip/test/test_iostream.rb
-test/lib/paperclip/test/test_paperclip.rb
-test/lib/paperclip/test/test_thumbnail.rb
-test/lib/schema.rb
-test/lib/user_suit.png
-test/test_abstract_view_support.rb
-test/test_action_view_support.rb
-test/test_avatar.rb
-test/test_file_column_source.rb
-test/test_gravatar_source.rb
-test/test_helper.rb
-test/test_nil_source.rb
-test/test_paperclip_source.rb
-test/test_rails_asset_source_wrapper.rb
-test/test_source_chain.rb
-test/test_static_url_source.rb
-test/test_string_substitution_source_wrapper.rb
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.rhtml