movies 0.1.3 → 0.1.4

data/lib/movies.rb

@@ -109,14 +109,14 @@ class Movies
   end
   
   def self.cleaner(string)
-    excluded.each do |clean|
-      string = string.gsub(/#{clean}/i, ' ')
-    end
-
-    [/((19|20)\d{2})/, /\./, /\s*-\s*/, /\s{2,}/].each do |regex|
+    [/((19|20)\d{2}).*$/, /\./, /\s*-\s*/, /\s{2,}/].each do |regex|
       string = string.gsub(regex, ' ')
     end
-
+    
+    excluded.each do |clean|
+      string = string.gsub(/#{clean}.*$/i, ' ')
+    end
+    
     string.strip
   end
   

data/lib/movies/exclude.yml

@@ -22,4 +22,5 @@ excluded:
   - LIMITED
   - (.+)?SUB
   - NTSC
-  - PAL
+  - PAL
+  - "S\d{1,2}E\d{1,2}"

data/movies.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "movies"
-  s.version     = "0.1.3"
+  s.version     = "0.1.4"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Linus Oleander"]
   s.email       = ["linus@oleander.nu"]

data/spec/exclude_spec.rb

@@ -114,11 +114,11 @@ describe "exclude.yaml" do
   end
   
   it "should not contain 'PAL'" do
-    Movies.cleaner("1942 PAL VC Arcade Wii-LaKiTu").should_not match(/pal/i)
+    Movies.cleaner("Sex And The City 2 2010 SUB PAL DVDRip XviD AC3-Rx").should_not match(/pal/i)
   end
   
   it "should not contain a year" do
-    Movies.cleaner("1942 PAL VC Arcade Wii-LaKiTu").should_not match(/1942/)
+    Movies.cleaner("VC Arcade 1942 Wii-LaKiTu").should_not match(/1942/)
   end
   
   it "should not contain dots" do
@@ -136,4 +136,8 @@ describe "exclude.yaml" do
   it "should strip ingoing params" do
     Movies.cleaner(" A B ").should eq("A B")
   end
+  
+  it "should remove TV related data" do
+    Movies.cleaner("Bones S06E19 HDTV XviD-LOL").should_not match(/s06e19/i)
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: movies
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Linus Oleander