RubyGems - mr_video - Versions diffs - 1.0.1 → 1.0.2 - Mend

mr_video 1.0.1 → 1.0.2

Files changed (19) hide show

data/README.md CHANGED Viewed

@@ -49,6 +49,7 @@ Mount it in your `config/routes.rb`.
 MyApp::Application.routes.draw do
   if Rails.env.development?
+    require 'mr_video'
     mount MrVideo::Engine => '/mr_video'
   end

data/app/controllers/mr_video/episodes_controller.rb CHANGED Viewed

@@ -3,19 +3,10 @@ module MrVideo
   class EpisodesController < MrVideoController
     def show
-      cassette = Cassette.find(params[:cassette_id])
-      episode = cassette.find_episode_by_id(params[:id])
-      episode_content = episode.content
-      unless params[:fix_relative_links] == 'false'
-        episode_content.gsub!(/href="\//, "href=\"#{episode.website_url}/")
-        episode_content.gsub!(/href="(?<foo>[a-zA-z0-9_])/, 'href="' + episode.website_url + '/\k<foo>')
-        episode_content.gsub!(/src="\//, "src=\"#{episode.website_url}/")
-        episode_content.gsub!(/@import url\("/, "@import url(\"#{episode.website_url}/")
-      end
+      show_presenter = Episodes::ShowPresenter.new(self)
       # TODO: Add method for sending decompressed content
-      send_data episode_content, type: episode.content_type, disposition: 'inline'
+      send_data show_presenter.content, type: show_presenter.content_type, disposition: 'inline'
     end
     def destroy

data/app/models/mr_video/cassette.rb CHANGED Viewed

@@ -23,7 +23,7 @@ module MrVideo
     end
     def updated_at
-      Time.zone.parse(File.mtime(cassette_path).to_s).to_datetime
+      @updated_at ||= episodes.map(&:recorded_at).max
     end

data/app/presenters/mr_video/episodes/show_presenter.rb ADDED Viewed

@@ -0,0 +1,80 @@
+module MrVideo
+  module Episodes
+    class ShowPresenter
+      def initialize(context)
+        @context = context
+      end
+      def content
+        if fix_relative_links?
+          content_with_relative_links_fixed
+        else
+          raw_content
+        end
+      end
+      def content_type
+        episode.content_type
+      end
+      private
+      def content_with_relative_links_fixed
+        content = raw_content
+        [
+        /href=["']([^'" >]+)["']/,
+        /src=["']([^'" >]+)["']/,
+        /@import url\(([^'" >]+)\)/
+        ].each do |pattern|
+          content.gsub!(pattern) do |match|
+            url = $1
+            match.gsub(url, URI.join(base_url, url).to_s)
+          end
+        end
+        content
+      end
+      def base_url
+        episode.website_url
+      end
+      def raw_content
+        episode.content
+      end
+      def fix_relative_links?
+        params[:fix_relative_links] != 'false'
+      end
+      def episode
+        @episode ||= cassette.find_episode_by_id(id)
+      end
+      def cassette
+        @cassette ||= Cassette.find(cassette_id)
+      end
+      def cassette_id
+        params[:cassette_id]
+      end
+      def id
+        params[:id]
+      end
+      def params
+        context.params
+      end
+      def context
+        @context
+      end
+    end # ShowPresenter class
+  end # Episodes module
+end # MrVideo module

data/app/views/layouts/mr_video.html.erb CHANGED Viewed

@@ -9,7 +9,7 @@
     <%= stylesheet_link_tag 'mr_video/application', media: 'all' %>
   </head>
   <body>
-    <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+    <nav class="navbar navbar-default navbar-fixed-top navbar-inverse" role="navigation">
       <div class="container">
         <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
@@ -19,7 +19,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="<%= root_path %>">Mr. Video</a>
+          <a class="navbar-brand" style="color: white;" href="<%= root_path %>">Mr. Video</a>
         </div><!-- /.navbar-header -->
         <div class="navbar-collapse collapse" id="navbar-main">
           <ul class="nav navbar-nav">
@@ -33,7 +33,7 @@
     <div class="container">
       <%= yield %>
     </div>
-    <div class="navbar navbar-fixed-bottom navbar-inverse">
+    <!--div class="navbar navbar-fixed-bottom navbar-inverse">
       <div class="navbar-inner">
         <div class="container">
           <ul class="nav navbar-nav">
@@ -49,7 +49,7 @@
           </ul>
         </div>
       </div>
-    </div>
+    </div-->
     <%= javascript_include_tag 'mr_video/application' %>
   </body>
 </html>

data/app/views/mr_video/cassettes/show.html.erb CHANGED Viewed

@@ -10,7 +10,7 @@
           <th>Url</th>
           <th>Method</th>
           <th>Content Type</th>
-          <th>Last Recorded</th>
+          <th>Recorded</th>
           <th>Action</th>
         </tr>
       </thead>
@@ -18,7 +18,7 @@
         <% @cassette.episodes.each_with_index do |episode, index| %>
           <tr id="episode_<%= episode.id %>_row">
             <td><%= index + 1 %></td>
-            <td><%= link_to(episode.url, cassette_episode_path(@cassette, episode), html_options = { target: '_blank' }) %></td>
+            <td><%= link_to(episode.url, cassette_episode_path(@cassette, episode, fix_relative_links: true), html_options = { target: '_blank' }) %></td>
             <td><%= episode.request_method.upcase %></td>
             <td><%= episode.content_type %></td>
             <td title="<%= episode.recorded_at %>"><%= time_ago_in_words(episode.recorded_at) %> ago</td>

data/lib/mr_video/constants.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module MrVideo
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
   URL = 'https://github.com/quidproquo/mr_video'
   NAME = 'Mr. Video'
 end

data/spec/controllers/{video_store → mr_video}/cassettes_controller_spec.rb RENAMED Viewed

File without changes

data/spec/controllers/mr_video/episodes_controller_spec.rb ADDED Viewed

@@ -0,0 +1,96 @@
+require 'rails_helper'
+describe MrVideo::EpisodesController do
+  routes { MrVideo::Engine.routes }
+  render_views
+  describe '#show' do
+    let(:cassette_id) { 'bell_house' }
+    let(:id) { 1234 }
+    let(:fix_relative_links) { 'false' }
+    let(:cassette) { double(:cassette, id: cassette_id) }
+    let(:episode) { double(:episode, id: id) }
+    let(:content) { '<html><body></body></html>' }
+    let(:website_url) { 'http://www.mrvideo.com' }
+    let(:content_type) { 'text/html' }
+    let(:params) { {
+      cassette_id: cassette_id,
+      id: id,
+      fix_relative_links: fix_relative_links
+    } }
+    let(:show) { get(:show, params) }
+    subject { show }
+    before do
+      expect(MrVideo::Cassette).to receive(:find).with(cassette_id) { cassette }
+      expect(cassette).to receive(:find_episode_by_id).with(id.to_s) { episode }
+      expect(episode).to receive(:content) { content }
+      allow(episode).to receive(:website_url) { website_url }
+      expect(episode).to receive(:content_type) { 'text/html' }
+      show
+    end
+    it { should be_success }
+    context 'fix relative links is true' do
+      let(:fix_relative_links) { 'true' }
+      let(:content) { raise NotImplementedError }
+      let(:body) { show.body }
+      subject { body }
+      context 'when href contains href="/' do
+        let(:content) { '<a href="/videos/video_1234" class="interesting">click here</a>' }
+        it 'should have correctly replaced the href' do
+          expect(body).to match(/href="http:\/\/www\.mrvideo\.com\/videos\/video_1234"/)
+        end
+      end
+      context 'when img contains src="/' do
+        let(:content) { '<img src="/videos/video_1234.png" />' }
+        it 'should have correctly replaced the src' do
+          expect(body).to match(/src="http:\/\/www\.mrvideo\.com\/videos\/video_1234.png"/)
+        end
+      end
+      context 'when @import is relative' do
+        let(:content) { '<style>@import url(fun.css);<style/>' }
+        it 'should have correctly replaced the url' do
+          expect(body).to match(/@import url\(http:\/\/www\.mrvideo\.com\/fun\.css\)/)
+        end
+      end
+    end # fix relative links
+  end # show
+  describe '#destroy' do
+    let(:cassette_id) { 'bell_house' }
+    let(:id) { 0 }
+    let(:params) { {
+      cassette_id: cassette_id,
+      id: id
+    } }
+    let(:cassette) { double(:cassette) }
+    let(:episode) { double(:episode, id: id) }
+    let(:destroy) { xhr(:post, :destroy, params) }
+    subject { destroy }
+    before do
+      expect(MrVideo::Cassette).to receive(:find).with(cassette_id) { cassette }
+      expect(cassette).to receive(:find_episode_by_id).with(id.to_s) { episode }
+      allow(episode).to receive(:destroy)
+      destroy
+    end
+    it { should be_success }
+    it 'should destroy the episode' do
+      expect(episode).to have_received(:destroy)
+    end
+  end # #destroy
+end # MrVideo::EpisodesController