gravtastic 2.0.0 → 2.1.0

data/README.textile

@@ -35,7 +35,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)
+  current_user.gravatar_url(:rating => 'R', :size => 512)
   => "http://gravatar.com/e9e719b44653a9300e1567f09f6b2e9e.png?r=R18&s=512"
   
   current_user.gravatar_url(:secure => true)
@@ -43,7 +43,7 @@ Note that it defaults to a PG rating. You can specify extra options with a hash:
   
 However, to DRY things up you can specify defaults in the class declaration.
 
-  is_gravtastic :with => :author_email, :rating => 'R18', :size => 20
+  is_gravtastic :with => :author_email, :rating => 'R', :size => 20
 
 Nice, now all the calls to gravatar_url will have the defaults you have specified. Any options that you pass when you use @gravatar_url@ will over-ride these class-defaults.
 
@@ -69,6 +69,8 @@ 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 and for submitting it to the official list of Gravatar implementations.
+* "Vincent Charles":http://vincentcharles.com/ For an updated README.
+
 
 
 h2. License

data/Rakefile

@@ -1,72 +1,76 @@
-require 'rubygems'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rubygems/specification'
-require 'spec/rake/spectask'
-require 'date'
+require 'mg'
 
-GEM = "gravtastic"
-GEM_VERSION = "2.0.0"
-AUTHOR = "Chris Lloyd"
-EMAIL = "christopher.lloyd@gmail.com"
-HOMEPAGE = "http://github.com/chrislloyd/gravtastic"
-SUMMARY = "Easily add Gravatars to your Ruby objects."
+MG.new('gravtastic.gemspec')
 
-spec = Gem::Specification.new do |s|
-  s.name = GEM
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.rubyforge_project = GEM
-  s.has_rdoc = true
-  s.extra_rdoc_files = ['README.textile', 'LICENSE']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  
-  # Uncomment this to add a dependency
-  # s.add_dependency "foo"
-  
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README.textile Rakefile) + Dir.glob("{lib,spec}/**/*")
-end
-
-desc "Run Specs"
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Generate Documentation"
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title = 'Gravtastic'
-  rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'Gravtastic'
-  rdoc.rdoc_files.include(FileList[ 'lib/**/*.rb', 'README.textile', 'LICENSE'])
-end
-
-task :default => :spec
-task :specs => :spec
-
-desc "Run all examples"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts = ['--options','spec/spec.opts']
-  t.spec_files = FileList['spec/**/*.rb']
-  t.rcov = true
-end
-
-desc "install the gem locally"
-task :install => [:package] do
-  sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
-end
-
-desc "create a gemspec file"
-task :make_spec do
-  File.open("#{GEM}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
-end
-
-task :bugs do
-  sh %{ditz html ; open html/index.html}
-end
+# require 'rubygems'
+# require 'rake/gempackagetask'
+# require 'rake/rdoctask'
+# require 'rubygems/specification'
+# require 'spec/rake/spectask'
+# require 'date'
+#
+# GEM = "gravtastic"
+# GEM_VERSION = "2.0.0"
+# AUTHOR = "Chris Lloyd"
+# EMAIL = "christopher.lloyd@gmail.com"
+# HOMEPAGE = "http://github.com/chrislloyd/gravtastic"
+# SUMMARY = "Easily add Gravatars to your Ruby objects."
+#
+# spec = Gem::Specification.new do |s|
+#   s.name = GEM
+#   s.version = GEM_VERSION
+#   s.platform = Gem::Platform::RUBY
+#   s.rubyforge_project = GEM
+#   s.has_rdoc = true
+#   s.extra_rdoc_files = ['README.textile', 'LICENSE']
+#   s.summary = SUMMARY
+#   s.description = s.summary
+#   s.author = AUTHOR
+#   s.email = EMAIL
+#   s.homepage = HOMEPAGE
+#
+#   # Uncomment this to add a dependency
+#   # s.add_dependency "foo"
+#
+#   s.require_path = 'lib'
+#   s.files = %w(LICENSE README.textile Rakefile) + Dir.glob("{lib,spec}/**/*")
+# end
+#
+# desc "Run Specs"
+# Rake::GemPackageTask.new(spec) do |pkg|
+#   pkg.gem_spec = spec
+# end
+#
+# desc "Generate Documentation"
+# Rake::RDocTask.new do |rdoc|
+#   rdoc.rdoc_dir = 'doc'
+#   rdoc.title = 'Gravtastic'
+#   rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'Gravtastic'
+#   rdoc.rdoc_files.include(FileList[ 'lib/**/*.rb', 'README.textile', 'LICENSE'])
+# end
+#
+# task :default => :spec
+# task :specs => :spec
+#
+# desc "Run all examples"
+# Spec::Rake::SpecTask.new('spec') do |t|
+#   t.spec_opts = ['--options','spec/spec.opts']
+#   t.spec_files = FileList['spec/**/*.rb']
+#   # t.rcov = true
+# end
+#
+# desc "install the gem locally"
+# task :install => [:package] do
+#   sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
+# end
+#
+# desc "create a gemspec file"
+# task :make_spec do
+#   File.open("#{GEM}.gemspec", "w") do |file|
+#     file.puts spec.to_ruby
+#   end
+# end
+#
+# task :bugs do
+#   sh %{ditz html ; open html/index.html}
+# end

data/lib/gravtastic.rb

@@ -3,180 +3,79 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require 'digest/md5'
 require 'cgi'
+require 'uri'
 
-# = Gravtastic - Easily add Gravatars to your Ruby objects.
-# 
-# Copyright (C) 2008 mailto:christopher.lloyd@gmail.com
-# 
-# == Example
-# 
-# Somewhere in your application you need to <tt>require 'gravtastic'</tt>. In Rails >= 2.1 you can forego this and just add a dependency gem dependency for Gravtastic.
-# 
-#   config.gem 'gravtastic'
-# 
-# If you are using Merb & DataMapper you can add do the same by adding the following to your init.rb file:
-# 
-#   dependency 'gravtastic'
-# 
-# Make sure you add this after either the <tt>use_orm :datamapper</tt> line or after a DataMapper extension. The next step is to give your model a Gravatar:
-# 
-#   class User
-#     is_gravtastic
-#   end
-# 
-# If you are using a standard Ruby class you have to add the line <tt>include Gravtastic::Resource</tt> before <tt>is_gravtastic</tt>.
-#   
-# This defaults to looking for the gravatar ID on the <tt>email</tt> method. So, if your <tt>User</tt> has an <tt>email</tt> then it will send that to Gravatar to get their picture. You can change the default gravatar source like this:
-# 
-#   is_gravtastic :with => :author_email
-# 
-# Now, you can access your object's gravatar with the <tt>gravatar_url</tt> method:
-# 
-#   current_user.gravatar_url
-#   => "http://gravatar.com/e9e719b44653a9300e1567f09f6b2e9e.png?r=PG"
-# 
-# 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=R18&s=512"
-#   
-#   current_user.gravatar_url(:secure => true)
-#   => "https://secure.gravatar.com/e9e719b44653a9300e1567f09f6b2e9e.png?r=PG"
-#   
-# However, to DRY things up you can specify defaults in the class declaration.
-# 
-#   is_gravtastic :with => :author_email, :rating => 'R18', :size => 20
-# 
-# Nice, now all the calls to gravatar_url will have the defaults you have specified. Any options that you pass when you use <tt>gravatar_url</tt> will over-ride these class-defaults.
-# 
 module Gravtastic
-  module Resource
 
-    def self.included(base) # :nodoc:
-      base.extend(ClassMethods)
+  def self.included(base)
+    base.extend(SingletonMethods)
+  end
+
+  module SingletonMethods
+
+    def is_gravtastic(source = :email, options={})
+      extend ClassMethods
+      include InstanceMethods
+
+      @gravatar_defaults = {
+        :rating => 'PG',
+        :secure => false,
+        :filetype => :png
+      }.merge(options)
+      @gravatar_source = source
+    end
+
+    alias :has_gravatar :is_gravtastic
+
+  end
+
+  module ClassMethods
+
+    # attr_reader :gravatar_source, :gravatar_defaults
+
+    def gravatar_source
+      @gravatar_source
     end
-    
-    module ClassMethods
-
-      # 
-      # Sets the gravatar_source. Basically starts this whole shindig.
-      # 
-      # Examples:
-      # 
-      #   is_gravtastic
-      # 
-      #   is_gravtastic :with => :author_email
-      # 
-      #   is_gravtastic :with => :author_email, :rating => 'R18', :secure => true
-      # 
-      def is_gravtastic(options={})
-        @gravatar_source = options[:with] || :email
-
-        options.delete_if {|key,_| ![:size, :rating, :default, :secure].include?(key) }
-        @gravatar_defaults = {:rating => 'PG', :secure => false}.merge(options)
-      end
-
-      alias :has_gravatar :is_gravtastic
-
-      # 
-      # Returns a symbol of the instance method where the Gravatar is pulled from.
-      # 
-      # For example, if your users email is returned by the method <tt>#gobagaldy_gook</tt> then it
-      # will return the symbol <tt>:gobagaldy_gook</tt>.
-      # 
-      def gravatar_source
-        @gravatar_source
-      end
-
-      # 
-      # Returns a hash of all the default gravtastic options.
-      # 
-      def gravatar_defaults
-        @gravatar_defaults
-      end
-
-      # 
-      # Returns <tt>true</tt> if the gravatar_source is set. <tt>false</tt> if not. Easy!
-      # 
-      def has_gravatar?
-        !!gravatar_source
-      end
 
+    def gravatar_defaults
+      @gravatar_defaults
     end
 
-    # 
-    # The raw MD5 hash used by Gravatar, generated from the ClassMethods#gravatar_source.
-    # 
+  end
+
+  module InstanceMethods
+
     def gravatar_id
-      if self.class.gravatar_source && value = send(self.class.gravatar_source)
-        @gravatar_id = Digest::MD5.hexdigest(value.to_s.downcase)
-      end
+      Digest::MD5.hexdigest(send(self.class.gravatar_source).to_s.downcase)
     end
 
-    # 
-    # Returns a string with the URL for the instance's Gravatar.
-    # 
-    # It defaults to <tt>:rating => 'PG'</tt> and <tt>:secure => false</tt>
-    # 
-    # Examples:
-    # 
-    #   current_user.gravatar_url
-    #   => "http://gravatar.com/e9e719b44653a9300e1567f09f6b2e9e.png?r=PG"
-    # 
-    #   current_user.gravatar_url(:rating => 'R18', :size => 512, :default => 'http://example.com/images/example.jpg')
-    #   => "http://gravatar.com/e9e719b44653a9300e1567f09f6b2e9e.png?d=http%3A%2F%2Fexample.com%2Fimages%2Fexample.jpg&r=R18&s=512"
-    # 
-    #   current_user.gravatar_url(:secure => true)
-    #   => "https://secure.gravatar.com/e9e719b44653a9300e1567f09f6b2e9e.png?r=PG"
-    # 
-    def gravatar_url(options={})      
+    def gravatar_url(options={})
       options = self.class.gravatar_defaults.merge(options)
-      
-      @gravatar_url = gravatar_hostname(options[:secure]) + gravatar_filename + parse_url_options_hash(options)
+      gravatar_hostname(options.delete(:secure)) +
+        gravatar_filename(options.delete(:filetype)) +
+        url_params_from_hash(options)
     end
 
-    private
-    
-    # 
-    # Parses a hash options for the image parameters. Returns a CGI escaped string.
-    # 
-    def parse_url_options_hash(options)
-      options.delete_if { |key,_| ![:size, :rating, :default].include?(key) }
-      
-      unless options.empty?
-        '?' + options.map do |pair|
-          pair[0] = pair[0].to_s[0,1] # Get the first character of the option
-          pair.map{|item| item = CGI::escape(item.to_s) }.join('=') # Join key & value together
-        end.sort.join('&') # Join options together
-      else
-        ''
-      end
+  private
+
+    def url_params_from_hash(hash)
+      '?' + hash.map do |pair|
+        pair[0] = pair[0].to_s[0,1]
+        pair.map{|item| item = CGI::escape(item.to_s) }.join('=')
+      end.sort.join('&')
     end
-    
-    # 
-    # Returns the Gravatar.com hostname
-    # 
+
     def gravatar_hostname(secure)
       'http' + (secure ? 's://secure.' : '://') + 'gravatar.com/avatar/'
     end
 
-    # 
-    # Returns the filename of the gravatar image.
-    # 
-    def gravatar_filename
-      if gravatar_id
-        gravatar_id + '.png'
-      else
-        ''
-      end
+    def gravatar_filename(filetype)
+      "#{gravatar_id}.#{filetype}"
     end
 
   end
-end
 
-ActiveRecord::Base.send(:include, Gravtastic::Resource) if defined?(ActiveRecord) # :nodoc:
+end
 
-if defined?(DataMapper) # :nodoc:
-  DataMapper::Resource.append_inclusions Gravtastic::Resource
-  DataMapper::Model.append_extensions Gravtastic::Resource::ClassMethods
-end
+ActiveRecord::Base.send(:include, Gravtastic) if defined?(ActiveRecord) # :nodoc:
+DataMapper::Resource.append_inclusions(Gravtastic) if defined?(DataMapper) # :nodoc:

data/spec/gravtastic_integration_spec.rb

@@ -2,37 +2,37 @@ require File.dirname(__FILE__) + '/spec_helper'
 require 'rubygems'
 
 require 'activerecord'
-require 'dm-core'
+# require 'dm-core'
+require 'gravtastic'
 
-reload_gravtastic!
 
-class User
-  include DataMapper::Resource
-  is_gravtastic
-end
+# class User
+#   include DataMapper::Resource
+#   is_gravtastic
+# end
 
 describe ActiveRecord::Base do
-  
-  it "includes Gravtastic::Resource" do
-    ActiveRecord::Base.included_modules.should include(Gravtastic::Resource)
+
+  it "includes Gravtastic" do
+    ActiveRecord::Base.included_modules.should include(Gravtastic)
   end
-  
+
   it "responds to .is_gravtastic" do
     ActiveRecord::Base.should respond_to(:is_gravtastic)
   end
-  
-end
 
-describe DataMapper::Resource do
-  
-  it "includes Gravtastic::Resource" do
-    User.included_modules.should include(Gravtastic::Resource)
-  end
-  
-  it "responds to .is_gravtastic" do
-    User.should respond_to(:is_gravtastic)
-  end
-  
 end
 
+# describe DataMapper::Resource do
+#
+#   it "includes Gravtastic::Resource" do
+#     User.included_modules.should include(Gravtastic)
+#   end
+#
+#   it "responds to .is_gravtastic" do
+#     User.should respond_to(:is_gravtastic)
+#   end
+#
+# end
+
 

data/spec/gravtastic_spec.rb

@@ -1,218 +1,75 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require 'gravtastic'
 
-describe Gravtastic::Resource do
+describe Gravtastic do
 
   before(:each) do
-    @user = mock('User')
-    @user.class.send(:include, Gravtastic::Resource)
-    @klass = @user.class
-  end
-  
-  describe ".gravatar_source" do
-    
-    it "is nil if unset" do
-      @klass.gravatar_source.should be_nil
-    end
-    
-    it "returns the value of @gravatar_source" do
-      @klass.instance_variable_set('@gravatar_source', :foo)
-      @klass.gravatar_source.should == :foo
-    end
-  
-  end
-  
-  describe ".gravatar_defaults" do
-    
-    it "it nil if unset" do
-      @klass.gravatar_defaults.should be_nil
-    end
-    
-    it "returns the value of @gravatar_defaults" do
-      @klass.instance_variable_set('@gravatar_defaults', :foo)
-      @klass.gravatar_source.should == :foo
+    @g = Class.new do |c|
+      c.send(:include, Gravtastic)
+      c.is_gravtastic
     end
-    
   end
-  
+
   describe ".is_gravtastic" do
-    
-    it "sets .gravatar_source to :email by default" do
-      @klass.is_gravtastic
-      @klass.gravatar_source.should == :email
-    end
-    
-    it "sets .gravatar_defaults to { :rating => 'PG', :secure => false } by default" do
-      @klass.is_gravtastic
-      @klass.gravatar_defaults.should == { :rating => 'PG', :secure => false }
-    end
-    
-    it "sets .gravatar_source to :email by default, even when defaults are supplied" do
-      @klass.is_gravtastic :secure => true
-      @klass.gravatar_source.should == :email
-    end
-    
-    it "keeps either :rating or :secure if only the other is passed as a default" do
-      @klass.is_gravtastic :secure => true
-      @klass.gravatar_defaults.should == { :rating => 'PG', :secure => true }
-    end
-    
-    it "changes .gravatar_source" do
-      lambda {
-        @klass.is_gravtastic :with => :other_method
-      }.should change(@klass, :gravatar_source)
-    end
-    
-    it "changes .gravatar_defaults" do
-      lambda {
-        @klass.is_gravtastic :rating => 'R18'
-      }.should change(@klass, :gravatar_defaults)
-    end
-    
-    it "sets .gravatar_source to the value of :on" do
-      @klass.is_gravtastic :with => :other_method
-      @klass.gravatar_source.should == :other_method
-    end
-    
-    it "sets .gravatar_defaults to the value of :defaults" do
-      @klass.is_gravtastic :rating => 'R18'
-      @klass.gravatar_defaults.should == { :rating => 'R18', :secure => false }
+
+    it "includes the methods" do
+      @g.included_modules.should include(Gravtastic::InstanceMethods)
     end
-    
+
   end
 
-  describe ".has_gravatar?" do
-    
-    it "is true when .gravatar_source is not nil" do
-      @user.class.stub!(:gravatar_source).and_return(:email)
-      @user.class.should have_gravatar
+  describe 'default' do
+
+    it "options are {:rating => 'PG', :secure => false, :filetype => :png}" do
+      @g.gravatar_defaults.should == {:rating => 'PG', :secure => false, :filetype => :png}
     end
-    
-    it "is false when .gravatar_soruce is not is nil" do
-      @user.class.stub!(:gravatar_source).and_return(nil)
-      @user.class.should_not have_gravatar
+
+    it "source is :email" do
+      @g.gravatar_source.should == :email
     end
-    
+
   end
 
   describe "#gravatar_id" do
 
-    before(:each) do
-      @user.stub!(:email).and_return('joe@example.com')
-      @user.stub!(:name).and_return('Joe Bloggs')
-      @user.class.stub!(:gravatar_source).and_return(:email)
-    end
-    
-    it "is not nil when .gravatar_source is not nil" do
-      @user.gravatar_id.should_not be_nil
-    end
-    
-    it "is nil when .gravatar_source is nil" do
-      @user.class.stub!(:gravatar_source).and_return(nil)
-      @user.gravatar_id.should be_nil
+    it "downcases email" do
+      a = @g.new
+      stub(a).email{ 'USER@EXAMPLE.COM' }
+      b = @g.new
+      stub(b).email{ 'user@example.com' }
+      a.gravatar_id.should == b.gravatar_id
     end
 
-    it "changes when .gravatar_source is changed" do
-      lambda {
-        @user.class.stub!(:gravatar_source).and_return(:name)
-      }.should change(@user, :gravatar_id)
-    end
-
-    it "is a MD5 hash" do
-      @user.gravatar_id.should == 'f5b8fb60c6116331da07c65b96a8a1d1'
-    end
-    
-    it "downcases any imput" do
-      @user.stub!(:email).and_return('JOE@EXAMPLE.COM')
-      @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
-    
+
     before(:each) do
-      @user.stub!(:email).and_return('joe@example.com')
-      @user.stub!(:name).and_return('Joe Bloggs')
-      @user.class.stub!(:gravatar_source).and_return(:email)
-      @user.class.stub!(:gravatar_defaults).and_return({:rating => 'PG'})
-    end
-    
-    it "is not nil when .gravatar_source is not nil" do
-      @user.gravatar_url.should_not be_nil
-    end
-    
-    it "returns a default Gravatar url when .gravatar_source is nil" do
-      @user.class.stub!(:gravatar_source).and_return(nil)
-      @user.gravatar_url.should =~ /http:\/\/gravatar.com\/avatar/
-    end
-    
-    it "always specifies a png resource type" do
-      @user.gravatar_url.should match(/.png/)
-    end
-    
-    it "returns a valid gravatar URL" do
-      @user.gravatar_url.should == valid_gravatar_url + '?r=PG'
-    end
-    
-    it "returns a valid SSL gravatar URL" do
-      @user.gravatar_url(:secure => true).should == 'https://secure.gravatar.com/avatar/f5b8fb60c6116331da07c65b96a8a1d1.png?r=PG'
-    end
-    
-    it "returns a url without the 'www'" do
-      @user.gravatar_url.should_not match(/www/)
-    end
-    
-    it "returns a valid gravatar URL even when invalid option is passed" do
-      @user.gravatar_url(:foo => :bar).should == valid_gravatar_url + '?r=PG'
-    end
-    
-    it "parses a size" do 
-      @user.gravatar_url(:size => 512).should == valid_gravatar_url + '?r=PG&s=512'
+      @user = @g.new
+      stub(@user).email{ 'user@example.com' }
     end
-    
-    it "parses a rating" do 
-      @user.gravatar_url(:rating => 'MA').should == valid_gravatar_url + '?r=MA'
-    end
-    
-    it "returns a valid gravatar URL when the rating option is unescaped" do
-      @user.gravatar_url(:rating => 'Unescaped String').should == valid_gravatar_url + '?r=Unescaped+String'
-    end
-    
-    it "parses a default image type" do 
-      @user.gravatar_url(:default => :identicon).should == valid_gravatar_url + '?d=identicon&r=PG'
-    end
-    
-    it "parses a default image URL" do 
-      @user.gravatar_url(:default => 'http://example.com/images/example.jpg').should == valid_gravatar_url + '?d=http%3A%2F%2Fexample.com%2Fimages%2Fexample.jpg&r=PG'
-    end
-    
-    it "parses multiple options" do
-      @user.gravatar_url(:size => 20, :rating => 'R18', :default => :monsterid).should == valid_gravatar_url + '?d=monsterid&r=R18&s=20'
+
+    it "makes a pretty URL" do
+      @user.gravatar_url.should == 'http://gravatar.com/avatar/b58996c504c5638798eb6b511e6f49af.png?r=PG'
     end
-    
-    it "defaults to a 'PG' rating" do
-      @user.gravatar_url(:rating => 'PG').should == @user.gravatar_url
+
+    it "makes a secure URL" do
+      @user.gravatar_url(:secure => true).should == 'https://secure.gravatar.com/avatar/b58996c504c5638798eb6b511e6f49af.png?r=PG'
     end
-    
-    it "uses the defaults from .gravatar_defaults" do
-      @user.class.stub!(:gravatar_defaults).and_return({ :size => 20, :rating => 'R18'})
-      @user.gravatar_url.should == valid_gravatar_url + '?r=R18&s=20'
+
+    it "makes a jpeggy URL" do
+      @user.gravatar_url(:filetype => :jpg).should == 'http://gravatar.com/avatar/b58996c504c5638798eb6b511e6f49af.jpg?r=PG'
     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/
+
+    it "makes a saucy URL" do
+      @user.gravatar_url(:rating => 'R').should == 'http://gravatar.com/avatar/b58996c504c5638798eb6b511e6f49af.png?r=R'
     end
-    
-    def valid_gravatar_url # :nodoc:
-      'http://gravatar.com/avatar/f5b8fb60c6116331da07c65b96a8a1d1.png'
+
+    it "makes a URL from the defaults" do
+      stub(@user.class).gravatar_defaults{ {:size => 20, :rating => 'R18', :secure => true, :filetype => :png} }
+      @user.gravatar_url.should == 'https://secure.gravatar.com/avatar/b58996c504c5638798eb6b511e6f49af.png?r=R18&s=20'
     end
-    
+
   end
-  
+
 end

data/spec/spec_helper.rb

@@ -6,4 +6,10 @@ def reload_gravtastic!
   require File.join(File.dirname(__FILE__),'../lib/gravtastic')
 end
 
-require 'gravtastic'
+Spec::Runner.configure do |config|
+  config.mock_with :rr
+end
+
+class Class
+  def to_sym; name.to_sym end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gravtastic
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Chris Lloyd
@@ -33,6 +33,8 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/chrislloyd/gravtastic
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -53,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gravtastic
-rubygems_version: 1.2.0
+rubygems_version: 1.3.2
 signing_key: 
 specification_version: 2
 summary: Easily add Gravatars to your Ruby objects.