traktr 0.3.0 → 0.4.0

data/lib/traktr/show/episode.rb

@@ -1,14 +1,18 @@
 module Traktr
-  module Show
-    module Episode
+  class Show
+    class Episode
       include HTTParty
       base_uri File.join(Traktr::Show.base_uri, "episode")
+      
+      def initialize(client)
+        @client = client
+      end
 
       ##
       ## show-episode GET methods
       ##
-      def self.comments(title, season, episode)
-        response = self.get("/" + File.join("comments.json", Traktr.api_key, title, season.to_s, episode.to_s))
+      def comments(title, season, episode)
+        response = self.class.get("/" + File.join("comments.json", @client.api_key, title, season.to_s, episode.to_s))
         raise ResponseError.new(response) if response.code != 200
 
         response.parsed_response.collect do |comment|
@@ -16,15 +20,15 @@ module Traktr
         end
       end
 
-      def self.summary(title, season, episode)
-        response = self.get("/" + File.join("summary.json", Traktr.api_key, title, season.to_s, episode.to_s))
+      def summary(title, season, episode)
+        response = self.class.get("/" + File.join("summary.json", @client.api_key, title, season.to_s, episode.to_s))
         raise ResponseError.new(response) if response.code != 200
 
         Mash.new(response.parsed_response)
       end
 
-      def self.watchingnow(title, season, episode)
-        response = self.get("/" + File.join("watchingnow.json", Traktr.api_key, title, season.to_s, episode.to_s))
+      def watchingnow(title, season, episode)
+        response = self.class.get("/" + File.join("watchingnow.json", @client.api_key, title, season.to_s, episode.to_s))
         raise ResponseError.new(response) if response.code != 200
 
         response.parsed_response.collect do |user|
@@ -36,73 +40,73 @@ module Traktr
       ##
       ## show-episode POST methods
       ##
-      def self.library(show, episodes)
+      def library(show, episodes)
         data = {
-            username: Traktr.username, password: Traktr.password,
+            username: @client.username, password: @client.password,
             title: show.title, year: show.year, imdb_id: show.imdb_id, tvdb_id: show.tvdb_id,
             episodes: episodes.collect{ |e| { season: e.season, episode: e.episode } }
         }
