gravatar-ultimate 1.0.2 → 1.0.3

data/lib/gravatar/version.rb

@@ -0,0 +1,8 @@
+class Gravatar
+  module Version
+    MAJOR, MINOR, TINY = 1, 0, 3
+    STRING = [MAJOR, MINOR, TINY].join('.')
+  end
+  
+  VERSION = Version::STRING
+end

data/spec/fixtures/responses/grav.addresses

@@ -0,0 +1,24 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Thu, 12 Jan 2012 17:03:38 GMT
+Content-Type: text/xml;charset=utf-8
+Connection: keep-alive
+Set-Cookie: gravatar=gravatartest1234%7C1326992618%7Ce99170b24c4e0980266341fe9624bc8c; expires=Fri, 30-Jan-2054 10:07:16 GMT; path=/; domain=.gravatar.com
+Content-Length: 580
+
+<?xml version="1.0"?>
+<methodResponse>
+  <params>
+    <param>
+      <value>
+        <struct>
+  <member><name>gravatartest123@gmail.com</name><value><struct>
+  <member><name>rating</name><value><int>0</int></value></member>
+  <member><name>userimage</name><value><string>fed25d74d58274248095ca6b2fe2beff</string></value></member>
+  <member><name>userimage_url</name><value><string>http://en.gravatar.com/userimage/30721149/fed25d74d58274248095ca6b2fe2beff.jpg</string></value></member>
+</struct></value></member>
+</struct>
+      </value>
+    </param>
+  </params>
+</methodResponse>

data/spec/fixtures/responses/grav.deleteUserimage

@@ -0,0 +1,18 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Thu, 12 Jan 2012 18:24:30 GMT
+Content-Type: text/xml;charset=utf-8
+Connection: keep-alive
+Set-Cookie: gravatar=gravatartest1234%7C1326997469%7C42587efbd6b763ee850c6df8d4773dce; expires=Fri, 30-Jan-2054 12:48:59 GMT; path=/; domain=.gravatar.com
+Content-Length: 163
+
+<?xml version="1.0"?>
+<methodResponse>
+  <params>
+    <param>
+      <value>
+        <boolean>1</boolean>
+      </value>
+    </param>
+  </params>
+</methodResponse>

data/spec/fixtures/responses/grav.exists

@@ -0,0 +1,20 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Thu, 12 Jan 2012 18:37:10 GMT
+Content-Type: text/xml;charset=utf-8
+Connection: keep-alive
+Set-Cookie: gravatar=gravatartest1234%7C1326998230%7Cb89ab5cf21fa3ffa20f17df81a3b12f5; expires=Fri, 30-Jan-2054 13:14:20 GMT; path=/; domain=.gravatar.com
+Content-Length: 253
+
+<?xml version="1.0"?>
+<methodResponse>
+  <params>
+    <param>
+      <value>
+        <struct>
+  <member><name>ef23bdc1f1fb9e3f46843a00e5832d98</name><value><int>1</int></value></member>
+</struct>
+      </value>
+    </param>
+  </params>
+</methodResponse>

data/spec/fixtures/responses/grav.exists.invalid

@@ -0,0 +1,20 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Thu, 12 Jan 2012 17:22:37 GMT
+Content-Type: text/xml;charset=utf-8
+Connection: keep-alive
+Set-Cookie: gravatar=gravatartest1234%7C1326993757%7C72540173b0631c51e85fc01dca61e168; expires=Fri, 30-Jan-2054 10:45:14 GMT; path=/; domain=.gravatar.com
+Content-Length: 253
+
+<?xml version="1.0"?>
+<methodResponse>
+  <params>
+    <param>
+      <value>
+        <struct>
+  <member><name>719bc43b2d4ded25e0164af83484f8f9</name><value><int>0</int></value></member>
+</struct>
+      </value>
+    </param>
+  </params>
+</methodResponse>

data/spec/fixtures/responses/grav.exists.multiple_invalid

@@ -0,0 +1,21 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Thu, 12 Jan 2012 17:33:37 GMT
+Content-Type: text/xml;charset=utf-8
+Connection: keep-alive
+Set-Cookie: gravatar=gravatartest1234%7C1326994417%7C848cddd19297979345219d34a7a6a018; expires=Fri, 30-Jan-2054 11:07:14 GMT; path=/; domain=.gravatar.com
+Content-Length: 345
+
+<?xml version="1.0"?>
+<methodResponse>
+  <params>
+    <param>
+      <value>
+        <struct>
+  <member><name>bdc68bf1ad91e719bf9e9527158b1aa6</name><value><int>0</int></value></member>
+  <member><name>09abeab96651fd6be4ae2d3a6f3140ee</name><value><int>0</int></value></member>
+</struct>
+      </value>
+    </param>
+  </params>
+</methodResponse>

data/spec/fixtures/responses/grav.removeImage

@@ -0,0 +1,20 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Thu, 12 Jan 2012 18:01:15 GMT
+Content-Type: text/xml;charset=utf-8
+Connection: keep-alive
+Set-Cookie: gravatar=gravatartest1234%7C1326996075%7C14852bd9e471836f3694c45941fe4786; expires=Fri, 30-Jan-2054 12:02:30 GMT; path=/; domain=.gravatar.com
+Content-Length: 254
+
+<?xml version="1.0"?>
+<methodResponse>
+  <params>
+    <param>
+      <value>
+        <struct>
+  <member><name>gravatartest123@gmail.com</name><value><boolean>1</boolean></value></member>
+</struct>
+      </value>
+    </param>
+  </params>
+</methodResponse>

data/spec/fixtures/responses/grav.saveData

@@ -0,0 +1,18 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Thu, 12 Jan 2012 17:36:21 GMT
+Content-Type: text/xml;charset=utf-8
+Connection: keep-alive
+Set-Cookie: gravatar=gravatartest1234%7C1326994581%7C6c6de4cd3ca0d618837a95c62d3040c1; expires=Fri, 30-Jan-2054 11:12:42 GMT; path=/; domain=.gravatar.com
+Content-Length: 192
+
+<?xml version="1.0"?>
+<methodResponse>
+  <params>
+    <param>
+      <value>
+        <string>3fe9302284aa75e9916f364a3f7989e4</string>
+      </value>
+    </param>
+  </params>
+</methodResponse>

data/spec/fixtures/responses/grav.saveUrl

@@ -0,0 +1,18 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Thu, 12 Jan 2012 17:00:43 GMT
+Content-Type: text/xml;charset=utf-8
+Connection: keep-alive
+Set-Cookie: gravatar=gravatartest1234%7C1326992442%7C26b54ee039346e757eddd969dfa13bc1; expires=Fri, 30-Jan-2054 10:01:24 GMT; path=/; domain=.gravatar.com
+Content-Length: 192
+
+<?xml version="1.0"?>
+<methodResponse>
+  <params>
+    <param>
+      <value>
+        <string>fed25d74d58274248095ca6b2fe2beff</string>
+      </value>
+    </param>
+  </params>
+</methodResponse>

data/spec/fixtures/responses/grav.test

@@ -0,0 +1,22 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Thu, 12 Jan 2012 15:40:29 GMT
+Content-Type: text/xml;charset=utf-8
+Connection: keep-alive
+Set-Cookie: gravatar=gravatartest1234%7C1326987629%7Cc15a3b35dc03e97ba2b8a22f523579c8; expires=Fri, 30-Jan-2054 07:20:58 GMT; path=/; domain=.gravatar.com
+Content-Length: 397
+
+<?xml version="1.0"?>
+<methodResponse>
+  <params>
+    <param>
+      <value>
+        <struct>
+  <member><name>password</name><value><string>censored</string></value></member>
+  <member><name>greeting</name><value><string>hello</string></value></member>
+  <member><name>response</name><value><int>1326382829</int></value></member>
+</struct>
+      </value>
+    </param>
+  </params>
+</methodResponse>

