addic7ed 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9ac47ab606d0c47c0f231fda702b005f6d8a6f6
-  data.tar.gz: f9f084432ec3ef5dfc2db748755e19d3ba8064aa
+  metadata.gz: d090b6dafb401806828c94d5eecc00b74848d9e3
+  data.tar.gz: adbf02a35ab41850d6bd8cfce2781c71043813a0
 SHA512:
-  metadata.gz: 2b8a15c946b67feead67c43ff1e959e259c145d4fba34b6f13c2df5b5310ca529906da3ddd635a1f87a2a4b45e09e1efbac0f77a631118574f10367e4238d7d3
-  data.tar.gz: f09d4f14b1a727b13708b2213fd6915b30a40f526d98907266e25b0b8651845e7d482a56ee789b5a513e771a8e50cefa201d234fa037854f5590adaa61b04915
+  metadata.gz: 7d2f78dcefedda6702524cd946d3ce811008e6f3e5bccb53d89ced041e79f46342c3664e232c9d26f4ca095aab5a9b15048108ad60031de401d3bbe3005c289e
+  data.tar.gz: 2c05be5aeb32c812dbb2db8eda5ea261d6801d8a86c6d39056d2905c25e1061cd0357adcc8d7b9d21be6b2c2cb9767d2fbc70d29bf08de0d4d7ff58712906a97

data/lib/addic7ed.rb

@@ -1,5 +1,7 @@
 require 'addic7ed/version'
 require 'addic7ed/common'
+require 'addic7ed/services/addic7ed_version_normalizer'
+require 'addic7ed/services/addic7ed_comment_normalizer'
 require 'addic7ed/errors'
 require 'addic7ed/show_list'
 require 'addic7ed/video_file'

data/lib/addic7ed/parser.rb

@@ -58,7 +58,7 @@ module Addic7ed
     def extract_version(sub_node)
       version_node = sub_node.css('.NewsTitle').first
       raise Addic7ed::ParsingError unless version_node
-      version_node.content.gsub(/ \nVersion /, '').gsub(/,.*/, '')
+      version_node.content
     end
 
     def extract_language(sub_node)
@@ -101,6 +101,5 @@ module Addic7ed
         raise Addic7ed::ParsingError unless comment_node
         comment_node.content.gsub(/<img[^>]+\>/i, "")
     end
-
   end
 end

data/lib/addic7ed/services/addic7ed_comment_normalizer.rb

@@ -0,0 +1,19 @@
+module Addic7ed
+  class Addic7edCommentNormalizer
+    attr_reader :comment
+
+    def initialize(comment)
+      @comment = comment || ""
+    end
+
+    def self.call(comment)
+      new(comment).call
+    end
+
+    def call
+      comment.downcase
+    end
+  end
+
+private
+end

data/lib/addic7ed/services/addic7ed_version_normalizer.rb

@@ -0,0 +1,24 @@
+module Addic7ed
+  class Addic7edVersionNormalizer
+    attr_reader :version
+
+    def initialize(version)
+      @version = version || ""
+    end
+
+    def self.call(version)
+      new(version).call
+    end
+
+    def call
+      version.
+        gsub(/[[:space:]]/, "").
+        upcase.
+        gsub(/,[\d\. ]+MBS$/, '').
+        gsub(/(^VERSION *|720P|1080P|HDTV|PROPER|RERIP|INTERNAL|X\.?264)/, '').
+        gsub(/[- \.]/, '')
+    end
+  end
+
+private
+end

data/lib/addic7ed/subtitle.rb

@@ -5,14 +5,14 @@ module Addic7ed
     attr_accessor :url
 
     def initialize(options = {})
-      @version   = normalize_version(options[:version])
+      @version   = Addic7edVersionNormalizer.call(options[:version])
       @language  = options[:language]
       @status    = options[:status]
       @url       = options[:url]
       @via       = options[:via]
       @hi        = options[:hi]
       @downloads = options[:downloads].to_i || 0
-      @comment   = normalize_comment(options[:comment])
+      @comment   = Addic7edCommentNormalizer.call(options[:comment])
     end
 
     def to_s
@@ -42,23 +42,16 @@ module Addic7ed
 
   protected
 
-    def normalize_version(version)
-      (version || "").
-        gsub(/(^Version *|720p|1080p|hdtv|proper|rerip|internal|x\.?264)/i, '').
-        gsub(/^[- \.]*/, '').gsub(/[- \.]*$/, '').
-        upcase
-    end
-
-    def normalize_comment(comment)
-      (comment || "").downcase
+    def is_compatible_with?(other_version)
+      defined_as_compatible_with(other_version) || generally_compatible_with?(other_version) || commented_as_compatible_with?(other_version)
     end
 
