lib/wgif/downloader.rb in wgif-0.2.0 vs lib/wgif/downloader.rb in wgif-0.3.0

@@ -12,73 +12,69 @@
 
     def initialize
       @cache = WGif::VideoCache.new
     end
 
-    def video_url youtube_url
-      begin
-        urls = ViddlRb.get_urls(youtube_url)
-        urls.first
-      rescue
-        raise WGif::VideoNotFoundException
-      end
+    def video_url(youtube_url)
+      urls = ViddlRb.get_urls(youtube_url)
+      urls.first
+    rescue
+      raise WGif::VideoNotFoundException
     end
 
-    def video_id youtube_url
-      begin
-        uri = URI(youtube_url)
-        params = CGI.parse(uri.query)
-        params['v'].first
-      rescue
-        raise WGif::InvalidUrlException
-      end
+    def video_id(youtube_url)
+      uri = URI(youtube_url)
+      params = CGI.parse(uri.query)
+      params['v'].first
+    rescue
+      raise WGif::InvalidUrlException
     end
 
-    def get_video youtube_url
+    def get_video(youtube_url)
       id = video_id youtube_url
-      if cached_clip = @cache.get(id)
-        return cached_clip
+      cached_clip = @cache.get(id)
+      if cached_clip
+        cached_clip
       else
         temp = load_clip(id, youtube_url)
         video = WGif::Video.new(id, temp.path)
         video
       end
     end
 
     private
 
-    def create_progress_bar request, output_file
+    def create_progress_bar(request, output_file)
       size = nil
       download_bar = WGif::DownloadBar.new
 
       request.on_headers do |response|
         size = response.headers['Content-Length'].to_i
         download_bar.update_total(size)
       end
 
       request.on_body do |chunk|
-          output_file.write(chunk)
-          download_bar.increment_progress(chunk.size)
+        output_file.write(chunk)
+        download_bar.increment_progress(chunk.size)
       end
     end
 
-    def request_clip youtube_url, output_file
-      clip_url = self.video_url youtube_url
+    def request_clip(youtube_url, output_file)
+      clip_url = video_url(youtube_url)
       request = Typhoeus::Request.new clip_url
       create_progress_bar(request, output_file)
       request.run
     end
 
-    def load_clip id, youtube_url
-      FileUtils.mkdir_p "/tmp/wgif"
+    def load_clip(id, youtube_url)
+      FileUtils.mkdir_p '/tmp/wgif'
       temp = File.open("/tmp/wgif/#{id}", 'wb')
       begin
         clip = request_clip(youtube_url, temp)
-        raise WGif::VideoNotFoundException unless clip.response_code == 200
+        fail WGif::VideoNotFoundException unless clip.response_code == 200
       ensure
         temp.close
       end
       temp
     end
-
   end
 end