acts_as_gravatar 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68830b45a0b35c111dab7a359891b2c227bc10e3
-  data.tar.gz: 3d2a2e37f8c94643c91420b41499e85bad172b3e
+  metadata.gz: 6b4c47913dc7fd944b2281cdbe9b0e92e5710880
+  data.tar.gz: 7975c899b60d71446d296d43086ad9737643d363
 SHA512:
-  metadata.gz: e3b677b38969122b14d93cb473b01734311df60d25ee3af992383e9e501dc11d0f7443692705e777e5e45d1a3bd89ad31562569d18e6d6f886adde44fd8084c4
-  data.tar.gz: 2251ab7811b9f3f0a55653b545bd5036117dd4def7f817ca3a0ab5cb1a149cccc26d9a471289cf0d4608ce3381588dc969d68d1adf081e982d77dc41c4d6e4a5
+  metadata.gz: d1b49ae702b606d6d365fb73476efccf76e55cbc44e6e132d4f78f579ca1320d668d758dedbfb1961b04fa700a74911ead2bb9eb949c2850eae1e4d92ea79203
+  data.tar.gz: 8c293369b5ef13fa5644a6099a956f79d2c5eefcbaaec201d9a61f567bc7edf47370e866453766bdf0a06757419abc8646e07de7ac5d1f72acfd4a64038f00e2

data/README.md

@@ -1,6 +1,7 @@
-# ActsAsGravatar
+# acts_as_gravatar
 
 acts\_as\_gravatar provide simple access to gravatar from ActiveRecord.
+From the email columns (can set it optionally) such as devices, acts_as_gravatar generate a URL of gravatar.
 
 ## Installation
 
@@ -33,49 +34,47 @@ The next method becomes to be usable.
 user = User.find(1); #
 
 # get html tag of gravatar.
-user.gravatar_tag
+user.gravatar_profile  # URL of gravatar profile.
 
 # get url of gravatar. 
-user.gravatar_url
+user.gravatar_image     # URL of gravatar image.
 
 ```
 acts\_as\_gravatar read `email` column.(default)
 
 ### Options
 when call acts\_as\_gravatar, can set default values.
-
+(The option not to appoint at the time of acts_as_gravatar summons becomes the default of gravatar.)
 ```
 class User < ActiveRecord::Base
   acts_as_gravatar({
-    :column        => :email                            # set email column.
-    :secure        => false                             # default protocol. (https).
-    :size          => 80                                # default image size.
-    :default_image => nil                               # default default_image.
-    :rating        => ActsAsGravatar::Enums::Rating     # default rating.
-    :image_type    => ActsAsGravatar::Enums::ImageType  # default image_type.
+    :column        => :email,                                # email column of Model.
+    :default_image => nil,                                   # default_image.(URL or gravatar default image param.)
+    :force_default => false,                                 # force the default image.
+    :image_type    => ActsAsGravatar::Enums::ImageType::PNG, # image_type. (JPG/JPEG/GIF/PNG)
+    :rating        => ActsAsGravatar::Enums::Rating::PG,     # rating. (G/PG/R/X)
+    :secure        => false,                                 # secure protocol. (https).
+    :size          => 80,                                    # image size.
   })
 end
 ```
 
-And can set options, when call `gravatar_tag` or `gravatar_url`.
+And can set options, when call `gravatar_image` or `gravatar_profile`.
 
 ```
 user = User.find(1); #
 
 # get url of gravatar.
-user.gravatar_url :secure => true, :size => 200
-
-```
+user.gravatar_image :secure => true, :size => 200
 
-gravatar_tag can set some html attributes.
-
-```
-user = User.find(1); #
 
 # get tag of gravatar.
