addic7ed 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6af440920aab856b3b6d6c0329a77156c798132f
-  data.tar.gz: 368155bf890e2f5335c5c455cc140f7c96af06bc
+  metadata.gz: 0d3890d1e46e13f0c3723d7920aafd15010445ff
+  data.tar.gz: 26c22db148789cfe188f49b2b9dbd36ac77ade91
 SHA512:
-  metadata.gz: 6f01f1ca16e06692ecd6dfe37ff6a25a35ed2fd5e1c637c9f7c6e050588dda18abe34d1a0a2b21e6706593eb9575acd07096d2fa32afb4273ba28ef4ddf19be6
-  data.tar.gz: d54a2a68b30f26f3acd617765300b3dce82583b3ec025ff20bd09d2137fc095bb1ab28ea644e4cd96ba95d928a8a543780b7f2e4f4c99d5ae096e0431020d897
+  metadata.gz: dc559f309a1fc2a4fdb7cd891ca464afc4db7ee5027961b70c7768f33b64c5e5ae16d69184eea4ffd682671c679c3ad2aec657a298753d5e4c7ce1bac9f6b6e6
+  data.tar.gz: 3cbd2bd9e0283ac42695fcae3e39e0fde44020257c2ab9e5314a0a58c0c4d832f932d7ae933fbf2cba2b5a77c0287c8e9073be9943b89faba51d69e5732f9234

data/lib/addic7ed/episode.rb

@@ -14,7 +14,7 @@ module Addic7ed
     def url(lang = 'fr')
       check_language_availability(lang)
       @localized_urls ||= {}
-      @localized_urls[lang] ||= "http://www.addic7ed.com/serie/#{ShowList.find(video_file.showname)}/#{video_file.season}/#{video_file.episode}/#{LANGUAGES[lang][:id]}"
+      @localized_urls[lang] ||= "http://www.addic7ed.com/serie/#{ShowList.url_segment_for(video_file.showname)}/#{video_file.season}/#{video_file.episode}/#{LANGUAGES[lang][:id]}"
     end
 
     def subtitles(lang = 'fr')

data/lib/addic7ed/show_list.rb

@@ -6,31 +6,36 @@ module Addic7ed
       @raw_name = raw_name
     end
 
-    def self.find(raw_name)
-      new(raw_name).find
+    def self.url_segment_for(raw_name)
+      new(raw_name).url_segment_for
     end
 
-    def find
-      matching_shows = human_list.select{ |i| [i, human_name].map(&:downcase).reduce(:==) }
+    def url_segment_for
       raise ShowNotFound if matching_shows.empty?
       matching_shows.first.gsub(' ', '_')
     end
 
     private
 
-    def human_name
-      @human_name ||= raw_name.
-                        gsub(/[_\.]+/, ' ').
-                        gsub(/ (US|UK)( |$)/i, ' (\1)\2').
-                        gsub(/ (\d{4})( |$)/i, ' (\1)\2')
+    def humanized_name
+      @humanized_name ||= raw_name.
+                            gsub(/[_\.]+/, ' ').
+                            gsub(/ (US|UK)( |$)/i, ' (\1)\2').
+                            gsub(/ (\d{4})( |$)/i, ' (\1)\2')
     end
 
-    def human_list
-      @@human_list ||= Nokogiri::HTML(addic7ed_homepage.body).css("select#qsShow option:not(:first-child)").map(&:text)
+    def matching_shows
+      @matching_shows ||= addic7ed_shows.select do |addic7ed_show|
+        [addic7ed_show, humanized_name].map{ |showname| showname.downcase.gsub("'", "") }.reduce(:==)
+      end
+    end
+
+    def addic7ed_shows
+      @@addic7ed_shows ||= Nokogiri::HTML(addic7ed_homepage.body).css("select#qsShow option:not(:first-child)").map(&:text)
     end
 
     def addic7ed_homepage
-      Net::HTTP.start("www.addic7ed.com", 80) do |http|
+      Net::HTTP.start("www.addic7ed.com") do |http|
         request = Net::HTTP::Get.new("/")
         request["User-Agent"] = USER_AGENTS.sample
         http.request(request)

data/lib/addic7ed/version.rb

@@ -1,3 +1,3 @@
 module Addic7ed
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/lib/addic7ed/show_list_spec.rb

@@ -1,33 +1,33 @@
 require "spec_helper"
 require "./lib/addic7ed"
 
-describe Addic7ed::ShowList, ".find" do
+describe Addic7ed::ShowList, ".url_segment_for" do
   it "changes all spaces to underscores" do
-    expect(Addic7ed::ShowList.find("The Walking Dead")).to eq "The_Walking_Dead"
+    expect(Addic7ed::ShowList.url_segment_for("The.Walking.Dead")).to eq "The_Walking_Dead"
   end
 
   it "wraps country code with parenthesis" do
-    expect(Addic7ed::ShowList.find("Shameless.US")).to eq "Shameless_(US)"
-    expect(Addic7ed::ShowList.find("Vikings.UK")).to eq "Vikings_(UK)"
+    expect(Addic7ed::ShowList.url_segment_for("Shameless.US")).to eq "Shameless_(US)"
+    expect(Addic7ed::ShowList.url_segment_for("Vikings.UK")).to eq "Vikings_(UK)"
   end
 
-  it "detects country code even in lowercase" do
-    expect(Addic7ed::ShowList.find("shameless.us")).to eq "Shameless_(US)"
+  it "is case-insensitive" do
+    expect(Addic7ed::ShowList.url_segment_for("shameless.us")).to eq "Shameless_(US)"
   end
 
-  it "sets production year between parenthesis" do
-    expect(Addic7ed::ShowList.find("Vikings.2013")).to eq "Vikings_(2013)"
+  it "wraps production year with parenthesis" do
+    expect(Addic7ed::ShowList.url_segment_for("Vikings.2013")).to eq "Vikings_(2013)"
   end
 
   it "handles when both country code and production year are present" do
-    expect(Addic7ed::ShowList.find("Legacy.2013.UK")).to eq "Legacy_(2013)_(UK)"
+    expect(Addic7ed::ShowList.url_segment_for("Legacy.2013.UK")).to eq "Legacy_(2013)_(UK)"
   end
 
   it "handles when show name contains a quote" do
-    expect(Addic7ed::ShowList.find("Grey's Anatomy")).to eq "Grey's_Anatomy"
+    expect(Addic7ed::ShowList.url_segment_for("Greys.Anatomy")).to eq "Grey's_Anatomy"
   end
 
   it "raises a ShowNotFound error when no matching show is found" do
-    expect{Addic7ed::ShowList.find("Not an existing show")}.to raise_error Addic7ed::ShowNotFound
+    expect{Addic7ed::ShowList.url_segment_for("Not.an.existing.show")}.to raise_error Addic7ed::ShowNotFound
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: addic7ed
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Michael Baudino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-07 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec