jro_apps/redmine Commit - r2727:560e915c50e8

Upgraded the gravatar plugin from http://github.com/woods/gravatar-plugin...

Eric Davis -

r2727:560e915c50e8

parent child

Context file:

r2727:560e915c50e8

Collapse all files

vendor/plugins/gravatar/.gitignore created 644 +1 0

	@@ -0,0 +1,1
				1	coverage

vendor/plugins/gravatar/README.rdoc ~~vendor/plugins/gravatar/README~~ renamed +6 -3

             == Installation
               cd ~/myapp
-              ruby script/plugin install svn://rubyforge.org//var/svn/gravatarplugin/plugins/gravatar
+              ruby script/plugin install git://github.com/woods/gravatar-plugin.git
             or, if you're using piston[http://piston.rubyforge.org] (worth it!):
               cd ~/myapp/vendor/plugins
-              piston import svn://rubyforge.org//var/svn/gravatarplugin/plugins/gravatar
+              piston import git://github.com/woods/gravatar-plugin.git
             == Example
             == Acknowledgments
+            Thanks to Magnus Bergmark (http://github.com/Mange), who contributed the SSL
+            support in this plugin, as well as a few minor fixes.
             The following people have also written gravatar-related Ruby libraries:
             * Seth Rasmussen created the gravatar gem[http://gravatar.rubyforge.org]
             * Matt McCray has also created a gravatar
             == TODO
-            * Get full spec coverage
+            * Add specs for ssl support
             * Finish rdoc documentation

vendor/plugins/gravatar/Rakefile 0 -1

             desc 'Run all application-specific specs'
             Spec::Rake::SpecTask.new(:spec) do |t|
-              t.warning = true
               t.rcov = true
             end

vendor/plugins/gravatar/about.yml +2 -2

             author: Scott Woods, West Arete Computing
             summary: View helpers for displaying gravatars.
-            homepage: http://gravatarplugin.rubyforge.org/
+            homepage: http://github.com/woods/gravatar-plugin/
-            plugin: svn://rubyforge.org//var/svn/gravatarplugin/plugins/gravatar
+            plugin: git://github.com/woods/gravatar-plugin.git
             license: MIT
             version: 0.1
             rails_version: 1.0+

vendor/plugins/gravatar/lib/gravatar.rb +22 -4

                 # exclude gravatars that may be out of character for your site.
                 :rating => 'PG',
-                # The alt text to use in the img tag for the gravatar.
+                # The alt text to use in the img tag for the gravatar.  Since it's a
-                :alt => 'avatar',
+                # decorational picture, the alt text should be empty according to the
+                # XHTML specs.
+                :alt => '',
                 # The class to assign to the img tag for the gravatar.
                 :class => 'gravatar',
+                # Whether or not to display the gravatars using HTTPS instead of HTTP
+                :ssl => false,
               }
               # The methods that will be made available to your views.
                   [:class, :alt, :size].each { |opt| options[opt] = h(options[opt]) }
                   "<img class=\"#{options[:class]}\" alt=\"#{options[:alt]}\" width=\"#{options[:size]}\" height=\"#{options[:size]}\" src=\"#{src}\" />"
                 end
+                # Returns the base Gravatar URL for the given email hash. If ssl evaluates to true,
+                # a secure URL will be used instead. This is required when the gravatar is to be
+                # displayed on a HTTPS site.
+                def gravatar_api_url(hash, ssl=false)
+                  if ssl
+                    "https://secure.gravatar.com/avatar/#{hash}"
+                  else
+                    "http://www.gravatar.com/avatar/#{hash}"
+                  end
+                end
                 # Return the gravatar URL for the given email address.
                 def gravatar_url(email, options={})
                   email_hash = Digest::MD5.hexdigest(email)
                   options = DEFAULT_OPTIONS.merge(options)
                   options[:default] = CGI::escape(options[:default]) unless options[:default].nil?
-                  returning "http://www.gravatar.com/avatar.php?gravatar_id=#{email_hash}" do |url|
+                  returning gravatar_api_url(email_hash, options.delete(:ssl)) do |url|
+                    opts = []
                     [:rating, :size, :default].each do |opt|
                       unless options[opt].nil?
                         value = h(options[opt])
-                        url << "&#{opt}=#{value}"
+                        opts << [opt, value].join('=')
                       end
                     end
+                    url << "?#{opts.join('&')}" unless opts.empty?
                   end
                 end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages