gravatarify 1.2.1 → 2.0.3

data/test/unit/gravatarify_subdomain_test.rb

@@ -11,34 +11,26 @@ class GravatarifySubdomainTest < Test::Unit::TestCase
   context "changing hosts through Gravatarify#subdomains" do
     should "override default subdomains (useful to e.g. switch back to 'www' only)" do
       Gravatarify.subdomains = ['0', '1']
-      assert_equal "http://0.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", build_gravatar_url('info@initech.com')
-      assert_equal "http://1.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", build_gravatar_url('support@initech.com')
+      assert_equal "http://0.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", gravatar_url('info@initech.com')
+      assert_equal "http://1.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", gravatar_url('support@initech.com')
     end
     
-    should "take in a string only argument, like www (and be aliased to 'subdomain' to singularize it :D)" do
-      Gravatarify.subdomain = 'www'
-      assert_equal "http://www.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", build_gravatar_url('info@initech.com')
-      assert_equal "http://www.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", build_gravatar_url('support@initech.com')      
+    should "take in a string only argument, like www" do
+      Gravatarify.subdomains = 'www'
+      assert_equal "http://www.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", gravatar_url('info@initech.com')
+      assert_equal "http://www.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", gravatar_url('support@initech.com')      
     end
     
     should "still work as expected if passed in `nil` and return urls with default subdomain `www`" do
-      Gravatarify.subdomain = nil
-      assert_equal "http://www.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", build_gravatar_url('info@initech.com')
-      assert_equal "http://www.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", build_gravatar_url('support@initech.com')            
+      Gravatarify.subdomains = nil
+      assert_equal "http://www.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", gravatar_url('info@initech.com')
+      assert_equal "http://www.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", gravatar_url('support@initech.com')            
     end
   end
-  
-  context "Gravatarify#use_only_www!" do
-    should "only generate www.gravatar.com urls" do
-      Gravatarify.use_www_only!
-      assert_equal "http://www.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", build_gravatar_url('info@initech.com')
-      assert_equal "http://www.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", build_gravatar_url('support@initech.com')      
-    end
-  end
-  
+    
   context "with Net::HTTP the gravatar.com subdomains" do
     should "return an image of type image/jpeg" do
-      Gravatarify.subdomains.each do |subdomain|
+      %w{ 0 1 2 www }.each do |subdomain|
         response = Net::HTTP.get_response URI.parse("http://#{subdomain}.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg")
         assert_equal 200, response.code.to_i
         assert_equal "image/jpeg", response.content_type
@@ -53,12 +45,12 @@ class GravatarifySubdomainTest < Test::Unit::TestCase
       http = Net::HTTP.new('secure.gravatar.com', 443)
       http.use_ssl = true
       
-      # do not verify peer certificate (get rid of that warning dude!)
+      # do not verify peer certificate (just get rid of that warning!)
       http.instance_variable_get('@ssl_context').verify_mode = OpenSSL::SSL::VERIFY_NONE
       
       response = http.get '/avatar/4979dd9653e759c78a81d4997f56bae2.jpg'
       assert_equal 200, response.code.to_i
-      assert_equal "image/jpeg", response.content_type      
+      assert_equal "image/jpeg", response.content_type
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gravatarify
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 2.0.3
 platform: ruby
 authors: 
 - Lukas Westermann
@@ -9,12 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 +01:00
+date: 2009-11-03 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
 description: |-
-  Awesome gravatar support for Ruby (and Rails, DataMapper, Haml) -
+  Awesome gravatar support for Ruby (and Rails) -
       with unique options like Proc's for default images, or
       support for gravatar.com's multiple host names.
 email: lukas.westermann@gmail.com
@@ -34,14 +34,13 @@ files:
 - lib/gravatarify.rb
 - lib/gravatarify/base.rb
 - lib/gravatarify/helper.rb
-- lib/gravatarify/object_support.rb
+- lib/gravatarify/utils.rb
 - rails/init.rb
 - test/test_helper.rb
-- test/unit/gravatarify_ar_dm_test.rb
 - test/unit/gravatarify_base_test.rb
 - test/unit/gravatarify_helper_test.rb
-- test/unit/gravatarify_object_support_test.rb
 - test/unit/gravatarify_rack_vs_cgi_test.rb
+- test/unit/gravatarify_styles_test.rb
 - test/unit/gravatarify_subdomain_test.rb
 has_rdoc: true
 homepage: http://github.com/lwe/gravatarify
@@ -70,12 +69,11 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Awesome gravatar support for Ruby (and Rails, DataMapper, Haml).
+summary: Awesome gravatar support for Ruby (and Rails).
 test_files: 
 - test/test_helper.rb
-- test/unit/gravatarify_ar_dm_test.rb
 - test/unit/gravatarify_base_test.rb
 - test/unit/gravatarify_helper_test.rb
-- test/unit/gravatarify_object_support_test.rb
 - test/unit/gravatarify_rack_vs_cgi_test.rb
+- test/unit/gravatarify_styles_test.rb
 - test/unit/gravatarify_subdomain_test.rb

data/lib/gravatarify/object_support.rb

@@ -1,59 +0,0 @@
-# Enables +gravatarify+ support in any plain old ruby object, ActiveRecord, DataMapper or wherever you like :)
-#
-# Provides the {ClassMethods#gravatarify} method to handle the creation of
-# a +gravatar_url+ method for a ruby object.
-#
-# An ActiveRecord example:
-# 
-#    class User < ActiveRecord::Base
-#      gravatarify
-#    end
-#    @user.gravatar_url # that's it!
-#
-# A DataMapper example:
-#
-#    class User
-#      include DataMapper::Resource
-#      property ...
-#      property :author_email, String
-#      gravatarify :author_email
-#    end
-#    @user.gravatar_url # that's it, using the specified field!
-#
-# And finally, using a plain old ruby object:
-#
-#    class SimpleUser
-#      include Gravatarify::ObjectSupport
-#      attr_accessor :email
-#      gravatarify
-#    end
-#    @user.gravatar_url # that's it!!!
-#
-# If more fine grained controller is required, feel free to use {Gravatarify::Base#build_gravatar_url}
-# directly.
-module Gravatarify::ObjectSupport
-  include Gravatarify::Base
-  
-  def self.included(base) #:nodoc:
-    base.send :extend, ClassMethods
-  end
-  
-  module ClassMethods    
-    def gravatarify(*args)
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      source = args.shift
-      define_method(:gravatar_url) do |*params|
-        source = :email if !source and respond_to?(:email)
-        source = :mail if !source and respond_to?(:mail)
-        build_gravatar_url send(source || :email), options.merge(params.first || {})
-      end
-      # has more
-      args.each do |src|
-        method = "#{src}_gravatar_url".sub(/_e?mail/, '')
-        define_method(method) do |*params|
-          build_gravatar_url send(src), options.merge(params.first || {})
-        end
-      end
-    end
-  end
-end

data/test/unit/gravatarify_ar_dm_test.rb

@@ -1,60 +0,0 @@
-require 'test_helper'
-
-class GravatarifyArDmTest < Test::Unit::TestCase
-  def setup; reset_gravatarify! end
-
-  context "ActiveRecord::Base" do
-    if defined?(ActiveRecord)    
-      should "include Gravatarify::ObjectSupport" do
-        assert ActiveRecord::Base.included_modules.include?(Gravatarify::ObjectSupport)
-      end
-    
-      should "respond to #gravatarify" do
-        assert_respond_to ActiveRecord::Base, :gravatarify
-      end
-    else
-      context "tests" do
-        should "be run (but looks like ActiveRecord is not available)" do
-          flunk "ActiveRecord not available -> thus tests are incomplete (error can be ignored though!)"          
-        end
-      end      
-    end
-  end
-  
-  context "DataMapper model (User)" do      
-    if defined?(DataMapper)             
-      setup do
-        class User
-          include DataMapper::Resource
-          property :id, Serial
-          property :name, String
-          property :email, String
-          property :author_email, String
-          
-          gravatarify
-        end
-      end
-      
-      should "include Gravatarify::ObjectSupport" do
-        assert User.included_modules.include?(Gravatarify::ObjectSupport)
-      end
-      
-      should "respond to #gravatarify" do
-        assert_respond_to User, :gravatarify
-      end
-      
-      context "as instance" do
-        should "be able to build correct gravatar_url's!" do
-          u = User.new(:email => "peter.gibbons@initech.com")
-          assert_equal "http://0.gravatar.com/avatar/cb7865556d41a3d800ae7dbb31d51d54.jpg", u.gravatar_url
-        end
-      end
-    else
-      context "tests" do
-        should "be run (but looks like DataMapper is not available)" do
-          flunk "DataMapper not available -> thus tests are incomplete (error can be ignored though!)"
-        end
-      end
-    end
-  end
-end

data/test/unit/gravatarify_object_support_test.rb

@@ -1,107 +0,0 @@
-require 'test_helper'
-
-class PoroUser
-  include Gravatarify::ObjectSupport
-  attr_accessor :email, :gender
-  def initialize(attributes = {})
-    attributes.each do |key, value|
-      self.send "#{key}=", value
-    end
-  end
-end
-
-class GravatarifyObjectSupportTest < Test::Unit::TestCase
-  def setup; reset_gravatarify! end
-  
-  context "#gravatarify" do
-    should "add support for #gravatar_url to POROs (plain old ruby objects, yeah POJO sounds better!)" do
-      poro = Class.new(PoroUser) { gravatarify }
-      mike_shiva = poro.new(:email => 'mike@shiva.ch')
-      assert_equal "http://0.gravatar.com/avatar/1b2818d77eadd6c9dbbe7f3beb1492c3.jpg", mike_shiva.gravatar_url
-      assert_equal "https://secure.gravatar.com/avatar/1b2818d77eadd6c9dbbe7f3beb1492c3.jpg", mike_shiva.gravatar_url(:secure => true)
-      assert_equal "http://0.gravatar.com/avatar/1b2818d77eadd6c9dbbe7f3beb1492c3.gif?r=x&s=16", mike_shiva.gravatar_url(:filetype => :gif, :rating => :x, :size => 16)
-    end
-    
-    should "allow some default options to be passed, which can be overriden locally, though" do
-      poro = Class.new(PoroUser) { gravatarify :secure => true, :filetype => :gif }
-      mike_shiva = poro.new(:email => 'mike@shiva.ch')
-      assert_equal "https://secure.gravatar.com/avatar/1b2818d77eadd6c9dbbe7f3beb1492c3.gif", mike_shiva.gravatar_url
-      assert_equal "http://0.gravatar.com/avatar/1b2818d77eadd6c9dbbe7f3beb1492c3.gif", mike_shiva.gravatar_url(:secure => false)
-      assert_equal "https://secure.gravatar.com/avatar/1b2818d77eadd6c9dbbe7f3beb1492c3.jpg?r=x&s=16", mike_shiva.gravatar_url(:filetype => :jpg, :rating => :x, :size => 16)      
-    end
-    
-    should "still respect options set by Gravatarify#options" do
-      Gravatarify.options[:size] = 20
-      poro = Class.new(PoroUser) { gravatarify }      
-      assert_equal "http://0.gravatar.com/avatar/1b2818d77eadd6c9dbbe7f3beb1492c3.jpg?s=20", poro.new(:email => 'mike@shiva.ch').gravatar_url
-    end
-    
-    should "be able to override options set by Gravatarify#options" do
-      Gravatarify.options[:size] = 20
-      poro = Class.new(PoroUser) { gravatarify :size => 25 }
-      assert_equal "http://0.gravatar.com/avatar/1b2818d77eadd6c9dbbe7f3beb1492c3.jpg?s=25", poro.new(:email => 'mike@shiva.ch').gravatar_url
-    end    
-  end
-  
-  context "#gravatarify with custom fields" do
-    should "detect and use the 'email' field automatically" do
-      poro = Class.new(PoroUser) { gravatarify }
-      assert_equal "http://0.gravatar.com/avatar/1b2818d77eadd6c9dbbe7f3beb1492c3.jpg", poro.new(:email => 'mike@shiva.ch').gravatar_url
-    end
-    
-    should "fallback to 'mail' if 'email' is not defined" do
-      poro = Class.new(PoroUser) do
-        gravatarify
-        undef :email, :email=
-        attr_accessor :mail
-      end
-      assert_equal "http://0.gravatar.com/avatar/1b2818d77eadd6c9dbbe7f3beb1492c3.jpg", poro.new(:mail => 'mike@shiva.ch').gravatar_url      
-    end
-    
-    should "raise NoMethodError if object does not respond to source" do
-      poro = Class.new do
-        include Gravatarify::ObjectSupport
-        gravatarify
-      end
-      assert_raise(NoMethodError) { poro.new.gravatar_url }
-    end
-    
-    should "allow to set custom source, like author_email" do
-      poro = Class.new(PoroUser) do
-        gravatarify :author_email
-        attr_accessor :author_email
-      end
-      assert_equal "http://0.gravatar.com/avatar/1b2818d77eadd6c9dbbe7f3beb1492c3.jpg", poro.new(:author_email => 'mike@shiva.ch').gravatar_url      
-    end
-    
-    should "allow multiple sources to be defined, yet still handle options!" do
-      poro = Class.new(PoroUser) do
-        gravatarify :email, :employee_email, :default => Proc.new { |*args| "http://initech.com/avatar-#{args.first[:size] || 80}.jpg" }
-        attr_accessor :employee_email
-      end
-      peter_gibbons = poro.new(:email => 'info@initech.com', :employee_email => 'peter.gibbons@initech.com')
-      assert_equal "http://2.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg?d=http%3A%2F%2Finitech.com%2Favatar-20.jpg&s=20", peter_gibbons.gravatar_url(:size => 20)
-      assert_equal "http://0.gravatar.com/avatar/cb7865556d41a3d800ae7dbb31d51d54.jpg?d=http%3A%2F%2Finitech.com%2Favatar-25.jpg&s=25", peter_gibbons.employee_gravatar_url(:size => 25)
-    end
-    
-    should "use full prefix, if not suffixed by email" do
-      poro = Class.new(PoroUser) do
-        gravatarify :email, :employee_login
-        attr_accessor :employee_login
-      end
-      peter_gibbons = poro.new(:email => 'peter.gibbons@initech.com', :employee_login => 'peter.gibbons@initech.com')
-      assert_respond_to peter_gibbons, :employee_login_gravatar_url
-      assert_equal "http://0.gravatar.com/avatar/cb7865556d41a3d800ae7dbb31d51d54.jpg?s=25", peter_gibbons.employee_login_gravatar_url(:size => 25)      
-    end
-    
-    should "pass in object as second parameter, not supplied string" do
-      poro = Class.new(PoroUser) do
-        gravatarify :default => Proc.new { |opts, obj| "http://initech.com/avatar#{obj.respond_to?(:gender) && obj.gender == :female ? '_girl' : ''}.jpg" }
-      end
-      peter_gibbons = poro.new(:email => 'peter.gibbons@initech.com', :gender => :male)
-      jane = poro.new(:email => 'jane@initech.com', :gender => :female)
-      assert_equal "http://0.gravatar.com/avatar/cb7865556d41a3d800ae7dbb31d51d54.jpg?d=http%3A%2F%2Finitech.com%2Favatar.jpg&s=25", peter_gibbons.gravatar_url(:s => 25)
-      assert_equal "http://1.gravatar.com/avatar/9b78f3f45cf32d7c52d304a63f6aef06.jpg?d=http%3A%2F%2Finitech.com%2Favatar_girl.jpg&s=35", jane.gravatar_url(:s => 35)
-    end
-  end
-end