themoviedb 0.1.0 → 1.0.0

data/lib/themoviedb/person.rb

@@ -1,8 +1,8 @@
 module Tmdb
   class Person < Resource
-    has_resource 'person', :plural => 'people'
+    has_resource 'person', plural: 'people'
 
-    #http://docs.themoviedb.apiary.io/#people
+    # http://docs.themoviedb.apiary.io/#people
     @@fields = [
       :adult,
       :also_known_as,
@@ -11,6 +11,7 @@ module Tmdb
       :deathday,
       :homepage,
       :id,
+      :known_for,
       :name,
       :place_of_birth,
       :profile_path,
@@ -25,62 +26,65 @@ module Tmdb
       attr_accessor field
     end
 
-    #Get the list of popular people on The Movie Database. This list refreshes every day.
+    # Get the list of popular people on The Movie Database. This list refreshes every day.
     def self.popular
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/popular")
-      search.fetch
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/popular")
+      search.fetch.collect do |result|
+        next unless result['known_for']
+        result['known_for'] = result['known_for'].collect { |movie| Tmdb::Movie.new(movie) }
+        new(result)
+      end
     end
 
-    #Get the latest person id.
+    # Get the latest person id.
     def self.latest
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/latest")
-      search.fetch_response
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/latest")
+      person = new(search.fetch_response)
     end
 
-    #Get the combined credits for a specific person id.
-    def self.credits(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/combined_credits")
+    # Get the combined credits for a specific person id.
+    def self.credits(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/combined_credits")
       search.fetch_response
     end
 
-    #Get film credits for a specific person id.
-    def self.movie_credits(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/movie_credits")
+    # Get film credits for a specific person id.
+    def self.movie_credits(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/movie_credits")
       search.fetch_response
     end
 
-    #Get TV credits for a specific person id.
-    def self.tv_credits(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/tv_credits")
+    # Get TV credits for a specific person id.
+    def self.tv_credits(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/tv_credits")
       search.fetch_response
     end
 
-    #Get external ID's for a specific person id.
-    def self.external_ids(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/external_ids")
+    # Get external ID's for a specific person id.
+    def self.external_ids(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/external_ids")
       search.fetch_response
     end
 
-    #Get the images for a specific person id.
-    def self.images(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/images")
+    # Get the images for a specific person id.
+    def self.images(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/images")
       search.fetch_response
     end
 
-    #Get the tagged images for a specific person id.
-    def self.tagged_images(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/tagged_images")
+    # Get the tagged images for a specific person id.
+    def self.tagged_images(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/tagged_images")
       search.fetch_response
     end
 
-    #Get the changes for a specific person 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 person 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
-
   end
 end

data/lib/themoviedb/resource.rb

@@ -3,56 +3,54 @@ module Tmdb
     @@endpoints = {}
     @@endpoint_id = {}
 
-    def self.has_resource(singular=nil, opts={})
-      @@endpoints[self.name.downcase] = {
-        :singular => singular.nil? ? "#{self.name.downcase}" : singular,
-        :plural => opts[:plural].nil? ? "#{self.name.downcase}s" : opts[:plural]
+    def self.has_resource(singular = nil, opts = {})
+      @@endpoints[name.downcase] = {
+        singular: singular.nil? ? name.downcase.to_s : singular,
+        plural: opts[:plural].nil? ? "#{name.downcase}s" : opts[:plural]
       }
-      @@endpoint_id[self.name.downcase] = opts[:id].nil? ? "" : "#{opts[:id]}-"
+      @@endpoint_id[name.downcase] = opts[:id].nil? ? '' : "#{opts[:id]}-"
     end
 
     def self.endpoints
-      @@endpoints[self.name.downcase]
+      @@endpoints[name.downcase]
     end
 
     def self.endpoint_id
-      @@endpoint_id[self.name.downcase]
+      @@endpoint_id[name.downcase]
     end
 
-    #Get the basic resource information for a specific id.
-    def self.detail(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}")
+    # Get the basic resource information for a specific id.
+    def self.detail(id, conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}")
       search.filter(conditions)
       search.fetch_response
     end
 
-    def self.list(conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:plural]}")
+    def self.list(conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:plural]}")
       search.filter(conditions)
       search.fetch.collect do |result|
-        self.new(result)
+        new(result)
       end
     end
 
     def self.search(query)
       search = Tmdb::Search.new
-      search.resource("#{self.endpoints[:singular]}")
+      search.resource(endpoints[:singular].to_s)
       search.query(query)
       search.fetch.collect do |result|
-        self.new(result)
+        new(result)
       end
     end
 
     class << self
-      alias_method :find, :search
+      alias find search
     end
 
-    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
   end
-end
+end

data/lib/themoviedb/search.rb

@@ -1,44 +1,44 @@
 module Tmdb
   class Search
-    def initialize(resource=nil)
+    def initialize(resource = nil)
       @params = {}
       @resource = resource.nil? ? '/search/movie' : resource
       self
     end
 
     def query(query)
-      @params[:query] = "#{query}"
+      @params[:query] = query.to_s
       self
     end
 
     def year(year)
-      @params[:year] = "#{year}"
+      @params[:year] = year.to_s
       self
     end
 
     def primary_realease_year(year)
-      @params[:primary_release_year] = "#{year}"
+      @params[:primary_release_year] = year.to_s
       self
     end
 
     def resource(resource)
       @resource = case resource
-      when 'movie'
-        '/search/movie'
-      when 'collection'
-        '/search/collection'
-      when 'tv'
-        '/search/tv'
-      when 'person'
-        '/search/person'
-      when 'list'
-        '/search/list'
-      when 'company'
-        '/search/company'
-      when 'keyword'
-        '/search/keyword'
-      when 'find'
-        '/find'
+                  when 'movie'
+                    '/search/movie'
+                  when 'collection'
+                    '/search/collection'
+                  when 'tv'
+                    '/search/tv'
+                  when 'person'
+                    '/search/person'
+                  when 'list'
+                    '/search/list'
+                  when 'company'
+                    '/search/company'
+                  when 'keyword'
+                    '/search/keyword'
+                  when 'find'
+                    '/find'
       end
       self
     end
@@ -46,8 +46,8 @@ module Tmdb
     def filter(conditions)
       if conditions
         conditions.each do |key, value|
-          if self.respond_to?(key)
-            self.send(key, value)
+          if respond_to?(key)
+            send(key, value)
           else
             @params[key] = value
           end
@@ -55,25 +55,25 @@ module Tmdb
       end
     end
 
-    #Sends back main data
+    # Sends back main data
     def fetch
       fetch_response['results']
     end
 
-    #Send back whole response
-    def fetch_response(conditions={})
+    # Send back whole response
+    def fetch_response(conditions = {})
       if conditions[:external_source]
-        options = @params.merge(Api.config.merge({external_source: conditions[:external_source]}))
+        options = @params.merge(Api.config.merge({ external_source: conditions[:external_source] }))
       else
         options = @params.merge(Api.config)
       end
-      response = Api.get(@resource, :query => options)
+      response = Api.get(@resource, query: options)
 
       original_etag = response.headers.fetch('etag', '')
-      etag = original_etag.gsub(/"/, '')
+      etag = original_etag.delete('"')
 
-      Api.set_response({'code' => response.code, 'etag' => etag})
-      return response.to_hash
+      Api.set_response('code' => response.code, 'etag' => etag)
+      response.to_hash
     end
   end
 end

data/lib/themoviedb/season.rb

@@ -1,37 +1,36 @@
 module Tmdb
   class Season < Resource
-    has_resource 'season', :plural => 'seasons'
+    has_resource 'season', plural: 'seasons'
 
-    #Get the primary information about a TV season by its season number.
-    def self.detail(id, season, conditions={})
-      search = Tmdb::Search.new("/tv/#{self.endpoint_id + id.to_s}/#{self.endpoints[:singular]}/#{self.endpoint_id + season.to_s}")
+    # Get the primary information about a TV season by its season number.
+    def self.detail(id, season, conditions = {})
+      search = Tmdb::Search.new("/tv/#{endpoint_id + id.to_s}/#{endpoints[:singular]}/#{endpoint_id + season.to_s}")
       search.filter(conditions)
       search.fetch_response
     end
 
-    #Get the cast credits for a TV season by season number.
-    def self.cast(id, season, conditions={})
-      search = Tmdb::Search.new("/tv/#{self.endpoint_id + id.to_s}/#{self.endpoints[:singular]}/#{self.endpoint_id + season.to_s}/credits")
+    # Get the cast credits for a TV season by season number.
+    def self.cast(id, season, _conditions = {})
+      search = Tmdb::Search.new("/tv/#{endpoint_id + id.to_s}/#{endpoints[:singular]}/#{endpoint_id + season.to_s}/credits")
       search.fetch_response['cast']
     end
 
-    #Get the crew credits for a TV season by season number.
-    def self.crew(id, season, conditions={})
-      search = Tmdb::Search.new("/tv/#{self.endpoint_id + id.to_s}/#{self.endpoints[:singular]}/#{self.endpoint_id + season.to_s}/credits")
+    # Get the crew credits for a TV season by season number.
+    def self.crew(id, season, _conditions = {})
+      search = Tmdb::Search.new("/tv/#{endpoint_id + id.to_s}/#{endpoints[:singular]}/#{endpoint_id + season.to_s}/credits")
       search.fetch_response['crew']
     end
 
-    #Get the external ids that we have stored for a TV season by season number.
-    def self.external_ids(id, season, conditions={})
-      search = Tmdb::Search.new("/tv/#{self.endpoint_id + id.to_s}/#{self.endpoints[:singular]}/#{self.endpoint_id + season.to_s}/external_ids")
+    # Get the external ids that we have stored for a TV season by season number.
+    def self.external_ids(id, season, _conditions = {})
+      search = Tmdb::Search.new("/tv/#{endpoint_id + id.to_s}/#{endpoints[:singular]}/#{endpoint_id + season.to_s}/external_ids")
       search.fetch_response
     end
 
-    #Get the images (posters) that we have stored for a TV season by season number.
-    def self.images(id, season, conditions={})
-      search = Tmdb::Search.new("/tv/#{self.endpoint_id + id.to_s}/#{self.endpoints[:singular]}/#{self.endpoint_id + season.to_s}/images")
+    # Get the images (posters) that we have stored for a TV season by season number.
+    def self.images(id, season, _conditions = {})
+      search = Tmdb::Search.new("/tv/#{endpoint_id + id.to_s}/#{endpoints[:singular]}/#{endpoint_id + season.to_s}/images")
       search.fetch_response
     end
-
   end
 end

data/lib/themoviedb/tv.rb

@@ -1,8 +1,8 @@
 module Tmdb
   class TV < Resource
-    has_resource 'tv', :plural => 'tv'
+    has_resource 'tv', plural: 'tv'
 
-    #http://docs.themoviedb.apiary.io/#tv
+    # http://docs.themoviedb.apiary.io/#tv
     @@fields = [
       :backdrop_path,
       :created_by,
@@ -35,48 +35,47 @@ module Tmdb
       attr_accessor field
     end
 
-    #Get the list of popular TV shows. This list refreshes every day.
+    # Get the list of popular TV shows. This list refreshes every day.
     def self.popular
-      search = Tmdb::Search.new("/tv/popular")
-      search.fetch
+      search = Tmdb::Search.new('/tv/popular')
+      search.fetch.collect { |result| new(result) }
     end
 
-    #Get the list of top rated TV shows. By default, this list will only include TV shows that have 2 or more votes. This list refreshes every day.
+    # Get the list of top rated TV shows. By default, this list will only include TV shows that have 2 or more votes. This list refreshes every day.
     def self.top_rated
-      search = Tmdb::Search.new("/tv/top_rated")
-      search.fetch
+      search = Tmdb::Search.new('/tv/top_rated')
+      search.fetch.collect { |result| new(result) }
     end
 
-    #Discover TV shows by different types of data like average rating, number of votes, genres, the network they aired on and air dates
-    def self.discover(conditions={})
-      search = Tmdb::Search.new("/discover/tv")
+    # Discover TV shows by different types of data like average rating, number of votes, genres, the network they aired on and air dates
+    def self.discover(conditions = {})
+      search = Tmdb::Search.new('/discover/tv')
       search.filter(conditions)
-      search.fetch
+      search.fetch.collect { |result| new(result) }
     end
 
-    #Get the cast information about a TV series.
-    def self.cast(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/credits")
+    # Get the cast information about a TV series.
+    def self.cast(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/credits")
       search.fetch_response['cast']
     end
 
-    #Get the crew information about a TV series.
-    def self.crew(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/credits")
+    # Get the crew information about a TV series.
+    def self.crew(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/credits")
       search.fetch_response['crew']
     end
 
-    #Get the external ids that we have stored for a TV series.
-    def self.external_ids(id, conditions={})
-      search = Tmdb::Search.new("/#{self.endpoints[:singular]}/#{self.endpoint_id + id.to_s}/external_ids")
+    # Get the external ids that we have stored for a TV series.
+    def self.external_ids(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/external_ids")
       search.fetch_response
     end
 
-    #Get the images (posters and backdrops) for a TV series.
-    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 TV series.
+    def self.images(id, _conditions = {})
+      search = Tmdb::Search.new("/#{endpoints[:singular]}/#{endpoint_id + id.to_s}/images")
       search.fetch_response
     end
-
   end
 end

data/lib/themoviedb/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tmdb
-  VERSION = "0.1.0"
+  VERSION = '1.0.0'.freeze
 end

data/spec/company_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 require 'vcr'
 
 describe Tmdb::Company do
-
   @fields = [
     :description,
     :headquarters,
@@ -18,41 +17,39 @@ describe Tmdb::Company do
     it { should respond_to field }
   end
 
-  describe "For a company detail" do
-
+  describe 'For a company detail' do
     before(:each) do
       VCR.use_cassette 'company/detail' do
         @company = Tmdb::Company.detail(5)
       end
     end
 
-    it "should return a id" do
-      @company['id'].should eq(5)
+    it 'should return a id' do
+      expect(@company['id']).to eq(5)
     end
 
-    it "should have a description" do
-      @company['description'].should eq("Columbia Pictures Industries, Inc. (CPII) is an American film production and distribution company. Columbia Pictures now forms part of the Columbia TriStar Motion Picture Group, owned by Sony Pictures Entertainment, a subsidiary of the Japanese conglomerate Sony. It is one of the leading film companies in the world, a member of the so-called Big Six. It was one of the so-called Little Three among the eight major film studios of Hollywood's Golden Age.")
+    it 'should have a description' do
+      expect(@company['description']).to eq("Columbia Pictures Industries, Inc. (CPII) is an American film production and distribution company. Columbia Pictures now forms part of the Columbia TriStar Motion Picture Group, owned by Sony Pictures Entertainment, a subsidiary of the Japanese conglomerate Sony. It is one of the leading film companies in the world, a member of the so-called Big Six. It was one of the so-called Little Three among the eight major film studios of Hollywood's Golden Age.")
     end
 
-    it "should have a homepage" do
-      @company['homepage'].should eq("http://www.sonypictures.com/")
+    it 'should have a homepage' do
+      expect(@company['homepage']).to eq('http://www.sonypictures.com/')
     end
 
-    it "should have logo" do
-      @company['logo_path'].should eq("/mjUSfXXUhMiLAA1Zq1TfStNSoLR.png")
+    it 'should have logo' do
+      expect(@company['logo_path']).to eq('/mjUSfXXUhMiLAA1Zq1TfStNSoLR.png')
     end
 
-    it "should have a name" do
-      @company['name'].should eq("Columbia Pictures")
+    it 'should have a name' do
+      expect(@company['name']).to eq('Columbia Pictures')
     end
 
-    it "could have a parent company" do
-      @company['parent_company']["name"].should eq("Sony Pictures Entertainment")
+    it 'could have a parent company' do
+      expect(@company['parent_company']['name']).to eq('Sony Pictures Entertainment')
     end
-
   end
 
-  describe "For a company movies" do
+  describe 'For a company movies' do
     before(:each) do
       VCR.use_cassette 'company/movies' do
         @movies = Tmdb::Company.movies(5)
@@ -60,38 +57,36 @@ describe Tmdb::Company do
       end
     end
 
-    it "should give back multiple movies" do
-      @movies.count.should > 1
+    it 'should give back multiple movies' do
+      expect(@movies.count).to be > 1
     end
 
-    it "should have a id" do
-      @movie["id"].should eq(97020)
+    it 'should have a id' do
+      expect(@movie.id).to eq(97_020)
     end
 
-    it "should have a title" do
-      @movie["title"].should eq("RoboCop")
+    it 'should have a title' do
+      expect(@movie.title).to eq('RoboCop')
     end
 
-    it "should have a original title" do
-      @movie["original_title"].should eq("RoboCop")
+    it 'should have a original title' do
+      expect(@movie.original_title).to eq('RoboCop')
     end
 
-    it "should have a poster" do
-      @movie["poster_path"].should eq("/xxLhczZMiJt1iRdhfkVkuMu87si.jpg")
+    it 'should have a poster' do
+      expect(@movie.poster_path).to eq('/xxLhczZMiJt1iRdhfkVkuMu87si.jpg')
     end
 
-    it "should have a popularity rating" do
-      @movie["popularity"].should eq(3.13451193740971)
+    it 'should have a popularity rating' do
+      expect(@movie.popularity).to eq(3.13451193740971)
     end
 
-    it "should show whether it is an adult movie" do
-      @movie["adult"].should eq(false)
+    it 'should show whether it is an adult movie' do
+      expect(@movie.adult).to eq(false)
     end
 
-    it "should have a release date" do
-      @movie["release_date"].should eq("2014-02-07")
+    it 'should have a release date' do
+      expect(@movie.release_date).to eq('2014-02-07')
     end
-
   end
-
-end
+end