data/spec/fixtures/responses/grav.useUserimage

@@ -0,0 +1,20 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Thu, 12 Jan 2012 17:59:53 GMT
+Content-Type: text/xml;charset=utf-8
+Connection: keep-alive
+Set-Cookie: gravatar=gravatartest1234%7C1326995990%7C75ab09270934a8e66a014c71b48ff416; expires=Fri, 30-Jan-2054 11:59:40 GMT; path=/; domain=.gravatar.com
+Content-Length: 254
+
+<?xml version="1.0"?>
+<methodResponse>
+  <params>
+    <param>
+      <value>
+        <struct>
+  <member><name>gravatartest123@gmail.com</name><value><boolean>1</boolean></value></member>
+</struct>
+      </value>
+    </param>
+  </params>
+</methodResponse>

data/spec/fixtures/responses/grav.userimages

@@ -0,0 +1,27 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Thu, 12 Jan 2012 18:35:10 GMT
+Content-Type: text/xml;charset=utf-8
+Connection: keep-alive
+Set-Cookie: gravatar=gravatartest1234%7C1326998110%7C19cb75eb75a09f90a26167c872508d90; expires=Fri, 30-Jan-2054 13:10:20 GMT; path=/; domain=.gravatar.com
+Content-Length: 677
+
+<?xml version="1.0"?>
+<methodResponse>
+  <params>
+    <param>
+      <value>
+        <struct>
+  <member><name>fed25d74d58274248095ca6b2fe2beff</name><value><array><data>
+  <value><string>0</string></value>
+  <value><string>http://en.gravatar.com/userimage/30721149/fed25d74d58274248095ca6b2fe2beff.jpg</string></value>
+</data></array></value></member>
+  <member><name>3fe9302284aa75e9916f364a3f7989e4</name><value><array><data>
+  <value><string>0</string></value>
+  <value><string>http://en.gravatar.com/userimage/30721149/3fe9302284aa75e9916f364a3f7989e4.jpg</string></value>
+</data></array></value></member>
+</struct>
+      </value>
+    </param>
+  </params>
+</methodResponse>

data/spec/lib/gravatar/cache_setup_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe "gravatar cache setup" do
   context "within Rails" do
     before(:each) do

data/spec/lib/gravatar/{cache_and_logger_spec.rb → cache_spec.rb}

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Gravatar::Cache do
   subject { Gravatar::Cache.new(new_cache, 30.minutes, "gravatar-specs") }
-
+  
   context "with a nonexistent cache item" do
     it "should be expired" do
       subject.expired?(:nothing).should be_true
@@ -28,6 +28,13 @@ describe Gravatar::Cache do
     it "should not be expired" do
       subject.expired?(:nothing).should be_false
     end
+    
+    context "after clearing the cache" do
+      before { subject.clear! }
+      it "should be nil" do
+        subject.call(:nothing) { 2 }.should == 2
+      end
+    end
 
     it "should not fire the block" do
       subject.call(:nothing) { @fired = 1 }
@@ -80,6 +87,10 @@ describe Gravatar::Cache do
             proc { subject.call(:nothing) { raise "something bad happened" } }.should raise_error(RuntimeError)
           end
         end
+
+        it "should provide access to the cached copy" do
+          subject.cached(:nothing).should == 1
+        end
       end
 
       it "should return the block value" do