-user.gravatar_tag {:secure => true, :size => 200}, {:width => "200px"}
+user.gravatar_tag :column => :other_column
 ```
 
+## API DOCUMENT
+
+* [acts_as_gravatar](http://rubydoc.info/github/alfa-jpn/acts_as_gravatar/frames)
 
 ## Contributing
 

data/lib/acts_as_gravatar.rb

@@ -8,17 +8,18 @@ module ActsAsGravatar
     # Use acts_as_gravatar in model.
     #
     # @example
-    #   acts_as_gravatar {
-    #     :column        => :email                            # email column.
-    #     :secure        => false                             # default protocol. (https).
-    #     :size          => 80                                # default image size.
-    #     :default_image => nil                               # default default_image.
-    #     :rating        => ActsAsGravatar::Enums::Rating     # default rating.
-    #     :image_type    => ActsAsGravatar::Enums::ImageType  # default image_type.
-    #   }
+    #   acts_as_gravatar({
+    #     :column        => :email,                                # email column of Model.
+    #     :default_image => nil,                                   # default_image.(URL or gravatar default image param.)
+    #     :force_default => false,                                 # force the default image.
+    #     :image_type    => ActsAsGravatar::Enums::ImageType::PNG, # image_type. (JPG/JPEG/GIF/PNG)
+    #     :rating        => ActsAsGravatar::Enums::Rating::PG,     # rating. (G/PG/R/X)
+    #     :secure        => false,                                 # secure protocol. (https).
+    #     :size          => 80,                                    # image size.
+    #   })
     #
-    # @params params [Hash] Options of ActsAsGravatar.
-    def acts_as_gravatar(params = {})
+    # @params default_options [Hash] Default options of ActsAsGravatar.
+    def acts_as_gravatar(default_options = {})
       options = {
         :column        => :email,
         :secure        => false,
@@ -26,10 +27,10 @@ module ActsAsGravatar
         :default_image => nil,
         :rating        => nil,
         :image_type    => nil
-      }.merge(params)
+      }.merge(default_options)
 
       include ActsAsGravatar::Methods
-      instance_variable_set(:@acts_as_gravatar_params, options)
+      instance_variable_set(:@acts_as_gravatar_default_options, options)
     end
   end
 
@@ -45,57 +46,54 @@ module ActsAsGravatar
     #
     #   # with option.
     #   url = user.gravatar_url {
-    #     :secure        => false                             # default protocol. (https).
-    #     :size          => 80                                # default image size.
-    #     :default_image => nil                               # default default_image.
-    #     :rating        => ActsAsGravatar::Enums::Rating     # default rating.
-    #     :image_type    => ActsAsGravatar::Enums::ImageType  # default image_type.
+    #     :column        => :email,                                # email column of Model.
+    #     :default_image => nil,                                   # default_image.(URL or gravatar default image param.)
+    #     :force_default => false,                                 # force the default image.
+    #     :image_type    => ActsAsGravatar::Enums::ImageType::PNG, # image_type. (JPG/JPEG/GIF/PNG)
+    #     :rating        => ActsAsGravatar::Enums::Rating::PG,     # rating. (G/PG/R/X)
+    #     :secure        => false,                                 # secure protocol. (https).
+    #     :size          => 80,                                    # image size.
     #   }
     #
-    # @param options [Hash] Option of gravatar.
+    # @param options [Hash] Option of gravatar image.
     #
     # @return [String] Url of Gravatar image.
-    def gravatar_url(options={})
-      opt   = self.class.instance_variable_get(:@acts_as_gravatar_params).merge(options)
-      email = send(opt[:column])
+    def gravatar_image(options = {})
+      opts  = gravatar_option(options)
+      email = send(opts[:column])
 
-      ActsAsGravatar::Gravatar.generate_url(
-        email, opt[:secure], opt[:size], opt[:default_image], opt[:rating], opt[:image_type]
-      )
+      ActsAsGravatar::Gravatar.generate_image(email, opts)
     end
 
-    # Generate a tag of Gravatar image.
+    # Generate a URL of Gravatar profile.
     # @example
     #   user = User.find(1)
     #   # get url with default options.
-    #   tag = user.gravatar_tag
+    #   profile = user.gravatar_profile
     #
     #   # with option.
-    #   tag = user.gravatar_tag {
-    #     :secure        => false                             # default protocol. (https).
-    #     :size          => 80                                # default image size.
-    #     :default_image => nil                               # default default_image.
-    #     :rating        => ActsAsGravatar::Enums::Rating     # default rating.
-    #     :image_type    => ActsAsGravatar::Enums::ImageType  # default image_type.
-    #   }
-    #
-    #   # with attributes of tag.
-    #   tag = user.gravatar_tag {},{
-    #     width: "100px",
-    #     height: "100px"
+    #   profile = user.gravatar_profile {
+    #     :column        => :email
     #   }
     #
-    # @param options    [Hash] Option of gravatar.
-    # @param attributes [Hash] Attributes of tag.
+    # @param options    [Hash] Option of gravatar profile.
     #
     # @return [String] tag of Gravatar image.
-    def gravatar_tag(options={}, attributes={})
-      opt   = self.class.instance_variable_get(:@acts_as_gravatar_params).merge(options)
-      email = send(opt[:column])
+    def gravatar_profile(options = {})
+      opts  = gravatar_option(options)
+      email = send(opts[:column])
 
-      ActsAsGravatar::Gravatar.generate_tag(
-        email, opt[:secure], opt[:size], opt[:default_image], opt[:rating], opt[:image_type], attributes
-      )
+      ActsAsGravatar::Gravatar.generate_profile(email, opts)
+    end
+
+    private
+    # Get options of gravatar.
+    # @note return default options merge merge_options.
+    #
+    # @param merge_options [Hash] Options of gravatar.
+    # @return [Hash] Options of gravatar.
+    def gravatar_option(merge_options = {})
+      self.class.instance_variable_get(:@acts_as_gravatar_default_options).merge(merge_options)
     end
 
   end

data/lib/acts_as_gravatar/enums/image_type.rb

@@ -3,10 +3,10 @@ require 'inum'
 module ActsAsGravatar
   module Enums
     class ImageType < Inum::Base
-      define_enum :Jpg
-      define_enum :Jpeg
-      define_enum :Gif
-      define_enum :Png
+      define_enum :JPG
+      define_enum :JPEG
+      define_enum :GIF
+      define_enum :PNG
     end
   end
-end
+end

data/lib/acts_as_gravatar/enums/rating.rb

@@ -9,4 +9,4 @@ module ActsAsGravatar
       define_enum :X
     end
   end
-end
+end

data/lib/acts_as_gravatar/gravatar.rb

@@ -6,23 +6,30 @@ module ActsAsGravatar
 
   # This class provide some utils of gravatar.
   class Gravatar
-    URL='http://www.gravatar.com/avatar/'
-    URL_SSL='https://secure.gravatar.com/avatar/'
+    PROFILE_URL   = 'http://www.gravatar.com/'
+    IMAGE_URL     = 'http://www.gravatar.com/avatar/'
+    IMAGE_URL_SSL = 'https://secure.gravatar.com/avatar/'
+
 
     # Generate a URL of Gravatar image.
-    # @If use a default of gravatar(without email), set nil.
     #
-    # @param email          [String]  Email.
-    # @param secure         [Boolean] Use SSL?
-    # @param size           [Integer] Size of Icon.
-    # @param default_image  [String]  Url of default image.
-    # @param rating         [ActsAsGravatar::Enums::Rating] Rating of image.
-    # @param image_type     [ActsAsGravatar::Enums::ImageType] Type of image.
+    # @example
+    #   generate_image 'nyarukosan@nyaruko.com', {
+    #     :default_image => nil,                                   # default_image.(URL or gravatar default image param.)
+    #     :force_default => false,                                 # force the default image.
+    #     :image_type    => ActsAsGravatar::Enums::ImageType::PNG, # image_type. (JPG/JPEG/GIF/PNG)
+    #     :rating        => ActsAsGravatar::Enums::Rating::PG,     # rating. (G/PG/R/X)
+    #     :secure        => false,                                 # secure protocol. (https).
+    #     :size          => 80,                                    # image size.
+    #   }
+    #
+    # @param email    [String] Email.
+    # @param options  [Hash]   Options of gravatar.
     # 
     # @return [String] Url of Gravatar image.
-    def self.generate_url(email, secure=false, size=nil, default_image=nil, rating=nil, image_type=nil)
-      url = generate_base_url(email, secure, image_type)
-      opt = generate_options_url(size, default_image, rating)
+    def self.generate_image(email, options = {})
+      url = generate_image_base_url(email, options)
+      opt = generate_image_options(options)
 
       if opt
         "#{url}?#{opt}"
@@ -31,65 +38,53 @@ module ActsAsGravatar
       end
     end
 
-    # Generate a tag of Gravatar image.
-    # @If use a default of gravatar(without email), set nil.
+    # Generate a URL of Gravatar profile.
     #
-    # @param email          [String]  Email.
-    # @param secure         [Boolean] Use SSL?
-    # @param size           [Integer] Size of Icon.
-    # @param default_image  [String]  Url of default image.
-    # @param rating         [ActsAsGravatar::Enums::Rating] Rating of image.
-    # @param image_type     [ActsAsGravatar::Enums::ImageType] Type of image.
-    # @param option         [Hash] option of attribute.
+    # @example
+    #   generate_profile 'nyarukosan@nyaruko.com'
     #
-    # @return [String] Url of Gravatar image.
-    def self.generate_tag(email, secure=false, size=nil, default_image=nil, rating=nil, image_type=nil, option={})
-      attrs = []
-      image = generate_url(email, secure, size, default_image, rating, image_type)
-      option.each do |key, value|
-        attrs << "#{key}=\"#{value}\""
-      end
-
-      "<img src=\"#{image}\" #{attrs.join(' ')}>"
+    # @param email    [String] Email.
+    # @param options  [Hash]   Options of gravatar.(There are none now.)
+    #
+    # @return [String] Url of Gravatar profile.
+    def self.generate_profile(email, options = {})
+      generate_profile_base_url(email, options)
     end
 
     private
     # Generate a base url of Gravatar image.
     #
-    # @param email          [String]  Email.
-    # @param secure         [Boolean] Use SSL?
-    # @param image_type     [ActsAsGravatar::Enums::ImageType] Type of image.
+    # @param email    [String] Email.
+    # @param options  [Hash]   Options of gravatar image.
     #
     # @return [String] Url of Gravatar image.
-    def self.generate_base_url(email, secure, image_type)
+    def self.generate_image_base_url(email, options = {})
       url = []
 
-      if secure
-        url << URL_SSL
+      if options[:secure]
+        url << IMAGE_URL_SSL
       else
-        url << URL
+        url << IMAGE_URL
       end
 
       url << Digest::MD5.hexdigest(email.downcase)
-
-      url << ".#{image_type.to_u}" if image_type
+      url << ".#{options[:image_type].to_u}" if options[:image_type]
 
       url.join
     end
 
     # Generate a options of url.
     #
-    # @param size           [Integer] Size of Icon.
-    # @param default_image  [String]  Url of default image.
-    # @param rating         [ActsAsGravatar::Enums::Rating] Rating of image.
+    # @param options  [Hash]   Options of gravatar image.
     #
     # @return [String] Url of Gravatar image. or nil.
-    def self.generate_options_url(size=nil, default_image=nil, rating=nil)
+    def self.generate_image_options(options = {})
       opts = []
 
-      opts << "s=#{size}"                       if size
-      opts << "d=#{CGI.escape(default_image)}"  if default_image
-      opts << "r=#{rating.to_u}"                if rating
+      opts << "s=#{options[:size]}"                       if options[:size]
+      opts << "d=#{CGI.escape(options[:default_image])}"  if options[:default_image]
+      opts << "r=#{options[:rating].to_u}"                if options[:rating]
+      opts << 'f=y'                                       if options[:force_default]
 
       if opts.length < 1
         nil
@@ -97,5 +92,16 @@ module ActsAsGravatar
         opts.join('&')
       end
     end
+
+    # Generate a base url of Gravatar profile.
+    #
+    # @param email    [String] Email.
+    # @param options  [Hash]   Options of gravatar profile.
+    #
+    # @return [String] Url of Gravatar image.
+    def self.generate_profile_base_url(email, options = {})
+      "#{PROFILE_URL}#{Digest::MD5.hexdigest(email.downcase)}"
+    end
+
   end
 end

data/lib/acts_as_gravatar/version.rb

@@ -1,3 +1,3 @@
 module ActsAsGravatar
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/spec/acts_as_gravatar/gravatar_spec.rb

@@ -2,74 +2,98 @@ require 'spec_helper'
 
 describe ActsAsGravatar::Gravatar do
   before(:each) do
-    @params = [
-      'nyarukosan@nyaruko.com',
-      false,
-      200,
-      'http://nyaruko.com/',
-      ActsAsGravatar::Enums::Rating::PG,
-      ActsAsGravatar::Enums::ImageType::Jpg
-    ]
 
-    @email_md5    = Digest::MD5.hexdigest(@params[0])
-    @url_escaped  = CGI.escape(@params[3])
+    #   generate_url 'nyarukosan@nyaruko.com', {
+    #     :default_image => nil,                                   # default_image.(URL or gravatar default image param.)
+    #     :force_default => false,                                 # force the default image.
+    #     :image_type    => ActsAsGravatar::Enums::ImageType::PNG, # image_type. (JPG/JPEG/GIF/PNG)
+    #     :rating        => ActsAsGravatar::Enums::Rating::PG,     # rating. (G/PG/R/X)
+    #     :secure        => false,                                 # secure protocol. (https).
+    #     :size          => 80,                                    # image size.
+    #   }
 
-    @base_url     = "http://www.gravatar.com/avatar/"
-    @base_url_ssl = "https://secure.gravatar.com/avatar/"
+    @email     = 'nyaruratohotepu@nyaruko.com'
+    @email_md5 = Digest::MD5.hexdigest(@email)
+
+    @url       = 'http://nyaruko.com/'
+    @url_enc   = CGI.escape(@url)
+
+    @options = {
+      default_image: @url,
+      force_default: true,
+      image_type:    ActsAsGravatar::Enums::ImageType::JPG,
+      rating:        ActsAsGravatar::Enums::Rating::PG,
+      secure:        true,
+      size:          200
+    }
+
+    @profile_url   = 'http://www.gravatar.com/'
+    @image_url     = 'http://www.gravatar.com/avatar/'
+    @image_url_ssl = 'https://secure.gravatar.com/avatar/'
 
 
   end
 
 
-  it 'generate url.' do
-    url = ActsAsGravatar::Gravatar.generate_url(@params[0])
+  it 'generate_profile generate profile.' do
+    url = ActsAsGravatar::Gravatar.generate_profile(@email)
+    expect(url).to eq("#{@profile_url}#{@email_md5}")
+  end
 
-    expect(url).to eq("#{@base_url}#{@email_md5}")
+  it 'generate_profile generate collect profile with disable option.' do
+    url = ActsAsGravatar::Gravatar.generate_profile(@email, @options)
+    expect(url).to eq("#{@profile_url}#{@email_md5}")
   end
 
-  it 'generate ssl url.' do
-    url = ActsAsGravatar::Gravatar.generate_url(@params[0], true)
-    expect(url).to eq("#{@base_url_ssl}#{@email_md5}")
+  it 'generate_image generate url.' do
+    url = ActsAsGravatar::Gravatar.generate_image(@email)
+    expect(url).to eq("#{@image_url}#{@email_md5}")
   end
 
-  it 'generate url with a size option.' do
-    url = ActsAsGravatar::Gravatar.generate_url(*@params[0 .. 2])
-    expect(url).to eq("#{@base_url}#{@email_md5}?s=200")
+  it 'generate_image generate collect image with disable option.' do
+    url = ActsAsGravatar::Gravatar.generate_image(@email, aaaaaa: false, bbbbb: 'bbbbbb', null: nil)
+    expect(url).to eq("#{@image_url}#{@email_md5}")
   end
 
-  it 'generate url with a default_image option.' do
-    url = ActsAsGravatar::Gravatar.generate_url(@params[0], nil, nil, @params[3])
-    expect(url).to eq("#{@base_url}#{@email_md5}?d=#{@url_escaped}")
+  it 'generate_image generate url with a secure option.' do
+    url = ActsAsGravatar::Gravatar.generate_image(@email, secure: true)
+    expect(url).to eq("#{@image_url_ssl}#{@email_md5}")
   end
 
-  it 'generate url with a rating option.' do
-    url = ActsAsGravatar::Gravatar.generate_url(@params[0], nil, nil, nil, @params[4])
-    expect(url).to eq("#{@base_url}#{@email_md5}?r=pg")
+  it 'generate_image generate url with a size option.' do
+    url = ActsAsGravatar::Gravatar.generate_image(@email, size: 200)
+    expect(url).to eq("#{@image_url}#{@email_md5}?s=200")
   end
 
-  it 'generate url with a image_type option.' do
-    url = ActsAsGravatar::Gravatar.generate_url(@params[0], nil, nil, nil, nil, @params[5])
-    expect(url).to eq("#{@base_url}#{@email_md5}.jpg")
+  it 'generate_image generate url with a url defualt_image option.' do
+    url = ActsAsGravatar::Gravatar.generate_image(@email, default_image: @url)
+    expect(url).to eq("#{@image_url}#{@email_md5}?d=#{@url_enc}")
   end
 
-  it 'generate url with all options.' do
-    url = ActsAsGravatar::Gravatar.generate_url(*@params)
-    expect(url).to eq("#{@base_url}#{@email_md5}.jpg?s=200&d=#{@url_escaped}&r=pg")
+  it 'generate_image generate url with a keyword defualt_image option.' do
+    url = ActsAsGravatar::Gravatar.generate_image(@email, default_image: 'mm')
+    expect(url).to eq("#{@image_url}#{@email_md5}?d=mm")
   end
 
-  it 'generate tag.' do
-    tag = ActsAsGravatar::Gravatar.generate_tag(@params[0])
-    expect(tag).to eq("<img src=\"#{@base_url}#{@email_md5}\" >")
+  it 'generate_image generate url with a rating option.' do
+    url = ActsAsGravatar::Gravatar.generate_image(@email, rating: ActsAsGravatar::Enums::Rating::PG)
+    expect(url).to eq("#{@image_url}#{@email_md5}?r=pg")
   end
 
-  it 'generate tag with an attribute.' do
-    tag = ActsAsGravatar::Gravatar.generate_tag(@params[0], nil, nil, nil, nil, nil, with:"100px")
-    expect(tag).to eq("<img src=\"#{@base_url}#{@email_md5}\" with=\"100px\">")
+  it 'generate_image generate url with a rating option.' do
+    url = ActsAsGravatar::Gravatar.generate_image(@email, image_type: ActsAsGravatar::Enums::ImageType::JPG)
+    expect(url).to eq("#{@image_url}#{@email_md5}.jpg")
   end
 
-  it 'generate tag with some attributes.' do
-    tag = ActsAsGravatar::Gravatar.generate_tag(@params[0], nil, nil, nil, nil, nil, with:"100px", height:"100px")
-    expect(tag).to eq("<img src=\"#{@base_url}#{@email_md5}\" with=\"100px\" height=\"100px\">")
+  it 'generate_image generate url with a force_default option.' do
+    url = ActsAsGravatar::Gravatar.generate_image(@email, force_default: true)
+    expect(url).to eq("#{@image_url}#{@email_md5}?f=y")
   end
+
+  it 'generate_image generate url with all option.' do
+    url = ActsAsGravatar::Gravatar.generate_image(@email, @options)
+    expect(url).to eq("#{@image_url_ssl}#{@email_md5}.jpg?s=200&d=#{@url_enc}&r=pg&f=y")
+  end
+
 end
 

data/spec/acts_as_gravatar_spec.rb

@@ -9,6 +9,15 @@ describe ActsAsGravatar do
 
     ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => test_db
     ActiveRecord::Base.connection.execute 'CREATE TABLE tests(id integer not null primary key, email string)'
+
+    @default_option ={
+        :column=>:email,
+        :secure=>false,
+        :size=>nil,
+        :default_image=>nil,
+        :rating=>nil,
+        :image_type=>nil
+    }
   end
 
   context 'after acts_as_gravatar,' do
@@ -23,12 +32,12 @@ describe ActsAsGravatar do
       end
     end
 
-    it 'gravatar_url exists.' do
-      expect(Test.method_defined?(:gravatar_url))
+    it 'gravatar_image exists.' do
+      expect(Test.method_defined?(:gravatar_image))
     end
 
-    it 'gravatar_tag exists.' do
-      expect(Test.method_defined?(:gravatar_tag))
+    it 'gravatar_profile exists.' do
+      expect(Test.method_defined?(:gravatar_profile))
     end
 
     context 'instance of ActiveRecord::Base' do
@@ -36,14 +45,14 @@ describe ActsAsGravatar do
         @test_instance = Test.new
       end
 
-      it 'gravatar_url call ActsAsGravatar.generate_url' do
-        ActsAsGravatar::Gravatar.should_receive(:generate_url).with('nyarukosan@nyaruko.com', false, nil, nil, nil, nil)
-        @test_instance.gravatar_url
+      it 'gravatar_image call ActsAsGravatar.generate_image' do
+        ActsAsGravatar::Gravatar.should_receive(:generate_image).with('nyarukosan@nyaruko.com', @default_option)
+        @test_instance.gravatar_image
       end
 
-      it 'gravatar_tag call ActsAsGravatar.generate_tag' do
-        ActsAsGravatar::Gravatar.should_receive(:generate_tag).with('nyarukosan@nyaruko.com', false, nil, nil, nil, nil, {})
-        @test_instance.gravatar_tag
+      it 'gravatar_profile call ActsAsGravatar.generate_profile' do
+        ActsAsGravatar::Gravatar.should_receive(:generate_profile).with('nyarukosan@nyaruko.com', @default_option)
+        @test_instance.gravatar_profile
       end
     end
   end
@@ -56,7 +65,7 @@ describe ActsAsGravatar do
           :size           => 200,
           :default_image  => 'http://nyaruko.com/',
           :rating         => ActsAsGravatar::Enums::Rating::PG,
-          :image_type     => ActsAsGravatar::Enums::ImageType::Gif
+          :image_type     => ActsAsGravatar::Enums::ImageType::GIF
         })
 
         attr_accessor :email
@@ -72,31 +81,64 @@ describe ActsAsGravatar do
         @test_instance = Test.new
       end
 
-      it 'gravatar_url call ActsAsGravatar.generate_url' do
-        ActsAsGravatar::Gravatar.should_receive(:generate_url).with(
-          'nyarukosan@nyaruko.com',
-          true,
-          200,
-          'http://nyaruko.com/',
-          ActsAsGravatar::Enums::Rating::PG,
-          ActsAsGravatar::Enums::ImageType::Gif
+      it 'gravatar_url call ActsAsGravatar.generate_image' do
+        ActsAsGravatar::Gravatar.should_receive(:generate_image).with(
+          "nyarukosan@nyaruko.com",
+          {
+            :column         => :email,
+            :secure         => true,
+            :size           => 200,
+            :default_image  => 'http://nyaruko.com/',
+            :rating         => ActsAsGravatar::Enums::Rating::PG,
+            :image_type     => ActsAsGravatar::Enums::ImageType::GIF
+          }
+        )
+        @test_instance.gravatar_image
+      end
+
+      it 'gravatar_image call ActsAsGravatar.generate_image with merged option.' do
+        ActsAsGravatar::Gravatar.should_receive(:generate_image).with(
+            "nyarukosan@nyaruko.com",
+            {
+                :column         => :email,
+                :secure         => true,
+                :size           => 200,
+                :default_image  => 'mm',
+                :rating         => ActsAsGravatar::Enums::Rating::PG,
+                :image_type     => ActsAsGravatar::Enums::ImageType::GIF
+            }
         )
+        @test_instance.gravatar_image :default_image => 'mm'
+      end
 
-        @test_instance.gravatar_url
+      it 'gravatar_profile call ActsAsGravatar.generate_profile' do
+        ActsAsGravatar::Gravatar.should_receive(:generate_profile).with(
+          "nyarukosan@nyaruko.com",
+          {
+            :column         => :email,
+            :secure         => true,
+            :size           => 200,
+            :default_image  => 'http://nyaruko.com/',
+            :rating         => ActsAsGravatar::Enums::Rating::PG,
+            :image_type     => ActsAsGravatar::Enums::ImageType::GIF
+          }
+        )
+        @test_instance.gravatar_profile
       end
 
-      it 'gravatar_tag call ActsAsGravatar.generate_tag' do
-        attributes = {width: "500px"}
-        ActsAsGravatar::Gravatar.should_receive(:generate_tag).with(
-          'nyarukosan@nyaruko.com',
-          true,
-          200,
-          'http://nyaruko.com/',
-          ActsAsGravatar::Enums::Rating::PG,
-          ActsAsGravatar::Enums::ImageType::Gif,
-          attributes
+      it 'gravatar_profile call ActsAsGravatar.generate_profile with merged option.' do
+        ActsAsGravatar::Gravatar.should_receive(:generate_profile).with(
+            "nyarukosan@nyaruko.com",
+            {
+                :column         => :email,
+                :secure         => false,
+                :size           => 888,
+                :default_image  => 'http://nyaruko.com/',
+                :rating         => ActsAsGravatar::Enums::Rating::PG,
+                :image_type     => ActsAsGravatar::Enums::ImageType::GIF
+            }
         )
-        @test_instance.gravatar_tag({}, attributes)
+        @test_instance.gravatar_profile :secure => false, :size => 888
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_gravatar
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Atsushi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler