filmaffinity 1.1.2 → 1.1.3

data/lib/filmaffinity/search.rb

@@ -1,17 +1,27 @@
+# frozen_string_literal: true
+
 require 'cgi'
 
 module FilmAffinity
-  # Class Search
   class Search
     def initialize(query)
       @query = query
-      @json_parser = JsonMoviesParser.new
     end
 
     def movies
       @movies ||= (exact_match? ? parse_movie : parse_movies)
     end
 
+    def to_json(*_args)
+      @json_parser.to_json(movies)
+    end
+
+    private
+
+    def json_parser
+      @json_parser ||= JsonMoviesParser.new
+    end
+
     def exact_match?
       !document_html.at('.z-movie').nil?
     end
@@ -21,28 +31,23 @@ module FilmAffinity
     end
 
     def generate_html
-      open(Constants.urls[:search_by_title] % CGI.escape(@query))
+      URI.parse(Constants.urls[:search_by_title] % CGI.escape(@query)).open
     end
 
     def parse_movie
       id    = document_html.at('meta[property="og:url"]')['content'][/\d+/].to_i
       title = document_html.at('meta[property="og:title"]')['content']
+
       [FilmAffinity::Movie.new(id, title)]
     end
 
     def parse_movies
-      movies = []
-      document_html.search('.movie-card.movie-card-1').each do |movie_card|
+      document_html.search('.movie-card.movie-card-1').map do |movie_card|
         id = movie_card['data-movie-id'].to_i
         title = movie_card.search('.mc-title a').first.content.strip
-        movie = FilmAffinity::Movie.new id, title
-        movies << movie
-      end
-      movies
-    end
 
-    def to_json
-      @json_parser.to_json movies
+        FilmAffinity::Movie.new(id, title)
+      end
     end
   end
 end

data/lib/filmaffinity/top.rb

@@ -1,16 +1,26 @@
+# frozen_string_literal: true
+
 module FilmAffinity
-  # Class Top
   class Top
     def initialize(options: {}, limit: 30)
       @options = options
       @limit = limit
-      @json_parser = JsonMoviesParser.new
     end
 
     def movies
       @movies = movies_with_limit
     end
 
+    def to_json(*_args)
+      @json_parser.to_json(movies)
+    end
+
+    private
+
+    def json_parser
+      @json_parser ||= JsonMoviesParser.new
+    end
+
     def document_html(from)
       @document_html = Nokogiri::HTML(generate_html(from))
     end
@@ -23,8 +33,7 @@ module FilmAffinity
     end
 
     def query_options
-      query_options = ''
-      query_options += '?'
+      query_options = '?'
       @options.each do |key, value|
         query_options += Constants.query_params[key] % value
       end
@@ -42,22 +51,21 @@ module FilmAffinity
       response = yield(from)
       collection += response
       last_position = collection.size
-      response.empty? || last_position >= @limit ? collection.flatten[0..@limit - 1] : collect_from(collection, last_position, &block)
+
+      if response.empty? || last_position >= @limit
+        collection.flatten[0..@limit - 1]
+      else
+        collect_from(collection, last_position, &block)
+      end
     end
 
     def parse_movies(document_html)
-      movies = []
-      document_html.search('.movie-card.movie-card-0').each_with_index do |movie_card, _index|
+      document_html.search('.movie-card.movie-card-0').map do |movie_card|
         id = movie_card['data-movie-id'].to_i
         title = movie_card.search('.mc-title a').first.content.strip
-        movie = FilmAffinity::Movie.new id, title
-        movies << movie
-      end
-      movies
-    end
 
-    def to_json
-      @json_parser.to_json movies
+        FilmAffinity::Movie.new(id, title)
+      end
     end
   end
 end

data/lib/filmaffinity/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module FilmAffinity
+  VERSION = '1.1.3'
+end

data/lib/filmaffinity.rb

@@ -1,25 +1,28 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 require 'nokogiri'
 
 require_relative 'constants/constants'
 require_relative 'filmaffinity/configuration'
