movie_organizer 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f54c3650fd6f47604caa55e65e6849c3e205dbf56682c1a4e152992bde76ddd
-  data.tar.gz: 62dac5e6ffc9548d7f7560a3246bdd304d122c0bafd9a98e4f6a2d34b39ac769
+  metadata.gz: a28b7b48ec7f557670cc640b987534dba854888ecb6fa82652edb99af1999e61
+  data.tar.gz: 6274d25406a319fb04e31c599b17941d5d9b860fa55752f38db5296e375f7913
 SHA512:
-  metadata.gz: e3663b3c36305f0c5f8906c9273be61764dec2d1e57e5bc9d9b5e81fbf9427522c84b5f244a3b2282c0f045e283ac92d9856a8d75d97442498ca86e73646583c
-  data.tar.gz: 000717141ad377bf135acad6ba2b88a1abb14e9c6cc21c07d2d91cf9130182cb05beba1bcc9d6f1bc4607a8185d468d0062ea79eb30cef3127cfc2dd05276af5
+  metadata.gz: aa2d1fff8f2f40c78d3c661261cae8aa292b0f703ca46c75fafd302be6d81f7a1374eebb8a58b4c54162c64b2734168c9f889d7628ed05d9edca96bfd8dd100c
+  data.tar.gz: 55b058b03139ae43e85e1c81b99ecaafaa546a54a0a880d92cce972457510af6e8fcd2b95bca8e860cf4b0dfb3c2a50b3642fa6c73eb2e0f77a8094bb1c8726f

data/.gitignore

@@ -17,3 +17,4 @@ mkmf.log
 /vendor
 /spec/.DS_Store
 /.DS_Store
+.DS_Store

data/CHANGELOG

@@ -1,3 +1,8 @@
+*0.1.10* (March 14, 2018)
+
+* Strip 'WebRip' from filenames
+* Add specs
+
 *0.1.9* (March 09, 2018)
 
 * Handle timeouts for remote SSH hosts

data/lib/movie_organizer/media.rb

@@ -82,6 +82,7 @@ module MovieOrganizer
       cleanstr = cleanstr.gsub(/BrRip/i, '').strip
       cleanstr = cleanstr.gsub(/ECI/i, '').strip
       cleanstr = cleanstr.gsub(/HDTV/i, '').strip
+      cleanstr = cleanstr.gsub(/WEBRip/i, '').strip
       cleanstr = cleanstr.gsub(/x264/, '').strip
       cleanstr = cleanstr.gsub(/-lol/i, '').strip
       # cleanstr = cleanstr.gsub(/[\.\s-]us[\.\s-]/i, ' ').strip

data/lib/movie_organizer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MovieOrganizer
-  VERSION = '0.1.9'.freeze
+  VERSION = '0.1.10'.freeze
 end

data/spec/lib/movie_organizer/media_spec.rb

@@ -27,7 +27,8 @@ module MovieOrganizer
       movies = [
         'Coco.2017.1080p.BluRay.x264-[BOGUS.IT]',
         'Beetlejuice',
-        'Justice.League.2017.1080p.BluRay.x264-[YTS.AM]'
+        'Justice.League.2017.1080p.BluRay.x264-[YTS.AM]',
+        'Jumanji.Welcome.To.The.Jungle.2017.1080p.WEBRip.x264-[YTS.AM].mp4'
       ]
 
       movies.each do |filename|

data/spec/lib/movie_organizer/movie_spec.rb

@@ -5,48 +5,76 @@ module MovieOrganizer
   RSpec.describe Movie, type: :lib do
     include_context 'media_shared'
 
-    let(:filename) do
-      create_test_file(
-        filename: 'Foreign+Correspondent+(1940)+1080p', extension: 'mp4'
-      ).first
-    end
-    let(:movie) { Movie.new(filename, default_options) }
+    movies = {
+      'Coco.2017.1080p.BluRay.x264-[BOGUS.IT]' => {
+        year: '2017',
+        name: 'Coco (2017).mp4'
+      },
+      'Beetlejuice' => {
+        year: nil,
+        name: 'Beetlejuice ().mp4'
+      },
+      'Justice.League.2017.1080p.BluRay.x264-[YTS.AM]' => {
+        year: '2017',
+        name: 'Justice League (2017).mp4'
+      },
+      'Jumanji.Welcome.To.The.Jungle.2017.1080p.WEBRip.x264-[YTS.AM]' => {
+        year: '2017',
+        name: 'Jumanji Welcome To The Jungle (2017).mp4'
+      }
+    }
 
-    context '#new' do
-      it 'returns a child of the Media class' do
-        expect(movie).to be_a(Media)
-      end
+    movies.each_pair do |filename, data|
+      context filename do
+        before(:each) do
+          @filepath = create_test_file(filename: filename, extension: 'mp4').first
+          @expected_filename = data[:name]
+          @expected_year = data[:year]
+          @movie = Movie.new(@filepath, default_options)
+        end
 
-      it 'is a Movie' do
-        expect(movie).to be_a(Movie)
-      end
+        context '.processed_filename' do
+          it "correctly processes the filename: [#{filename}]" do
+            expect(
+              @movie.processed_filename
+            ).to eq(@expected_filename)
+          end
+        end
 
-      it 'sets filename accessor' do
-        expect(movie.filename).to eq(filename)
+        context '.year' do
+          it 'returns the correct year' do
+            expect(@movie.year).to eq(@expected_year)
+          end
+        end
       end
     end
 
-    context '.processed_filename' do
-      it 'correctly processes the filename' do
-        expect(
-          movie.processed_filename
-        ).to eq('Foreign Correspondent (1940).mp4')
+    context 'single movie' do
+      let(:filename) do
+        create_test_file(
+          filename: 'Foreign+Correspondent+(1940)+1080p', extension: 'mp4'
+        ).first
       end
-    end
+      let(:movie) { Movie.new(filename, default_options) }
+
+      context '#new' do
+        it 'is a Movie' do
+          expect(movie).to be_a(Movie)
+        end
 
-    context '.year' do
-      it 'returns the year' do
-        expect(movie.year).to eq('1940')
+        it 'sets filename accessor' do
+          expect(movie.filename).to eq(filename)
+        end
       end
-    end
 
-    context '.process!' do
-      it 'moves the file to the configured location' do
-        settings = Settings.new
-        settings[:movies][:directory] = MovieOrganizer.root.join('tmp', 'files', 'movies').to_s
-        settings.save
-        movie.process!
-        expect(File.exist?(filename)).to eq(true)
+      context '.process!' do
+        it 'moves the file to the configured location' do
+          settings = Settings.new
+          settings[:movies][:directory] = MovieOrganizer.root.join('tmp', 'files', 'movies').to_s
+          settings.save
+          movie.process!
+          expect(File.exist?(filename)).to eq(true)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: movie_organizer
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Chris Blackburn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler