filmaffinity 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 84f126709ab4e3d029bd5d44d1a1cbdd4489f29d
-  data.tar.gz: d052a091f96b336367eced41ffe2f09f4b94cf3a
+SHA256:
+  metadata.gz: a9088f75d64b8f2421c88d12ac936cfa80c90a6bd5e42fae80fdf3dfdd47f1d4
+  data.tar.gz: a0156abae8630d24c0b287050e22d3d7040f3b02267ae883bbb414cff37cc1cb
 SHA512:
-  metadata.gz: 612703b5987c9f95e314f70e78a323cd73fd9b7c131cda3418b4085b1bf6a2175c398e49b6d661494c86667fe72f9639cdfa4438a9a4bfe666aac2450daebb48
-  data.tar.gz: d7508c69357d275ba26a3d85eb35817976cddbd96925c0820e151943d93134eb8c36d69539996e40390052d1cfe9c951dd278b4e3c44c9e05d0d088c33e71b62
+  metadata.gz: 383b5ab1107b601b3b03e71fee4efeee526c8ac05028d42d4e17cf71e5cf6e90230c8a3ee090e64f175784260e895b9e5253b6e06332f3b53a637440aec1a87b
+  data.tar.gz: 55baab9211fd1bfae9aa390a2d3a82e847a88fef5f81b783b7766632dc2d1d7845da8cefedcb9e4aa3cfb6fd998626160c397cd1c0eb913a43ecd24df2c446ed

