gravtastic 1.5.2 → 1.6.0

data/README.textile

@@ -3,14 +3,14 @@ Easily add "Gravatars":http://gravatar.com to your Ruby objects.
 
 h2. Install
 
-  sudo gem install chrislloyd-gravtastic --source=http://gems.github.com
+  sudo gem install gravtastic
 
 
 h2. Usage
 
 Somewhere in your application you need to @require 'gravtastic'@. In Rails >= 2.1 you can forego this and just add a dependency gem dependency for Gravtastic.
 
-    config.gem 'gravtastic', :source => 'http://gems.github.com/'
+    config.gem 'gravtastic'
 
 The next step is to give your model a Gravatar:
 
@@ -36,14 +36,14 @@ Note that it defaults to a PG rating. You can specify extra options with a hash:
   
   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.
 
-PS.  Bonus points for anybody who can tell me what that users email is!
-PPS. Shame on Automattic for still using MD5!
-
+  has_gravatar :author_email, :defaults => { :rating => 'R18', :size => 20 }
 
-h2. The Future
+Nice, now all the calls to gravatar_url will have the defaults you have specified.
 
-* "Datamapper":http://datamaper.org support
+PS.  Bonus points for anybody who can tell me what that users email is!
 
 
 h2. Authors
@@ -64,6 +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
 
 
 h2. License

data/Rakefile

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

data/lib/gravtastic.rb

@@ -57,8 +57,12 @@ module Gravtastic
       # 
       #   has_gravatar :on => :author_email
       # 
+      #   has_gravatar :defaults => { :rating => 'R18' }
+      # 
       def has_gravatar(options={:on => :email})
         @gravatar_source = options[:on]
+        options[:defaults] ||= {}
+        @gravatar_defaults = {:rating => 'PG', :secure => false}.merge(options[:defaults])
       end
 
       # 
@@ -70,7 +74,14 @@ module Gravtastic
       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!
       # 
@@ -92,7 +103,7 @@ module Gravtastic
     # 
     # Returns a string with the URL for the instance's Gravatar.
     # 
-    # It defaults to <tt>:rating => 'PG'</tt>
+    # It defaults to <tt>:rating => 'PG'</tt> and <tt>:secure => false</tt>
     # 
     # Examples:
     # 
@@ -105,9 +116,10 @@ module Gravtastic
     #   current_user.gravatar_url(:secure => true)
     #   => "https://secure.gravatar.com/e9e719b44653a9300e1567f09f6b2e9e.png?r=PG"
     # 
-    def gravatar_url(options={})
-      options[:rating] ||= 'PG'
-      options[:secure] ||= false
+    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

data/spec/gravtastic_spec.rb

@@ -13,27 +13,66 @@ describe "Gravtastic::Model" 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
+    end
+    
+  end
+  
   describe ".has_gravatar" do
     
-    it "sets .gravatar_source to email by default" do
+    it "sets .gravatar_source to :email by default" do
       @klass.has_gravatar
       @klass.gravatar_source.should == :email
     end
     
+    it "sets .gravatar_defaults to { :rating => 'PG', :secure => false } by default" do
+      @klass.has_gravatar
+      @klass.gravatar_defaults.should == { :rating => 'PG', :secure => false }
+    end
+    
+    it "keeps either :rating or :secure if only the other is passed as a default" do
+      @klass.has_gravatar :defaults => { :secure => true }
+      @klass.gravatar_defaults.should == { :rating => 'PG', :secure => true }
+    end
+    
     it "changes .gravatar_source" do
       lambda {
         @klass.has_gravatar :on => :other_method
       }.should change(@klass, :gravatar_source)
     end
     
+    it "changes .gravatar_defaults" do
+      lambda {
+        @klass.has_gravatar :defaults => { :rating => 'R18' }
+      }.should change(@klass, :gravatar_defaults)
+    end
+    
     it "sets .gravatar_source to the value of :on" do
       @klass.has_gravatar :on => :other_method
       @klass.gravatar_source.should == :other_method
     end
     
+    it "sets .gravatar_defaults to the value of :defaults" do
+      @klass.has_gravatar :defaults => { :rating => 'R18'}
+      @klass.gravatar_defaults.should == { :rating => 'R18', :secure => false }
+    end
+    
   end
 
   describe ".has_gravatar?" do
@@ -90,6 +129,7 @@ describe "Gravtastic::Model" 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
@@ -149,6 +189,11 @@ describe "Gravtastic::Model" do
       @user.gravatar_url(:rating => 'PG').should == @user.gravatar_url
     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'
+    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.5.2
+  version: 1.6.0
 platform: ruby
 authors: 
 - Chris Lloyd
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-15 00:00:00 +10:00
+date: 2008-06-28 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -52,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gravtastic
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Easily add Gravatars to your Ruby objects.