-require_relative 'filmaffinity/poster-manager'
-require_relative 'filmaffinity/json-movies-parser'
-require_relative 'filmaffinity/json-movie-parser'
+require_relative 'filmaffinity/poster_manager'
+require_relative 'filmaffinity/json_movies_parser'
+require_relative 'filmaffinity/json_movie_parser'
 require_relative 'filmaffinity/movie'
 require_relative 'filmaffinity/search'
 require_relative 'filmaffinity/top'
-# Module FilmAffinity
+require_relative 'filmaffinity/version'
+
 module FilmAffinity
   class << self
-    attr_accessor :configuration
-  end
+    attr_writer :configuration
 
-  def self.configuration
-    @configuration ||= Configuration.new
-  end
+    def configuration
+      @configuration ||= Configuration.new
+    end
 
-  def self.configure
-    yield(configuration)
+    def configure
+      yield(configuration)
+    end
   end
 end

data/spec/filmaffinity/{json-movie-parser_spec.rb → json_movie_parser_spec.rb}

@@ -1,9 +1,12 @@
-require_relative '../spec_helper'
+# frozen_string_literal: true
 
-describe 'JsonMovieParser' do
+require 'spec_helper'
+
+describe JsonMovieParser, :vcr do
   describe '#to_hash' do
     subject { JsonMovieParser.new }
-    it 'return the right director for the given movie' do
+
+    it 'returns the right director for the given movie' do
       movie = FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
       hash = subject.to_hash movie
       expect(hash['director']).to eq('Peter Weir')

data/spec/filmaffinity/{json-movies-parser_spec.rb → json_movies_parser_spec.rb}

@@ -1,9 +1,12 @@
-require_relative '../spec_helper'
+# frozen_string_literal: true
 
-describe 'JsonMoviesParser' do
+require 'spec_helper'
+
+describe JsonMoviesParser, :vcr do
   describe '#to_hashes' do
     subject { JsonMoviesParser.new }
-    it 'return some valid ids for a given search' do
+
+    it 'returns some valid ids for a given search' do
       hashes = subject.to_hashes FilmAffinity::Search.new('truman').movies
       expect(hashes.map { |hash| hash['id'] }).to include(193_232, 504_889)
     end

data/spec/filmaffinity/movie_spec.rb

@@ -1,93 +1,73 @@
-require_relative '../spec_helper'
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe FilmAffinity::Movie, :vcr do
+  subject(:movie) do
+    FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
+  end
 
-describe 'FilmAffinity::Movie' do
   context 'english version' do
     describe '#title' do
       subject(:movie) do
         FilmAffinity::Movie.new(504_889)
       end
-      it 'should return an valid title when initializes with no title' do
+
+      it 'returns an valid title when initializes with no title' do
         expect(movie.title).to eq('The Truman Show')
       end
     end
-
     describe '#rating' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return an Float' do
+
+      it 'returns an Float' do
         expect(movie.rating).to be_a(Float)
       end
     end
-
     describe '#year' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return an Fixnum' do
-        expect(movie.year).to be_an(Fixnum)
+      it 'returns an Integer' do
+        expect(movie.year).to be_an(Integer)
       end
-      it 'should return 1998' do
+      it 'returns 1998' do
         expect(movie.year).to eq(1998)
       end
     end
-
     describe '#duration' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return an Fixnum' do
-        expect(movie.duration).to be_a(Fixnum)
+      it 'returns an Integer' do
+        expect(movie.duration).to be_a(Integer)
       end
-      it 'should return 103' do
+      it 'returns 103' do
         expect(movie.duration).to eq(103)
       end
     end
-
     describe '#country' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return a String' do
+      it 'returns a String' do
         expect(movie.country).to be_a(String)
       end
-      it 'should return "United States"' do
+      it 'returns "United States"' do
         expect(movie.country).to eq('United States')
       end
     end
-
     describe '#director' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return a String' do
+      it 'returns a String' do
         expect(movie.director).to be_a(String)
       end
