youtube-rb 0.2.0 → 0.3.0

data/lib/youtube-rb.rb

@@ -1,14 +1,12 @@
 require_relative "youtube-rb/version"
 require_relative "youtube-rb/options"
 require_relative "youtube-rb/video_info"
-require_relative "youtube-rb/extractor"
 require_relative "youtube-rb/ytdlp_wrapper"
 require_relative "youtube-rb/downloader"
 require_relative "youtube-rb/client"
 
 module YoutubeRb
   class Error < StandardError; end
-  class ExtractionError < Error; end
   class DownloadError < Error; end
   class ValidationError < Error; end
 

data/spec/client_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe YoutubeRb::Client do
   let(:client) { described_class.new(output_path: @test_output_dir) }
 
   before do
-    mock_extractor(video_data)
+    mock_ytdlp(video_data)
   end
 
   describe '#initialize' do
@@ -62,11 +62,11 @@ RSpec.describe YoutubeRb::Client do
     end
 
     it 'raises error for invalid URL' do
-      mock_extractor_error
+      mock_ytdlp_error
       
       expect {
         client.info('https://www.youtube.com/watch?v=invalid')
-      }.to raise_error(YoutubeRb::Extractor::ExtractionError)
+      }.to raise_error(StandardError)
     end
   end
 
@@ -96,7 +96,7 @@ RSpec.describe YoutubeRb::Client do
       custom_dir = File.join(@test_output_dir, 'nested', 'path')
       custom_client = described_class.new(output_path: custom_dir)
       
-      mock_extractor(video_data)
+      mock_ytdlp(video_data)
       stub_video_download(video_url)
       
       output_file = custom_client.download(test_url)
@@ -275,7 +275,7 @@ RSpec.describe YoutubeRb::Client do
         subtitle_format: 'vtt'
       )
       
-      mock_extractor(video_data)
+      mock_ytdlp(video_data)
       video_data['subtitles'].each do |lang, subs|
         subs.each { |sub| stub_subtitle_download(sub['url']) }
       end
@@ -366,13 +366,6 @@ RSpec.describe YoutubeRb::Client do
       expect(output_file).to be_a(String)
     end
 
-    it 'raises error if ffmpeg not available' do
-      allow_any_instance_of(YoutubeRb::Downloader).to receive(:ffmpeg_available?).and_return(false)
-      
-      expect {
-        client.extract_audio(test_url)
-      }.to raise_error(YoutubeRb::Downloader::DownloadError, /FFmpeg is required/)
-    end
   end
 
   describe '#valid_url?' do
@@ -381,7 +374,7 @@ RSpec.describe YoutubeRb::Client do
     end
 
     it 'returns false for invalid URL' do
-      mock_extractor_error
+      mock_ytdlp_error
       
       expect(client.valid_url?('https://www.youtube.com/watch?v=invalid')).to be false
     end
@@ -395,7 +388,7 @@ RSpec.describe YoutubeRb::Client do
     end
 
     it 'returns false for non-YouTube URL' do
-      mock_extractor_error(YoutubeRb::Extractor::ExtractionError, 'Not a YouTube URL')
+      mock_ytdlp_error('Not a YouTube URL')
       
       expect(client.valid_url?('https://example.com')).to be false
     end
@@ -416,7 +409,7 @@ RSpec.describe YoutubeRb::Client do
       no_formats_data = video_data.dup
       no_formats_data['formats'] = []
       
-      mock_extractor(no_formats_data)
+      mock_ytdlp(no_formats_data)
       
       formats = client.formats('https://www.youtube.com/watch?v=noformats')
       expect(formats).to eq([])
@@ -437,7 +430,7 @@ RSpec.describe YoutubeRb::Client do
       no_subs_data = video_data.dup
       no_subs_data['subtitles'] = {}
       
-      mock_extractor(no_subs_data)
+      mock_ytdlp(no_subs_data)
       
       subtitles = client.subtitles('https://www.youtube.com/watch?v=nosubs')
       expect(subtitles).to eq({})

data/spec/download_with_mocks_spec.rb

@@ -13,10 +13,9 @@ RSpec.describe "Download with mocks" do
   before(:each) do
     FileUtils.mkdir_p(output_dir)
     
-    # Mock the Extractor to return real data
-    allow_any_instance_of(YoutubeRb::Extractor).to receive(:extract_info) do
-      YoutubeRb::VideoInfo.new(rickroll_info)
-    end
+    # Mock YtdlpWrapper to return real data
+    allow(YoutubeRb::YtdlpWrapper).to receive(:available?).and_return(true)
+    allow_any_instance_of(YoutubeRb::YtdlpWrapper).to receive(:extract_info).and_return(rickroll_info)
   end
 
   after(:each) do
@@ -70,8 +69,7 @@ RSpec.describe "Download with mocks" do
       end
       
       client = YoutubeRb::Client.new(
-        output_path: output_dir,
-        use_ytdlp: true
+        output_path: output_dir
       )
 
       output_file = client.download(rickroll_url)
@@ -101,8 +99,7 @@ RSpec.describe "Download with mocks" do
       end
       
       client = YoutubeRb::Client.new(
-        output_path: output_dir,
-        use_ytdlp: true
+        output_path: output_dir
       )
 
       output_file = client.download_segment(rickroll_url, start_time, end_time)
@@ -146,7 +143,7 @@ RSpec.describe "Download with mocks" do
       # It's better tested in real_download_spec.rb with actual downloads
     end
 
-    it "respects use_ytdlp: true option" do
+    it "always uses yt-dlp for downloads" do
       tried_ytdlp = false
       
       allow_any_instance_of(YoutubeRb::YtdlpWrapper).to receive(:download) do
@@ -157,8 +154,7 @@ RSpec.describe "Download with mocks" do
       end
       
       client = YoutubeRb::Client.new(
-        output_path: output_dir,
-        use_ytdlp: true
+        output_path: output_dir
       )
 
       client.download(rickroll_url)
@@ -173,14 +169,8 @@ RSpec.describe "Download with mocks" do
         raise YoutubeRb::YtdlpWrapper::YtdlpError, "Video unavailable"
       end
       
-      allow_any_instance_of(YoutubeRb::Extractor).to receive(:extract_info) do
-        raise YoutubeRb::Extractor::ExtractionError, "Failed to extract"
-      end
-      
       client = YoutubeRb::Client.new(
-        output_path: output_dir,
-        use_ytdlp: true,
-        ytdlp_fallback: false
+        output_path: output_dir
       )
 
       expect {

data/spec/downloader_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe YoutubeRb::Downloader do
   let(:downloader) { described_class.new(test_url, options) }
 
   before do
-    mock_extractor(video_data)
+    mock_ytdlp(video_data)
   end
 
   describe '#initialize' do
@@ -49,11 +49,9 @@ RSpec.describe YoutubeRb::Downloader do
       expect(info1).to equal(info2)
     end
 
-    it 'calls extractor only once' do
-      video_info = YoutubeRb::VideoInfo.new(video_data)
-      
-      expect_any_instance_of(YoutubeRb::Extractor)
-        .to receive(:extract_info).once.and_return(video_info)
+    it 'calls ytdlp only once' do
+      expect_any_instance_of(YoutubeRb::YtdlpWrapper)
+        .to receive(:extract_info).once.and_return(video_data)
       
       downloader.info
       downloader.info
@@ -91,7 +89,7 @@ RSpec.describe YoutubeRb::Downloader do
         )
         dl = described_class.new(test_url, custom_options)
         
-        mock_extractor(video_data)
+        mock_ytdlp(video_data)
         stub_video_download(video_url)
         
         output_file = dl.download
@@ -103,7 +101,7 @@ RSpec.describe YoutubeRb::Downloader do
         bad_title_data = video_data.dup
         bad_title_data['title'] = 'Test/Video:With*Bad?Chars'
         
-        mock_extractor(bad_title_data)
+        mock_ytdlp(bad_title_data)
         stub_video_download(video_url)
         
         dl = described_class.new(
@@ -134,7 +132,7 @@ RSpec.describe YoutubeRb::Downloader do
         )
         dl = described_class.new(test_url, subtitle_options)
         
-        mock_extractor(video_data)
+        mock_ytdlp(video_data)
         stub_video_download(video_url)
         video_data['subtitles'].each do |lang, subs|
           subs.each { |sub| stub_subtitle_download(sub['url']) }
@@ -149,7 +147,7 @@ RSpec.describe YoutubeRb::Downloader do
       it 'skips subtitles when disabled' do
         dl = described_class.new(test_url, options)
         
-        mock_extractor(video_data)
+        mock_ytdlp(video_data)
         stub_video_download(video_url)
         
         dl.download
@@ -171,7 +169,7 @@ RSpec.describe YoutubeRb::Downloader do
         )
         dl = described_class.new(test_url, metadata_options)
         
-        mock_extractor(video_data)
+        mock_ytdlp(video_data)
         stub_video_download(video_url)
         stub_thumbnail_download(video_data['thumbnail'])
         
@@ -191,7 +189,7 @@ RSpec.describe YoutubeRb::Downloader do
         )
         dl = described_class.new(test_url, thumbnail_options)
         
-        mock_extractor(video_data)
+        mock_ytdlp(video_data)
         stub_video_download(video_url)
         stub_thumbnail_download(video_data['thumbnail'])
         
@@ -208,7 +206,7 @@ RSpec.describe YoutubeRb::Downloader do
         )
         dl = described_class.new(test_url, desc_options)
         
-        mock_extractor(video_data)
+        mock_ytdlp(video_data)
         stub_video_download(video_url)
         
         dl.download
@@ -236,7 +234,7 @@ RSpec.describe YoutubeRb::Downloader do
         )
         dl = described_class.new(test_url, audio_options)
         
-        mock_extractor(video_data)
+        mock_ytdlp(video_data)
         stub_video_download(video_url)
         
         output_file = dl.download
@@ -244,81 +242,16 @@ RSpec.describe YoutubeRb::Downloader do
         expect(output_file).to be_a(String)
       end
 
-      it 'raises error if ffmpeg not available' do
-        audio_options = YoutubeRb::Options.new(
-          output_path: @test_output_dir,
-          extract_audio: true
-        )
-        dl = described_class.new(test_url, audio_options)
-        
-        mock_extractor(video_data)
-        stub_video_download(video_url)
-        
-        allow_any_instance_of(described_class).to receive(:ffmpeg_available?).and_return(false)
-        
-        expect {
-          dl.download
-        }.to raise_error(YoutubeRb::Downloader::DownloadError, /FFmpeg is required/)
-      end
     end
 
     context 'error handling' do
-      it 'raises error when no formats available' do
-        no_format_data = video_data.dup
-        no_format_data['formats'] = []
-        
-        mock_extractor(no_format_data)
-        
-        dl = described_class.new(
-          'https://www.youtube.com/watch?v=noformat',
-          options
-        )
-        
-        expect {
-          dl.download
-        }.to raise_error(YoutubeRb::Downloader::DownloadError, /No suitable format/)
-      end
-
-      it 'raises error when format has no URL' do
-        bad_format_data = video_data.dup
-        bad_format_data['formats'] = [{ 'format_id' => '18', 'ext' => 'mp4' }]
-        
-        mock_extractor(bad_format_data)
-        
-        dl = described_class.new(
-          'https://www.youtube.com/watch?v=badformat',
-          options
-        )
-        
-        expect {
-          dl.download
-        }.to raise_error(YoutubeRb::Downloader::DownloadError, /No URL found/)
-      end
-
-      it 'handles HTTP download errors' do
-        # Disable yt-dlp fallback for this test
-        dl = YoutubeRb::Downloader.new(
-          test_url,
-          output_path: @test_output_dir,
-          use_ytdlp: false,
-          ytdlp_fallback: false
-        )
-        
-        mock_extractor(video_data)
-        stub_request(:get, video_url).to_return(status: 403, body: 'Forbidden')
-        
-        expect {
-          dl.download
-        }.to raise_error(YoutubeRb::Downloader::DownloadError, /HTTP download failed/)
-      end
-
-      it 'handles network errors' do
-        mock_extractor(video_data)
-        stub_request(:get, video_url).to_raise(Faraday::ConnectionFailed)
+      it 'handles download errors' do
+        allow_any_instance_of(YoutubeRb::YtdlpWrapper).to receive(:download)
+          .and_raise(YoutubeRb::YtdlpWrapper::YtdlpError, 'Download failed')
         
         expect {
           downloader.download
-        }.to raise_error(YoutubeRb::Downloader::DownloadError, /Network error/)
+        }.to raise_error(YoutubeRb::Downloader::DownloadError, /Download failed/)
       end
     end
   end
@@ -556,7 +489,7 @@ RSpec.describe YoutubeRb::Downloader do
         )
         dl = described_class.new(test_url, cache_options)
         
-        mock_extractor(video_data)
+        mock_ytdlp(video_data)
         
         # Mock yt-dlp download
         allow_any_instance_of(YoutubeRb::YtdlpWrapper).to receive(:download) do |_, url, output_path|
@@ -583,7 +516,7 @@ RSpec.describe YoutubeRb::Downloader do
         )
         dl = described_class.new(test_url, no_cache_options)
         
-        mock_extractor(video_data)
+        mock_ytdlp(video_data)
         
         # Mock yt-dlp download
         allow_any_instance_of(YoutubeRb::YtdlpWrapper).to receive(:download) do |_, url, output_path|
@@ -633,7 +566,7 @@ RSpec.describe YoutubeRb::Downloader do
       )
       dl = described_class.new(test_url, subtitle_options)
       
-      mock_extractor(video_data)
+      mock_ytdlp(video_data)
       video_data['subtitles'].each do |lang, subs|
         subs.each { |sub| stub_subtitle_download(sub['url']) }
       end
@@ -649,7 +582,7 @@ RSpec.describe YoutubeRb::Downloader do
       subtitle_options = YoutubeRb::Options.new(output_path: custom_dir)
       dl = described_class.new(test_url, subtitle_options)
       
-      mock_extractor(video_data)
+      mock_ytdlp(video_data)
       video_data['subtitles'].each do |lang, subs|
         subs.each { |sub| stub_subtitle_download(sub['url']) }
       end
@@ -701,32 +634,6 @@ RSpec.describe YoutubeRb::Downloader do
       end
     end
 
-    describe '#audio_codec_for_format' do
-      it 'returns correct codec for mp3' do
-        dl = downloader
-        expect(dl.send(:audio_codec_for_format, 'mp3')).to eq('libmp3lame')
-      end
-
-      it 'returns correct codec for aac' do
-        dl = downloader
-        expect(dl.send(:audio_codec_for_format, 'aac')).to eq('aac')
-      end
-
-      it 'returns correct codec for opus' do
-        dl = downloader
-        expect(dl.send(:audio_codec_for_format, 'opus')).to eq('libopus')
-      end
-
-      it 'returns correct codec for flac' do
-        dl = downloader
-        expect(dl.send(:audio_codec_for_format, 'flac')).to eq('flac')
-      end
-
-      it 'returns copy for unknown format' do
-        dl = downloader
-        expect(dl.send(:audio_codec_for_format, 'unknown')).to eq('copy')
-      end
-    end
 
     describe '#valid_segment_duration?' do
       it 'returns true for 10 seconds (default minimum)' do
@@ -762,7 +669,7 @@ RSpec.describe YoutubeRb::Downloader do
         )
         dl = described_class.new(test_url, custom_options)
         
-        mock_extractor(video_data)
+        mock_ytdlp(video_data)
         
         expect(dl.send(:valid_segment_duration?, 5)).to be true   # custom minimum
         expect(dl.send(:valid_segment_duration?, 120)).to be true # custom maximum