trakt_api 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51fdf3bbcf2e850646ad5b135011562e3b1499ba
-  data.tar.gz: 99db31861fcd5b3adad40ef9b1975333d11fcce9
+  metadata.gz: 2f02f863053f9b797654121ba6cd8d24e5e4c9b3
+  data.tar.gz: f85005692b1ee864416f4e5413cf2a457796e040
 SHA512:
-  metadata.gz: f1870bd798113f962fcbbb7cc8dedf485f844502f0700e6c45d532506adb4678f754d2df8e274604e24493653600a8f8e3a58477c4f11ce66c43cb5b088e64b6
-  data.tar.gz: 773b03d6166fc576186dbd4c15d6dd41b0668411817e8a29d5f9a9274cbfab776c655265e34cc138040e1adebf5a70e52edab4659386fbd2248b589e836e99f5
+  metadata.gz: 5abbbedea5d3b6472eb31401fb6278ecf6e7182753abcf2294016d1e517ea19f412990a0c57358254af46c4ed247af70bf367f84b7d527e19defc5d225adccf8
+  data.tar.gz: a21c16ce803175971c0d4afa4a6b1603f9d889a410d60d5d2efba73d34d0f452b483b33eb6e3b66395cba3cb8bbcad092a8d5819c82b7a10e4245a69feb5fcfe

data/README.md

@@ -2,6 +2,7 @@
 [![Dependency Status](https://gemnasium.com/wafcio/trakt_api.png)](https://gemnasium.com/wafcio/trakt_api)
 [![Code Climate](https://codeclimate.com/github/wafcio/trakt_api.png)](https://codeclimate.com/github/wafcio/trakt_api)
 [![Coverage Status](https://coveralls.io/repos/wafcio/trakt_api/badge.png)](https://coveralls.io/r/wafcio/trakt_api)
+[![Gem Version](https://badge.fury.io/rb/trakt_api.png)](http://badge.fury.io/rb/trakt_api)
 
 # TraktApi
 
@@ -103,9 +104,9 @@ client.lists.update({...})
 Movie API
 
 ```ruby
-client.movie.cancel_checkin
+client.movie.cancel_check_in
 client.movie.cancel_watching
-client.movie.checkin({...})
+client.movie.check_in({...})
 client.movie.comments({...})
 client.movie.scrobble({...})
 client.movie.library({...})
@@ -176,7 +177,7 @@ client.server.time
 Show API
 
 ```ruby
- client.show.cancel_checkin
+ client.show.cancel_check_in
  client.show.cancel_watching
  client.show.check_in({...})
  client.show.comments({...})
@@ -238,9 +239,9 @@ client.user.ratings_episodes({...})
 client.user.ratings_movies({...})
 client.user.ratings_shows({...})
 client.user.watching({...})
-client.user.watchlist_episode({...})
-client.user.watchlist_movies({...})
-client.user.watchlist_shows({...})
+client.user.watch_list_episode({...})
+client.user.watch_list_movies({...})
+client.user.watch_list_shows({...})
 ```
 
 ## Contributing

data/lib/trakt_api/activity.rb

@@ -1,72 +1,57 @@
 class TraktApi::Activity < TraktApi::Base
   # documentation: http://trakt.tv/api-docs/activity-community
   def community(options = {})
-    optional_auth(options).get('activity/community').restful_params(options, type_fields).
-      params(query_params(options, type_fields)).response
+    get('activity/community').params(options).restful_params(type_fields).response
   end
 
   # documentation: http://trakt.tv/api-docs/activity-episodes
   def episodes(options = {})
-    optional_auth(options).get('activity/episodes').restful_params(options, episodes_fields).
-      params(query_params(options, episodes_fields)).response
+    get('activity/episodes').params(options).restful_params(episodes_fields).response
   end
 
   # documentation: http://trakt.tv/api-docs/activity-friends
   def friends(options = {})
-    auth.post('activity/friends').restful_params(options, type_fields).params(query_params(options, type_fields)).
-      response
+    auth.post('activity/friends').params(options).restful_params(type_fields).response
   end
 
   # documentation: http://trakt.tv/api-docs/activity-movies
   def movies(options = {})
-    optional_auth(options).get('activity/movies').restful_params(options, title_fields).
-      params(query_params(options, title_fields)).response
+    get('activity/movies').params(options).restful_params(title_fields).response
   end
 
   # documentation: http://trakt.tv/api-docs/activity-seasons
   def seasons(options = {})
-    optional_auth(options).get('activity/seasons').restful_params(options, seasons_fields).
-      params(query_params(options, seasons_fields)).response
+    get('activity/seasons').params(options).restful_params(seasons_fields).response
   end
 
   # documentation: http://trakt.tv/api-docs/activity-shows
   def shows(options = {})
-    optional_auth(options).get('activity/shows').restful_params(options, title_fields).
-      params(query_params(options, title_fields)).response
+    get('activity/shows').params(options).restful_params(title_fields).response
   end
 
   # documentation: http://trakt.tv/api-docs/activity-user
   def user(options = {})
-    optional_auth(options).get('activity/user').restful_params(options, user_fields).
-      params(query_params(options, user_fields)).response
+    get('activity/user').params(options).restful_params(user_fields).response
   end
 
   # documentation: http://trakt.tv/api-docs/activity-user-episodes
   def user_episodes(options = {})
-    optional_auth(options).get('activity/user/episodes').restful_params(options, user_episodes_fields).
-      params(query_params(options, user_episodes_fields)).response
+    get('activity/user/episodes').params(options).restful_params(user_episodes_fields).response
   end
 
   # documentation: http://trakt.tv/api-docs/activity-user-movies
   def user_movies(options = {})
-    optional_auth(options).get('activity/user/movies').restful_params(options, user_title_fields).
-      params(query_params(options, user_title_fields)).response
+    get('activity/user/movies').params(options).restful_params(user_title_fields).response
   end
 
   # documentation: http://trakt.tv/api-docs/activity-user-seasons
   def user_seasons(options = {})
-    optional_auth(options).get('activity/user/seasons').restful_params(options, user_seasons_fields).
-      params(query_params(options, user_seasons_fields)).response
+    get('activity/user/seasons').params(options).restful_params(user_seasons_fields).response
   end
 
   # documentation: http://trakt.tv/api-docs/activity-user-shows
   def user_shows(options = {})
-    optional_auth(options).get('activity/user/shows').restful_params(options, user_title_fields).
-      params(query_params(options, user_title_fields)).response
-  end
-
-  def query_params(options, fields)
-    options.reject{ |option| fields.include?(option) }
+    get('activity/user/shows').params(options).restful_params(user_title_fields).response
   end
 
   private

data/lib/trakt_api/base.rb

@@ -18,12 +18,6 @@ class TraktApi::Base
     self
   end
 
-  def optional_auth(options)
-    auth if options[:auth]
-
-    self
-  end
-
   def store_uri(uri)
     @uri = "#{uri}.json/#{api_key}"
   end
@@ -44,16 +38,18 @@ class TraktApi::Base
 
   def params(options)
     @params = options
+    auth if options.delete(:auth)
 
     self
   end
 
-  def restful_params(options, fields)
+  def restful_params(fields = [])
     restful_params_string = ''
     fields.each do |field|
-      restful_params_string += "/#{options[field]}" if options[field]
+      value = @params.delete(field)
+      restful_params_string += "/#{value}" if value
     end
-    @uri = "#{@uri}/#{restful_params_string}"
+    @uri = "#{@uri}#{restful_params_string}"
 
     self
   end

data/lib/trakt_api/calendar.rb

@@ -1,12 +1,12 @@
 class TraktApi::Calendar < TraktApi::Base
   # documentation: http://trakt.tv/api-docs/calendar-premieres
   def premieres(options = {})
-    optional_auth(options).get('calendar/premieres').restful_params(options, fields).response
+    get('calendar/premieres').params(options).restful_params(fields).response
   end
 
   # documentation: http://trakt.tv/api-docs/calendar-shows
   def shows(options = {})
-    optional_auth(options).get('calendar/shows').restful_params(options, fields).response
+    get('calendar/shows').params(options).restful_params(fields).response
   end
 
   private

data/lib/trakt_api/movie.rb

@@ -1,6 +1,6 @@
 class TraktApi::Movie < TraktApi::Base
   # documentation: http://trakt.tv/api-docs/movie-cancelcheckin
-  def cancel_checkin
+  def cancel_check_in
     auth.post('movie/cancelcheckin').response
   end
 
@@ -10,7 +10,7 @@ class TraktApi::Movie < TraktApi::Base
   end
 
   # documentation: http://trakt.tv/api-docs/movie-checkin
-  def checkin(options = {})
+  def check_in(options = {})
     auth.post('movie/checkin').params(options).response
   end
 
@@ -36,22 +36,22 @@ class TraktApi::Movie < TraktApi::Base
 
   # documentation: http://trakt.tv/api-docs/movie-related
   def related(options = {})
-    optional_auth(options).get('movie/related').restful_params(options, [:title, :hidewatched]).response
+    get('movie/related').params(options).restful_params([:title, :hidewatched]).response
   end
 
   # documentation: http://trakt.tv/api-docs/movie-stats
   def stats(options = {})
-    get('movie/stats').restful_params(options, [:title]).response
+    get('movie/stats').params(options).restful_params([:title]).response
   end
 
   # documentation: http://trakt.tv/api-docs/movie-summary
   def summary(options = {})
-    optional_auth(options).get('movie/summary').restful_params(options, [:title]).response
+    get('movie/summary').params(options).restful_params([:title]).response
   end
 
   # documentation: http://trakt.tv/api-docs/movie-summaries
   def summaries(options = {})
-    get('movie/summaries').restful_params(options, [:title, :extended]).response
+    get('movie/summaries').params(options).restful_params([:title, :extended]).response
   end
 
   # documentation: http://trakt.tv/api-docs/movie-unlibrary
@@ -76,7 +76,7 @@ class TraktApi::Movie < TraktApi::Base
 
   # documentation: http://trakt.tv/api-docs/movie-watchingnow
   def watching_now(options = {})
-    optional_auth(options).get('movie/watchingnow').restful_params(options, [:title]).response
+    get('movie/watchingnow').params(options).restful_params([:title]).response
   end
 
   # documentation: http://trakt.tv/api-docs/movie-watchlist

data/lib/trakt_api/movies.rb

@@ -1,11 +1,11 @@
 class TraktApi::Movies < TraktApi::Base
   # documentation: http://trakt.tv/api-docs/movies-trending
   def trending(options = {})
-    optional_auth(options).get('movies/trending').response
+    get('movies/trending').params(options).response
   end
 
   # documentation: http://trakt.tv/api-docs/movies-updated
   def updated(options = {})
-    get('movies/updated').restful_params(options, [:timestamp]).response
+    get('movies/updated').params(options).restful_params([:timestamp]).response
   end
 end

data/lib/trakt_api/show.rb

@@ -1,6 +1,6 @@
 class TraktApi::Show < TraktApi::Base
   # documentation: http://trakt.tv/api-docs/show-cancelcheckin
-  def cancel_checkin
+  def cancel_check_in
     auth.post('show/cancelcheckin').response
   end
 
@@ -16,12 +16,12 @@ class TraktApi::Show < TraktApi::Base
 
   # documentation: http://trakt.tv/api-docs/show-comments
   def comments(options = {})
-    get('show/comments').restful_params(options, [:title, :type]).response
+    get('show/comments').params(options).restful_params([:title, :type]).response
   end
 
   # documentation: http://trakt.tv/api-docs/show-episode-comments
   def episode_comments(options = {})
-    get('show/episode/comments').restful_params(options, [:title, :season, :episode, :type]).response
+    get('show/episode/comments').params(options).restful_params([:title, :season, :episode, :type]).response
   end
 
   # documentation: http://trakt.tv/api-docs/show-episode-library
@@ -36,12 +36,12 @@ class TraktApi::Show < TraktApi::Base
 
   # documentation: http://trakt.tv/api-docs/show-episode-stats
   def episode_stats(options = {})
-    get('show/episode/stats').restful_params(options, [:title, :season, :episode]).response
+    get('show/episode/stats').params(options).restful_params([:title, :season, :episode]).response
   end
 
   # documentation: http://trakt.tv/api-docs/show-episode-summary
   def episode_summary(options = {})
-    optional_auth(options).get('show/episode/summary').restful_params(options, [:title, :season, :episode]).response
+    get('show/episode/summary').params(options).restful_params([:title, :season, :episode]).response
   end
 
   # documentation: http://trakt.tv/api-docs/show-episode-unlibrary
@@ -61,8 +61,7 @@ class TraktApi::Show < TraktApi::Base
 
   # documentation: http://trakt.tv/api-docs/show-episode-watchingnow
   def episode_watching_now(options = {})
-    optional_auth(options).get('show/episode/watchingnow').restful_params(options, [:title, :season, :episode]).
-      response
+    get('show/episode/watchingnow').params(options).restful_params([:title, :season, :episode]).response
   end
 
   # documentation: http://trakt.tv/api-docs/show-episode-watchlist
@@ -77,7 +76,7 @@ class TraktApi::Show < TraktApi::Base
 
   # documentation: http://trakt.tv/api-docs/show-related
   def related(options = {})
-    optional_auth(options).get('show/related').restful_params(options, [:title, :extended, :hidewatched]).response
+    get('show/related').params(options).restful_params([:title, :extended, :hidewatched]).response
   end
 
   # documentation: http://trakt.tv/api-docs/show-scrobble
@@ -87,7 +86,7 @@ class TraktApi::Show < TraktApi::Base
 
   # documentation: http://trakt.tv/api-docs/show-season
   def season(options = {})
-    optional_auth(options).get('show/season').restful_params(options, [:title, :season]).response
+    get('show/season').params(options).restful_params([:title, :season]).response
   end
 
   # documentation: http://trakt.tv/api-docs/show-season-library
@@ -102,7 +101,7 @@ class TraktApi::Show < TraktApi::Base
 
   # documentation: http://trakt.tv/api-docs/show-seasons
   def seasons(options = {})
-    get('show/seasons').restful_params(options, [:title]).response
+    get('show/seasons').params(options).restful_params([:title]).response
   end
 
   # documentation: http://trakt.tv/api-docs/show-seen
@@ -112,12 +111,12 @@ class TraktApi::Show < TraktApi::Base
 
   # documentation: http://trakt.tv/api-docs/show-stats
   def stats(options = {})
-    get('show/stats').restful_params(options, [:title]).response
+    get('show/stats').params(options).restful_params([:title]).response
   end
 
   # documentation: http://trakt.tv/api-docs/show-summary
   def summary(options = {})
-    optional_auth(options).get('show/summary').restful_params(options, [:title, :extended]).response
+    get('show/summary').params(options).restful_params([:title, :extended]).response
   end
 
   # documentation: http://trakt.tv/api-docs/show-summaries
@@ -142,7 +141,7 @@ class TraktApi::Show < TraktApi::Base
 
   # documentation: http://trakt.tv/api-docs/show-watchingnow
   def watching_now(options = {})
-    optional_auth(options).get('show/watchingnow').restful_params(options, [:title]).response
+    get('show/watchingnow').params(options).restful_params([:title]).response
   end
 
   # documentation: http://trakt.tv/api-docs/show-watchlist

data/lib/trakt_api/shows.rb

@@ -1,11 +1,11 @@
 class TraktApi::Shows < TraktApi::Base
   # documentation: http://trakt.tv/api-docs/shows-trending
   def trending(options = {})
-    optional_auth(options).get('shows/trending').response
+    get('shows/trending').params(options).response
   end
 
   # documentation: http://trakt.tv/api-docs/shows-updated
   def updated(options = {})
-    get('shows/updated').restful_params(options, [:time]).response
+    get('shows/updated').params(options).restful_params([:time]).response
   end
 end

data/lib/trakt_api/user.rb

@@ -1,124 +1,116 @@
 class TraktApi::User < TraktApi::Base
   # documentation: http://trakt.tv/api-docs/user-calendar-shows
   def calendar_shows(options = {})
-    optional_auth(options).get('user/calendar/shows').restful_params(options, [:username, :date, :days]).response
+    get('user/calendar/shows').params(options).restful_params([:username, :date, :days]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-lastactivity
   def last_activity(options = {})
-    optional_auth(options).get('user/lastactivity').restful_params(options, [:username]).response
+    get('user/lastactivity').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-library-movies-all
   def library_movies_all(options = {})
-    optional_auth(options).get('user/library/movies/all').restful_params(options, [:username]).params(options).response
+    get('user/library/movies/all').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-library-movies-collection
   def library_movies_collection(options = {})
-    optional_auth(options).get('user/library/movies/collection').restful_params(options, [:username]).params(options).
-      response
+    get('user/library/movies/collection').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-library-movies-watched
   def library_movies_watched(options = {})
-    optional_auth(options).get('user/library/movies/watched').restful_params(options, [:username]).params(options).
-      response
+    get('user/library/movies/watched').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-library-shows-all
   def library_shows_all(options = {})
-    optional_auth(options).get('user/library/shows/all').restful_params(options, [:username]).params(options).
-      response
+    get('user/library/shows/all').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-library-shows-collection
   def library_shows_collection(options = {})
-    optional_auth(options).get('user/library/shows/collection').restful_params(options, [:username]).params(options).
-      response
+    get('user/library/shows/collection').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-library-shows-watched
   def library_shows_watched(options = {})
-    optional_auth(options).get('user/library/shows/watched').restful_params(options, [:username]).params(options).
-      response
+    get('user/library/shows/watched').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-list
   def list(options = {})
-    optional_auth(options).get('user/list').restful_params(options, [:username, :slug]).params(options).response
+    get('user/list').params(options).restful_params([:username, :slug]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-lists
   def lists(options = {})
-    optional_auth(options).get('user/lists').restful_params(options, [:username]).params(options).response
+    get('user/lists').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-network-followers
   def network_followers(options = {})
-    optional_auth(options).get('user/network/followers').restful_params(options, [:username]).params(options).response
+    get('user/network/followers').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-network-following
   def network_following(options = {})
-    optional_auth(options).get('user/network/following').restful_params(options, [:username]).params(options).response
+    get('user/network/following').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-network-friends
   def network_friends(options = {})
-    optional_auth(options).get('user/network/friends').restful_params(options, [:username]).params(options).response
+    get('user/network/friends').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-profile
   def profile(options = {})
-    optional_auth(options).get('user/profile').restful_params(options, [:username]).params(options).response
+    get('user/profile').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-progress-collected
   def progress_collected(options = {})
-    optional_auth(options).get('user/progress/collected').
-      restful_params(options, [:username, :title, :sort, :extended]).response
+    get('user/progress/collected').params(options).restful_params([:username, :title, :sort, :extended]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-progress-watched
   def progress_watched(options = {})
-    optional_auth(options).get('user/progress/watched').restful_params(options, [:username, :title, :sort, :extended]).
-      response
+    get('user/progress/watched').params(options).restful_params([:username, :title, :sort, :extended]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-ratings-episodes
   def ratings_episodes(options = {})
-    optional_auth(options).get('user/ratings/episodes').restful_params(options, [:username, :rating, :extended]).
-      response
+    get('user/ratings/episodes').params(options).restful_params([:username, :rating, :extended]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-ratings-movies
   def ratings_movies(options = {})
-    optional_auth(options).get('user/ratings/movies').restful_params(options, [:username, :rating, :extended]).response
+    get('user/ratings/movies').params(options).restful_params([:username, :rating, :extended]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-ratings-shows
   def ratings_shows(options = {})
-    optional_auth(options).get('user/ratings/shows').restful_params(options, [:username, :rating, :extended]).response
+    get('user/ratings/shows').params(options).restful_params([:username, :rating, :extended]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-watching
   def watching(options = {})
-    optional_auth(options).get('user/watching').restful_params(options, [:username]).response
+    get('user/watching').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-watchlist-episodes
-  def watchlist_episode(options = {})
-    optional_auth(options).get('user/watchlist/episodes').restful_params(options, [:username]).response
+  def watch_list_episode(options = {})
+    get('user/watchlist/episodes').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-watchlist-movies
-  def watchlist_movies(options = {})
-    optional_auth(options).get('user/watchlist/movies').restful_params(options, [:username]).response
+  def watch_list_movies(options = {})
+    get('user/watchlist/movies').params(options).restful_params([:username]).response
   end
 
   # documentation: http://trakt.tv/api-docs/user-watchlist-shows
-  def watchlist_shows(options = {})
-    optional_auth(options).get('user/watchlist/shows').restful_params(options, [:username]).response
+  def watch_list_shows(options = {})
+    get('user/watchlist/shows').params(options).restful_params([:username]).response
   end
 end