-      it 'should return "Peter Weir"' do
+      it 'returns "Peter Weir"' do
         expect(movie.director).to eq('Peter Weir')
       end
     end
-
     describe '#script' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return a String' do
+      it 'returns a String' do
         expect(movie.script).to be_a(String)
       end
-      it 'should return "Andrew Niccol"' do
+      it 'returns "Andrew Niccol"' do
         expect(movie.script).to eq('Andrew Niccol')
       end
     end
-
     describe '#cast' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return an Array' do
+      it 'returns an Array' do
         expect(movie.cast).to be_an(Array)
       end
-      it 'should to include the passed cast' do
+      it 'includes the passed cast' do
         expected_cast = [
           'Jim Carrey',
           'Laura Linney',
@@ -97,138 +77,105 @@ describe 'FilmAffinity::Movie' do
         expect(movie.cast).to include(*expected_cast)
       end
     end
-
     describe '#company' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return a String' do
+      it 'returns a String' do
         expect(movie.company).to be_a(String)
       end
-      it 'should return "Paramount Pictures / Scott Rudin Productions"' do
-        expect(movie.company).to eq('Paramount Pictures / Scott Rudin Productions')
+      it 'returns "Paramount Pictures, Scott Rudin Productions"' do
+        expect(movie.company).to eq('Paramount Pictures, Scott Rudin Productions')
       end
     end
-
     describe '#genres' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return an Array' do
+      it 'returns an Array' do
         expect(movie.genres).to be_an(Array)
       end
-      it 'should to include the passed genres' do
+      it 'includes the passed genres' do
         expected_genres = %w(Drama Comedy Satire)
         expect(movie.genres).to include(*expected_genres)
       end
     end
-
     describe '#poster' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return a String' do
+      it 'returns a String' do
         expect(movie.poster).to be_a(String)
       end
-      it 'should return a .jpg address' do
+      it 'returns a .jpg address' do
         expect(movie.poster).to include('.jpg')
       end
     end
   end
 
   context 'spanish version' do
-    before :all do
+    before(:all) do
       FilmAffinity.configure do |config|
         config.language = 'ES'
       end
     end
 
+    after(:all) do
+      FilmAffinity.configure do |config|
+        config.language = 'EN'
+      end
+    end
+
     describe '#title' do
       subject(:movie) do
         FilmAffinity::Movie.new(504_889)
       end
-      it 'should return an valid title when initializes with no title' do
+
+      it 'returns an valid title when initializes with no title' do
         expect(movie.title).to eq('El show de Truman (Una vida en directo)')
       end
     end
-
     describe '#rating' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return an Float' do
+      it 'returns an Float' do
         expect(movie.rating).to be_a(Float)
       end
     end
-
     describe '#year' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return an Fixnum' do
-        expect(movie.year).to be_an(Fixnum)
+      it 'returns an Integer' do
+        expect(movie.year).to be_an(Integer)
       end
-      it 'should return 1998' do
+      it 'returns 1998' do
         expect(movie.year).to eq(1998)
       end
     end
-
     describe '#duration' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return an Fixnum' do
-        expect(movie.duration).to be_a(Fixnum)
+      it 'returns an Integer' do
+        expect(movie.duration).to be_a(Integer)
       end
-      it 'should return 103' do
+      it 'returns 103' do
         expect(movie.duration).to eq(103)
       end
     end
-
     describe '#country' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return a String' do
+      it 'returns a String' do
         expect(movie.country).to be_a(String)
       end
-      it 'should return "Estados Unidos"' do
+      it 'returns "Estados Unidos"' do
         expect(movie.country).to eq('Estados Unidos')
       end
     end
-
     describe '#director' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return a String' do
+      it 'returns a String' do
         expect(movie.director).to be_a(String)
       end
-      it 'should return "Peter Weir"' do
+      it 'returns "Peter Weir"' do
         expect(movie.director).to eq('Peter Weir')
       end
     end
-
     describe '#script' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return a String' do
+      it 'returns a String' do
         expect(movie.script).to be_a(String)
       end
-      it 'should return "Andrew Niccol"' do
+      it 'returns "Andrew Niccol"' do
         expect(movie.script).to eq('Andrew Niccol')
       end
     end
-
     describe '#cast' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return an Array' do
+      it 'returns an Array' do
         expect(movie.cast).to be_an(Array)
       end
-      it 'should to include the passed cast' do
+      it 'includes the passed cast' do
         expected_cast = [
           'Jim Carrey',
           'Laura Linney',
@@ -238,40 +185,28 @@ describe 'FilmAffinity::Movie' do
         expect(movie.cast).to include(*expected_cast)
       end
     end
-
     describe '#company' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return a String' do
+      it 'returns a String' do
         expect(movie.company).to be_a(String)
       end
-      it 'should return "Paramount Pictures / Scott Rudin Productions"' do
-        expect(movie.company).to eq('Paramount Pictures / Scott Rudin Productions')
+      it 'returns "Paramount Pictures, Scott Rudin Productions"' do
+        expect(movie.company).to eq('Paramount Pictures, Scott Rudin Productions')
       end
     end
-
     describe '#genres' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return an Array' do
+      it 'returns an Array' do
         expect(movie.genres).to be_an(Array)
       end
-      it 'should to include the passed genres' do
-        expected_genres = %w(Drama Comedia Sátira)
+      it 'includes the passed genres' do
+        expected_genres = %w[Drama Comedia Sátira]
         expect(movie.genres).to include(*expected_genres)
       end
     end
-
     describe '#poster' do
-      subject(:movie) do
-        FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
-      end
-      it 'should return a String' do
+      it 'returns a String' do
         expect(movie.poster).to be_a(String)
       end
-      it 'should return a .jpg address' do
+      it 'returns a .jpg address' do
         expect(movie.poster).to include('.jpg')
       end
     end

data/spec/filmaffinity/search_spec.rb

@@ -1,30 +1,23 @@
-require_relative '../spec_helper'
-require_relative 'matchers/include-movie'
+# frozen_string_literal: true
 
-describe 'FilmAffinity::Search' do
-  describe '#create_document_html' do
-    subject(:search) { FilmAffinity::Search.new('truman') }
-
-    it '#create_document_html' do
-      document_html = search.document_html
-      expect(document_html).to be_an(Nokogiri::HTML::Document)
-    end
-  end
+require 'spec_helper'
 
+describe FilmAffinity::Search, :vcr do
   describe '#movies' do
     subject(:search) { FilmAffinity::Search.new('truman') }
 
-    it 'should return an array' do
+    it 'returns an array' do
       movies = search.movies
       expect(movies).to be_an(Array)
     end
-    it 'should return just FilmAffinity::Movie objects only' do
-      movies = search.movies
-      movies.each { |movie| expect(movie).to be_an(FilmAffinity::Movie) }
+    it 'returns FilmAffinity::Movie objects only' do
+      expect(search.movies).to all(be_an(FilmAffinity::Movie))
     end
-    it 'should include "Truman Show"' do
+    it 'includes the "The Truman Show"' do
       movies = search.movies
-      truman_movie = FilmAffinity::Movie.new(504_889, 'El show de Truman (Una vida en directo)')
+      truman_movie = FilmAffinity::Movie.new(
+        504_889, 'The Truman Show'
+      )
       expect(movies).to include_movie(truman_movie)
     end
   end
@@ -33,13 +26,13 @@ describe 'FilmAffinity::Search' do
     # Get a direct result from a specific searchs
     subject(:search) { FilmAffinity::Search.new('truman show') }
 
-    it 'should parse id' do
+    it 'parses the id' do
       id = 504_889
       expect(id).to eq(search.movies.first.id)
     end
 
-    it 'should parse title' do
-      title = 'El show de Truman (Una vida en directo) (1998)'
+    it 'parses the title' do
+      title = 'The Truman Show  (1998)'
       expect(title).to eq(search.movies.first.title)
     end
   end