themoviedb 0.1.0 → 1.0.0

data/lib/themoviedb.rb

@@ -1,11 +1,10 @@
 require 'rubygems'
 require 'httparty'
 
-["api", "search", "resource", "configuration"].each do |inc|
-  require File.join(File.dirname(__FILE__), "themoviedb", inc)
+%w(api search resource configuration).each do |inc|
+  require File.join(File.dirname(__FILE__), 'themoviedb', inc)
 end
 
-["movie", "tv", "season", "episode", "collection", "person", "company", "genre", "find", "job"].each do |inc|
-  require File.join(File.dirname(__FILE__), "themoviedb", inc)
+%w(movie tv season episode collection person company genre find job).each do |inc|
+  require File.join(File.dirname(__FILE__), 'themoviedb', inc)
 end
-

data/lib/themoviedb/api.rb

@@ -11,14 +11,14 @@ module Tmdb
     end
 
     def self.key(api_key)
-      self.config[:api_key] = api_key
+      config[:api_key] = api_key
     end
 
     def self.language(lang)
-      if (lang.nil?)
-        self.config.delete(:language)
+      if lang.nil?
+        config.delete(:language)
       else
-        self.config[:language] = lang
+        config[:language] = lang
       end
     end
 
@@ -33,6 +33,5 @@ module Tmdb
     def self.set_response(hash)
       @@response = hash
     end
-
   end
 end

data/lib/themoviedb/collection.rb

@@ -1,8 +1,8 @@
 module Tmdb
   class Collection < Resource
-    has_resource 'collection', :plural => 'collections'
+    has_resource 'collection', plural: 'collections'
 
