Skip to content

Replace via.placeholder.com with placehold.co #3056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
runephilosof-abtion wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace via.placeholder.com with placehold.co #3056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions doc/default/omniauth.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ Faker::Omniauth.github #=>
:nickname => "jackson-keeling",
:email => "jackson.keeling@example.com",
:name => "Jackson Keeling",
:image => "https://via.placeholder.com/300x300.png",
:image => "https://placehold.co/300x300.png",
:urls => {
:GitHub => "https://github.com/jackson-keeling"
}
Expand All @@ -228,7 +228,7 @@ Faker::Omniauth.github #=>
:raw_info => {
:login => "jackson-keeling",
:id => "95144751",
:avatar_url => "https://via.placeholder.com/300x300.png",
:avatar_url => "https://placehold.co/300x300.png",
:gravatar_id => "",
:url => "https://api.github.com/users/jackson-keeling",
:html_url => "https://github.com/jackson-keeling",
Expand Down Expand Up @@ -299,7 +299,7 @@ Faker::Omniauth.auth0 #=>
:name => "auth0|d0584e3ab2d3816be9518a56",
:nickname => "Thurman DuBuque",
:email => "dubuque_thurman@example.com",
:image => "https://via.placeholder.com/300x300.png"
:image => "https://placehold.co/300x300.png"
},
:credentials=> {
:expires_at => 1654345109,
Expand Down
14 changes: 7 additions & 7 deletions doc/default/placeholdit.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

```ruby
# Keyword arguments: size, format, background_color, text_color, text
Faker::Placeholdit.image #=> "https://via.placeholder.com/300x300.png"
Faker::Placeholdit.image(size: '50x50') #=> "https://via.placeholder.com/50x50.png"
Faker::Placeholdit.image(size: '50x50', format: 'jpg') #=> "https://via.placeholder.com/50x50.jpg"
Faker::Placeholdit.image(size: '50x50', format: 'gif', background_color: 'ffffff') #=> "https://via.placeholder.com/50x50.gif/ffffff"
Faker::Placeholdit.image(size: '50x50', format: 'jpeg', background_color: :random) #=> "https://via.placeholder.com/50x50.jpeg/39eba7"
Faker::Placeholdit.image(size: '50x50', format: 'jpeg', background_color: 'ffffff', text_color: '000') #=> "https://via.placeholder.com/50x50.jpeg/ffffff/000"
Faker::Placeholdit.image(size: '50x50', format: 'jpg', background_color: 'ffffff', text_color: '000', text: 'Some Custom Text') #=> "https://via.placeholder.com/50x50.jpg/ffffff/000?text=Some Custom Text"
Faker::Placeholdit.image #=> "https://placehold.co/300x300.png"
Faker::Placeholdit.image(size: '50x50') #=> "https://placehold.co/50x50.png"
Faker::Placeholdit.image(size: '50x50', format: 'jpg') #=> "https://placehold.co/50x50.jpg"
Faker::Placeholdit.image(size: '50x50', format: 'gif', background_color: 'ffffff') #=> "https://placehold.co/50x50.gif/ffffff"
Faker::Placeholdit.image(size: '50x50', format: 'jpeg', background_color: :random) #=> "https://placehold.co/50x50.jpeg/39eba7"
Faker::Placeholdit.image(size: '50x50', format: 'jpeg', background_color: 'ffffff', text_color: '000') #=> "https://placehold.co/50x50.jpeg/ffffff/000"
Faker::Placeholdit.image(size: '50x50', format: 'jpg', background_color: 'ffffff', text_color: '000', text: 'Some Custom Text') #=> "https://placehold.co/50x50.jpg/ffffff/000?text=Some Custom Text"
```

## Tips
Expand Down
26 changes: 14 additions & 12 deletions lib/faker/default/placeholdit.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
module Faker
class Placeholdit < Base
class << self
SUPPORTED_FORMATS = %w[png jpg gif jpeg].freeze
SUPPORTED_FORMATS = %w[avif gif jpg jpeg png svg webp].freeze

##
# Produces a random placeholder image from https://via.placeholder.com.
# Produces a random placeholder image from https://placehold.co.
#
# @param size [String] Specifies the image's size, dimensions separated by 'x'.
# @param format [String] Specifies the image's extension.
Expand All @@ -17,13 +17,13 @@ class << self
#
# @example
# # Keyword arguments: size, format, background_color, text_color, text
# Faker::Placeholdit.image #=> "https://via.placeholder.com/300x300.png"
# Faker::Placeholdit.image(size: '50x50') #=> "https://via.placeholder.com/50x50.png"
# Faker::Placeholdit.image(size: '50x50', format: 'jpg') #=> "https://via.placeholder.com/50x50.jpg"
# Faker::Placeholdit.image(size: '50x50', format: 'gif', background_color: 'ffffff') #=> "https://via.placeholder.com/50x50.gif/ffffff"
# Faker::Placeholdit.image(size: '50x50', format: 'jpeg', background_color: :random) #=> "https://via.placeholder.com/50x50.jpeg/39eba7"
# Faker::Placeholdit.image(size: '50x50', format: 'jpeg', background_color: 'ffffff', text_color: '000') #=> "https://via.placeholder.com/50x50.jpeg/ffffff/000"
# Faker::Placeholdit.image(size: '50x50', format: 'jpg', background_color: 'ffffff', text_color: '000', text: 'Some Custom Text') #=> "https://via.placeholder.com/50x50.jpg/ffffff/000?text=Some Custom Text"
# Faker::Placeholdit.image #=> "https://placehold.co/300x300.png"
# Faker::Placeholdit.image(size: '50x50') #=> "https://placehold.co/50x50.png"
# Faker::Placeholdit.image(size: '50x50', format: 'jpg') #=> "https://placehold.co/50x50.jpg"
# Faker::Placeholdit.image(size: '50x50', format: 'gif', background_color: 'ffffff') #=> "https://placehold.co/50x50/ffffff/000.gif"
# Faker::Placeholdit.image(size: '50x50', format: 'jpeg', background_color: :random) #=> "https://placehold.co/50x50/39eba7/000.jpeg"
# Faker::Placeholdit.image(size: '50x50', format: 'jpeg', background_color: 'ffffff', text_color: '000') #=> "https://placehold.co/50x50/ffffff/000.jpeg"
# Faker::Placeholdit.image(size: '50x50', format: 'jpg', background_color: 'ffffff', text_color: '000', text: 'Some Custom Text') #=> "https://placehold.co/50x50/ffffff/000.jpg?text=Some Custom Text"
#
# @faker.version 1.6.0
def image(size: '300x300', format: 'png', background_color: nil, text_color: nil, text: nil)
Expand All @@ -35,9 +35,11 @@ def image(size: '300x300', format: 'png', background_color: nil, text_color: nil
raise ArgumentError, "background_color must be a hex value without '#'" unless background_color.nil? || background_color =~ /((?:^\h{3}$)|(?:^\h{6}$)){1}(?!.*\H)/
raise ArgumentError, "text_color must be a hex value without '#'" unless text_color.nil? || text_color =~ /((?:^\h{3}$)|(?:^\h{6}$)){1}(?!.*\H)/

image_url = "https://via.placeholder.com/#{size}.#{format}"
image_url += "/#{background_color}" if background_color
image_url += "/#{text_color}" if text_color
image_url = "https://placehold.co/#{size}"
if background_color || text_color
image_url += "/#{background_color || 'fff'}/#{text_color || '000'}"
end
image_url += ".#{format}"
image_url += "?text=#{text}" if text
image_url
end
Expand Down
30 changes: 19 additions & 11 deletions test/faker/default/test_placeholdit.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ def setup
end

def test_placeholdit
refute_nil @tester.image.match(%r{https://via\.placeholder\.com/(.+)(png?)})[1]
refute_nil @tester.image.match(%r{https://placehold\.co/(.+)(png?)})[1]
end

def test_avatar_with_custom_size
assert_equal('3x3', @tester.image(size: '3x3').match(%r{https://via\.placeholder\.com/+(\d+x\d+)})[1])
assert_equal('3x3', @tester.image(size: '3x3').match(%r{https://placehold\.co/+(\d+x\d+)})[1])
end

def test_avatar_with_incorrect_size
Expand All @@ -22,7 +22,7 @@ def test_avatar_with_incorrect_size
end

def test_avatar_with_supported_format
assert_match %r{https://via\.placeholder\.com/(.+)(jpg?)}, @tester.image(size: '300x300', format: 'jpg')
assert_match %r{https://placehold\.co/(.+)(jpg?)}, @tester.image(size: '300x300', format: 'jpg')
end

def test_avatar_with_incorrect_format
Expand All @@ -31,16 +31,20 @@ def test_avatar_with_incorrect_format
end
end

def test_avatar_uses_000_as_text_when_only_specifying_background
assert_match %r{https://placehold\.co/(.+)/ffffff/000}, @tester.image(size: '300x300', format: 'jpg', background_color: 'ffffff')
end

def test_avatar_background_with_correct_six_char_hex
assert_match %r{https://via\.placeholder\.com/(.+)(jpg?)/ffffff}, @tester.image(size: '300x300', format: 'jpg', background_color: 'ffffff')
assert_match %r{https://placehold\.co/(.+)/ffffff}, @tester.image(size: '300x300', format: 'jpg', background_color: 'ffffff')
end

def test_avatar_background_with_correct_three_char_hex
assert_match %r{https://via\.placeholder\.com/(.+)(jpg?)/fff}, @tester.image(size: '300x300', format: 'jpg', background_color: 'fff')
assert_match %r{https://placehold\.co/(.+)/fff}, @tester.image(size: '300x300', format: 'jpg', background_color: 'fff')
end

def test_avatar_background_with_random_color
assert_match %r{https://via\.placeholder\.com/(.+)(jpg?)/[a-f0-9]{6}}, @tester.image(size: '300x300', format: 'jpg', background_color: :random)
assert_match %r{https://placehold\.co/(.+)/[a-f0-9]{6}/000}, @tester.image(size: '300x300', format: 'jpg', background_color: :random)
end

def test_avatar_background_with_wrong_six_char_hex
Expand All @@ -61,16 +65,20 @@ def test_avatar_background_with_wrong_three_char_hex
end
end

def test_avatar_uses_fff_as_background_when_only_specifying_font_color
assert_match %r{https://placehold\.co/(.+)/fff/000000}, @tester.image(size: '300x300', format: 'jpg', text_color: '000000')
end

def test_avatar_font_color_with_correct_six_char_hex
assert_match %r{https://via\.placeholder\.com/(.+)(jpg?)/ffffff/000000}, @tester.image(size: '300x300', format: 'jpg', background_color: 'ffffff', text_color: '000000')
assert_match %r{https://placehold\.co/(.+)/ffffff/000000}, @tester.image(size: '300x300', format: 'jpg', background_color: 'ffffff', text_color: '000000')
end

def test_avatar_font_color_with_correct_three_char_hex
assert_match %r{https://via\.placeholder\.com/(.+)(jpg?)/fff}, @tester.image(size: '300x300', format: 'jpg', background_color: 'fff', text_color: '000')
assert_match %r{https://placehold\.co/(.+)/fff}, @tester.image(size: '300x300', format: 'jpg', background_color: 'fff', text_color: '000')
end

def test_avatar_font_color_with_random_color
assert_match %r{https://via\.placeholder\.com/(.+)(jpg?)/fff/[a-f0-9]{6}}, @tester.image(size: '300x300', format: 'jpg', background_color: 'fff', text_color: :random)
assert_match %r{https://placehold\.co/(.+)/fff/[a-f0-9]{6}}, @tester.image(size: '300x300', format: 'jpg', background_color: 'fff', text_color: :random)
end

def test_avatar_font_color_with_wrong_six_char_hex
Expand All @@ -92,10 +100,10 @@ def test_avatar_font_color_with_wrong_three_char_hex
end

def test_text_not_present
assert_match %r{https://via\.placeholder\.com/[^\\?]+$}, @tester.image(size: '300x300', format: 'jpg', background_color: 'fff', text_color: '000')
assert_match %r{https://placehold\.co/[^\\?]+$}, @tester.image(size: '300x300', format: 'jpg', background_color: 'fff', text_color: '000')
end

def test_text_present
assert_match %r{https://via\.placeholder\.com/(.+)\?text=hello}, @tester.image(size: '300x300', format: 'jpg', background_color: 'fff', text_color: '000', text: 'hello')
assert_match %r{https://placehold\.co/(.+)\?text=hello}, @tester.image(size: '300x300', format: 'jpg', background_color: 'fff', text_color: '000', text: 'hello')
end
end