data/.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    name: Rubocop
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - name: Install dependencies
+      run: gem install rubocop
+    - name: Rubocop
+      run: rubocop
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7' ]
+    name: Test w/ Ruby ${{ matrix.ruby }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+    - name: RSpec
+      run: bundle exec rspec --order rand

data/.rubocop.yml

@@ -1,4 +1,7 @@
-inherit_from: .rubocop_todo.yml 
+AllCops:
+  TargetRubyVersion: 2.5
+  Exclude:
+    - 'spec/**/*'
 
-# Style/FileName:
-#   Enabled: false
+Documentation:
+  Enabled: false

data/Gemfile

@@ -1,3 +1,11 @@
-source 'https://rubygems.org/'
-gem 'pry-nav', group: [:development, :test]
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
 gemspec
+
+group :test do
+  gem 'rubocop'
+  gem 'vcr'
+  gem 'webmock'
+end

data/Gemfile.lock

@@ -1,33 +1,43 @@
 PATH
   remote: .
   specs:
-    filmaffinity (1.1.1)
+    filmaffinity (1.1.2)
       imgur-api (~> 0)
-      json (~> 1.8)
-      nokogiri (~> 1.6)
+      json (>= 1.8, < 3.0)
+      nokogiri (>= 1.8.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.1)
+    crack (0.4.4)
     diff-lcs (1.2.5)
-    httparty (0.14.0)
+    hashdiff (1.0.1)
+    httparty (0.18.1)
+      mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     imgur-api (0.0.4)
       httparty
-    json (1.8.6)
-    method_source (0.8.2)
-    mini_portile2 (2.1.0)
+    json (2.3.1)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.0512)
+    mini_portile2 (2.5.1)
     multi_xml (0.6.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    rake (10.4.2)
+    nokogiri (1.11.4)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rainbow (3.0.0)
+    rake (12.3.3)
+    regexp_parser (1.8.1)
+    rexml (3.2.5)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -41,16 +51,35 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    slop (3.6.0)
+    rubocop (0.92.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.5.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.7.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.10.1)
+    unicode-display_width (1.7.0)
+    vcr (6.0.0)
+    webmock (3.9.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   filmaffinity!
-  pry-nav
-  rake (~> 10.0)
+  rake (~> 12.3)
   rspec (~> 3.3)
+  rubocop
+  vcr
+  webmock
 
 BUNDLED WITH
-   1.13.6
+   2.1.4

data/README.md

@@ -1,5 +1,6 @@
-# FilmAffinity Scraper Gem
-[![Build Status](https://travis-ci.org/davidsantosmerino/filmaffinity-gem.png?branch=master)](https://travis-ci.org/davidsantosmerino/filmaffinity-gem)
+# FilmAffinity Gem
+
+[![Build Status](https://github.com/dsantosmerino/filmaffinity-gem/workflows/CI/badge.svg)](https://github.com/dsantosmerino/filmaffinity-gem/actions)
 [![Gem Version](https://badge.fury.io/rb/filmaffinity.svg)](http://badge.fury.io/rb/filmaffinity)
 
 ## Description

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new do |task|

data/filmaffinity.gemspec

@@ -1,20 +1,26 @@
-Gem::Specification.new do |s|
-  s.name        = 'filmaffinity'
-  s.version     = '1.1.2'
-  s.date        = '2017-10-09'
-  s.summary     = 'filmaffinity'
-  s.description = 'Easily use Ruby or the command line to find information on Filmaffinity.com'
-  s.authors     = ['David Santos', 'Oriol Bellido']
-  s.email       = 'dsantosmerino@gmail.com'
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  s.require_paths = ['lib']
-  s.homepage      = 'https://github.com/davidsantosmerino/filmaffinity-gem'
-  s.license       = 'MIT'
-  s.add_dependency 'nokogiri', ' ~> 1.6'
-  s.add_dependency 'json', ' ~> 1.8'
-  s.add_dependency 'imgur-api', '~> 0'
-  s.add_development_dependency 'rake', '~> 10.0'
-  s.add_development_dependency 'rspec', '~> 3.3'
+# frozen_string_literal: false
+
+$LOAD_PATH.unshift File.expand_path("lib", __dir__)
+
+require 'filmaffinity/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = 'filmaffinity'
+  gem.version       = FilmAffinity::VERSION
+  gem.summary       = 'filmaffinity'
+  gem.description   = 'Easily use Ruby or the command line to find information on Filmaffinity.com'
+  gem.authors       = ['David Santos', 'Oriol Bellido']
+  gem.email         = 'dsantosmerino@gmail.com'
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  gem.require_paths = ['lib']
+  gem.homepage      = 'https://github.com/davidsantosmerino/filmaffinity-gem'
+  gem.license       = 'MIT'
+  gem.add_dependency 'imgur-api', '~> 0'
+  gem.add_dependency 'json', '>= 1.8', '< 3.0'
+  gem.add_dependency 'nokogiri', '>= 1.8.1'
+  gem.add_development_dependency 'rake', '~> 12.3'
+  gem.add_development_dependency 'rspec', '~> 3.3'
+  gem.required_ruby_version = '>= 2.5.0'
 end

data/lib/constants/constants.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Constants
   def self.query_params
     {
@@ -18,75 +20,78 @@ module Constants
     }
   end
 
+  # rubocop:disable Metrics/MethodLength
   def self.tags
     {
 
-      title: { EN: '#main-title span',
-               ES: '#main-title span'
+      title: {
+        EN: '#main-title span',
+        ES: '#main-title span'
       },
-
-      year: { EN: 'dd[itemprop="datePublished"]',
-              ES: 'dd[itemprop="datePublished"]'
+      year: {
+        EN: 'dd[itemprop="datePublished"]',
+        ES: 'dd[itemprop="datePublished"]'
       },
-
-      duration: { EN: 'dd[itemprop="duration"]',
-                  ES: 'dd[itemprop="duration"]'
+      duration: {
+        EN: 'dd[itemprop="duration"]',
+        ES: 'dd[itemprop="duration"]'
       },
-
-      country: { EN: '#country-img',
-                 ES: '#country-img'
+      country: {
+        EN: '#country-img',
+        ES: '#country-img'
       },
-
-      director: { EN: 'a[itemprop="url"]',
-                  ES: 'a[itemprop="url"]'
+      director: {
+        EN: 'a[itemprop="url"]',
+        ES: 'a[itemprop="url"]'
       },
-
-      music: { EN: 'dt:contains("Music")',
-               ES: 'dt:contains("Music")'
+      music: {
+        EN: 'dt:contains("Music")',
+        ES: 'dt:contains("Music")'
       },
-
-      company: { EN: 'dt:contains("Producer")',
-                 ES: 'dt:contains("Productora")'
+      company: {
+        EN: 'dt:contains("Producer")',
+        ES: 'dt:contains("Productora")'
       },
-
-      script: { EN: 'dt:contains("Screenwriter")',
-                ES: 'dt:contains("Guion")'
+      script: {
+        EN: 'dt:contains("Screenwriter")',
+        ES: 'dt:contains("Guion")'
       },
-
-      photography: { EN: 'dt:contains("Cinematography")',
-                     ES: 'dt:contains("Fotografía")'
+      photography: {
+        EN: 'dt:contains("Cinematography")',
+        ES: 'dt:contains("Fotografía")'
       },
-
-      cast: { EN: 'span[itemprop="actor"]',
-              ES: 'span[itemprop="actor"]'
+      cast: {
+        EN: 'span[itemprop="actor"]',
+        ES: 'span[itemprop="actor"]'
       },
-
-      cast_each: { EN: 'span[itemprop="name"]',
-                   ES: 'span[itemprop="name"]'
+      cast_each: {
+        EN: 'span[itemprop="name"]',
+        ES: 'span[itemprop="name"]'
       },
-
-      genre: { EN: 'dt:contains("Genre")',
-               ES: 'dt:contains("Género")'
+      genre: {
+        EN: 'dt:contains("Genre")',
+        ES: 'dt:contains("Género")'
       },
-
-      sinopsis: { EN: 'dd[itemprop="description"]',
-                  ES: 'dd[itemprop="description"]'
+      sinopsis: {
+        EN: 'dd[itemprop="description"]',
+        ES: 'dd[itemprop="description"]'
       },
-
-      rating: { EN: 'div[itemprop="ratingValue"]',
-                ES: 'div[itemprop="ratingValue"]'
+      rating: {
+        EN: 'div[itemprop="ratingValue"]',
+        ES: 'div[itemprop="ratingValue"]'
       },
-
-      poster: { EN: 'img[itemprop="image"]',
-                ES: 'img[itemprop="image"]'
+      poster: {
+        EN: 'img[itemprop="image"]',
+        ES: 'img[itemprop="image"]'
       },
-
-      poster_big: { EN: 'a[class="lightbox"]',
-                    ES: 'a[class="lightbox"]'
+      poster_big: {
+        EN: 'a[class="lightbox"]',
+        ES: 'a[class="lightbox"]'
       }
 
     }
   end
+  # rubocop:enable Metrics/MethodLength
 
   def self.tag(type)
     lang = FilmAffinity.configuration.language.to_sym

data/lib/filmaffinity/configuration.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Configuration
   attr_accessor :imgur_id, :language

data/lib/filmaffinity/{json-movie-parser.rb → json_movie_parser.rb}

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 require 'json'
 
 class JsonMovieParser
+  # rubocop:disable Metrics/MethodLength
   def to_hash(movie)
     {
       'title' => movie.title,
@@ -15,9 +18,9 @@ class JsonMovieParser
       'poster_big' => movie.poster_big
     }
   end
+  # rubocop:enable Metrics/MethodLength
 
   def to_json(movie)
-    hash = to_hash movie
-    hash.to_json
+    to_hash(movie).to_json
   end
 end

data/lib/filmaffinity/{json-movies-parser.rb → json_movies_parser.rb}

@@ -1,18 +1,16 @@
+# frozen_string_literal: true
+
 class JsonMoviesParser
   def to_hashes(movies)
-    hashes = []
-    movies.each do |movie|
-      hash = {
+    movies.map do |movie|
+      {
         'id' => movie.id,
         'title' => movie.title
       }
-      hashes << hash
     end
-    hashes
   end
 
   def to_json(movies)
-    hashes = to_hashes movies
-    hashes.to_json
+    to_hashes(movies).to_json
   end
 end

data/lib/filmaffinity/movie.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 module FilmAffinity
   class Movie
-    attr_reader :id, :title
+    attr_reader :id
+
     def initialize(id, title = nil)
       @id = id
-      @title = title if title
+      @title = title
       @json_parser = JsonMovieParser.new
       @poster_manager = PosterManager.new
     end
@@ -13,117 +16,110 @@ module FilmAffinity
     end
 
     def generate_html
-      open(Constants.urls[:movie] % id)
+      URI.parse(Constants.urls[:movie] % id).open
     end
 
     def title
       @title ||= document_html.at(Constants.tag(:title)).content.strip
-    rescue
+    rescue StandardError
       nil
     end
 
     def year
       document_html.at(Constants.tag(:year)).content[/\d+/].to_i
-    rescue
+    rescue StandardError
       nil
     end
 
     def duration
       document_html.at(Constants.tag(:duration)).content[/\d+/].to_i
-    rescue
+    rescue StandardError
       nil
     end
 
     def country
-      raw_country = document_html.at(Constants.tag(:country)).next_sibling.content
-      raw_country.gsub(/\A[[:space:]]+|[[:space:]]+\z/, '') if raw_country
-    rescue
+      document_html.at(Constants.tag(:country)).next_sibling.content&.gsub(/\A[[:space:]]+|[[:space:]]+\z/, '')
+    rescue StandardError
       nil
     end
 
     def director
-      raw_director = document_html.at(Constants.tag(:director)).content
-      raw_director.strip if raw_director
-    rescue
+      document_html.at(Constants.tag(:director)).content&.strip
+    rescue StandardError
       nil
     end
 
     def music
       document_html.at(Constants.tag(:music)).next_sibling.next_sibling.content
-    rescue
+    rescue StandardError
       nil
     end
 
     def company
       document_html.at(Constants.tag(:company)).next_sibling.next_sibling.content
-    rescue
+    rescue StandardError
       nil
     end
 
     def script
       document_html.at(Constants.tag(:script)).next_sibling.next_sibling.content
-    rescue
+    rescue StandardError
       nil
     end
 
     def photography
       document_html.at(Constants.tag(:photography)).next_sibling.next_sibling.content
-    rescue
+    rescue StandardError
       nil
     end
 
     def cast
-      actors = []
-      node = document_html.search(Constants.tag(:cast))
-      node.each do |actor|
-        actors << actor.at(Constants.tag(:cast_each)).content.strip
+      document_html.search(Constants.tag(:cast)).map do |actor|
+        actor.at(Constants.tag(:cast_each)).content.strip
       end
-      actors
-    rescue
+    rescue StandardError
       []
     end
 
     def genres
-      genres = []
       node = document_html.at(Constants.tag(:genre)).next_sibling.next_sibling
       raw_genres = node.search('a')
-      raw_genres.each do |raw_genre|
-        genres << raw_genre.content.strip
+      raw_genres.map do |raw_genre|
+        raw_genre.content.strip
       end
-      genres
-    rescue
+    rescue StandardError
       []
     end
 
     def sinopsis
       document_html.at(Constants.tag(:sinopsis)).content
-    rescue
+    rescue StandardError
       nil
     end
 
     def rating
       raw_rating = document_html.at(Constants.tag(:rating)).content.strip
-      raw_rating.tr(',', '.').to_f if raw_rating
-    rescue
+      raw_rating&.tr(',', '.')&.to_f
+    rescue StandardError
       nil
     end
 
     def poster
       poster_url = document_html.at(Constants.tag(:poster))['src']
       @poster_manager.load_poster(poster_url) if poster_url
-    rescue
+    rescue StandardError
       nil
     end
 
     def poster_big
       poster_url = document_html.at(Constants.tag(:poster_big))['href']
       @poster_manager.load_poster(poster_url) if poster_url
-    rescue
+    rescue StandardError
       nil
     end
 
-    def to_json
-      @json_parser.to_json self
+    def to_json(*_args)
+      @json_parser.to_json(self)
     end
   end
 end

data/lib/filmaffinity/{poster-manager.rb → poster_manager.rb}

@@ -1,15 +1,18 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 require 'imgur'
 
 class PosterManager
   def load_poster(posterurl)
     return posterurl unless FilmAffinity.configuration.imgur_id
+
     upload(posterurl, FilmAffinity.configuration.imgur_id)
   end
 
   def upload(posterurl, api_id)
     imgur = Imgur.new(api_id)
-    @dir = __dir__ + '/' + construct_name + '.jpg'
+    @dir = __dir__ + '/' + random_name + '.jpg'
     save_img_locally(posterurl)
     local_image = Imgur::LocalImage.new(@dir)
     uploaded = imgur.upload(local_image)
@@ -18,14 +21,14 @@ class PosterManager
   end
 
   def save_img_locally(posterurl)
-    open(posterurl) do |f|
+    URI.parse(posterurl).open do |f|
       File.open(@dir, 'wb') do |file|
         file.puts f.read
       end
     end
   end
 
-  def construct_name
-    (0...8).map { (65 + rand(26)).chr }.join
+  def random_name
+    SecureRandom.urlsafe_base64(8)
   end
 end