avatar 0.0.1 → 0.0.2

data/.gitignore

@@ -1,11 +1,8 @@
 #ignore all .diff files
 /*.diff
 
-#ignore coverage reports
+#ignore generated files:
 /coverage
-
-#ignore logs
+/doc
 /log/*.log
-
-#ignore packaged local gem:
 /pkg

data/History.txt

@@ -1,3 +1,13 @@
+== 0.0.2 2008-03-24
+* 1 major fix:
+  * SourceChain duplicates options before passing to elements
+
+* 1 minor fix:
+  * forced GravatarSource to coerce rating and size to proper values
+
+* 1 minor enhancement:
+  * broke out URL generation in GravatarSource to allow overriding
+
 == 0.0.1 2008-03-24
 
 * 1 major enhancement:

data/lib/avatar/source/gravatar_source.rb

@@ -3,6 +3,15 @@ require 'avatar/source/static_url_source'
 require 'avatar/source/nil_source'
 require 'digest/md5'
 
+unless Object.method_defined?(:returning)
+  Object.class_eval do
+    def returning(value)
+      yield(value)
+      value
+    end
+  end
+end
+
 module Avatar # :nodoc:
   module Source # :nodoc:
     # NOTE: since Gravatar always returns a URL (never a 404), instances of this
@@ -23,7 +32,14 @@ module Avatar # :nodoc:
         'http://www.gravatar.com/avatar/'
       end
       
-      # :nodoc:
+      # ['G', 'PG', 'R', 'X']
+      def self.allowed_ratings
+        ['G', 'PG', 'R', 'X']
+      end
+      
+      # Arguments:
+      # * +default_source+: a Source to generate defaults to be passed to Gravatar; optional; default: nil (a NilSource).
+      # * +default_field+: the field within each +person+ passed to <code>avatar_url_for</code> in which to look for an email address
       def initialize(default_source = nil, default_field = :email)
         self.default_source = default_source #not @default_source = ... b/c want to use the setter function below
         @default_field = default_field
@@ -38,17 +54,30 @@ module Avatar # :nodoc:
       # * <code>:rating or :r</code> - the maximum rating; one of ['G', 'PG', 'R', 'X']
       def avatar_url_for(person, options = {})
         return nil if person.nil?
-        options[:default] ||= default_avatar_url_for(person, options)
-        field = options[:field] || default_field
+        field = options.delete(:field) || default_field
         raise ArgumentError.new('No field specified; either specify a default field or pass in a value for :field (probably :email)') unless field
-        url = self.class.base_url
-        url << Digest::MD5::hexdigest(person.send(field)).strip
-        [:size, :s, :rating, :r, :default].each do |x|
-          next unless options[x]
-          url << (url.include?('?') ? '&' : '?')
-          url << "#{x}=#{options[x]}"
+        
+        options = parse_options(person, options)
+        returning(self.class.base_url) do |url|
+          url << Digest::MD5::hexdigest(person.send(field)).strip
+          options.each do |k, v|
+            next if v.nil?
+            url << (url.include?('?') ? '&' : '?')
+            url << "#{k}=#{v}"
+          end
+        end
+      end
+      
+      def parse_options(person, options)
+        returning({}) do |result|
+          result[:default] = options[:default] || default_avatar_url_for(person, options)
+
+          size = options[:size] || options[:s]
+          result[:size] = size if size.to_s =~ /^\d*/
+
+          rating = options[:rating] || options[:r]
+          result[:rating] = rating.upcase if rating and self.class.allowed_ratings.include?(rating.to_s)
         end
-        url
       end
       
       # Set the default source for all people.

data/lib/avatar/source/source_chain.rb

@@ -37,10 +37,11 @@ module Avatar # :nodoc:
       end
       
       # Iterate through the chain and return the first URL returned.
-      # Any error raised will propagate.
+      # Any error raised will propagate.  Duplicates +options+ before
+      # passing so each Source receives the same arguments.
       def avatar_url_for(person, options = {})
         @chain.each do |source|
-          result = source.avatar_url_for(person, options)
+          result = source.avatar_url_for(person, options.dup)
           return result unless result.nil?
         end
         return nil

data/lib/avatar/version.rb

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

data/test/test_gravatar_source.rb

@@ -47,12 +47,12 @@ class TestGravatarSource < Test::Unit::TestCase
   
   def test_size
     assert_equal "http://www.gravatar.com/avatar/#{@email_hash}?size=70", @source.avatar_url_for(@gary, :size => 70)
-    assert_equal "http://www.gravatar.com/avatar/#{@email_hash}?s=62", @source.avatar_url_for(@gary, :s => 62)
+    assert_equal "http://www.gravatar.com/avatar/#{@email_hash}?size=62", @source.avatar_url_for(@gary, :s => 62)
   end
   
   def test_rating
     assert_equal "http://www.gravatar.com/avatar/#{@email_hash}?rating=R", @source.avatar_url_for(@gary, :rating => 'R')
-    assert_equal "http://www.gravatar.com/avatar/#{@email_hash}?r=PG", @source.avatar_url_for(@gary, :r => 'PG')
+    assert_equal "http://www.gravatar.com/avatar/#{@email_hash}?rating=PG", @source.avatar_url_for(@gary, :r => 'PG')
   end
   
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Avatar</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/avatar"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/avatar" class="numbers">0.0.1</a>
+      <a href="http://rubyforge.org/projects/avatar" class="numbers">0.0.2</a>
     </div>
     <h1>&#x2192; &#8216;Avatar&#8217;</h1>
 
@@ -76,7 +76,7 @@ end</p>
 	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
 
 
-	<p>The trunk repository is <code>svn://rubyforge.org/var/svn/avatar/trunk</code> for anonymous access.</p>
+	<p>The project is hosted on <a href="http://github.com/gcnovus/avatar/tree/master">GitHub</a></p>
 
 
 	<h2>License</h2>
@@ -88,9 +88,9 @@ end</p>
 	<h2>Contact</h2>
 
 
-	<p>Comments are welcome. Send an email to <a href="mailto:FIXME"><span class="caps">FIXME</span> full name</a> email via the <a href="http://groups.google.com/group/avatar">forum</a></p>
+	<p>Comments are welcome. Put them on the <a href="http://groups.google.com/group/ruby-avatar">forum</a></p>
     <p class="coda">
-      <a href="FIXME email">FIXME full name</a>, 25th March 2008<br>
+      <a href="FIXME email">FIXME full name</a>, 26th March 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -32,7 +32,7 @@ h2. How to submit patches
 
 Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
 
-The trunk repository is <code>svn://rubyforge.org/var/svn/avatar/trunk</code> for anonymous access.
+The project is hosted on "GitHub":http://github.com/gcnovus/avatar/tree/master
 
 h2. License
 
@@ -40,5 +40,5 @@ This code is free to use under the terms of the MIT license.
 
 h2. Contact
 
-Comments are welcome. Send an email to "FIXME full name":mailto:FIXME email via the "forum":http://groups.google.com/group/avatar
+Comments are welcome. Put them on the "forum":http://groups.google.com/group/ruby-avatar
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: avatar
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - James Rosen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-25 00:00:00 -04:00
+date: 2008-03-26 00:00:00 -04:00
 default_executable: 
 dependencies: []