image - removed image url didnt do anything

vsafonkin · Feb 27, 2024 · 2d1206a · 2d1206a
1 parent bf67431
commit 2d1206a
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 105 deletions.
diff --git a/image.go b/image.go
@@ -7,19 +7,8 @@ import (
 	imgCol "image/color"
 	"image/jpeg"
 	"image/png"
-	"strconv"
 )
 
-// ImageURL will generate a random Image Based Upon Height And Width. https://picsum.photos/
-func ImageURL(width int, height int) string { return imageURL(GlobalFaker, width, height) }
-
-// ImageURL will generate a random Image Based Upon Height And Width. https://picsum.photos/
-func (f *Faker) ImageURL(width int, height int) string { return imageURL(f, width, height) }
-
-func imageURL(f *Faker, width int, height int) string {
-	return "https://picsum.photos/" + strconv.Itoa(width) + "/" + strconv.Itoa(height)
-}
-
 // Image generates a random rgba image
 func Image(width int, height int) *img.RGBA { return image(GlobalFaker, width, height) }
 
@@ -67,37 +56,6 @@ func imagePng(f *Faker, width int, height int) []byte {
 }
 
 func addImageLookup() {
-	AddFuncLookup("imageurl", Info{
-		Display:     "Image URL",
-		Category:    "image",
-		Description: "Web address pointing to an image file that can be accessed and displayed online",
-		Example:     "https://picsum.photos/500/500",
-		Output:      "string",
-		Params: []Param{
-			{Field: "width", Display: "Width", Type: "int", Default: "500", Description: "Image width in px"},
-			{Field: "height", Display: "Height", Type: "int", Default: "500", Description: "Image height in px"},
-		},
-		Generate: func(f *Faker, m *MapParams, info *Info) (any, error) {
-			width, err := info.GetInt(m, "width")
-			if err != nil {
-				return nil, err
-			}
-			if width < 10 || width >= 1000 {
-				return nil, errors.New("invalid image width, must be greater than 10, less than 1000")
-			}
-
-			height, err := info.GetInt(m, "height")
-			if err != nil {
-				return nil, err
-			}
-			if height < 10 || height >= 1000 {
-				return nil, errors.New("invalid image height, must be greater than 10, less than 1000")
-			}
-
-			return imageURL(f, width, height), nil
-		},
-	})
-
 	AddFuncLookup("imagejpeg", Info{
 		Display:     "Image JPEG",
 		Category:    "image",

diff --git a/image_test.go b/image_test.go
@@ -5,26 +5,6 @@ import (
 	"testing"
 )
 
-func ExampleImageURL() {
-	Seed(11)
-	fmt.Println(ImageURL(640, 480))
-
-	// Output: https://picsum.photos/640/480
-}
-
-func ExampleFaker_ImageURL() {
-	f := New(11)
-	fmt.Println(f.ImageURL(640, 480))
-
-	// Output: https://picsum.photos/640/480
-}
-
-func BenchmarkImageURL(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ImageURL(640, 480)
-	}
-}
-
 func ExampleImage() {
 	Seed(11)
 	fmt.Println(Image(1, 1))

diff --git a/person.go b/person.go
@@ -12,7 +12,6 @@ type PersonInfo struct {
 	LastName   string          `json:"last_name" xml:"last_name"`
 	Gender     string          `json:"gender" xml:"gender"`
 	SSN        string          `json:"ssn" xml:"ssn"`
-	Image      string          `json:"image" xml:"image"`
 	Hobby      string          `json:"hobby" xml:"hobby"`
 	Job        *JobInfo        `json:"job" xml:"job"`
 	Address    *AddressInfo    `json:"address" xml:"address"`
@@ -32,7 +31,6 @@ func person(f *Faker) *PersonInfo {
 		LastName:   lastName(f),
 		Gender:     gender(f),
 		SSN:        ssn(f),
-		Image:      imageURL(f, number(f, 100, 500), number(f, 100, 500)),
 		Hobby:      hobby(f),
 		Job:        job(f),
 		Address:    address(f),

diff --git a/person_test.go b/person_test.go
@@ -197,7 +197,6 @@ func ExamplePerson() {
 	fmt.Println(person.LastName)
 	fmt.Println(person.Gender)
 	fmt.Println(person.SSN)
-	fmt.Println(person.Image)
 	fmt.Println(person.Hobby)
 
 	fmt.Println(job.Company)
@@ -226,26 +225,25 @@ func ExamplePerson() {
 	// Stiedemann
 	// male
 	// 280254464
-	// https://picsum.photos/311/192
-	// Sea glass collecting
-	// Mango Transit
-	// Supervisor
-	// National
-	// Solutions
-	// 999 West Lanebury, Lincoln, Kansas 93050
-	// 999 West Lanebury
-	// Lincoln
-	// Kansas
-	// 93050
-	// Uganda
-	// -0.729058
-	// -53.873895
-	// 6268940591
-	// [email protected]
+	// Sailing
+	// DataLogix
+	// Planner
+	// Human
+	// Usability
+	// 679 Underpassborough, Omaha, Massachusetts 37930
+	// 679 Underpassborough
+	// Omaha
+	// Massachusetts
+	// 37930
+	// North Macedonia
+	// -0.877085
+	// 83.264578
+	// 4102689405
+	// [email protected]
 	// American Express
-	// 4570938757201747
-	// 11/27
-	// 205
+	// 562570938760
+	// 04/25
+	// 906
 }
 
 func ExampleFaker_Person() {
@@ -260,7 +258,6 @@ func ExampleFaker_Person() {
 	fmt.Println(person.LastName)
 	fmt.Println(person.Gender)
 	fmt.Println(person.SSN)
-	fmt.Println(person.Image)
 	fmt.Println(person.Hobby)
 
 	fmt.Println(job.Company)
@@ -289,26 +286,25 @@ func ExampleFaker_Person() {
 	// Stiedemann
 	// male
 	// 280254464
-	// https://picsum.photos/311/192
-	// Sea glass collecting
-	// Mango Transit
-	// Supervisor
-	// National
-	// Solutions
-	// 999 West Lanebury, Lincoln, Kansas 93050
-	// 999 West Lanebury
-	// Lincoln
-	// Kansas
-	// 93050
-	// Uganda
-	// -0.729058
-	// -53.873895
-	// 6268940591
-	// [email protected]
+	// Sailing
+	// DataLogix
+	// Planner
+	// Human
+	// Usability
+	// 679 Underpassborough, Omaha, Massachusetts 37930
+	// 679 Underpassborough
+	// Omaha
+	// Massachusetts
+	// 37930
+	// North Macedonia
+	// -0.877085
+	// 83.264578
+	// 4102689405
+	// [email protected]
 	// American Express
-	// 4570938757201747
-	// 11/27
-	// 205
+	// 562570938760
+	// 04/25
+	// 906
 }
 
 func BenchmarkPerson(b *testing.B) {

diff --git a/template_test.go b/template_test.go
@@ -103,7 +103,6 @@ func TestTemplate_misc(t *testing.T) {
 		"Number":              "{{Number 1 42 }}",
 		"Price":               "{{Price 1 100 }}",
 		"Regex":               "{{Regex `[abcdef]{5}` }}",
-		"ImageURL":            "{{ImageURL 640 480 }}",
 		"DigitN":              "{{DigitN 10 }}",
 		"LoremIpsumParagraph": "{{LoremIpsumParagraph 3  5  12 `\n` }}",
 		"Paragraph":           "{{Paragraph 3  5  12 `\n` }}",