gravtastic 1.6.0 → 1.7.0

data/README.textile

@@ -32,7 +32,7 @@ Now, you can access your object's gravatar with the @gravatar_url@ method:
 Note that it defaults to a PG rating. You can specify extra options with a hash:
 
   current_user.gravatar_url(:rating => 'R18', :size => 512)
-  => "http://gravatar.com/e9e719b44653a9300e1567f09f6b2e9e.png?r=PG&s=512"
+  => "http://gravatar.com/e9e719b44653a9300e1567f09f6b2e9e.png?r=R18&s=512"
   
   current_user.gravatar_url(:secure => true)
   => "https://secure.gravatar.com/e9e719b44653a9300e1567f09f6b2e9e.png?r=PG"
@@ -64,7 +64,7 @@ If you submit a successful patch then you'll be given full commit rights to the
 h2. Thanks
 
 * "Xavier Shay":http://rhnh.net and others for "Enki":http://enkiblog.com (the reason this was written)
-* "Matthew Moore":http://www.matthewpaulmoore.com/ for helpful suggestions
+* "Matthew Moore":http://www.matthewpaulmoore.com/ for helpful suggestions and for submitting it to the official list of Gravatar implementations.
 
 
 h2. License

data/Rakefile

@@ -5,7 +5,7 @@ require 'spec/rake/spectask'
 require 'date'
 
 GEM = "gravtastic"
-GEM_VERSION = "1.6.0"
+GEM_VERSION = "1.7.0"
 AUTHOR = "Chris Lloyd"
 EMAIL = "christopher.lloyd@gmail.com"
 HOMEPAGE = "http://github.com/chrislloyd/gravtastic"

data/lib/gravtastic.rb

@@ -34,7 +34,7 @@ require 'cgi'
 # Note that it defaults to a PG rating. You can specify extra options with a hash:
 # 
 #   current_user.gravatar_url(:rating => 'R18', :size => 512)
-#   => "http://gravatar.com/e9e719b44653a9300e1567f09f6b2e9e.png?r=PG&s=512"
+#   => "http://gravatar.com/e9e719b44653a9300e1567f09f6b2e9e.png?r=R18&s=512"
 # 
 #   current_user.gravatar_url(:secure => true)
 #   => "https://secure.gravatar.com/e9e719b44653a9300e1567f09f6b2e9e.png?r=PG"
@@ -95,8 +95,8 @@ module Gravtastic
     # The raw MD5 hash used by Gravatar, generated from the ClassMethods#gravatar_source.
     # 
     def gravatar_id
-      if self.class.gravatar_source && value = send(self.class.gravatar_source).downcase
-        @gravatar_id = Digest::MD5.hexdigest(value.to_s)
+      if self.class.gravatar_source && value = send(self.class.gravatar_source)
+        @gravatar_id = Digest::MD5.hexdigest(value.to_s.downcase)
       end
     end
 
@@ -117,12 +117,9 @@ module Gravtastic
     #   => "https://secure.gravatar.com/e9e719b44653a9300e1567f09f6b2e9e.png?r=PG"
     # 
     def gravatar_url(options={})      
-      
       options = self.class.gravatar_defaults.merge(options)
       
-      if gravatar_id
-        @gravatar_url = 'http' + (options[:secure] ? 's://secure.' : '://') + 'gravatar.com/avatar/' + gravatar_id + '.png' + parse_url_options_hash(options)
-      end
+      @gravatar_url = gravatar_url_base(options[:secure]) + gravatar_filename + parse_url_options_hash(options)
     end
 
     private
@@ -142,7 +139,19 @@ module Gravtastic
         ''
       end
     end
-
+    
+    def gravatar_url_base(secure)
+      'http' + (secure ? 's://secure.' : '://') + 'gravatar.com/avatar/'
+    end
+    
+    def gravatar_filename
+      if gravatar_id
+        gravatar_id + '.png'
+      else
+        ''
+      end
+    end
+    
   end
 end
 

data/spec/gravtastic_spec.rb

@@ -121,6 +121,11 @@ describe "Gravtastic::Model" do
       @user.gravatar_id.should == 'f5b8fb60c6116331da07c65b96a8a1d1'
     end
     
+    it "is nil when email is not a string" do
+      @user.stub!(:email).and_return(nil)
+      @user.gravatar_id.should == nil
+    end
+    
   end
   
   describe "#gravatar_url" do
@@ -136,9 +141,9 @@ describe "Gravtastic::Model" do
       @user.gravatar_url.should_not be_nil
     end
     
-    it "is nil when .gravatar_source is nil" do
+    it "returns a default Gravatar url when .gravatar_source is nil" do
       @user.class.stub!(:gravatar_source).and_return(nil)
-      @user.gravatar_url.should be_nil
+      @user.gravatar_url.should =~ /http:\/\/gravatar.com\/avatar/
     end
     
     it "always specifies a png resource type" do
@@ -194,6 +199,11 @@ describe "Gravtastic::Model" do
       @user.gravatar_url.should == valid_gravatar_url + '?r=R18&s=20'
     end
     
+    it "returns a default Gravatar url when #gravatar_id is nil" do
+      @user.stub!(:email).and_return(nil)
+      @user.gravatar_url.should =~ /http:\/\/gravatar.com\/avatar/
+    end
+    
     def valid_gravatar_url # :nodoc:
       'http://gravatar.com/avatar/f5b8fb60c6116331da07c65b96a8a1d1.png'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gravtastic
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Chris Lloyd
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-28 00:00:00 +10:00
+date: 2008-08-30 00:00:00 +10:00
 default_executable: 
 dependencies: []