-        response = self.post("/" + File.join("library", Traktr.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
+        response = self.class.post("/" + File.join("library", @client.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
         raise ResponseError.new(response) if response.code != 200
 
         Mash.new(response.parsed_response)
       end
 
-      def self.unlibrary(show, episodes)
+      def unlibrary(show, episodes)
         data = {
-            username: Traktr.username, password: Traktr.password,
+            username: @client.username, password: @client.password,
             title: show.title, year: show.year, imdb_id: show.imdb_id, tvdb_id: show.tvdb_id,
             episodes: episodes.collect{ |e| { season: e.season, episode: e.episode } }
         }
-        response = self.post("/" + File.join("unlibrary", Traktr.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
+        response = self.class.post("/" + File.join("unlibrary", @client.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
         raise ResponseError.new(response) if response.code != 200
 
         Mash.new(response.parsed_response)
       end
 
-      def self.seen(show, episodes)
+      def seen(show, episodes)
         data = {
-            username: Traktr.username, password: Traktr.password,
+            username: @client.username, password: @client.password,
             title: show.title, year: show.year, imdb_id: show.imdb_id, tvdb_id: show.tvdb_id,
             episodes: episodes.collect{ |e| { season: e.season, episode: e.episode } }
         }
-        response = self.post("/" + File.join("seen", Traktr.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
+        response = self.class.post("/" + File.join("seen", @client.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
         raise ResponseError.new(response) if response.code != 200
 
         Mash.new(response.parsed_response)
       end
 
-      def self.unseen(show, episodes)
+      def unseen(show, episodes)
         data = {
-            username: Traktr.username, password: Traktr.password,
+            username: @client.username, password: @client.password,
             title: show.title, year: show.year, imdb_id: show.imdb_id, tvdb_id: show.tvdb_id,
             episodes: episodes.collect{ |e| { season: e.season, episode: e.episode } }
         }
-        response = self.post("/" + File.join("unseen", Traktr.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
+        response = self.class.post("/" + File.join("unseen", @client.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
         raise ResponseError.new(response) if response.code != 200
 
         Mash.new(response.parsed_response)
       end
 
-      def self.watchlist(show, episodes)
+      def watchlist(show, episodes)
         data = {
-            username: Traktr.username, password: Traktr.password,
+            username: @client.username, password: @client.password,
             title: show.title, year: show.year, imdb_id: show.imdb_id, tvdb_id: show.tvdb_id,
             episodes: episodes.collect{ |e| { season: e.season, episode: e.episode } }
         }
-        response = self.post("/" + File.join("watchlist", Traktr.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
+        response = self.class.post("/" + File.join("watchlist", @client.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
         raise ResponseError.new(response) if response.code != 200
 
         Mash.new(response.parsed_response)
       end
 
-      def self.unwatchlist(show, episodes)
+      def unwatchlist(show, episodes)
         data = {
-            username: Traktr.username, password: Traktr.password,
+            username: @client.username, password: @client.password,
             title: show.title, year: show.year, imdb_id: show.imdb_id, tvdb_id: show.tvdb_id,
             episodes: episodes.collect{ |e| { season: e.season, episode: e.episode } }
         }
-        response = self.post("/" + File.join("unwatchlist", Traktr.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
+        response = self.class.post("/" + File.join("unwatchlist", @client.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
         raise ResponseError.new(response) if response.code != 200
 
         Mash.new(response.parsed_response)

data/lib/traktr/show/season.rb

@@ -1,31 +1,35 @@
 module Traktr
-  module Show
-    module Season
+  class Show
+    class Season
       include HTTParty
       base_uri File.join(Traktr::Show.base_uri, "season")
 
+      def initialize(client)
+        @client = client
+      end
+      
       ##
       ## show-season POST methods
       ##
-      def self.library(show, season)
+      def library(show, season)
         data = {
-            username: Traktr.username, password: Traktr.password,
+            username: @client.username, password: @client.password,
             title: show.title, year: show.year, imdb_id: show.imdb_id, tvdb_id: show.tvdb_id,
             season: season
         }
-        response = self.post("/" + File.join("library", Traktr.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
+        response = self.class.post("/" + File.join("library", @client.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
         raise ResponseError.new(response) if response.code != 200
 
         Mash.new(response.parsed_response)
       end
 
-      def self.seen(show, season)
+      def seen(show, season)
         data = {
-            username: Traktr.username, password: Traktr.password,
+            username: @client.username, password: @client.password,
             title: show.title, year: show.year, imdb_id: show.imdb_id, tvdb_id: show.tvdb_id,
             season: season
         }
-        response = self.post("/" + File.join("seen", Traktr.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
+        response = self.class.post("/" + File.join("seen", @client.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
         raise ResponseError.new(response) if response.code != 200
 
         Mash.new(response.parsed_response)

data/lib/traktr/shows.rb

@@ -1,13 +1,17 @@
 module Traktr
-  module Shows
+  class Shows
     include HTTParty
     base_uri File.join(Traktr.base_uri, 'shows')
 
+    def initialize(client)
+      @client = client
+    end
+
     ##
     ## movies GET methods
     ##
-    def self.trending
-      response = self.get('/' + File.join('trending.json', Traktr.api_key))
+    def trending
+      response = self.class.get('/' + File.join('trending.json', @client.api_key))
       raise ResponseError.new(response) if response.code != 200
 
       response.parsed_response.collect do |show|
@@ -15,8 +19,8 @@ module Traktr
       end
     end
 
-    def self.updated(timestamp)
-      response = self.get('/' + File.join('updated.json', Traktr.api_key, timestamp.to_i.to_s))
+    def updated(timestamp)
+      response = self.class.get('/' + File.join('updated.json', @client.api_key, timestamp.to_i.to_s))
       raise ResponseError.new(response) if response.code != 200
 
       Mash.new(response.parsed_response)

data/lib/traktr/user.rb

@@ -1,24 +1,28 @@
 module Traktr
-  module User
+  class User
     include HTTParty
     base_uri File.join(Traktr.base_uri, "user")
 
-    def self.lastactivity(user = Traktr.username)
-      response = self.get("/" + File.join("lastactivity.json", Traktr.api_key, user))
+    def initialize(client)
+      @client = client
+    end
+
+    def lastactivity(user = @client.username)
+      response = self.class.get("/" + File.join("lastactivity.json", @client.api_key, user))
       raise ResponseError.new(response) if response.code != 200
 
       Mash.new(response.parsed_response)
     end
 
-    def self.list(slug, user = Traktr.username)
-      response = self.get("/" + File.join("list.json", Traktr.api_key, user, slug))
+    def list(slug, user = @client.username)
+      response = self.class.get("/" + File.join("list.json", @client.api_key, user, slug))
       raise ResponseError.new(response) if response.code != 200
 
       Mash.new(response.parsed_response)
     end
 
-    def self.lists(user = Traktr.username)
-      response = self.get("/" + File.join("lists.json", Traktr.api_key, user))
+    def lists(user = @client.username)
+      response = self.class.get("/" + File.join("lists.json", @client.api_key, user))
       raise ResponseError.new(response) if response.code != 200
 
       response.parsed_response.collect do |item|
@@ -26,15 +30,15 @@ module Traktr
       end
     end
 
-    def self.profile(user = Traktr.username)
-      response = self.get("/" + File.join("profile.json", Traktr.api_key, user))
+    def profile(user = @client.username)
+      response = self.class.get("/" + File.join("profile.json", @client.api_key, user))
       raise ResponseError.new(response) if response.code != 200
 
       Mash.new(response.parsed_response)
     end
 
-    def self.watching(user = Traktr.username)
-      response = self.get("/" + File.join("watching.json", Traktr.api_key, user))
+    def watching(user = @client.username)
+      response = self.class.get("/" + File.join("watching.json", @client.api_key, user))
       raise ResponseError.new(response) if response.code != 200
 
       response.parsed_response.collect do |item|
@@ -44,8 +48,8 @@ module Traktr
   end
 end
 
-require 'traktr/user/library'
-require 'traktr/user/network'
-require 'traktr/user/progress'
-require 'traktr/user/ratings'
-require 'traktr/user/watchlist'
+#require 'traktr/user/library'
+#require 'traktr/user/network'
+#require 'traktr/user/progress'
+#require 'traktr/user/ratings'
+#require 'traktr/user/watchlist'

data/lib/traktr/user/calendar.rb

@@ -4,9 +4,9 @@ module Traktr
       include HTTParty
       base_uri File.join(Traktr::User.base_uri, 'calendar')
 
-      def self.shows(username = Traktr.username, date = Date.today, days = 7)
+      def shows(username = @client.username, date = Date.today, days = 7)
         date = date.strftime('%Y%m%d') if date.class == Date
-        response = self.get('/' + File.join('shows.json', Traktr.api_key, username, date, days.to_s))
+        response = self.class.get('/' + File.join('shows.json', @client.api_key, username, date, days.to_s))
         raise ResponseError.new(response) if response.code != 200
 
         response.parsed_response.collect do |item|

data/lib/traktr/user/library/movies.rb

@@ -5,8 +5,8 @@ module Traktr
         include HTTParty
         base_uri File.join(Traktr::User::Library.base_uri, 'movies')
 
-        def self.all(username = Traktr.username, extended = :min)
-          response = self.get('/' + File.join('all.json', Traktr.api_key, username, extended.to_s))
+        def all(username = @client.username, extended = :min)
+          response = self.class.get('/' + File.join('all.json', @client.api_key, username, extended.to_s))
           raise ResponseError.new(response) if response.code != 200
 
           response.parsed_response.collect do |item|
@@ -14,8 +14,8 @@ module Traktr
           end
         end
 
-        def self.collection(username = Traktr.username, extended = :min)
-          response = self.get('/' + File.join('collection.json', Traktr.api_key, username, extended.to_s))
+        def collection(username = @client.username, extended = :min)
+          response = self.class.get('/' + File.join('collection.json', @client.api_key, username, extended.to_s))
           raise ResponseError.new(response) if response.code != 200
 
           response.parsed_response.collect do |item|
@@ -23,8 +23,8 @@ module Traktr
           end
         end
 
-        def self.watched(username = Traktr.username, extended = :min)
-          response = self.get('/' + File.join('watched.json', Traktr.api_key, username, extended.to_s))
+        def watched(username = @client.username, extended = :min)
+          response = self.class.get('/' + File.join('watched.json', @client.api_key, username, extended.to_s))
           raise ResponseError.new(response) if response.code != 200
 
           response.parsed_response.collect do |item|

data/lib/traktr/user/library/shows.rb

@@ -5,8 +5,8 @@ module Traktr
         include HTTParty
         base_uri File.join(Traktr::User::Library.base_uri, 'shows')
 
-        def self.all(username = Traktr.username, extended = :min)
-          response = self.get('/' + File.join('all.json', Traktr.api_key, username, extended.to_s))
+        def all(username = @client.username, extended = :min)
+          response = self.class.get('/' + File.join('all.json', @client.api_key, username, extended.to_s))
           raise ResponseError.new(response) if response.code != 200
 
           response.parsed_response.collect do |item|
@@ -14,8 +14,8 @@ module Traktr
           end
         end
 
-        def self.collection(username = Traktr.username, extended = :min)
-          response = self.get('/' + File.join('collection.json', Traktr.api_key, username, extended.to_s))
+        def collection(username = @client.username, extended = :min)
+          response = self.class.get('/' + File.join('collection.json', @client.api_key, username, extended.to_s))
           raise ResponseError.new(response) if response.code != 200
 
           response.parsed_response.collect do |item|
@@ -23,8 +23,8 @@ module Traktr
           end
         end
 
-        def self.watched(username = Traktr.username, extended = :min)
-          response = self.get('/' + File.join('watched.json', Traktr.api_key, username, extended.to_s))
+        def watched(username = @client.username, extended = :min)
+          response = self.class.get('/' + File.join('watched.json', @client.api_key, username, extended.to_s))
           raise ResponseError.new(response) if response.code != 200
 
           response.parsed_response.collect do |item|

data/lib/traktr/user/network.rb

@@ -4,8 +4,8 @@ module Traktr
       include HTTParty
       base_uri File.join(Traktr::User.base_uri, 'network')
 
-      def self.followers(username = Traktr.username)
-        response = self.get('/' + File.join('followers.json', Traktr.api_key, username))
+      def followers(username = @client.username)
+        response = self.class.get('/' + File.join('followers.json', @client.api_key, username))
         raise ResponseError.new(response) if response.code != 200
 
         response.parsed_response.collect do |item|
@@ -13,8 +13,8 @@ module Traktr
         end
       end
 
-      def self.following(username = Traktr.username)
-        response = self.get('/' + File.join('following.json', Traktr.api_key, username))
+      def following(username = @client.username)
+        response = self.class.get('/' + File.join('following.json', @client.api_key, username))
         raise ResponseError.new(response) if response.code != 200
 
         response.parsed_response.collect do |item|
@@ -22,8 +22,8 @@ module Traktr
         end
       end
 
-      def self.friends(username = Traktr.username)
-        response = self.get('/' + File.join('friends.json', Traktr.api_key, username))
+      def friends(username = @client.username)
+        response = self.class.get('/' + File.join('friends.json', @client.api_key, username))
         raise ResponseError.new(response) if response.code != 200
 
         response.parsed_response.collect do |item|

data/lib/traktr/user/progress.rb

@@ -4,8 +4,8 @@ module Traktr
       include HTTParty
       base_uri File.join(Traktr::User.base_uri, 'progress')
 
-      def self.collected(username = Traktr.username, title = :all, sort = :title, extended = :min)
-        response = self.get('/' + File.join('collected.json', Traktr.api_key, username, title.to_s, sort.to_s, extended.to_s))
+      def collected(username = @client.username, title = :all, sort = :title, extended = :min)
+        response = self.class.get('/' + File.join('collected.json', @client.api_key, username, title.to_s, sort.to_s, extended.to_s))
         raise ResponseError.new(response) if response.code != 200
 
         response.parsed_response.collect do |item|
@@ -13,8 +13,8 @@ module Traktr
         end
       end
 
-      def self.watched(username = Traktr.username, title = :all, sort = :title, extended = :min)
-        response = self.get('/' + File.join('watched.json', Traktr.api_key, username, title.to_s, sort.to_s, extended.to_s))
+      def watched(username = @client.username, title = :all, sort = :title, extended = :min)
+        response = self.class.get('/' + File.join('watched.json', @client.api_key, username, title.to_s, sort.to_s, extended.to_s))
         raise ResponseError.new(response) if response.code != 200
 
         response.parsed_response.collect do |item|

data/lib/traktr/user/ratings.rb

@@ -4,8 +4,8 @@ module Traktr
       include HTTParty
       base_uri File.join(Traktr::User.base_uri, 'ratings')
 
-      def self.episodes(username = Traktr.username, rating = :all, extended = :min)
-        response = self.get('/' + File.join('episodes.json', Traktr.api_key, username, rating.to_s, extended.to_s))
+      def episodes(username = @client.username, rating = :all, extended = :min)
+        response = self.class.get('/' + File.join('episodes.json', @client.api_key, username, rating.to_s, extended.to_s))
         raise ResponseError.new(response) if response.code != 200
 
         response.parsed_response.collect do |item|
@@ -13,8 +13,8 @@ module Traktr
         end
       end
 
-      def self.movies(username = Traktr.username, rating = :all, extended = :min)
-        response = self.get('/' + File.join('movies.json', Traktr.api_key, username, rating.to_s, extended.to_s))
+      def movies(username = @client.username, rating = :all, extended = :min)
+        response = self.class.get('/' + File.join('movies.json', @client.api_key, username, rating.to_s, extended.to_s))
         raise ResponseError.new(response) if response.code != 200
 
         response.parsed_response.collect do |item|
@@ -22,8 +22,8 @@ module Traktr
         end
       end
 
-      def self.shows(username = Traktr.username, rating = :all, extended = :min)
-        response = self.get('/' + File.join('shows.json', Traktr.api_key, username, rating.to_s, extended.to_s))
+      def shows(username = @client.username, rating = :all, extended = :min)
+        response = self.class.get('/' + File.join('shows.json', @client.api_key, username, rating.to_s, extended.to_s))
         raise ResponseError.new(response) if response.code != 200
 
         response.parsed_response.collect do |item|

data/lib/traktr/user/watchlist.rb

@@ -4,8 +4,8 @@ module Traktr
       include HTTParty
       base_uri File.join(Traktr::User.base_uri, 'watchlist')
 
-      def self.episodes(username = Traktr.username)
-        response = self.get('/' + File.join('episodes.json', Traktr.api_key, username))
+      def episodes(username = @client.username)
+        response = self.class.get('/' + File.join('episodes.json', @client.api_key, username))
         raise ResponseError.new(response) if response.code != 200
 
         response.parsed_response.collect do |item|
@@ -13,8 +13,8 @@ module Traktr
         end
       end
 
-      def self.movies(username = Traktr.username)
-        response = self.get('/' + File.join('movies.json', Traktr.api_key, username))
+      def movies(username = @client.username)
+        response = self.class.get('/' + File.join('movies.json', @client.api_key, username))
         raise ResponseError.new(response) if response.code != 200
 
         response.parsed_response.collect do |item|
@@ -22,8 +22,8 @@ module Traktr
         end
       end
 
-      def self.shows(username = Traktr.username)
-        response = self.get('/' + File.join('shows.json', Traktr.api_key, username))
+      def shows(username = @client.username)
+        response = self.class.get('/' + File.join('shows.json', @client.api_key, username))
         raise ResponseError.new(response) if response.code != 200
 
         response.parsed_response.collect do |item|