project: refactoring

Author: GopherSuslik

action.go

@@ -18,11 +18,11 @@ const (
 type Action struct {
 	Name   string `json:"action"`
 	ItemID string `json:"item_id"`
-	RefId  string `json:"ref_id,omitempty"`
+	RefID  string `json:"ref_id,omitempty"`
 	Tags   string `json:"tags,omitempty"`
 	Time   int64  `json:"time,omitempty"`
 	Title  string `json:"title,omitempty"`
-	Url    string `json:"url,omitempty"`
+	URL    string `json:"url,omitempty"`
 	OldTag string `json:"old_tag,omitempty"`
 	NewTag string `json:"new_tag,omitempty"`
 }

pocket.go

@@ -14,7 +14,7 @@ import (
 
 const (
 	host         = "https://getpocket.com/v3"
-	authorizeUrl = "https://getpocket.com/auth/authorize?request_token=%s&redirect_uri=%s"
+	authorizeURL = "https://getpocket.com/auth/authorize?request_token=%s&redirect_uri=%s"
 
 	endpointAdd              = "/add"
 	endpointModify           = "/send"
@@ -138,7 +138,7 @@ func (c Client) GetAuthorizationURL(requestToken string) (string, error) {
 		return "", ErrEmptyRedirectURL
 	}
 
-	return fmt.Sprintf(authorizeUrl, requestToken, c.redirectURL), nil
+	return fmt.Sprintf(authorizeURL, requestToken, c.redirectURL), nil
 }
 
 // GetRequestToken returns the request token (code), which will be used later to authenticate the user in your application.

pocket_test.go

@@ -188,7 +188,7 @@ func TestClient_Modify(t *testing.T) {
 				modifyInput: ModifyInput{
 					AccessToken: "access-token",
 					Actions: []Action{
-						{Name: ActionAdd, ItemID: "987", Url: "https://github.com", Title: "Github"},
+						{Name: ActionAdd, ItemID: "987", URL: "https://github.com", Title: "Github"},
 						{Name: ActionArchive, ItemID: "654", Time: time.Now().Unix()},
 						{Name: ActionFavorite, ItemID: "321", Time: time.Now().Unix()},
 					},
@@ -205,7 +205,7 @@ func TestClient_Modify(t *testing.T) {
 				modifyInput: ModifyInput{
 					AccessToken: "",
 					Actions: []Action{
-						{Name: ActionAdd, ItemID: "987", Url: "https://github.com", Title: "Github"},
+						{Name: ActionAdd, ItemID: "987", URL: "https://github.com", Title: "Github"},
 						{Name: ActionArchive, ItemID: "654", Time: time.Now().Unix()},
 						{Name: ActionFavorite, ItemID: "321", Time: time.Now().Unix()},
 					},
@@ -235,7 +235,7 @@ func TestClient_Modify(t *testing.T) {
 				modifyInput: ModifyInput{
 					AccessToken: "access-token",
 					Actions: []Action{
-						{Name: ActionAdd, ItemID: "987", Url: "https://github.com", Title: "Github"},
+						{Name: ActionAdd, ItemID: "987", URL: "https://github.com", Title: "Github"},
 						{Name: ActionArchive, ItemID: "654", Time: time.Now().Unix()},
 						{Name: ActionFavorite, ItemID: "321", Time: time.Now().Unix()},
 					},
@@ -293,9 +293,9 @@ func TestClient_Retrieving(t *testing.T) {
 				{
 					ID:            "229279689",
 					ResolvedID:    "229279689",
-					GivenUrl:      `http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview`,
+					GivenURL:      `http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview`,
 					GivenTitle:    `The Massive Ryder Cup Preview - The Triangle Blog - Grantland`,
-					ResolvedUrl:   `http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview`,
+					ResolvedURL:   `http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview`,
 					ResolvedTitle: `The Massive Ryder Cup Preview`,
 					Favorite:      "0",
 					Status:        "0",

response.go

@@ -15,8 +15,8 @@ type Authorization struct {
 type Item struct {
 	ID            string
 	ResolvedID    string
-	GivenUrl      string
-	ResolvedUrl   string
+	GivenURL      string
+	ResolvedURL   string
 	GivenTitle    string
 	ResolvedTitle string
 	Favorite      string
@@ -30,8 +30,8 @@ type Item struct {
 
 func (i *Item) fillAllFields(result gjson.Result) {
 	i.ResolvedID = result.Get(fmt.Sprintf("list.%s.resolved_id", i.ID)).String()
-	i.GivenUrl = result.Get(fmt.Sprintf("list.%s.given_url", i.ID)).String()
-	i.ResolvedUrl = result.Get(fmt.Sprintf("list.%s.resolved_url", i.ID)).String()
+	i.GivenURL = result.Get(fmt.Sprintf("list.%s.given_url", i.ID)).String()
+	i.ResolvedURL = result.Get(fmt.Sprintf("list.%s.resolved_url", i.ID)).String()
 	i.GivenTitle = result.Get(fmt.Sprintf("list.%s.given_title", i.ID)).String()
 	i.ResolvedTitle = result.Get(fmt.Sprintf("list.%s.resolved_title", i.ID)).String()
 	i.Favorite = result.Get(fmt.Sprintf("list.%s.favorite", i.ID)).String()