gravatar_image_tag 1.0.0 → 1.1.0

data/README.textile

@@ -60,9 +60,9 @@ p. *Splat* the default gravatar image !http://www.gravatar.com/avatar/0c821f675f
 
 p. You can set the default gravatar image inline as follows:
 
-<pre>gravatar_image_tag('junk', :alt => 'Github Default Gravatar', :gravatar => { :default => 'http://github.com/images/gravatars/gravatar-80.png' })</pre>
+<pre>gravatar_image_tag('junk', :alt => 'Github Default Gravatar', :gravatar => { :default => 'https://assets.github.com/images/gravatars/gravatar-140.png' })</pre>
 
-p. *Ka-Pow* !http://www.gravatar.com/avatar/0c821f675f132d790b3f25e79da739a7?default=http%3A%2F%2Fgithub.com%2Fimages%2Fgravatars%2Fgravatar-80.png(Github Default Gravatar)!
+p. *Ka-Pow* !https://assets.github.com/images/gravatars/gravatar-140.png(Github Default Gravatar)!
 
 p. Other options supported besides an image url to fall back on include the following:
 
@@ -103,6 +103,6 @@ p. You can set the gravatar filetype inline as follows:
 
 h2. Credits
 
-The ideas an methods for this plugin are from expanding upon my original blog post "Adding Gravatar To Your Website Or Blog (Gravatar Rails)":http://mdeering.com/posts/005-adding-gravitar-to-your-website-or-blog
+The ideas and methods for this plugin are from expanding upon my original blog post "Adding Gravatar To Your Website Or Blog (Gravatar Rails)":http://mdeering.com/posts/005-adding-gravitar-to-your-website-or-blog
 
 Copyright (c) 2009-2010 "Michael Deering(Ruby on Rails Development Edmonton)":http://mdeering.com, released under the MIT license

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rake'
-require 'rake/rdoctask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 begin
   AUTHOR   = "Michael Deering"
@@ -28,23 +27,11 @@ desc 'Default: spec tests.'
 task :default => :spec
 
 desc 'Test the gravatar_image_tag gem.'
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ["-c"]
+RSpec::Core::RakeTask.new do |t|
 end
 
 desc "Run all examples with RCov"
-Spec::Rake::SpecTask.new('examples_with_rcov') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new(:coverage) do |t|
   t.rcov = true
   t.rcov_opts = ['--exclude', '/opt,spec,Library']
 end
-
-desc 'Generate documentation for the gravatar_image_tag plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'GravatarImageTag'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.textile')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/gravatar_image_tag.rb

@@ -13,8 +13,13 @@ module GravatarImageTag
   end
 
   class Configuration
-     attr_accessor :default_image, :filetype, :rating, :size, :secure
-   end
+     attr_accessor :default_image, :filetype, :include_size_attributes, :rating, :size, :secure
+
+     def initialize
+        @include_size_attributes = true
+     end
+
+  end
 
   def self.included(base)
     GravatarImageTag.configure { |c| nil }
@@ -58,27 +63,32 @@ module GravatarImageTag
   module InstanceMethods
 
     def gravatar_image_tag(email, options = {})
-      options[:src] = GravatarImageTag::gravatar_url( email, options.delete( :gravatar ) )
+      gravatar_overrides = options.delete(:gravatar)
+      options[:src] = GravatarImageTag::gravatar_url(email, gravatar_overrides)
       options[:alt] ||= 'Gravatar'
+      options[:height] = options[:width] = "#{GravatarImageTag::gravatar_options(gravatar_overrides)[:size]}px" if GravatarImageTag.configuration.include_size_attributes
       tag 'img', options, false, false # Patch submitted to rails to allow image_tag here https://rails.lighthouseapp.com/projects/8994/tickets/2878-image_tag-doesnt-allow-escape-false-option-anymore
     end
 
   end
 
   def self.gravatar_url(email, overrides = {})
-    overrides ||= {}
-    gravatar_params = {
-      :default     => GravatarImageTag.configuration.default_image,
-      :filetype    => GravatarImageTag.configuration.filetype,
-      :rating      => GravatarImageTag.configuration.rating,
-      :secure      => GravatarImageTag.configuration.secure,
-      :size        => GravatarImageTag.configuration.size
-    }.merge(overrides).delete_if { |key, value| value.nil? }
+    gravatar_params = gravatar_options(overrides || {})
     "#{gravatar_url_base(gravatar_params.delete(:secure))}/#{gravatar_id(email, gravatar_params.delete(:filetype))}#{url_params(gravatar_params)}"
   end
 
   private
 
+    def self.gravatar_options(overrides = {})
+      {
+        :default     => GravatarImageTag.configuration.default_image,
+        :filetype    => GravatarImageTag.configuration.filetype,
+        :rating      => GravatarImageTag.configuration.rating,
+        :secure      => GravatarImageTag.configuration.secure,
+        :size        => GravatarImageTag.configuration.size
+      }.merge(overrides || {}).delete_if { |key, value| value.nil? }
+    end
+
     def self.gravatar_url_base(secure = false)
       'http' + (!!secure ? 's://secure.' : '://') + 'gravatar.com/avatar'
     end

data/spec/gravatar_image_tag_spec.rb

@@ -75,8 +75,19 @@ describe GravatarImageTag do
     (!!view.gravatar_image_tag(email, { :gravatar => { :secure => true } }).match(/src="https:\/\/secure.gravatar.com\/avatar\//)).should be_true
   end
 
+  it 'should set the image tags height and width to avoid the page going all jiggy (technical term) when loading a page with lots of Gravatars' do
+    (!!view.gravatar_image_tag(email).match(/height="50px"/)).should be_true
+    (!!view.gravatar_image_tag(email).match(/width="50px"/)).should  be_true
+  end
+
+  it 'should not include the height and width attributes on the image tag if it is turned off in the configuration' do
+    GravatarImageTag.configure { |c| c.include_size_attributes = false }
+    (!!view.gravatar_image_tag(email).match(/height=/)).should be_false
+    (!!view.gravatar_image_tag(email).match(/width=/)).should  be_false
+  end
+
   it 'GravatarImageTag#gravitar_id should not error out when email is nil' do
-    lambda { GravatarImageTag::gravatar_id(nil) }.should_not  raise_error(TypeError)
+    lambda { GravatarImageTag::gravatar_id(nil) }.should_not raise_error(TypeError)
   end
 
 end

data/spec/test_helper.rb

@@ -1,11 +1,11 @@
 require 'rubygems'
-require 'spec'
+#require 'spec'
 require 'active_support'
 require 'action_view'
 require 'digest/md5'
 require 'uri'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')

metadata

@@ -1,73 +1,118 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gravatar_image_tag
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Michael Deering
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-16 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
+date: 2012-04-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70174494367000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70174494367000
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70174494366520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70174494366520
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70174494366040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70174494366040
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70174494365460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70174494365460
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70174494364980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70174494364980
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70174494364400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70174494364400
 description: 
 email: mdeering@mdeering.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - MIT-LICENSE
 - README.textile
 - Rakefile
 - lib/gravatar_image_tag.rb
 - spec/gravatar_image_tag_spec.rb
 - spec/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/mdeering/gravatar_image_tag
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A configurable and documented Rails view helper for adding gravatars into your Rails application.
-test_files: 
-- spec/gravatar_image_tag_spec.rb
-- spec/test_helper.rb
+summary: A configurable and documented Rails view helper for adding gravatars into
+  your Rails application.
+test_files: []