Skip to content

Commit

Permalink
bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
@JustinBeckwith
JustinBeckwith committed Jan 6, 2014
1 parent b294068 commit 34e34d2
Show file tree
Hide file tree
Showing 3 changed files with 261 additions and 261 deletions.
2 changes: 1 addition & 1 deletion YelpSharp.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>YelpSharp</id>
<version>1.2.0.0</version>
<version>1.2.1.0</version>
<title>YelpSharp</title>
<authors>Justin Beckwith</authors>
<owners>Justin Beckwith</owners>
Expand Down
272 changes: 136 additions & 136 deletions YelpSharp/Yelp.cs
View file
Original file line number Diff line number Diff line change
@@ -1,133 +1,133 @@
using System;
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using RestSharp;
using RestSharp.Authenticators;
using YelpSharp.Data;
using YelpSharp.Data.Options;
using Newtonsoft.Json;
using System.Threading.Tasks;


namespace YelpSharp
{
/// <summary>
///
/// </summary>
public class Yelp
{
//--------------------------------------------------------------------------
//
// Variables
//
//--------------------------------------------------------------------------

/// <summary>
/// Root url for the Yelp REST API.
/// </summary>
protected const string rootUri = "http:https://api.yelp.com/v2/";

/// <summary>
/// Authentication options for the connection.
/// </summary>
protected Options options { get; set; }

//--------------------------------------------------------------------------
//
// Constructors
//
//--------------------------------------------------------------------------

/// <summary>
/// Driver for the Yelp API
/// </summary>
/// <param name="options">OAuth options for using the Yelp API</param>
public Yelp(Options options)
{
this.options = options;
}


//--------------------------------------------------------------------------
//
// Public Methods
//
//--------------------------------------------------------------------------

/// <summary>
/// Simple search method to look for a term in a given plain text address
/// </summary>
/// <param name="term">what to look for (ex: coffee)</param>
/// <param name="location">where to look for it (ex: seattle)</param>
/// <returns>a strongly typed result</returns>
public Task<SearchResults> Search(string term, string location)
{
var result = makeRequest<SearchResults>("search", null, new Dictionary<string, string>
{
{ "term", term },
{ "location", location }
});

return result;
}

/// <summary>
/// advanced search based on search options object
/// </summary>
/// <param name="options"></param>
/// <returns></returns>
public Task<SearchResults> Search(SearchOptions options)
{
var result = makeRequest<SearchResults>("search", null, options.GetParameters());
return result;
}

/// <summary>
/// search the list of business based on name
/// </summary>
/// <param name="name">name of the business you want to get information on</param>
/// <returns>Business details</returns>
public Task<Business> GetBusiness(string name)
{
var result = makeRequest<Business>("business", name, null);
return result;
}


//--------------------------------------------------------------------------
//
// Internal Methods
//
//--------------------------------------------------------------------------

/// <summary>
/// contains all of the oauth magic, makes the http request and returns raw json
/// </summary>
/// <param name="parameters">hash array of qs parameters</param>
/// <returns>plain text json response from the api</returns>
protected Task<T> makeRequest<T>(string area, string id, Dictionary<string, string> parameters)
{
// build the url with parameters
var url = area;
if (!String.IsNullOrEmpty(id)) url += "/" + Uri.EscapeDataString(id);

// restsharp FTW!
var client = new RestClient(rootUri);
client.Authenticator = OAuth1Authenticator.ForProtectedResource(options.ConsumerKey, options.ConsumerSecret, options.AccessToken, options.AccessTokenSecret);
var request = new RestRequest(url, Method.GET);

if (parameters != null)
{
string[] keys = parameters.Keys.ToArray();
foreach (string k in keys)
{
request.AddParameter(k, parameters[k]);
}
}

var tcs = new TaskCompletionSource<T>();
var handle = client.ExecuteAsync(request, response =>
using RestSharp;
using RestSharp.Authenticators;
using YelpSharp.Data;
using YelpSharp.Data.Options;
using Newtonsoft.Json;
using System.Threading.Tasks;


namespace YelpSharp
{
/// <summary>
///
/// </summary>
public class Yelp
{
//--------------------------------------------------------------------------
//
// Variables
//
//--------------------------------------------------------------------------

/// <summary>
/// Root url for the Yelp REST API.
/// </summary>
protected const string rootUri = "http:https://api.yelp.com/v2/";

/// <summary>
/// Authentication options for the connection.
/// </summary>
protected Options options { get; set; }

//--------------------------------------------------------------------------
//
// Constructors
//
//--------------------------------------------------------------------------

/// <summary>
/// Driver for the Yelp API
/// </summary>
/// <param name="options">OAuth options for using the Yelp API</param>
public Yelp(Options options)
{
this.options = options;
}


//--------------------------------------------------------------------------
//
// Public Methods
//
//--------------------------------------------------------------------------

/// <summary>
/// Simple search method to look for a term in a given plain text address
/// </summary>
/// <param name="term">what to look for (ex: coffee)</param>
/// <param name="location">where to look for it (ex: seattle)</param>
/// <returns>a strongly typed result</returns>
public Task<SearchResults> Search(string term, string location)
{
var result = makeRequest<SearchResults>("search", null, new Dictionary<string, string>
{
{ "term", term },
{ "location", location }
});

return result;
}

/// <summary>
/// advanced search based on search options object
/// </summary>
/// <param name="options"></param>
/// <returns></returns>
public Task<SearchResults> Search(SearchOptions options)
{
var result = makeRequest<SearchResults>("search", null, options.GetParameters());
return result;
}

/// <summary>
/// search the list of business based on name
/// </summary>
/// <param name="name">name of the business you want to get information on</param>
/// <returns>Business details</returns>
public Task<Business> GetBusiness(string name)
{
var result = makeRequest<Business>("business", name, null);
return result;
}


//--------------------------------------------------------------------------
//
// Internal Methods
//
//--------------------------------------------------------------------------

/// <summary>
/// contains all of the oauth magic, makes the http request and returns raw json
/// </summary>
/// <param name="parameters">hash array of qs parameters</param>
/// <returns>plain text json response from the api</returns>
protected Task<T> makeRequest<T>(string area, string id, Dictionary<string, string> parameters)
{
// build the url with parameters
var url = area;
if (!String.IsNullOrEmpty(id)) url += "/" + Uri.EscapeDataString(id);

// restsharp FTW!
var client = new RestClient(rootUri);
client.Authenticator = OAuth1Authenticator.ForProtectedResource(options.ConsumerKey, options.ConsumerSecret, options.AccessToken, options.AccessTokenSecret);
var request = new RestRequest(url, Method.GET);

if (parameters != null)
{
string[] keys = parameters.Keys.ToArray();
foreach (string k in keys)
{
request.AddParameter(k, parameters[k]);
}
}

var tcs = new TaskCompletionSource<T>();
var handle = client.ExecuteAsync(request, response =>
{
if(response.StatusCode == HttpStatusCode.NotFound)
{
Expand All @@ -144,11 +144,11 @@ protected Task<T> makeRequest<T>(string area, string id, Dictionary<string, stri
{
tcs.SetException(ex);
}
}
});

return tcs.Task;
}

}
}
}
});

return tcs.Task;
}

}
}
Loading

0 comments on commit 34e34d2

Please sign in to comment.