-    #http://docs.themoviedb.apiary.io/#collections
+    # http://docs.themoviedb.apiary.io/#collections
     @@fields = [
       :backdrop_path,
       :id,
@@ -15,11 +15,10 @@ module Tmdb
       attr_accessor field
     end
 
-    #Get all of the images for a particular collection by collection id.
-    def self.images(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/images")
+    # Get all of the images for a particular collection by collection id.
+    def self.images(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/images")
       search.fetch_response
     end
-
   end
-end
+end

data/lib/themoviedb/company.rb

@@ -1,8 +1,8 @@
 module Tmdb
   class Company < Resource
-    has_resource 'company', :plural => 'companies'
+    has_resource 'company', plural: 'companies'
 
-    #http://docs.themoviedb.apiary.io/#companies
+    # http://docs.themoviedb.apiary.io/#companies
     @@fields = [
       :description,
       :headquarters,
@@ -17,11 +17,10 @@ module Tmdb
       attr_accessor field
     end
 
-    #Get the list of movies associated with a particular company.
-    def self.movies(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/movies")
-      search.fetch
+    # Get the list of movies associated with a particular company.
+    def self.movies(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/movies")
+      search.fetch.collect { |result| Tmdb::Movie.new(result) }
     end
-
   end
-end
+end

data/lib/themoviedb/configuration.rb

@@ -1,6 +1,6 @@
 module Tmdb
   class Configuration
-    def initialize()
+    def initialize
       @params = {}
       @resource = '/configuration'
       self
@@ -37,7 +37,7 @@ module Tmdb
 
     def fetch_response
       options = @params.merge(Api.config)
-      response = Api.get(@resource, :query => options)
+      response = Api.get(@resource, query: options)
       response.to_hash
     end
 

data/lib/themoviedb/episode.rb

@@ -1,37 +1,36 @@
 module Tmdb
   class Episode < Resource
-    has_resource 'episode', :plural => 'episodes'
+    has_resource 'episode', plural: 'episodes'
 
-    #Get the primary information about a TV episode by combination of a season and episode number.
-    def self.detail(id, season, episode, conditions={})
-      search = Tmdb::Search.new("/tv/#{self.endpoint_id + id.to_s}/season/#{self.endpoint_id + season.to_s}/#{self.endpoints[:singular]}/#{self.endpoint_id + episode.to_s}")
+    # Get the primary information about a TV episode by combination of a season and episode number.
+    def self.detail(id, season, episode, conditions = {})
+      search = Tmdb::Search.new("/tv/#{endpoint_id + id.to_s}/season/#{endpoint_id + season.to_s}/#{endpoints[:singular]}/#{endpoint_id + episode.to_s}")
       search.filter(conditions)
       search.fetch_response
     end
 
-    #Get the TV episode cast credits by combination of season and episode number.
-    def self.cast(id, season, episode, conditions={})
-      search = Tmdb::Search.new("/tv/#{self.endpoint_id + id.to_s}/season/#{self.endpoint_id + season.to_s}/#{self.endpoints[:singular]}/#{self.endpoint_id + episode.to_s}/credits")
+    # Get the TV episode cast credits by combination of season and episode number.
+    def self.cast(id, season, episode, _conditions = {})
+      search = Tmdb::Search.new("/tv/#{endpoint_id + id.to_s}/season/#{endpoint_id + season.to_s}/#{endpoints[:singular]}/#{endpoint_id + episode.to_s}/credits")
       search.fetch_response['cast']
     end
 
-    #Get the TV episode crew credits by combination of season and episode number.
-    def self.crew(id, season, episode, conditions={})
-      search = Tmdb::Search.new("/tv/#{self.endpoint_id + id.to_s}/season/#{self.endpoint_id + season.to_s}/#{self.endpoints[:singular]}/#{self.endpoint_id + episode.to_s}/credits")
+    # Get the TV episode crew credits by combination of season and episode number.
+    def self.crew(id, season, episode, _conditions = {})
+      search = Tmdb::Search.new("/tv/#{endpoint_id + id.to_s}/season/#{endpoint_id + season.to_s}/#{endpoints[:singular]}/#{endpoint_id + episode.to_s}/credits")
       search.fetch_response['crew']
     end
 
-    #Get the external ids for a TV episode by comabination of a season and episode number.
-    def self.external_ids(id, season, episode, conditions={})
-      search = Tmdb::Search.new("/tv/#{self.endpoint_id + id.to_s}/season/#{self.endpoint_id + season.to_s}/#{self.endpoints[:singular]}/#{self.endpoint_id + episode.to_s}/external_ids")
+    # Get the external ids for a TV episode by comabination of a season and episode number.
+    def self.external_ids(id, season, episode, _conditions = {})
+      search = Tmdb::Search.new("/tv/#{endpoint_id + id.to_s}/season/#{endpoint_id + season.to_s}/#{endpoints[:singular]}/#{endpoint_id + episode.to_s}/external_ids")
       search.fetch_response
     end
 
-    #Get the images (episode stills) for a TV episode by combination of a season and episode number.
-    def self.images(id, season, episode, conditions={})
-      search = Tmdb::Search.new("/tv/#{self.endpoint_id + id.to_s}/season/#{self.endpoint_id + season.to_s}/#{self.endpoints[:singular]}/#{self.endpoint_id + episode.to_s}/images")
+    # Get the images (episode stills) for a TV episode by combination of a season and episode number.
+    def self.images(id, season, episode, _conditions = {})
+      search = Tmdb::Search.new("/tv/#{endpoint_id + id.to_s}/season/#{endpoint_id + season.to_s}/#{endpoints[:singular]}/#{endpoint_id + episode.to_s}/images")
       search.fetch_response
     end
-
   end
 end

data/lib/themoviedb/find.rb

@@ -2,30 +2,29 @@ module Tmdb
   class Find < Resource
     has_resource 'find'
 
-    def self.imdb_id(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}")
+    def self.imdb_id(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}")
       search.fetch_response(external_source: 'imdb_id')
     end
 
-    def self.freebase_mid(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}")
+    def self.freebase_mid(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}")
       search.fetch_response(external_source: 'freebase_mid')
     end
 
-    def self.freebase_id(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}")
+    def self.freebase_id(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}")
       search.fetch_response(external_source: 'freebase_id')
     end
 
-    def self.tvrage_id(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}")
+    def self.tvrage_id(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}")
       search.fetch_response(external_source: 'tvrage_id')
     end
 
-    def self.tvdb_id(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}")
+    def self.tvdb_id(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}")
       search.fetch_response(external_source: 'tvdb_id')
     end
-
   end
-end
+end

data/lib/themoviedb/genre.rb

@@ -1,63 +1,59 @@
 module Tmdb
-	class Genre
-    def initialize(attributes={})
+  class Genre
+    def initialize(attributes = {})
       attributes.each do |key, value|
-        if self.respond_to?(key.to_sym)
-          self.instance_variable_set("@#{key}", value)
+        instance_variable_set("@#{key}", value) if respond_to?(key.to_sym)
+      end
+    end
+
+    # http://docs.themoviedb.apiary.io/#genres
+    @@fields = [
+      :id,
+      :page,
+      :total_pages,
+      :total_results,
+      :results
+    ]
+
+    @@fields.each do |field|
+      attr_accessor field
+    end
+
+    def self.search(query)
+      detail(list['genres'].detect { |g| g['name'] == query }['id'])
+    end
+
+    class << self
+      alias find search
+    end
+
+    def self.list
+      search = Tmdb::Search.new('/genre/list')
+      search.fetch_response
+    end
+
+    def self.detail(id, conditions = {})
+      url = "/genre/#{id}/movies"
+      unless conditions.empty?
+        url << '?'
+        conditions.each_with_index do |(key, value), index|
+          url << "#{key}=#{value}"
+          url << '&' if index != conditions.length - 1
         end
       end
+      search = Tmdb::Search.new(url)
+      new(search.fetch_response)
     end
 
-		#http://docs.themoviedb.apiary.io/#genres
-		@@fields = [
-			:id,
-			:page,
-			:total_pages,
-			:total_results,
-			:results
-		]
-
-		@@fields.each do |field|
-			attr_accessor field
-		end
-
-		def self.search(query)
-			self.detail(self.list['genres'].detect { |g| g['name'] == query }['id'])
-		end
-
-		class << self
-			alias_method :find, :search
-		end
-
-		def self.list
-			search = Tmdb::Search.new("/genre/list")
-			search.fetch_response
-		end
-
-		def self.detail(id, conditions={})
-			url = "/genre/#{id}/movies"
-			if !conditions.empty?
-				url << "?"
-				conditions.each_with_index do |(key, value), index|
-					url << "#{key}=#{value}"
-					if index != conditions.length - 1
-						url << "&"
-					end
-				end
-			end
-			search = Tmdb::Search.new(url)
-			self.new(search.fetch_response)
-		end
-
-		def name
-			@name ||= self.class.list['genres'].detect { |g| g['id'] == @id }['name']
-		end
-
-		def get_page(page_number, conditions={})
-			if page_number != @page and page_number > 0 and page_number <= @total_pages
-				conditions.merge!({ :page => page_number })
-				self.class.detail(id, conditions)
-			end
-		end
-	end
-end
+    def name
+      @name ||= self.class.list['genres'].detect { |g| g['id'] == @id }['name']
+    end
+
+    def get_page(page_number, conditions = {})
+      if page_number != @page && page_number > 0 && page_number <= @total_pages
+        conditions[:page] = page_number
+        self.class.detail(id, conditions)
+      end
+    end
+  end
+end

data/lib/themoviedb/job.rb

@@ -1,10 +1,8 @@
 module Tmdb
   class Job
-    def initialize(attributes={})
+    def initialize(attributes = {})
       attributes.each do |key, value|
-        if self.respond_to?(key.to_sym)
-          self.instance_variable_set("@#{key}", value)
-        end
+        instance_variable_set("@#{key}", value) if respond_to?(key.to_sym)
       end
     end
 
@@ -19,7 +17,7 @@ module Tmdb
     end
 
     def self.list
-      search = Tmdb::Search.new("/job/list")
+      search = Tmdb::Search.new('/job/list')
       search.fetch_response
     end
   end

data/lib/themoviedb/movie.rb

@@ -1,8 +1,8 @@
 module Tmdb
   class Movie < Resource
-    has_resource 'movie', :plural => 'movies'
+    has_resource 'movie', plural: 'movies'
 
-    #http://docs.themoviedb.apiary.io/#movies
+    # http://docs.themoviedb.apiary.io/#movies
     @@fields = [
       :adult,
       :backdrop_path,
@@ -43,119 +43,118 @@ module Tmdb
       attr_accessor field
     end
 
-    #Get the latest movie id. singular
+    # Get the latest movie id. singular
     def self.latest
-      search = Tmdb::Search.new("/movie/latest")
-      search.fetch_response
+      search = Tmdb::Search.new('/movie/latest')
+      new(search.fetch_response)
     end
 
-    #Get the list of upcoming movies. This list refreshes every day. The maximum number of items this list will include is 100.
+    # Get the list of upcoming movies. This list refreshes every day. The maximum number of items this list will include is 100.
     def self.upcoming
-      search = Tmdb::Search.new("/movie/upcoming")
-      search.fetch
+      search = Tmdb::Search.new('/movie/upcoming')
+      search.fetch.collect { |result| new(result) }
     end
 
-    #Get the list of movies playing in theatres. This list refreshes every day. The maximum number of items this list will include is 100.
+    # Get the list of movies playing in theatres. This list refreshes every day. The maximum number of items this list will include is 100.
     def self.now_playing
-      search = Tmdb::Search.new("/movie/now_playing")
-      search.fetch
+      search = Tmdb::Search.new('/movie/now_playing')
+      search.fetch.collect { |result| new(result) }
     end
 
-    #Get the list of popular movies on The Movie Database. This list refreshes every day.
+    # Get the list of popular movies on The Movie Database. This list refreshes every day.
     def self.popular
-      search = Tmdb::Search.new("/movie/popular")
-      search.fetch
+      search = Tmdb::Search.new('/movie/popular')
+      search.fetch.collect { |result| new(result) }
     end
 
-    #Get the list of top rated movies. By default, this list will only include movies that have 10 or more votes. This list refreshes every day.
+    # Get the list of top rated movies. By default, this list will only include movies that have 10 or more votes. This list refreshes every day.
     def self.top_rated
-      search = Tmdb::Search.new("/movie/top_rated")
-      search.fetch
+      search = Tmdb::Search.new('/movie/top_rated')
+      search.fetch.collect { |result| new(result) }
     end
 
-    #Discover movies by different types of data like average rating, number of votes, genres and certifications.
-    def self.discover(conditions={})
-      search = Tmdb::Search.new("/discover/movie")
+    # Discover movies by different types of data like average rating, number of votes, genres and certifications.
+    def self.discover(conditions = {})
+      search = Tmdb::Search.new('/discover/movie')
       search.filter(conditions)
-      search.fetch
+      search.fetch.collect { |result| new(result) }
     end
 
-    #Get the alternative titles for a specific movie id.
-    def self.alternative_titles(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/alternative_titles")
+    # Get the alternative titles for a specific movie id.
+    def self.alternative_titles(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/alternative_titles")
       search.fetch_response
     end
 
-    #Get the cast information for a specific movie id.
-    def self.casts(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/casts")
+    # Get the cast information for a specific movie id.
+    def self.casts(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/casts")
       search.fetch_response['cast']
     end
 
-    #Get the cast information for a specific movie id.
-    def self.crew(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/casts")
+    # Get the cast information for a specific movie id.
+    def self.crew(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/casts")
       search.fetch_response['crew']
     end
 
-    #Get the images (posters and backdrops) for a specific movie id.
-    def self.images(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/images")
+    # Get the images (posters and backdrops) for a specific movie id.
+    def self.images(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/images")
       search.fetch_response
     end
 
-    #Get the plot keywords for a specific movie id.
-    def self.keywords(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/keywords")
+    # Get the plot keywords for a specific movie id.
+    def self.keywords(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/keywords")
       search.fetch_response
     end
 
-    #Get the release date by country for a specific movie id.
-    def self.releases(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/releases")
+    # Get the release date by country for a specific movie id.
+    def self.releases(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/releases")
       search.fetch_response
     end
 
-    #Get the trailers for a specific movie id.
-    def self.trailers(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/trailers")
+    # Get the trailers for a specific movie id.
+    def self.trailers(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/trailers")
       search.fetch_response
     end
 
-    #Get the translations for a specific movie id.
-    def self.translations(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/translations")
+    # Get the translations for a specific movie id.
+    def self.translations(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/translations")
       search.fetch_response
     end
 
-    #Get the similar movies for a specific movie id.
-    def self.similar_movies(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/similar_movies")
+    # Get the similar movies for a specific movie id.
+    def self.similar_movies(id, conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/similar_movies")
       search.filter(conditions)
-      search.fetch
+      search.fetch.collect { |result| new(result) }
     end
 
-    #Get the lists that the movie belongs to.
-    def self.lists(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/lists")
+    # Get the lists that the movie belongs to.
+    def self.lists(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/lists")
       search.fetch_response
     end
 
-    #Get the changes for a specific movie id.
-    #Changes are grouped by key, and ordered by date in descending order.
-    #By default, only the last 24 hours of changes are returned.
-    #The maximum number of days that can be returned in a single request is 14.
-    #The language is present on fields that are translatable.
-    def self.changes(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/changes")
+    # Get the changes for a specific movie id.
+    # Changes are grouped by key, and ordered by date in descending order.
+    # By default, only the last 24 hours of changes are returned.
+    # The maximum number of days that can be returned in a single request is 14.
+    # The language is present on fields that are translatable.
+    def self.changes(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/changes")
       search.fetch_response
     end
 
-    #Get the credits for a specific movie id.
-    def self.credits(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/credits")
+    # Get the credits for a specific movie id.
+    def self.credits(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/credits")
       search.fetch_response
     end
-
   end
 end