RubyGems - poltergeist-screenshot_overview - Versions diffs - 0.1.8 → 0.2.1 - Mend

poltergeist-screenshot_overview 0.1.8 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml +4 -4
data/lib/poltergeist/screenshot_overview/capybara_patch.rb +49 -0
data/lib/poltergeist/screenshot_overview/manager.rb +25 -6
data/lib/poltergeist/screenshot_overview/rspec.rb +6 -3
data/lib/poltergeist/screenshot_overview/version.rb +1 -1
data/lib/poltergeist/screenshot_overview.rb +0 -34
data/templates/layout.erb +75 -64
data/templates/screenshot.erb +22 -10
metadata +3 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d55dfe2d1810db2618c72c957dcc8e43a3649fb4
-  data.tar.gz: e27d5ee0e8469ba9b6ca5ce2a261b6e515a48a39
+  metadata.gz: b91cf4b227b7cb2262672190cc89ab4c1ea3e8cc
+  data.tar.gz: b38d9f89fe29f258da38b2f991091c25918e03e7
 SHA512:
-  metadata.gz: 64af1d99ebddd35de6459781cc9f6b760623497d3877af3a4ee83731792af9c1f5878c763f982fadd2bedc9a50c982620ecdb0d1979dc3fc87006988e1f464ea
-  data.tar.gz: 6ed18399397448b422c890e78ae209a6f8193ce479d8859e9bd7916751cd2f3817e58a5b277bf10a7b14476ae9420b7563c5fedc73757aad38ec2d18d71d3213
+  metadata.gz: 27f3e49938bc7d6f40cef9b5e213c58d3d142eaa86e0c4b1a7c82198363a88c9235070d393db5453c8eeb902fb8743df7d4f1a14030497e2420c56e9b079510b
+  data.tar.gz: d940561a9de23b6a0f2d52b344838c2517e51b216047d9255a2efa1b2edd6e5fba7f53480a7cf9d85222391180af5e3e8ec894f439829a6a71fc4b090868041d

data/lib/poltergeist/screenshot_overview/capybara_patch.rb ADDED Viewed

@@ -0,0 +1,49 @@
+module Poltergeist::ScreenshotOverview
+  module CapybaraPatch
+    extend ActiveSupport::Concern
+    included do
+      # @override
+      def visit(url)
+        with_screenshot(url, page.visit(url))
+      end
+      # @override
+      def click_button(*args)
+        # page.send method, *args, &block
+        with_screenshot(args.first, page.click_button(*args))
+      end
+      # @override
+      def click_link(*args)
+        with_screenshot(args.first, page.click_link(*args))
+      end
+      # @override
+      def click_on(*args)
+        with_screenshot(args.first, page.click_on(*args))
+      end
+    end
+    private
+    def with_screenshot(url, result)
+      make_screenshot(url)
+      result
+    end
+    def make_screenshot(argument)
+      if defined?(RSpec.current_example)
+        ex = RSpec.current_example
+      else
+        ex = example
+      end
+      if ex && (ex.metadata[:js] || ex.metadata[:screenshot])
+        filename = Manager.instance.add_image_from_rspec(argument, ex, current_path)
+        page.driver.render(Rails.root.join(filename).to_s, full: true)
+      end
+    end
+  end
+end

data/lib/poltergeist/screenshot_overview/manager.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 require "erb"
 require "ostruct"
 module Poltergeist::ScreenshotOverview
-  class ScreenshotGroup
+  class ExampleFile
     attr_accessor :screenshots, :file_name
     def initialize(file,screenshots)
@@ -12,6 +12,24 @@ module Poltergeist::ScreenshotOverview
     def to_id
       file_name.gsub(/\W+/, "-").gsub(/^-/, "")
     end
+    def examples
+      screenshots.group_by{|i| i.example_description }.map do |_,screenshots|
+        Example.new(screenshots)
+      end
+    end
+  end
+  class Example
+    attr_accessor :screenshots
+    def initialize(screenshots)
+      @screenshots = screenshots.sort_by{|i| i.file_with_line }
+    end
+    def title
+      (screenshots.first.group_description + [screenshots.first.example_description]).join(' >> ')
+    end
   end
   class Screenshot
@@ -38,11 +56,11 @@ module Poltergeist::ScreenshotOverview
     end
     def snippet
-      File.read(full_test_path).lines[ line_number - 3, 5].join
+      File.read(full_test_path).lines[ line_number - 5, 9].tap{|i| i[4] = ">>" + i[4].gsub(/^  /,'')}.join
     end
     def test_file
-      full_test_path.gsub(Dir.pwd, "").gsub("spec/features/","")
+      file_with_line.gsub(Dir.pwd, '').gsub(/:\d+$/,'')
     end
     def render
@@ -92,10 +110,11 @@ module Poltergeist::ScreenshotOverview
     end
-    def groups
-      @files.
+    def example_files
+      @example_files ||=
+        @files.
         group_by{ |screenshot| screenshot.test_file}.
-        map{|file,screenshots| ScreenshotGroup.new(file,screenshots.sort_by{|s| s.file_with_line }) }
+        map{|file,screenshots| ExampleFile.new(file,screenshots.sort_by{|s| s.file_with_line }) }
     end
   end

data/lib/poltergeist/screenshot_overview/rspec.rb CHANGED Viewed

@@ -1,5 +1,11 @@
+require 'capybara'
+# require 'poltergeist'
 require "poltergeist/screenshot_overview"
 require "poltergeist/screenshot_overview/manager"
+require "poltergeist/screenshot_overview/capybara_patch"
+Capybara::DSL.send(:include, Poltergeist::ScreenshotOverview::CapybaraPatch)
 RSpec.configure do |config|
   config.before(:suite) do
     Poltergeist::ScreenshotOverview::Manager.instance.start
@@ -7,7 +13,4 @@ RSpec.configure do |config|
   config.after(:suite) do
     Poltergeist::ScreenshotOverview::Manager.instance.generate_html
   end
-  config.include Poltergeist::ScreenshotOverview, :type => :feature, :js => true
 end

data/lib/poltergeist/screenshot_overview/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Poltergeist
   module ScreenshotOverview
-    VERSION = "0.1.8"
+    VERSION = "0.2.1"
   end
 end

data/lib/poltergeist/screenshot_overview.rb CHANGED Viewed

@@ -20,39 +20,5 @@ module Poltergeist
       end
     end
-    # @override
-    def visit(*args)
-      super
-      make_screenshot(args.first)
-    end
-    # @override
-    def click_button(*args)
-      super
-      make_screenshot(args.first)
-    end
-    # @override
-    def click_link(*args)
-      super
-      make_screenshot(args.first)
-    end
-    def click_on(*args)
-      super
-      make_screenshot(args.first)
-    end
-    private
-    def make_screenshot(argument)
-      return if !defined?(RSpec.current_example)
-      ex = RSpec.current_example
-      if ex && (ex.metadata[:js] || ex.metadata[:screenshot])
-        filename = Manager.instance.add_image_from_rspec(argument, ex, current_path)
-        page.driver.render(Rails.root.join(filename).to_s,full: true)
-      end
-    end
   end
 end

data/templates/layout.erb CHANGED Viewed

@@ -1,79 +1,90 @@
 <!DOCTYPE html>
 <html class="no-js"> <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title><%= title %></title>
-<meta name="description" content="">
-<meta name="viewport" content="width=device-width">
-<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width">
+    <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
-<style type='text/css'>
-  .screenshot {
-    margin-bottom: 15px;
-    padding-bottom: 15px;
-    border-bottom: 2px solid #aaa;
-  }
-  #container {
-    width: 80%;
-    margin: 0 auto;
-    padding: 0 20px;
-    font-family: Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif;
-  }
-  #toc {
-    width: 200px;
-    background-color: #FFFFFF;
-    border-radius: 6px 6px 6px 6px;
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.067);
-    margin: 30px 0 0;
-    padding: 0;
-  }
-  #toc a {
-    border: 1px solid #E5E5E5;
-    display: block;
-    margin: 0 0 -1px;
-    padding: 8px 14px;
-    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  }
-</style>
+    <style type='text/css'>
+      .screenshot {
+        margin-bottom: 15px;
+        padding-bottom: 15px;
+        border-bottom: 2px solid #aaa;
+        vertical-align: top;
+        display: inline-block;
+      }
+      #container {
+        width: 80%;
+        margin: 0 auto;
+        padding: 0 20px;
+        font-family: Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif;
+      }
+      #toc {
+        width: 200px;
+        background-color: #FFFFFF;
+        border-radius: 6px 6px 6px 6px;
+        box-shadow: 0 1px 4px rgba(0, 0, 0, 0.067);
+        margin: 30px 0 0;
+        padding: 0;
+      }
+      #toc a {
+        border: 1px solid #E5E5E5;
+        display: block;
+        margin: 0 0 -1px;
+        padding: 8px 14px;
+        text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+      }
+    </style>
-<script type='text/javascript'>
-  //url = window.location.toString();
-  //console.log(url)
-  //if (!/\/$/.test(url)) {
-  //    url = url + '/';
-  //    window.location = url
-  //}
-</script>
+    <script type='text/javascript'>
+      //url = window.location.toString();
+    //console.log(url)
+    //if (!/\/$/.test(url)) {
+    //    url = url + '/';
+    //    window.location = url
+    //}
+  </script>
 </head>
 <body data-spy="scroll" data-target=".navbar">
+  <div class='container-fluid'>
-  <div id='container' class='row'>
-    <div class='span10'>
-      <h1><%= title %></h1>
-      <% groups.each do |group| %>
-        <div class='group'>
-          <h2 id='<%=group.to_id%>'><%= group.file_name %></h2>
-          <% group.screenshots.each do |screenshot| %>
-            <%= screenshot.render %>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
+    <div id='container' class='row'>
+      <div class='col-sm-8 col-lg-10'>
+        <h1><%= title %></h1>
+        <% example_files.each do |file| %>
+          <div class='group'>
+            <h2 id='<%=file.to_id%>'><%= file.file_name %></h2>
+            <% file.examples.each do |example| %>
+              <h4><%= example.title %></h4>
+              <% example.screenshots.each do |screenshot| %>
+                <%= screenshot.render %>
+              <% end %>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
-    <div class='span2'>
-      <div class='navbar' id='toc' data-spy="affix" data-offset-top="200">
-        <ul class='nav nav-list'>
-          <% groups.each do |group| %>
-            <li>
-            <a href='#<%=group.to_id %>'><%= group.file_name %></a>
-            </li>
-          <% end %>
+      <div class='col-sm-4 col-lg-2'>
+        <div class='navbar' id='toc' data-spy="affix" data-offset-top="200">
+          <ul class='nav nav-list'>
+            <% example_files.each do |group| %>
+              <li>
+                <a href='#<%=group.to_id %>'><%= group.file_name %></a>
+              </li>
+            <% end %>
+          </div>
+        </div>
       </div>
     </div>
-  </div>
-<script src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
-<script src="http://code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
-<script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
-</body>
+    <script src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
+    <script src="http://code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
+    <script type='application/javascript' src='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js'></script>
+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/styles/default.min.css">
+    <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/highlight.min.js"></script>
+    <script>hljs.initHighlightingOnLoad();</script>
+  </body>
 </html>

data/templates/screenshot.erb CHANGED Viewed

@@ -1,12 +1,24 @@
 <div class='screenshot'>
-  <img src='<%= local_image %>' alt=''/>
-  <ul>
-    <li>
-    <strong><%= group_description.join(" >> ") %> <%= example_description %></strong>
-  </li>
-  <li>URL: <code><%= url %></code></li>
-  <li>clicked on: <code><%= argument %></code></li>
-  <li><a href='file://<%= file_with_line %>'><%= file_with_line %></a></li>
-  <code><pre><%= snippet %></pre></code>
-</table>
+  <% id = 'modal' + Digest::MD5.hexdigest(file_with_line) %>
+  <a href='#<%=id%>' data-toggle='modal'>
+    <img src='<%= local_image %>' alt='' style='width: 100px'/>
+  </a>
+  <div class="modal fade" id='<%=id%>'>
+    <div class="modal-dialog modal-lg">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+          <h3 class='modal-title'><%= group_description.join(" >> ") %> <%= example_description %></h3>
+        </div>
+        <div class="modal-body">
+          <p>URL: <code><%= url %></code></p>
+          <p>clicked on: <code><%= argument %></code></p>
+          <p><a href='file://<%= file_with_line %>'><%= file_with_line %></a></p>
+          <pre><code lang='ruby' class='ruby'><%= snippet %></code></pre>
+          <img src='<%= local_image %>' alt='' class='img-responsive'/>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist-screenshot_overview
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.1
 platform: ruby
 authors:
 - Stefan Wienert
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: poltergeist
@@ -66,6 +66,7 @@ files:
 - README.md
 - Rakefile
 - lib/poltergeist/screenshot_overview.rb
+- lib/poltergeist/screenshot_overview/capybara_patch.rb
 - lib/poltergeist/screenshot_overview/manager.rb
 - lib/poltergeist/screenshot_overview/rspec.rb
 - lib/poltergeist/screenshot_overview/version.rb