-    def is_compatible_with?(other_version)
-      generally_compatible_with?(other_version) || commented_as_compatible_with?(other_version)
+    def defined_as_compatible_with(other_version)
+      version.split(",").include? other_version
     end
 
     def generally_compatible_with?(other_version)
-      version == other_version || COMPATIBILITY_720P[version] == other_version || COMPATIBILITY_720P[other_version] == version
+      COMPATIBILITY_720P[version] == other_version || COMPATIBILITY_720P[other_version] == version
     end
 
     def commented_as_compatible_with?(other_version)

data/lib/addic7ed/version.rb

@@ -1,3 +1,3 @@
 module Addic7ed
-  VERSION = "2.0.4"
+  VERSION = "2.1.0"
 end

data/spec/lib/addic7ed/services/addic7ed_comment_normalizer_spec.rb

@@ -0,0 +1,12 @@
+require "spec_helper"
+require "./lib/addic7ed"
+
+describe Addic7ed::Addic7edCommentNormalizer do
+  def normalized_comment(comment)
+    described_class.call(comment)
+  end
+
+  it "downcases everything" do
+    expect(normalized_comment("DiMENSiON")).to eq "dimension"
+  end
+end

data/spec/lib/addic7ed/services/addic7ed_version_normalizer_spec.rb

@@ -0,0 +1,73 @@
+require "spec_helper"
+require "./lib/addic7ed"
+
+describe Addic7ed::Addic7edVersionNormalizer do
+  def normalized_version(version)
+    described_class.call(version)
+  end
+
+  it "upcases everything" do
+    expect(normalized_version("DiMENSiON")).to eq "DIMENSION"
+  end
+
+  it "removes white spaces and line breaks and non-breaking spaces" do
+    expect(normalized_version(" \n DIMENSION \u00a0 ")).to eq "DIMENSION"
+  end
+
+  it "removes the filesize" do
+    expect(normalized_version("DIMENSION, 0.00 MBs")).to eq "DIMENSION"
+  end
+
+  it "removes heading or trailing dots" do
+    expect(normalized_version(".DIMENSION.")).to eq "DIMENSION"
+  end
+
+  it "removes heading or trailing whitespaces" do
+    expect(normalized_version(" DIMENSION ")).to eq "DIMENSION"
+  end
+
+  it "removes heading or trailing dashes" do
+    expect(normalized_version("-DIMENSION-")).to eq "DIMENSION"
+  end
+
+  it "removes '720p' tag" do
+    expect(normalized_version("720P DIMENSION")).to eq "DIMENSION"
+  end
+
+  it "removes '1080p' tag" do
+    expect(normalized_version("1080P DIMENSION")).to eq "DIMENSION"
+  end
+
+  it "removes 'HDTV' tag" do
+    expect(normalized_version("HDTV DIMENSION")).to eq "DIMENSION"
+  end
+
+  it "removes 'x264' tag" do
+    expect(normalized_version("X264 DIMENSION")).to eq "DIMENSION"
+    expect(normalized_version("X.264 DIMENSION")).to eq "DIMENSION"
+  end
+
+  it "removes 'PROPER' tag" do
+    expect(normalized_version("PROPER DIMENSION")).to eq "DIMENSION"
+  end
+
+  it "removes 'RERIP' tag" do
+    expect(normalized_version("RERIP DIMENSION")).to eq "DIMENSION"
+  end
+
+  it "removes 'INTERNAL' tag" do
+    expect(normalized_version("INTERNAL DIMENSION")).to eq "DIMENSION"
+  end
+
+  it "removes the 'Version' prefix" do
+    expect(normalized_version("Version DIMENSION")).to eq "DIMENSION"
+  end
+
+  it "removes combined tags" do
+    expect(normalized_version("Version 720P PROPER X264 HDTV DIMENSION")).to eq "DIMENSION"
+  end
+
+  it "supports multiple concatenated versions" do
+    expect(normalized_version("-TLA, -FoV")).to eq "TLA,FOV"
+  end
+end

data/spec/lib/addic7ed/subtitle_spec.rb

@@ -1,62 +1,20 @@
 require "spec_helper"
 require "./lib/addic7ed"
 
-describe Addic7ed::Subtitle, "#normalize_version!" do
-  def normalized_version(version)
-    Addic7ed::Subtitle.new(version: version).version
-  end
-
-  it "upcases everything" do
-    expect(normalized_version("DiMENSiON")).to eq 'DIMENSION'
-  end
-
-  it "removes heading or trailing dots" do
-    expect(normalized_version(".DIMENSION.")).to eq 'DIMENSION'
-  end
-
-  it "removes heading or trailing whitespaces" do
-    expect(normalized_version(" DIMENSION ")).to eq 'DIMENSION'
-  end
-
-  it "removes heading or trailing dashes" do
-    expect(normalized_version("-DIMENSION-")).to eq 'DIMENSION'
-  end
-
-  it "removes '720p' tag" do
-    expect(normalized_version("720P DIMENSION")).to eq 'DIMENSION'
-  end
-
-  it "removes '1080p' tag" do
-    expect(normalized_version("1080P DIMENSION")).to eq 'DIMENSION'
-  end
-
-  it "removes 'HDTV' tag" do
-    expect(normalized_version("HDTV DIMENSION")).to eq 'DIMENSION'
-  end
-
-  it "removes 'x264' tag" do
-    expect(normalized_version("X264 DIMENSION")).to eq 'DIMENSION'
-    expect(normalized_version("X.264 DIMENSION")).to eq 'DIMENSION'
-  end
-
-  it "removes 'PROPER' tag" do
-    expect(normalized_version("PROPER DIMENSION")).to eq 'DIMENSION'
-  end
-
-  it "removes 'RERIP' tag" do
-    expect(normalized_version("RERIP DIMENSION")).to eq 'DIMENSION'
-  end
+describe Addic7ed::Subtitle, "#initialize" do
+  let(:version) { "Version DIMENSiON" }
+  let(:comment) { "Works for LOL" }
 
-  it "removes 'INTERNAL' tag" do
-    expect(normalized_version("INTERNAL DIMENSION")).to eq 'DIMENSION'
-  end
+  subject { described_class.new(version: version, comment: comment) }
 
-  it "removes the 'Version' prefix" do
-    expect(normalized_version("Version DIMENSION")).to eq 'DIMENSION'
+  it "normalizes Addic7ed version" do
+    expect(Addic7ed::Addic7edVersionNormalizer).to receive(:call).with(version)
+    subject
   end
 
-  it "removes combined tags" do
-    expect(normalized_version("Version 720P PROPER X264 HDTV DIMENSION")).to eq "DIMENSION"
+  it "normalizes Addic7ed comment" do
+    expect(Addic7ed::Addic7edCommentNormalizer).to receive(:call).with(comment)
+    subject
   end
 end
 
@@ -125,6 +83,19 @@ describe Addic7ed::Subtitle, "#works_for?" do
         expect(subtitle.works_for? "IMMERSE").to be false
       end
     end
+
+    context "when it has multiple versions" do
+      let(:subtitle) { Addic7ed::Subtitle.new(version: "FOV,TLA") }
+
+      it "returns true if it works for one of them" do
+        expect(subtitle.works_for? "TLA").to be true
+        expect(subtitle.works_for? "FOV").to be true
+      end
+
+      it "returns false when none of them work" do
+        expect(subtitle.works_for? "LOL").to be false
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: addic7ed
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Michael Baudino
@@ -108,12 +108,16 @@ files:
 - lib/addic7ed/episode.rb
 - lib/addic7ed/errors.rb
 - lib/addic7ed/parser.rb
+- lib/addic7ed/services/addic7ed_comment_normalizer.rb
+- lib/addic7ed/services/addic7ed_version_normalizer.rb
 - lib/addic7ed/show_list.rb
 - lib/addic7ed/subtitle.rb
 - lib/addic7ed/version.rb
 - lib/addic7ed/video_file.rb
 - spec/lib/addic7ed/common_spec.rb
 - spec/lib/addic7ed/episode_spec.rb
+- spec/lib/addic7ed/services/addic7ed_comment_normalizer_spec.rb
+- spec/lib/addic7ed/services/addic7ed_version_normalizer_spec.rb
 - spec/lib/addic7ed/show_list_spec.rb
 - spec/lib/addic7ed/subtitle_spec.rb
 - spec/lib/addic7ed/video_file_spec.rb
@@ -155,6 +159,8 @@ summary: Addic7ed auto-downloader
 test_files:
 - spec/lib/addic7ed/common_spec.rb
 - spec/lib/addic7ed/episode_spec.rb
+- spec/lib/addic7ed/services/addic7ed_comment_normalizer_spec.rb
+- spec/lib/addic7ed/services/addic7ed_version_normalizer_spec.rb
 - spec/lib/addic7ed/show_list_spec.rb
 - spec/lib/addic7ed/subtitle_spec.rb
 - spec/lib/addic7ed/video_file_spec.rb