gravatar-ultimate 1.0.3 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 39e02de9e566df68c95997a4b50dfedf40c4c2c7
+  data.tar.gz: cecdf8f73ad1f5bc3d8091b9c345ae921dd7789f
+SHA512:
+  metadata.gz: 16fb4076d360969187a1a6105523c50f6291dab536bf8a5c588b10cb375e167060d78d002d371c5655a635af2cd0962eead3c43ae0f129c17e7354b02204ecfa
+  data.tar.gz: cf58afdc5590a06dc756b7b8c9f39b766d25ff0fae4de85110c72021ca1feae3a0c63ff755216c7a570c6b0ab1154155307ca5caeb6d5a77744819238a25bc10

data/.travis.yml

@@ -1,16 +1,20 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby
-  - rbx-18mode
-  - ree
   - ruby-head
 
 gemfile:
   - Gemfile
-  - gemfiles/rails-2.3.14
-  - gemfiles/rails-3.1.3
+  - gemfiles/rails-3.1
+  - gemfiles/rails-3.2
+  - gemfiles/rails-4.0
 
 env:
   - DEBUG=1
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby
+    - rvm: 1.9.3

data/Gemfile.lock

@@ -1,33 +1,64 @@
 PATH
   remote: .
   specs:
-    gravatar-ultimate (1.0.3)
+    gravatar-ultimate (2.0.0)
+      activesupport (>= 2.3.14)
+      rack
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (2.3.14)
-    diff-lcs (1.1.3)
+    activesupport (4.0.1)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    atomic (1.1.14)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
+    diff-lcs (1.2.4)
     fakeweb (1.3.0)
-    i18n (0.6.0)
-    json (1.6.1)
+    i18n (0.6.5)
+    json (1.8.1)
+    mime-types (2.0)
+    minitest (4.7.5)
+    multi_json (1.8.2)
+    rack (1.5.2)
     rake (0.9.2.2)
-    rdoc (3.11)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
+    tins (0.12.0)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 2.3.14)
+  coveralls
   fakeweb (>= 1.2.8)
   gravatar-ultimate!
   i18n (~> 0.6.0)

data/README.rdoc

@@ -1,4 +1,4 @@
-= gravatar-ultimate {<img src="https://secure.travis-ci.org/sinisterchipmunk/gravatar.png" />}[http://travis-ci.org/sinisterchipmunk/gravatar]
+= gravatar-ultimate {<img src="https://secure.travis-ci.org/sinisterchipmunk/gravatar.png" />}[http://travis-ci.org/sinisterchipmunk/gravatar] {<img src="https://codeclimate.com/github/sinisterchipmunk/gravatar.png" />}[https://codeclimate.com/github/sinisterchipmunk/gravatar] {<img src="https://coveralls.io/repos/sinisterchipmunk/gravatar/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/sinisterchipmunk/gravatar]
 
 The Ultimate Gravatar Gem!
 
@@ -6,35 +6,22 @@ This gem is used to interface with the entire Gravatar API: it's not just for ge
 
 == Installation
 
-gem install gravatar-ultimate
+Only Ruby 2.0 is officially supported. Rails itself is optional, but if used,
+only versions 3.1, 3.2, and 4.0+ are supported. For older versions of Ruby
+and/or Rails, see v1.x of this gem.
 
-== Activate the gem...
+In your Gemfile:
 
-As with any gem, you have to type a few lines to tell Ruby to actually *use* it. Here's how to do that...
-
-==== ...in Ruby on Rails (v3.x)
-
-* Edit your Gemfile
-* Add this line:
-  gem 'gravatar-ultimate'
-
-==== ...in Ruby on Rails (v2.x)
-
-* Edit your config/environment.rb file
-* Add this line beneath "Rails::Initializer.run do |config|":
-   config.gem 'gravatar-ultimate'
-
-==== ...in vanilla Ruby
-
-  require 'rubygems'
   gem 'gravatar-ultimate'
-  require 'gravatar-ultimate'
 
 == Usage
+
 Using the gem is actually pretty simple. Let's say you want the Gravatar image URL for "generic@example.com":
+
   url = Gravatar.new("generic@example.com").image_url
 
 Cool, huh? Let's take it a step further and grab the actual image *data* so that we can render it on the screen:
+
   data = Gravatar.new("generic@example.com").image_data
 
 Fine, but how about the rest of the API as advertised at http://en.gravatar.com/site/implement/xmlrpc? Well, for

data/environments/rails-3.1/config/environments/development.rb

@@ -7,7 +7,8 @@ Rails31::Application.configure do
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  config.whiny_nils = true if Rails::VERSION::MAJOR < 4
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/gemfiles/{rails-3.1.3 → rails-3.1}

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 gemspec :path => '..'
 
-gem 'rails', '= 3.1.3'
+gem 'rails', '~> 3.1'
 gem 'jruby-openssl', :platforms => :jruby

data/gemfiles/{rails-2.3.14 → rails-3.2}

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 gemspec :path => '..'
 
-gem 'rails', '= 2.3.14'
+gem 'rails', '~> 3.2'
 gem 'jruby-openssl', :platforms => :jruby

data/gemfiles/rails-4.0

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+gemspec :path => '..'
+
+gem 'rails', '~> 4.0'
+gem 'jruby-openssl', :platforms => :jruby

data/gemfiles/rails-4.0.lock

@@ -0,0 +1,123 @@
+PATH
+  remote: ..
+  specs:
+    gravatar-ultimate (2.0.0)
+      activesupport (>= 2.3.14)
+      rack
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.0.1)
+      actionpack (= 4.0.1)
+      mail (~> 2.5.4)
+    actionpack (4.0.1)
+      activesupport (= 4.0.1)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.1)
+      activesupport (= 4.0.1)
+      builder (~> 3.1.0)
+    activerecord (4.0.1)
+      activemodel (= 4.0.1)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.1)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.1)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.1)
+    atomic (1.1.14)
+    builder (3.1.4)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
+    diff-lcs (1.2.4)
+    erubis (2.7.0)
+    fakeweb (1.3.0)
+    hike (1.2.3)
+    i18n (0.6.5)
+    json (1.8.1)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25)
+    minitest (4.7.5)
+    multi_json (1.8.2)
+    polyglot (0.3.3)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.1)
+      actionmailer (= 4.0.1)
+      actionpack (= 4.0.1)
+      activerecord (= 4.0.1)
+      activesupport (= 4.0.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.1)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.1)
+      actionpack (= 4.0.1)
+      activesupport (= 4.0.1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (0.9.2.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sprockets (2.10.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
+    tilt (1.4.1)
+    tins (0.12.0)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.38)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  coveralls
+  fakeweb (>= 1.2.8)
+  gravatar-ultimate!
+  i18n (~> 0.6.0)
+  jruby-openssl
+  rails (~> 4.0)
+  rake (~> 0.9.2.2)
+  rdoc (~> 3.11)
+  rspec (>= 1.3.0)

data/gravatar-ultimate.gemspec

@@ -26,12 +26,14 @@ rather than just a URL to that data. This saves you the extra step of having to
   s.summary = %q{A gem for interfacing with the entire Gravatar API: not just images, but the XML-RPC API too!}
   s.test_files = `git ls-files -- spec/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n")
+  
+  s.add_dependency('activesupport', '>= 2.3.14')
+  s.add_dependency('rack')
 
-  # s.add_runtime_dependency('sc-core-ext', ">= 1.2.0")
   s.add_development_dependency('rspec', ">= 1.3.0")
   s.add_development_dependency('fakeweb', ">= 1.2.8")
-  s.add_development_dependency('activesupport', '>= 2.3.14')
   s.add_development_dependency('i18n', '~> 0.6.0')
   s.add_development_dependency('rake', '~> 0.9.2.2')
   s.add_development_dependency('rdoc', '~> 3.11')
+  s.add_development_dependency('coveralls')
 end

data/lib/gravatar.rb

@@ -18,7 +18,7 @@ require File.expand_path("../gravatar/cache", __FILE__)
 class Gravatar
   API_METHODS = [
     :exists?, :addresses, :user_images, :save_data!, :save_image!, :save_url!, :use_image!, :use_user_image!,
-    :remove_image!, :delete_user_image!, :test, :image_url, :image_data
+    :remove_image!, :delete_user_image!, :test, :image_url, :image_data, :signup_url
   ]
   autoload :TestCase, File.expand_path('gravatar/test_case', File.dirname(__FILE__))
   
@@ -207,6 +207,15 @@ class Gravatar
     "#{proto}://#{sub}.gravatar.com/avatar/#{email_hash}#{extension_for_image(options)}#{query_for_image(options)}"
   end
 
+  # Returns the URL for Gravatar's signup form, with the user's email pre-filled. Options include:
+  #
+  #   :locale                if non-nil, wil be used to prefix the URL. Example: :en
+  def signup_url(options = {})
+    locale_prefix = options[:locale] ? "#{options[:locale]}." : ''
+
+    "https://#{locale_prefix}gravatar.com/site/signup/#{CGI.escape(email)}"
+  end
+
   # Returns the image data for this user's gravatar image. This is the same as reading the data at #image_url. See
   # that method for more information.
   #

data/lib/gravatar/version.rb

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

data/spec/lib/gravatar/cache_spec.rb

@@ -61,7 +61,7 @@ describe Gravatar::Cache do
         before(:each) { subject.logger = StringIO.new("") }
         
         it "should recover" do
-          proc { subject.call(:nothing) { raise "something bad happened" } }.should_not raise_error(RuntimeError)
+          proc { subject.call(:nothing) { raise "something bad happened" } }.should_not raise_error
         end
 
         it "should return the cached copy" do
@@ -72,19 +72,19 @@ describe Gravatar::Cache do
           before(:each) { subject.logger = Object.new }
 
           it "should log it if #error is available" do
-            subject.logger.stub!(:error => nil)
+            subject.logger.stub(:error => nil)
             subject.logger.should_receive(:error).and_return(nil)
             subject.call(:nothing) { raise "something bad happened" }
           end
 
           it "should log it if #write is available" do
-            subject.logger.stub!(:write => nil)
+            subject.logger.stub(:write => nil)
             subject.logger.should_receive(:write).and_return(nil)
             subject.call(:nothing) { raise "something bad happened" }
           end
 
           it "should re-raise the error if no other methods are available" do
-            proc { subject.call(:nothing) { raise "something bad happened" } }.should raise_error(RuntimeError)
+            proc { subject.call(:nothing) { raise "something bad happened" } }.should raise_error
           end
         end
 

data/spec/lib/gravatar_spec.rb

@@ -105,7 +105,7 @@ describe Gravatar do
     before { grav $credentials[:email] }
     
     it "should not raise an error" do
-      proc { grav }.should_not raise_error(ArgumentError)
+      proc { grav }.should_not raise_error
     end
 
     it "should return email_hash" do
@@ -173,5 +173,13 @@ describe Gravatar do
       )
       combinations.should include(image_url(:ssl => true, :default => "identicon", :size => 80, :rating => :g))
     end
+    
+    it "should return gravatar signup_url" do
+      signup_url.should == "https://gravatar.com/site/signup/gravatartest123%40gmail.com"
+    end
+
+    it "should return gravatar signup_url with locale" do
+      signup_url(:locale => :en).should == "https://en.gravatar.com/site/signup/gravatartest123%40gmail.com"      
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 require 'bundler'
 Bundler.setup
 
+require 'coveralls'
+Coveralls.wear!
+
 require File.expand_path('../environments/rails', File.dirname(__FILE__))
 require File.expand_path("../../lib/gravatar", __FILE__)
 require 'rspec'
@@ -11,9 +14,19 @@ def mock_image_data
 end
 
 require 'fakeweb'
-FakeWeb.allow_net_connect = false
-FakeWeb.register_uri(:get, "http://www.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98", :response =>
-        "HTTP/1.1 200 OK\nContent-Type: image/jpg\n\n" +mock_image_data)
+
+RSpec.configure do |config|
+  config.before do
+    FakeWeb.allow_net_connect = false
+    FakeWeb.register_uri(:get, "http://www.gravatar.com/avatar/ef23bdc1f1fb9e3f46843a00e5832d98", :response =>
+            "HTTP/1.1 200 OK\nContent-Type: image/jpg\n\n" +mock_image_data)
+  end
+
+  config.after do
+    FakeWeb.allow_net_connect = true
+  end
+end
+
 
 def new_cache
   ActiveSupport::Cache::MemoryStore.new