data/spec/lib/gravatar/test_case_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Gravatar::TestCase do
+  before { auth_with :password => '123' }
+  
+  it "should have default email address" do
+    self.class.default_email.should_not be_nil
+  end
+  
+  it "should raise errors instead of logging them" do
+    grav.rescue_errors.should be_false
+  end
+  
+  it "should use mock responses" do
+    mock_response 'grav.test'
+    test(:greeting => 'hello').should have_key(:response)
+  end
+  
+  it "should nil out mock responses after use" do
+    mock_response 'grav.test'
+    test(:greeting => 'hello').should have_key(:response)
+    mock_response.should be_nil
+  end
+  
+  it "should remove mock responses from FakeWeb after use" do
+    mock_response 'grav.test'
+    test(:greeting => 'hello').should have_key(:response)
+    FakeWeb.should_not be_registered_uri(:post, grav.url)
+  end
+  
+  it "should not generate grav more than once" do
+    grav.should be grav
+  end
+  
+  it "should replace old mock responses with nil" do
+    mock_response 'grav.test'
+    mock_response nil
+    mock_response.should be_nil
+  end
+end

data/spec/lib/gravatar_spec.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe Gravatar do
-  it "should have a valid version number" do
-    Gravatar.version.should =~ /^\d+\.\d+\.\d+$/
-  end
-
+  default_email $credentials[:primary_email]
+  before { grav.auth_with(:password => $credentials[:password]) }
+  before { mock_response nil }
+  
   it "should allow setting cache duration by instance" do
-    grav = Gravatar.new($credentials[:primary_email])
     grav.cache_duration = 10.minutes
     grav.cache_duration.should == 10.minutes
   end
@@ -18,124 +17,161 @@ describe Gravatar do
   end
 
   it "should require :email" do
-    proc { subject }.should raise_error(ArgumentError)
+    proc { Gravatar.new(nil, :rescue_errors => false) }.should raise_error(ArgumentError)
   end
 
   context "given :email and :key" do
-    subject { Gravatar.new($credentials[:primary_email], $credentials)}
+    before { grav $credentials[:primary_email], $credentials }
 
     context "varying image ratings" do
       [:g, :pg, :r, :x].each do |rating|
         it "should save #{rating}-rated URLs and delete them" do
-          subject.save_url!(rating, "http://jigsaw.w3.org/css-validator/images/vcss").should ==
-                  "2df7db511c46303983f0092556a1e47c"
-          subject.delete_user_image!("2df7db511c46303983f0092556a1e47c").should == true
+          mock_response "grav.saveUrl"
+          save_url!(rating, "https://github.com/sinisterchipmunk/gravatar/raw/master/spec/fixtures/image.jpg").should ==
+                  "fed25d74d58274248095ca6b2fe2beff"
+          
+          mock_response "grav.deleteUserimage"
+          delete_user_image!("fed25d74d58274248095ca6b2fe2beff").should == true
         end
       end
 
       it "should raise an ArgumentError given an invalid rating" do
-        proc { subject.save_url!(:invalid_rating, "http://jigsaw.w3.org/css-validator/images/vcss") }.should \
+        proc { save_url!(:invalid_rating, "https://github.com/sinisterchipmunk/gravatar/raw/master/spec/fixtures/image.jpg") }.should \
           raise_error(ArgumentError)
       end
     end
 
     it "should return addresses" do
-      subject.addresses.should_not be_empty
+      mock_response 'grav.addresses'
+      addresses.should_not be_empty
     end
 
     it "should test successfully" do
-      subject.test(:greeting => 'hello').should have_key(:response)
+      mock_response 'grav.test'
+      test(:greeting => 'hello').should have_key(:response)
     end
 
     it "should save URLs and delete them" do
-      subject.save_url!(:g, "http://jigsaw.w3.org/css-validator/images/vcss").should == "2df7db511c46303983f0092556a1e47c"
-      subject.delete_user_image!("2df7db511c46303983f0092556a1e47c").should == true
-    end
-
-    # Not really the ideal approach but it's a valid test, at least
-    it "should save and delete images and associate/unassociate them with accounts" do
-      begin
-        subject.save_data!(:g, image_data).should == "23f086a793459fa25aab280054fec1b2"
-        subject.use_user_image!("23f086a793459fa25aab280054fec1b2", $credentials[:email]).should ==
-                { $credentials[:email] => false }
-        # See rdoc for #remove_image! for why we're not checking this.
-        subject.remove_image!($credentials[:email])#.should == { $credentials[:email] => true }
-        subject.delete_user_image!("23f086a793459fa25aab280054fec1b2").should == true
-      ensure
-        subject.remove_image!($credentials[:email])
-        begin
-          subject.delete_user_image!("23f086a793459fa25aab280054fec1b2")
-        rescue XMLRPC::FaultException
-        end
+      mock_response 'grav.saveUrl'
+      save_url!(:g, "https://github.com/sinisterchipmunk/gravatar/raw/master/spec/fixtures/image.jpg").should == "fed25d74d58274248095ca6b2fe2beff"
+      
+      mock_response 'grav.deleteUserimage'
+      delete_user_image!("fed25d74d58274248095ca6b2fe2beff").should == true
+    end
+    
+    context "with a user image attached" do
+      before do
+        mock_response 'grav.saveData'
+        @image_hash = save_data!(:g, mock_image_data)
+        
+        mock_response 'grav.useUserimage'
+        use_user_image!(@image_hash, $credentials[:email])
+        
+        @image_hash = 'fed25d74d58274248095ca6b2fe2beff'
       end
-    end
 
-    it "should return user images" do
-      subject.user_images.should include({"fe9dee44a1df19967db30a04083722d5"=>
-              [:g, "http://en.gravatar.com/userimage/14612723/fe9dee44a1df19967db30a04083722d5.jpg"]})
-    end
+      it "should save and delete images and associate/unassociate them with accounts" do
+        mock_response 'grav.removeImage'
+        remove_image!($credentials[:email]).should == { $credentials[:email] => true }
+
+        mock_response 'grav.deleteUserimage'
+        delete_user_image!('image_hash').should == true
+      end
+
+      it "should return user images" do
+        mock_response 'grav.userimages'
+        user_images.should include({@image_hash=>
+                [:g, "http://en.gravatar.com/userimage/30721149/#{@image_hash}.jpg"]})
+      end
 
-    it "should determine that the user exists" do
-      subject.exists?.should be_true
+      it "should determine that the email has an avatar" do
+        mock_response 'grav.exists'
+        exists?.should be_true
+      end
     end
 
-    it "should determine that a fake user does not exist" do
-      subject.exists?("not-even-a-valid-email").should be_false
+    it "should determine that a fake email does not have an avatar" do
+      mock_response 'grav.exists.invalid'
+      exists?("not-even-a-valid-email").should be_false
     end
 
-    it "should determine that multiple fake users do not exist" do
-      subject.exists?("invalid-1", "invalid-2").should == { "invalid-1" => false, "invalid-2" => false }
+    it "should determine that multiple fake emails do not have avatars" do
+      mock_response 'grav.exists.multiple_invalid'
+      exists?("invalid-1", "invalid-2").should == { "invalid-1" => false, "invalid-2" => false }
     end
   end
 
   context "given :email" do
-    subject { Gravatar.new("sinisterchipmunk@gmail.com") }
-
+    before { grav $credentials[:email] }
+    
     it "should not raise an error" do
-      proc { subject }.should_not raise_error(ArgumentError)
+      proc { grav }.should_not raise_error(ArgumentError)
     end
 
     it "should return email_hash" do
-      subject.email_hash.should == "5d8c7a8d951a28e10bd7407f33df6d63"
+      email_hash.should == "ef23bdc1f1fb9e3f46843a00e5832d98"
     end
 
     it "should return gravatar image_url" do
-      subject.image_url.should == "http://www.gravatar.com/avatar/5d8c7a8d951a28e10bd7407f33df6d63"
+      image_url.should == "http://www.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98"
     end
 
-    it "should return gravitar image data" do
-      subject.image_data.should == image_data
+    context "with a user image attached" do
+      before do
+        grav $credentials[:email], $credentials
+
+        mock_response 'grav.saveData'
+        @image_hash = save_data!(:g, mock_image_data)
+        
+        mock_response 'grav.useUserimage'
+        use_user_image!(@image_hash, $credentials[:email])
+      end
+
+      it "should return gravitar image data" do
+        Digest::MD5.hexdigest(grav.image_data).should == Digest::MD5.hexdigest(mock_image_data)
+      end
     end
 
     it "should return gravatar image_url with SSL" do
-      subject.image_url(:ssl => true).should == "https://secure.gravatar.com/avatar/5d8c7a8d951a28e10bd7407f33df6d63"
+      image_url(:ssl => true).should == "https://secure.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98"
     end
 
     it "should return gravatar image_url with size" do
-      subject.image_url(:size => 512).should == "http://www.gravatar.com/avatar/5d8c7a8d951a28e10bd7407f33df6d63?size=512"
+      image_url(:s => 512).should == "http://www.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98?s=512"
+      image_url(:size => 512).should == "http://www.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98?size=512"
     end
 
     it "should return gravatar image_url with rating" do
-      subject.image_url(:rating => 'pg').should == "http://www.gravatar.com/avatar/5d8c7a8d951a28e10bd7407f33df6d63?rating=pg"
+      image_url(:r => 'pg').should == "http://www.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98?r=pg"
+      image_url(:rating => 'pg').should == "http://www.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98?rating=pg"
     end
 
     it "should return gravatar image_url with file type" do
-      subject.image_url(:filetype => 'png').should == "http://www.gravatar.com/avatar/5d8c7a8d951a28e10bd7407f33df6d63.png"
+      image_url(:filetype => 'png').should == "http://www.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98.png"
     end
 
     it "should return gravatar image_url with default image" do
-      subject.image_url(:default => "http://example.com/images/example.jpg").should ==
-              "http://www.gravatar.com/avatar/5d8c7a8d951a28e10bd7407f33df6d63?default=http%3A%2F%2Fexample.com%2Fimages%2Fexample.jpg"
+      image_url(:d => "http://example.com/images/example.jpg").should ==
+              "http://www.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98?d=http%3A%2F%2Fexample.com%2Fimages%2Fexample.jpg"
+      image_url(:default => "http://example.com/images/example.jpg").should ==
+              "http://www.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98?default=http%3A%2F%2Fexample.com%2Fimages%2Fexample.jpg"
+    end
+    
+    it "should return gravatar image_url with forcedefault" do
+      image_url(:f => :identicon).should ==
+              "http://www.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98?f=identicon"
+      image_url(:forcedefault => :identicon).should ==
+              "http://www.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98?forcedefault=identicon"
     end
 
     it "should return gravatar image_url with SSL and default and size and rating" do
       combinations = %w(
-        https://secure.gravatar.com/avatar/5d8c7a8d951a28e10bd7407f33df6d63?default=identicon&size=80&rating=g
-        https://secure.gravatar.com/avatar/5d8c7a8d951a28e10bd7407f33df6d63?size=80&rating=g&default=identicon
-        https://secure.gravatar.com/avatar/5d8c7a8d951a28e10bd7407f33df6d63?size=80&default=identicon&rating=g
-        https://secure.gravatar.com/avatar/5d8c7a8d951a28e10bd7407f33df6d63?rating=g&size=80&default=identicon
+        https://secure.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98?default=identicon&size=80&rating=g
+        https://secure.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98?size=80&rating=g&default=identicon
+        https://secure.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98?size=80&default=identicon&rating=g
+        https://secure.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98?rating=g&size=80&default=identicon
       )
-      combinations.should include(subject.image_url(:ssl => true, :default => "identicon", :size => 80, :rating => :g))
+      combinations.should include(image_url(:ssl => true, :default => "identicon", :size => 80, :rating => :g))
     end
   end
 end