traktr 0.5.0 → 0.7.0

data/lib/traktr/show/season.rb

@@ -1,26 +1,13 @@
 module Traktr
   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
-      ##
+    class Season < Endpoint
       def library(show, season)
         data = {
             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.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)
+        parse_response self.class.post("/" + File.join("library", @client.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
       end
 
       def seen(show, season)
@@ -29,12 +16,8 @@ module Traktr
             title: show.title, year: show.year, imdb_id: show.imdb_id, tvdb_id: show.tvdb_id,
             season: season
         }
-        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)
+        parse_response self.class.post("/" + File.join("seen", @client.api_key), body: data.to_json, headers: { 'Content-Type' => 'application/json'})
       end
-
     end
   end
 end

data/lib/traktr/shows.rb

@@ -1,30 +1,12 @@
 module Traktr
-  class Shows
-    include HTTParty
-    base_uri File.join(Traktr.base_uri, 'shows')
-
-    def initialize(client)
-      @client = client
-    end
-
-    ##
-    ## movies GET methods
-    ##
+  class Shows < Endpoint
     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|
-        Mash.new(show)
-      end
+      parse_response self.class.get('/' + File.join('trending.json', @client.api_key), :basic_auth => @auth)
     end
 
     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)
+      timestamp = timestamp.class == Time ? timestamp.to_i.to_s : timestamp.to_s
+      parse_response self.class.get('/' + File.join('updated.json', @client.api_key, timestamp))
     end
-
   end
 end

data/lib/traktr/user.rb

@@ -1,55 +1,52 @@
 module Traktr
-  class User
-    include HTTParty
-    base_uri File.join(Traktr.base_uri, "user")
-
-    def initialize(client)
-      @client = client
+  class User < Endpoint
+    def lastactivity(user = @client.username)
+      parse_response self.class.get("/" + File.join("lastactivity.json", @client.api_key, user), :basic_auth => @auth)
     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
+    def list(slug, user = @client.username)
+      parse_response self.class.get("/" + File.join("list.json", @client.api_key, user, slug), :basic_auth => @auth)
+    end
 
-      Mash.new(response.parsed_response)
+    def lists(user = @client.username)
+      parse_response self.class.get("/" + File.join("lists.json", @client.api_key, user), :basic_auth => @auth)
     end
 
-    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
+    def profile(user = @client.username)
+      parse_response self.class.get("/" + File.join("profile.json", @client.api_key, user), :basic_auth => @auth)
+    end
 
-      Mash.new(response.parsed_response)
+    def watching(user = @client.username)
+      #
+      # TODO : When the user is protected or not currently watching anything, this
+      #        returns an empty array. However, Trakt's documentation makes it seem
+      #        like an empty object will be returned
+      #
+      parse_response self.class.get("/" + File.join("watching.json", @client.api_key, user), :basic_auth => @auth)
     end
 
-    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
+    def calendar
+      @calendar ||= Traktr::User::Calendar.new(@client)
+    end
 
-      response.parsed_response.collect do |item|
-        Mash.new(item)
-      end
+    def library
+      @library ||= Traktr::User::Library.new(@client)
     end
 
-    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
+    def network
+      @network ||= Traktr::User::Network.new(@client)
+    end
 
-      Mash.new(response.parsed_response)
+    def progress
+      @progress ||= Traktr::User::Progress.new(@client)
     end
 
-    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
+    def ratings
+      @ratings ||= Traktr::User::Ratings.new(@client)
+    end
 
-      response.parsed_response.collect do |item|
-        Mash.new(item)
-      end
+    def watchlist
+      @watchlist ||= Traktr::User::Watchlist.new(@client)
     end
   end
 end
-
-#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

@@ -1,17 +1,9 @@
 module Traktr
-  module User
-    module Calendar
-      include HTTParty
-      base_uri File.join(Traktr::User.base_uri, 'calendar')
-
+  class User
+    class Calendar < Endpoint
       def shows(username = @client.username, date = Date.today, days = 7)
-        date = date.strftime('%Y%m%d') if date.class == Date
-        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|
-          Mash.new(item)
-        end
+        date = date.class == Date ? date.strftime("%Y%m%d") : date.to_s
+        parse_response self.class.get('/' + File.join('shows.json', @client.api_key, username, date, days.to_s), :basic_auth => @auth)
       end
     end
   end

data/lib/traktr/user/library.rb

@@ -1,11 +1,13 @@
 module Traktr
-  module User
-    module Library
-      include HTTParty
-      base_uri File.join(Traktr::User.base_uri, 'library')
+  class User
+    class Library < Endpoint
+      def movies
+      	@movies ||= Traktr::User::Library::Movies.new(@client)
+      end
+
+      def shows
+      	@shows ||= Traktr::User::Library::Shows.new(@client)
+      end
     end
   end
 end
-
-require 'traktr/user/library/movies'
-require 'traktr/user/library/shows'

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

@@ -1,35 +1,17 @@
 module Traktr
-  module User
-    module Library
-      module Movies
-        include HTTParty
-        base_uri File.join(Traktr::User::Library.base_uri, 'movies')
-
+  class User
+    class Library
+      class Movies < Endpoint
         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|
-            Mash.new(item)
-          end
+          parse_response self.class.get('/' + File.join('all.json', @client.api_key, username, extended.to_s))
         end
 
         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|
-            Mash.new(item)
-          end
+          parse_response self.class.get('/' + File.join('collection.json', @client.api_key, username, extended.to_s))
         end
 
         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|
-            Mash.new(item)
-          end
+          parse_response self.class.get('/' + File.join('watched.json', @client.api_key, username, extended.to_s))
         end
       end
     end

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

@@ -1,35 +1,17 @@
 module Traktr
-  module User
-    module Library
-      module Shows
-        include HTTParty
-        base_uri File.join(Traktr::User::Library.base_uri, 'shows')
-
+  class User
+    class Library
+      class Shows < Endpoint
         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|
-            Mash.new(item)
-          end
+          parse_response self.class.get('/' + File.join('all.json', @client.api_key, username, extended.to_s))
         end
 
         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|
-            Mash.new(item)
-          end
+          parse_response self.class.get('/' + File.join('collection.json', @client.api_key, username, extended.to_s))
         end
 
         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|
-            Mash.new(item)
-          end
+          parse_response self.class.get('/' + File.join('watched.json', @client.api_key, username, extended.to_s))
         end
       end
     end

data/lib/traktr/user/network.rb

@@ -1,34 +1,16 @@
 module Traktr
-  module User
-    module Network
-      include HTTParty
-      base_uri File.join(Traktr::User.base_uri, 'network')
-
+  class User
+    class Network < Endpoint
       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|
-          Mash.new(item)
-        end
+        parse_response self.class.get('/' + File.join('followers.json', @client.api_key, username))
       end
 
       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|
-          Mash.new(item)
-        end
+        parse_response self.class.get('/' + File.join('following.json', @client.api_key, username))
       end
 
       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|
-          Mash.new(item)
-        end
+        parse_response self.class.get('/' + File.join('friends.json', @client.api_key, username))
       end
     end
   end

data/lib/traktr/user/progress.rb

@@ -1,25 +1,12 @@
 module Traktr
-  module User
-    module Progress
-      include HTTParty
-      base_uri File.join(Traktr::User.base_uri, 'progress')
-
+  class User
+    class Progress < Endpoint
       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|
-          Mash.new(item)
-        end
+        parse_response self.class.get('/' + File.join('collected.json', @client.api_key, username, title.to_s, sort.to_s, extended.to_s))
       end
 
       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|
-          Mash.new(item)
-        end
+        parse_response self.class.get('/' + File.join('watched.json', @client.api_key, username, title.to_s, sort.to_s, extended.to_s))
       end
     end
   end

data/lib/traktr/user/ratings.rb

@@ -1,34 +1,16 @@
 module Traktr
-  module User
-    module Ratings
-      include HTTParty
-      base_uri File.join(Traktr::User.base_uri, 'ratings')
-
+  class User
+    class Ratings < Endpoint
       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|
-          Mash.new(item)
-        end
+        parse_response self.class.get('/' + File.join('episodes.json', @client.api_key, username, rating.to_s, extended.to_s))
       end
 
       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|
-          Mash.new(item)
-        end
+        parse_response self.class.get('/' + File.join('movies.json', @client.api_key, username, rating.to_s, extended.to_s))
       end
 
       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|
-          Mash.new(item)
-        end
+        parse_response self.class.get('/' + File.join('shows.json', @client.api_key, username, rating.to_s, extended.to_s))
       end
     end
   end

data/lib/traktr/user/watchlist.rb

@@ -1,34 +1,16 @@
 module Traktr
-  module User
-    module Watchlist
-      include HTTParty
-      base_uri File.join(Traktr::User.base_uri, 'watchlist')
-
+  class User
+    class Watchlist < Endpoint
       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|
-          Mash.new(item)
-        end
+        parse_response self.class.get('/' + File.join('episodes.json', @client.api_key, username))
       end
 
       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|
-          Mash.new(item)
-        end
+        parse_response self.class.get('/' + File.join('movies.json', @client.api_key, username))
       end
 
       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|
-          Mash.new(item)
-        end
+        parse_response self.class.get('/' + File.join('shows.json', @client.api_key, username))
       end
     end
   end