addic7ed 0.1.2 → 0.1.3

data/README.md

@@ -1,8 +1,8 @@
-# addic7ed-ruby [![Build Status](https://travis-ci.org/michaelbaudino/addic7ed-ruby.png)](https://travis-ci.org/michaelbaudino/addic7ed-ruby) [![Dependency Status](https://gemnasium.com/michaelbaudino/addic7ed-ruby.png)](https://gemnasium.com/michaelbaudino/addic7ed-ruby)
+# addic7ed-ruby [![Build Status](https://travis-ci.org/michaelbaudino/addic7ed-ruby.png)](https://travis-ci.org/michaelbaudino/addic7ed-ruby) [![Dependency Status](https://gemnasium.com/michaelbaudino/addic7ed-ruby.png)](https://gemnasium.com/michaelbaudino/addic7ed-ruby) [![Code Climate](https://codeclimate.com/github/michaelbaudino/addic7ed-ruby.png)](https://codeclimate.com/github/michaelbaudino/addic7ed-ruby)
 
 Ruby command-line script to fetch subtitles on Addic7ed
 
-Current version: **0.1.2**
+Current version: **0.1.3**
 
 ### Is it working ?
 
@@ -45,7 +45,8 @@ Usage: addic7ed [options] <file1> [<file2>, <file3>, ...]
 
 Feel free to submit a Pull Request, I'd be glad to review/merge it.
 
-Also, if you like the awesome work done by the Addic7ed team, please consider [donating to them](http://www.chipin.com/contribute/id/780aa4c5d8c51efd).
+Also, if you like the awesome work done by the Addic7ed team, please consider donating to them (no link here as they are just in the middle of changing their donation system, but feel free to go their website) !
+
 
 ### Notes
 
@@ -66,6 +67,7 @@ There's some work remaining:
 
 ### Changelog
 
+* 0.1.3: Fixed bugs with show names containing country code or production year
 * 0.1.2: Fixed how the daily download limit reach is detected
 * 0.1.1: This is now a _working_ gem
 * 0.1.0: This is now a gem

data/bin/addic7ed

@@ -3,7 +3,7 @@
 def require_dependencies
   require 'optparse'
   require 'nokogiri'
-  require 'addic7ed'
+  require './lib/addic7ed'
 end
 
 begin
@@ -123,7 +123,7 @@ options[:filenames].each do |filename|
     puts "The subtitle could not be downloaded. Skipping.".gsub(/^/, options[:verbose] ? '  ' : '') unless options[:quiet]
     next
   rescue Addic7ed::DownloadLimitReached
-    puts "Your exceeded your daily download count. Exiting.".gsub(/^/, options[:verbose] ? '  ' : '') unless options[:quiet]
+    puts "You exceeded your daily download count. Exiting.".gsub(/^/, options[:verbose] ? '  ' : '') unless options[:quiet]
     break
   rescue Addic7ed::SubtitleCannotBeSaved
     puts "The downloaded subtitle could not be saved as #{filename.gsub(/\.\w{3}$/, '.srt')}. Skipping.".gsub(/^/, options[:verbose] ? '  ' : '') unless options[:quiet]

data/lib/addic7ed.rb

@@ -1,6 +1,6 @@
-require 'addic7ed/version'
-require 'addic7ed/common'
-require 'addic7ed/errors'
-require 'addic7ed/filename'
-require 'addic7ed/episode'
-require 'addic7ed/subtitle'
+require './lib/addic7ed/version'
+require './lib/addic7ed/common'
+require './lib/addic7ed/errors'
+require './lib/addic7ed/filename'
+require './lib/addic7ed/episode'
+require './lib/addic7ed/subtitle'

data/lib/addic7ed/episode.rb

@@ -14,7 +14,7 @@ module Addic7ed
     def url(lang = 'fr')
       raise LanguageNotSupported unless LANGUAGES[lang]
       @localized_urls ||= {}
-      @localized_urls[lang] ||= "http://www.addic7ed.com/serie/#{@filename.showname.gsub(' ', '_')}/#{@filename.season}/#{@filename.episode}/#{LANGUAGES[lang][:id]}"
+      @localized_urls[lang] ||= "http://www.addic7ed.com/serie/#{@filename.encoded_showname}/#{@filename.season}/#{@filename.episode}/#{LANGUAGES[lang][:id]}"
     end
 
     def subtitles(lang = 'fr')

data/lib/addic7ed/filename.rb

@@ -19,6 +19,17 @@ module Addic7ed
       end
     end
 
+    def encoded_showname
+      @showname.
+        gsub(/ /, '_').
+        gsub(/_US$/, '_(US)').
+        gsub(/_US_/, '_(US)_').
+        gsub(/_UK$/, '').
+        gsub(/_UK_/, '_').
+        gsub(/_\d{4}$/, '').
+        gsub(/_\d{4}_/, '_')
+    end
+
     # Lazy getters
 
     def basename

data/lib/addic7ed/subtitle.rb

@@ -5,7 +5,7 @@ module Addic7ed
     attr_accessor :url
 
     def initialize(version, language, status, url, downloads)
-      @version   = version.upcase
+      @version   = version.gsub(/ *720p */i, '').upcase
       @language  = language
       @status    = status
       @url       = url

data/lib/addic7ed/version.rb

@@ -1,3 +1,3 @@
 module Addic7ed
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/addic7ed-filename_spec.rb

@@ -29,6 +29,13 @@ describe Addic7ed::Filename do
     @filename_no_episode = 'Californication.S06.720p.HDTV.x264-2HD.mkv'
     @filename_no_tags = 'Californication.S06E07.2HD.mkv'
     @filename_no_group = 'Californication.S06E07.720p.HDTV.x264.mkv'
+    # Filename with special tags
+    @filename_showname_US = 'Shameless.US.S03E06.720p.HDTV.x264-IMMERSE.mkv'
+    @filename_showname_UK = 'Shameless.UK.S09E11.720p.HDTV.x264-TLA.mkv'
+    @filename_showname_UK_year = 'The.Hour.UK.2011.S01E03.REPACK.HDTV.XviD-FoV.avi'
+    @filename_showname_year_UK = 'The.Hour.2011.UK.S01E03.REPACK.HDTV.XviD-FoV.avi'
+    @filename_showname_US_year = 'The.Hour.US.2011.S01E03.REPACK.HDTV.XviD-FoV.avi'
+    @filename_showname_year_US = 'The.Hour.2011.US.S01E03.REPACK.HDTV.XviD-FoV.avi'
   end
 
   it 'should succeed given valid argument' do
@@ -259,6 +266,31 @@ describe Addic7ed::Filename do
     }.to raise_error(Addic7ed::InvalidFilename)
   end
 
+  describe '#encoded_filename' do
+    it 'should change all spaces to underscores' do
+      Addic7ed::Filename.new(@filename_multiple_words).encoded_showname.should == 'The_Walking_Dead'
+    end
+
+    it 'should wrap country code with parenthesis' do
+      Addic7ed::Filename.new(@filename_showname_US).encoded_showname.should == 'Shameless_(US)'
+    end
+
+    it 'should remove country code for the original show (usually UK)' do
+      Addic7ed::Filename.new(@filename_showname_UK).encoded_showname.should == 'Shameless'
+    end
+
+    it 'should remove production year' do
+      Addic7ed::Filename.new(@filename_showname_year).encoded_showname.should == 'The_Americans'
+    end
+
+    it 'should handle when both country code and production year are present' do
+      Addic7ed::Filename.new(@filename_showname_UK_year).encoded_showname.should == 'The_Hour'
+      Addic7ed::Filename.new(@filename_showname_year_UK).encoded_showname.should == 'The_Hour'
+      Addic7ed::Filename.new(@filename_showname_US_year).encoded_showname.should == 'The_Hour_(US)'
+      Addic7ed::Filename.new(@filename_showname_year_US).encoded_showname.should == 'The_Hour_(US)'
+    end
+  end
+
   describe '#basename' do
     it 'should return only file name given a full path' do
       Addic7ed::Filename.new(@filename_full_path).basename.should == 'Californication.S06E07.720p.HDTV.x264-2HD.mkv'

data/spec/addic7ed-subtitle_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require './lib/addic7ed'
+
+describe Addic7ed::Subtitle do
+  before :all do
+  end
+
+  it 'should upcase the version string' do
+    Addic7ed::Subtitle.new('DiMENSiON', '', '', '', '0').version.should == 'DIMENSION'
+  end
+
+  it 'should automatically remove "720p" in version string' do
+    Addic7ed::Subtitle.new('720p DIMENSION', '', '', '', '0').version.should == 'DIMENSION'
+    Addic7ed::Subtitle.new('720P DIMENSION', '', '', '', '0').version.should == 'DIMENSION'
+    Addic7ed::Subtitle.new('DIMENSION 720p', '', '', '', '0').version.should == 'DIMENSION'
+    Addic7ed::Subtitle.new('DIMENSION 720P', '', '', '', '0').version.should == 'DIMENSION'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: addic7ed
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -78,6 +78,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- spec/addic7ed-subtitle_spec.rb
 - spec/addic7ed-episode_spec.rb
 - spec/addic7ed-filename_spec.rb
 - spec/spec_helper.rb
@@ -95,18 +96,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1188396796560563585
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1188396796560563585
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -114,6 +109,7 @@ signing_key:
 specification_version: 3
 summary: Addic7ed auto-downloader
 test_files:
+- spec/addic7ed-subtitle_spec.rb
 - spec/addic7ed-episode_spec.rb
 - spec/addic7ed-filename_spec.rb
 - spec/addic7ed-common_spec.rb