addic7ed 4.0.0.pre.beta.5 → 4.0.0.pre.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f35a03ffc86438dec745786eb22f8eeb7b9921e7
-  data.tar.gz: 933523356c8b9f5e33675c71695a033cebb11053
+  metadata.gz: c2a0a0fd093c29b07a62a7259c773df5343c4c2c
+  data.tar.gz: 03110733e1ba66da173b5ad852ea3668dcbc7f4a
 SHA512:
-  metadata.gz: 0228eb701d71be54816022ff1ee625de7dc1d1d27ef6e60b59378087afb34bf1f45e3a011807bc55439af8ae3336c642cf64db098ccb5c6eb05daceaa51c64f0
-  data.tar.gz: f07949fa8ca57cf05655ffeb11a711e47d9ec14567f2c2647987b9b1240b7947d4d2dbf05f06f799033f7442ea3959029094b8f4f11cfe6a85b4b70b305a79c9
+  metadata.gz: c06455d2aad3610b7321dffd54f88f6d426087872083d96ae3284d21e6853936d883d76eff11390f7ffd8774ff0177126edce6460bec03288d1ad1789e6ec89d
+  data.tar.gz: 6b2a108af177c4b6096ef55152b233319893a7cd967e1e1a11daea8006f76933ecc783a44b585fdceb29f0dd32e446b0865a363c553fe20e7d027536d46e8fd4

data/lib/addic7ed.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dir[
   File.join(File.dirname(__FILE__), "addic7ed/*.rb"),
   File.join(File.dirname(__FILE__), "addic7ed/services/**/*.rb"),

data/lib/addic7ed/common.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require "json"
 
 module Addic7ed
   CONFIG_FILE  = File.join(File.dirname(__FILE__), "config.json").freeze
-  CONFIG       = JSON.load(File.open(CONFIG_FILE), nil, symbolize_names: true).freeze
+  CONFIG       = JSON.parse(File.read(CONFIG_FILE), symbolize_names: true).freeze
   LANGUAGES    = CONFIG[:languages].freeze
   USER_AGENTS  = CONFIG[:user_agents].freeze
   SHOWS_URL    = CONFIG[:urls][:shows].freeze

data/lib/addic7ed/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Addic7ed
   class InvalidFilename       < StandardError; end
   class ShowNotFound          < StandardError; end

data/lib/addic7ed/models/episode.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "net/http"
 require "open-uri"
 
@@ -91,7 +93,7 @@ module Addic7ed
       localized_urls[language]
     end
 
-  private
+    private
 
     def localized_urls
       @localized_urls ||= languages_hash { |code, lang| { code => localized_url(lang[:id]) } }

data/lib/addic7ed/models/search.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Addic7ed
   # Represents a subtitle search for a +video_filename+ in a +language+ with
   # multiple search +criterias+.
@@ -79,7 +81,7 @@ module Addic7ed
       @best_subtitle ||= matching_subtitles.most_popular
     end
 
-  private
+    private
 
     def default_criterias
       {

data/lib/addic7ed/models/subtitle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Addic7ed
   # Represents a subtitle on Addic7ed.
   #

data/lib/addic7ed/models/subtitles_collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Addic7ed
   # Represents a collection of {Subtitle} objects.
   #
@@ -54,7 +56,7 @@ module Addic7ed
       sort_by(&:downloads).last
     end
 
-  private
+    private
 
     def select
       SubtitlesCollection.new(super)

data/lib/addic7ed/models/video_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Addic7ed
   # Represents the video file you're looking a subtitle for.
   #

data/lib/addic7ed/service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Addic7ed
   module Service
     def self.included(base)

data/lib/addic7ed/services/check_compatibility.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Addic7ed
   class CheckCompatibility
     include Service
@@ -13,7 +15,7 @@ module Addic7ed
       defined_as_compatible? || generally_compatible? || commented_as_compatible?
     end
 
-  private
+    private
 
     def defined_as_compatible?
       subtitle.version.split(",").include? group
@@ -24,13 +26,21 @@ module Addic7ed
     end
 
     def commented_as_compatible?
-      return false if /(won'?t|doesn'?t|not) +work/i =~ subtitle.comment
-      return false if /resync +(from|of|for)/i =~ subtitle.comment
-      !!comment_matches_a_compatible_group?
+      return false if comment_explicitely_wont_work?
+      return false if comment_is_a_resync?
+      comment_matches_a_compatible_group?
     end
 
     def comment_matches_a_compatible_group?
-      Regexp.new("(#{compatible_groups.join('|')})", "i") =~ subtitle.comment
+      !Regexp.new("(#{compatible_groups.join("|")})", "i").match(subtitle.comment).nil?
+    end
+
+    def comment_explicitely_wont_work?
+      !/(won'?t|doesn'?t|not) +work/i.match(subtitle.comment).nil?
+    end
+
+    def comment_is_a_resync?
+      !/resync +(from|of|for)/i.match(subtitle.comment).nil?
     end
 
     def compatible_groups

data/lib/addic7ed/services/download_subtitle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Addic7ed
   class DownloadSubtitle
     include Service
@@ -15,17 +17,21 @@ module Addic7ed
 
     def call
       raise DownloadError, "Too many HTTP redirections" if redirect_count >= HTTP_REDIRECT_LIMIT
-      raise DailyLimitExceeded, "Daily limit exceeded"  if %r{^/downloadexceeded.php} =~ url
+      raise DailyLimitExceeded, "Daily limit exceeded"  if download_limit_exceeded?
       return follow_redirection(response["location"])   if response.is_a? Net::HTTPRedirection
       write(response.body)
     end
 
-  private
+    private
 
     def uri
       @uri ||= URI(url)
     end
 
+    def download_limit_exceeded?
+      !%r{^/downloadexceeded.php}.match(url).nil?
+    end
+
     def response
       @response ||= Net::HTTP.start(uri.hostname, uri.port) do |http|
         request = Net::HTTP::Get.new(uri.request_uri)

data/lib/addic7ed/services/get_shows_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "singleton"
 
 module Addic7ed
@@ -9,13 +11,13 @@ module Addic7ed
     end
 
     def call
-      @shows ||= homepage_body.css("select#qsShow option:not(:first-child)").map(&:text)
+      @shows ||= homepage_body.css("select#qsShow option").to_a[1..-1].map(&:text)
     end
 
-  private
+    private
 
     def homepage_body
-      @homepage_body ||= Oga.parse_html(addic7ed_homepage.body)
+      Oga.parse_html(addic7ed_homepage.body)
     end
 
     def addic7ed_homepage

data/lib/addic7ed/services/normalize_comment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Addic7ed
   class NormalizeComment
     include Service

data/lib/addic7ed/services/normalize_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Addic7ed
   class NormalizeVersion
     include Service

data/lib/addic7ed/services/parse_page.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "oga"
 require "net/http"
 require "open-uri"
@@ -17,7 +19,7 @@ module Addic7ed
       subtitles_nodes.map { |subtitle_node| Addic7ed::ParseSubtitle.call(subtitle_node) }
     end
 
-  private
+    private
 
     def page_dom
       raise EpisodeNotFound if server_response.body.nil? || server_response.body.empty?

data/lib/addic7ed/services/parse_subtitle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "oga"
 
 module Addic7ed
@@ -6,7 +8,7 @@ module Addic7ed
 
     attr_reader :subtitle_node
 
-    FIELDS = [:version, :language, :status, :url, :source, :hi, :downloads, :comment].freeze
+    FIELDS = %i[version language status url source hi downloads comment].freeze
 
     def initialize(subtitle_node)
       @subtitle_node = subtitle_node
@@ -16,7 +18,7 @@ module Addic7ed
       Addic7ed::Subtitle.new(extract_fields)
     end
 
-  private
+    private
 
     def extract_fields
       FIELDS.map do |field|
@@ -48,7 +50,7 @@ module Addic7ed
 
     def extract_url
       extract_field("a.buttonDownload:last-of-type") do |node|
-        "http://www.addic7ed.com#{node['href']}"
+        "http://www.addic7ed.com#{node["href"]}"
       end
     end
 

data/lib/addic7ed/services/url_encode_show_name.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Addic7ed
   class URLEncodeShowName
     include Service
@@ -18,7 +20,7 @@ module Addic7ed
       matching_shows.last.tr(" ", "_")
     end
 
-  private
+    private
 
     def matching_shows(opts)
       addic7ed_shows.select { |show_name| matching?(show_name, opts) }

data/lib/addic7ed/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Addic7ed
-  VERSION = "4.0.0-beta.5".freeze
+  VERSION = "4.0.0-beta.6".freeze # rubocop:disable Style/RedundantFreeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: addic7ed
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre.beta.5
+  version: 4.0.0.pre.beta.6
 platform: ruby
 authors:
 - Michael Baudino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-04 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -122,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.3
 description: Ruby script (cli) to fetch subtitles on Addic7ed
 email: michael.baudino@alpine-lab.com
 executables: []
@@ -182,9 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Addic7ed auto-downloader
 test_files: []
-has_rdoc: