addic7ed 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d3890d1e46e13f0c3723d7920aafd15010445ff
-  data.tar.gz: 26c22db148789cfe188f49b2b9dbd36ac77ade91
+  metadata.gz: 32e131ca12d3e3478d6b1c74165907737e3ee5c9
+  data.tar.gz: 433d4e43d15508a69a1ecd373dc59f2940763278
 SHA512:
-  metadata.gz: dc559f309a1fc2a4fdb7cd891ca464afc4db7ee5027961b70c7768f33b64c5e5ae16d69184eea4ffd682671c679c3ad2aec657a298753d5e4c7ce1bac9f6b6e6
-  data.tar.gz: 3cbd2bd9e0283ac42695fcae3e39e0fde44020257c2ab9e5314a0a58c0c4d832f932d7ae933fbf2cba2b5a77c0287c8e9073be9943b89faba51d69e5732f9234
+  metadata.gz: d48aff4625c23cac1618b4b053bf8f9a0e5a68cb1c9d5f1105d35c2e3e916aa044e69276074c1abda129ea292b797d9f67522bc162697fff57ebb8f31574a11b
+  data.tar.gz: 26e1a7d7e651016edfc33050bfcca18945e724ab6b256edb1867d4696a4aea217da25e90eab9f1d021b4c0c4d1bffa55795b869e9da647d583014d608a03e358

data/bin/addic7ed

@@ -116,7 +116,7 @@ options[:filenames].each do |filename|
     puts "Show not found on Addic7ed : #{ep.video_file.showname}. Skipping.".gsub(/^/, options[:verbose] ? '  ' : '') unless options[:quiet]
     next
   rescue Addic7ed::EpisodeNotFound
-    puts "Episode not found on Addic7ed : #{Addic7ed::ShowList.find(ep.video_file.showname)} S#{ep.video_file.season}E#{ep.video_file.episode}. Skipping.".gsub(/^/, options[:verbose] ? '  ' : '') unless options[:quiet]
+    puts "Episode not found on Addic7ed : #{Addic7ed::ShowList.url_segment_for(ep.video_file.showname)} S#{ep.video_file.season}E#{ep.video_file.episode}. Skipping.".gsub(/^/, options[:verbose] ? '  ' : '') unless options[:quiet]
     next
   rescue Addic7ed::LanguageNotSupported
     puts "Addic7ed does not support language '#{options[:language]}'. Exiting.".gsub(/^/, options[:verbose] ? '  ' : '') unless options[:quiet]

data/lib/addic7ed/show_list.rb

@@ -11,12 +11,34 @@ module Addic7ed
     end
 
     def url_segment_for
-      raise ShowNotFound if matching_shows.empty?
-      matching_shows.first.gsub(' ', '_')
+      shows_matching = shows_matching_exactly
+      shows_matching = shows_matching_without_year if shows_matching.empty?
+      raise ShowNotFound if shows_matching.empty?
+      shows_matching.last.gsub(' ', '_')
     end
 
     private
 
+    def shows_matching_exactly
+      @shows_matching_exactly ||= addic7ed_shows.select{ |addic7ed_show| is_matching? addic7ed_show }
+    end
+
+    def shows_matching_without_year
+      @shows_matching_without_year ||= addic7ed_shows.select{ |addic7ed_show| is_matching? addic7ed_show, :comparer_without_year }
+    end
+
+    def default_comparer(showname)
+      showname.downcase.gsub("'", "")
+    end
+
+    def comparer_without_year(showname)
+      default_comparer(showname).gsub(/ \(\d{4}\)( |$)/, '\1')
+    end
+
+    def is_matching?(addic7ed_show, comparer = :default_comparer)
+      [humanized_name, addic7ed_show].map(&method(comparer)).reduce(:==)
+    end
+
     def humanized_name
       @humanized_name ||= raw_name.
                             gsub(/[_\.]+/, ' ').
@@ -24,12 +46,6 @@ module Addic7ed
                             gsub(/ (\d{4})( |$)/i, ' (\1)\2')
     end
 
-    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

data/lib/addic7ed/version.rb

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

data/spec/lib/addic7ed/show_list_spec.rb

@@ -19,6 +19,11 @@ describe Addic7ed::ShowList, ".url_segment_for" do
     expect(Addic7ed::ShowList.url_segment_for("Vikings.2013")).to eq "Vikings_(2013)"
   end
 
+  it "returns last show when production year is unspecified" do
+    expect(Addic7ed::ShowList.url_segment_for("Empire")).to eq "Empire_(2015)"
+    expect(Addic7ed::ShowList.url_segment_for("American.Crime")).to eq "American_Crime_(2015)"
+  end
+
   it "handles when both country code and production year are present" do
     expect(Addic7ed::ShowList.url_segment_for("Legacy.2013.UK")).to eq "Legacy_(2013)_(UK)"
   end

metadata

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