happo 2.7.7 → 2.8.0

data/lib/happo/server.rb

@@ -29,7 +29,7 @@ module Happo
       result_summary = Happo::Utils.last_result_summary
 
       diff_images = result_summary[:diff_examples].map do |image|
-        [:previous, :diff, :current].each do |variant|
+        [:previous, :current].each do |variant|
           file_path = Happo::Utils.path_to(
             image[:description],
             image[:viewport],
@@ -52,32 +52,96 @@ module Happo
 
       erb :diffs, locals: {
         diff_images: diff_images,
-        new_images: new_images
+        new_images: new_images,
+        triggered_by_url: nil,
       }
     end
 
     get '/review-demo' do
       diff_images = [
+        {
+          description: '<Small>',
+          viewport: 'small',
+          previous: '/small-previous.png',
+          current: '/small-current.png',
+          height: 22,
+        },
+        {
+          description: '<Small> inverted',
+          viewport: 'small',
+          previous: '/small-current.png',
+          current: '/small-previous.png',
+          height: 22,
+        },
+        {
+          description: '<FullPage> small',
+          viewport: 'small',
+          current: '/full-page-small-current.png',
+          previous: '/full-page-small-previous.png',
+          height: 672,
+        },
+        {
+          description: '<FullPage> large',
+          viewport: 'large',
+          current: '/full-page-large-current.png',
+          previous: '/full-page-large-previous.png',
+          height: 718,
+        },
+        {
+          description: 'Completely different',
+          viewport: 'small',
+          previous: '/modal-previous.png',
+          current: '/card-current.png',
+          height: 373,
+        },
+        {
+          description: 'Completely different, reversed',
+          viewport: 'small',
+          previous: '/card-current.png',
+          current: '/modal-previous.png',
+          height: 373,
+        },
         {
           description: '<First> with "test"',
           viewport: 'small',
-          previous: 'http://placehold.it/350x150',
-          diff: 'http://placehold.it/350x150',
-          current: 'http://placehold.it/450x190',
+          previous: '/modal-previous.png',
+          current: '/modal-current.png',
+          height: 373,
         },
         {
           description: '<First> some other \'test\'',
           viewport: 'medium',
-          previous: 'http://placehold.it/550x150',
-          diff: 'http://placehold.it/550x150',
-          current: 'http://placehold.it/450x110',
+          previous: '/card-previous.png',
+          current: '/card-current.png',
+          height: 373,
+        },
+        {
+          description: '<First> /$&^',
+          viewport: 'large',
+          previous: '/wide-previous.png',
+          current: '/wide-current.png',
+          height: 300,
         },
         {
           description: '<First>',
           viewport: 'large',
-          previous: 'http://placehold.it/850x150',
-          diff: 'http://placehold.it/850x150',
-          current: 'http://placehold.it/850x150',
+          previous: '/dialog-previous.png',
+          current: '/dialog-current.png',
+          height: 373,
+        },
+        {
+          description: '<MajorDiff> large',
+          viewport: 'large',
+          current: '/major-diff-large-current.png',
+          previous: '/major-diff-large-previous.png',
+          height: 718,
+        },
+        {
+          description: '<MajorDiff> small',
+          viewport: 'small',
+          current: '/major-diff-small-current.png',
+          previous: '/major-diff-small-previous.png',
+          height: 672,
         },
       ]
 
@@ -86,27 +150,32 @@ module Happo
           description: '<New>',
           viewport: 'small',
           current: 'http://placehold.it/350x150',
+          height: 150,
         },
         {
           description: '<New>',
           viewport: 'medium',
           current: 'http://placehold.it/550x150',
+          height: 150,
         },
         {
           description: '<New>',
           viewport: 'large',
           current: 'http://placehold.it/850x150',
+          height: 150,
         },
         {
           description: '<SomethingElseNew>',
           viewport: 'small',
           current: 'http://placehold.it/350x150',
+          height: 150,
         },
       ]
 
       erb :diffs, locals: {
         diff_images: diff_images,
-        new_images: new_images
+        new_images: new_images,
+        triggered_by_url: 'https://test.example',
       }
     end
 

data/lib/happo/uploader.rb

@@ -13,7 +13,7 @@ module Happo
       @s3_bucket_path = ENV['S3_BUCKET_PATH']
     end
 
-    def upload_diffs
+    def upload_diffs(triggered_by_url)
       result_summary = Happo::Utils.last_result_summary
 
       return [] if result_summary[:diff_examples].empty? &&
@@ -21,7 +21,6 @@ module Happo
 
       diff_images = result_summary[:diff_examples].map do |example|
         example[:previous] = upload_image(example, 'previous')
-        example[:diff] = upload_image(example, 'diff')
         example[:current] = upload_image(example, 'current')
         example
       end

data/lib/happo/utils.rb

@@ -91,7 +91,7 @@ module Happo
     end
 
     def self.jsx_code
-      File.read(File.expand_path('../public/HappoDiffs.jsx', __FILE__))
+      File.read(File.expand_path('../public/HappoApp.bundle.js', __FILE__))
     end
 
     def self.last_result_summary

data/lib/happo/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module Happo
-  VERSION = '2.7.7'
+  VERSION = '2.8.0'
 end

data/lib/happo/views/diffs.erb

@@ -4,6 +4,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
+    <meta content="width=device-width, initial-scale=1" name="viewport">
     <title><%= Happo::Utils.page_title(diff_images, new_images) %></title>
 
     <link rel="shortcut icon" href="<%= Happo::Utils.favicon_as_base64 %>" />
@@ -14,26 +15,20 @@
 
     <script src="https://unpkg.com/react@15.3.1/dist/react.min.js"></script>
     <script src="https://unpkg.com/react-dom@15.3.1/dist/react-dom.min.js"></script>
-    <script src="https://unpkg.com/babel-core@5.8.38/browser.min.js"></script>
 
-    <script type="text/babel">
+    <script>
+      window.APP_PROPS = {
+        newImages: <%= new_images.to_json %>,
+        diffImages: <%= diff_images.to_json %>,
+        pageTitle: <%= Happo::Utils.page_title(diff_images, new_images).to_json %>,
+        generatedAt: <%= Time.now.to_s.to_json %>,
+        triggeredByUrl: <%= triggered_by_url.to_json %>
+      };
       <%= Happo::Utils.jsx_code %>
     </script>
   </head>
 
   <body>
     <div id="react-root"></div>
-
-    <script type="text/babel">
-      ReactDOM.render(
-        <HappoDiffs
-          newImages={<%= new_images.to_json %>}
-          diffImages={<%= diff_images.to_json %>}
-          pageTitle={<%= Happo::Utils.page_title(diff_images, new_images).to_json %>}
-          generatedAt={<%= Time.now.to_s.to_json %>}
-        />,
-        document.getElementById('react-root')
-      );
-    </script>
   </body>
 </html>

data/lib/happo.rb

@@ -3,4 +3,3 @@ require 'happo/utils'
 require 'happo/uploader'
 require 'happo/version'
 require 'happo/logger'
-require 'happo/snapshot_comparer'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happo
 version: !ruby/object:Gem::Version
-  version: 2.7.7
+  version: 2.8.0
 platform: ruby
 authors:
 - Henric Trotzig
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -25,20 +25,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: diff-lcs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: oily_png
   requirement: !ruby/object:Gem::Requirement
@@ -145,16 +131,116 @@ files:
 - bin/happo
 - lib/happo.rb
 - lib/happo/logger.rb
-- lib/happo/public/HappoDiffs.jsx
+- lib/happo/public/0144a92667ed2e8a8b13.worker.js
+- lib/happo/public/0622a1eb2a5b4dab0d7d.worker.js
+- lib/happo/public/088cc9d4615d51d37661.worker.js
+- lib/happo/public/11b439cedd6aa6a01e71.worker.js
+- lib/happo/public/15b1495833b5b13f5f51.worker.js
+- lib/happo/public/167f0a5b59a8c27815fe.worker.js
+- lib/happo/public/19f5f7403fb4a2ba42e2.worker.js
+- lib/happo/public/1a86029ce53b1aa81f68.worker.js
+- lib/happo/public/1b6803fbc7b07f61cba2.worker.js
+- lib/happo/public/1d3dc560f1f39393dafe.worker.js
+- lib/happo/public/203272bf00c349325c60.worker.js
+- lib/happo/public/220e711d4abdbc4bd32f.worker.js
+- lib/happo/public/25ad7a1e52bd424ca81d.worker.js
+- lib/happo/public/26d95a76207ba0fe6c25.worker.js
+- lib/happo/public/28237f0668f12dfb456c.worker.js
+- lib/happo/public/2a7a935f3b9526c6f7ab.worker.js
+- lib/happo/public/2c00cb8d0a2eb5dd4078.worker.js
+- lib/happo/public/2c71ddb5b15a755d4644.worker.js
+- lib/happo/public/32648d3dfb22995f4066.worker.js
+- lib/happo/public/3452650686a8096b2bb7.worker.js
+- lib/happo/public/346cefcc1572890455b8.worker.js
+- lib/happo/public/35bd63f58bb69ac267ea.worker.js
+- lib/happo/public/360e0acb872760f43b07.worker.js
+- lib/happo/public/3818f1c91ce4d4d8b724.worker.js
+- lib/happo/public/3cc2e649d9b6ff62f4ab.worker.js
+- lib/happo/public/3deccedc8fbb96bb1aa7.worker.js
+- lib/happo/public/3e672be26a7a8864a342.worker.js
+- lib/happo/public/41aa7471344a79ff98f2.worker.js
+- lib/happo/public/423ba9f549f3829873e6.worker.js
+- lib/happo/public/463eb0ecadbb11365ca4.worker.js
+- lib/happo/public/47c52ff0e060fedb841f.worker.js
+- lib/happo/public/4e685162de1d8a9b102d.worker.js
+- lib/happo/public/4eea1b4008ed68e41f82.worker.js
+- lib/happo/public/4f6b0faf1b43e93a1404.worker.js
+- lib/happo/public/54ba8bc7a595358209d2.worker.js
+- lib/happo/public/589c2f9547d240ac8a57.worker.js
+- lib/happo/public/5a8c0588ca745d7904f7.worker.js
+- lib/happo/public/5b3cabd81f7d8688f7a5.worker.js
+- lib/happo/public/5f5c9f07cb5117c523a2.worker.js
+- lib/happo/public/5fb8c7066659ea1b57e2.worker.js
+- lib/happo/public/5fb962cc191a60b42af0.worker.js
+- lib/happo/public/62c7585d1d23297b316f.worker.js
+- lib/happo/public/62e676d31cbf8aaa9359.worker.js
+- lib/happo/public/65efcf6aee5e3ef33539.worker.js
+- lib/happo/public/693d4918a5dae465c134.worker.js
+- lib/happo/public/69d106b071dd31ad86de.worker.js
+- lib/happo/public/730c035f5c2b404ff225.worker.js
+- lib/happo/public/7609088c49b73ee2e3e1.worker.js
+- lib/happo/public/76161d401db5bb36980a.worker.js
+- lib/happo/public/7d9febb46b37ddffa2d5.worker.js
+- lib/happo/public/7f29af56bd0ea82d77d9.worker.js
+- lib/happo/public/80009e8bc0ffd29d3390.worker.js
+- lib/happo/public/830db6cc9c99c2e8e9c1.worker.js
+- lib/happo/public/85ad69599657de02d20d.worker.js
+- lib/happo/public/875e790f3e64476b3aa0.worker.js
+- lib/happo/public/8fa9a7b2a5f19075eedc.worker.js
+- lib/happo/public/906ce908877052838b8e.worker.js
+- lib/happo/public/9472102d9a6d2577f988.worker.js
+- lib/happo/public/9ac309ab34f48e7af07c.worker.js
+- lib/happo/public/9cdd6f0763fd866a5118.worker.js
+- lib/happo/public/HappoApp.bundle.js
+- lib/happo/public/a8bfebcafc4935d15b00.worker.js
+- lib/happo/public/aa7ae8013f9780eb8acb.worker.js
+- lib/happo/public/b20a32590dfe259f4fe3.worker.js
+- lib/happo/public/b25ebdd4e2d2dee8c7b1.worker.js
+- lib/happo/public/b7a49d603b1d50f535b2.worker.js
+- lib/happo/public/b8e667564ad96f5c77f4.worker.js
+- lib/happo/public/b913c562805ec9a01635.worker.js
+- lib/happo/public/bab832c7110d15a5f43b.worker.js
+- lib/happo/public/bfcf99c9b2bf3d58ec7f.worker.js
+- lib/happo/public/c0aeff8b32c9911c8547.worker.js
+- lib/happo/public/c2297ce40f0d071ec173.worker.js
+- lib/happo/public/c3d7b17359c21ff82281.worker.js
+- lib/happo/public/c9f7adcce3de80eb759a.worker.js
+- lib/happo/public/card-current.png
+- lib/happo/public/card-previous.png
+- lib/happo/public/d7b87aec5f1e4f2a7a5d.worker.js
+- lib/happo/public/d8fefa1bd98baa4e38da.worker.js
+- lib/happo/public/db617ae6458966f4acae.worker.js
+- lib/happo/public/dialog-current.png
+- lib/happo/public/dialog-previous.png
+- lib/happo/public/e247eaa7506f44b5b847.worker.js
+- lib/happo/public/e92bb4e1e06843fa771e.worker.js
+- lib/happo/public/e9e2d97848e0059e15c5.worker.js
+- lib/happo/public/ea87c48552c960ed7a1c.worker.js
+- lib/happo/public/eb5aafba8d16a397517a.worker.js
+- lib/happo/public/edc218b655b9ef694b3e.worker.js
+- lib/happo/public/eea64a6efa0620a576d7.worker.js
+- lib/happo/public/f269a8e7ffca13e9366a.worker.js
+- lib/happo/public/f81ed0eec7edfa2dfadb.worker.js
 - lib/happo/public/favicon.ico
+- lib/happo/public/fcd20ee3e5a10e8667bb.worker.js
+- lib/happo/public/full-page-large-current.png
+- lib/happo/public/full-page-large-previous.png
+- lib/happo/public/full-page-small-current.png
+- lib/happo/public/full-page-small-previous.png
 - lib/happo/public/happo-runner.js
 - lib/happo/public/happo-styles.css
+- lib/happo/public/major-diff-large-current.png
+- lib/happo/public/major-diff-large-previous.png
+- lib/happo/public/major-diff-small-current.png
+- lib/happo/public/major-diff-small-previous.png
+- lib/happo/public/modal-current.png
+- lib/happo/public/modal-previous.png
+- lib/happo/public/small-current.png
+- lib/happo/public/small-previous.png
+- lib/happo/public/wide-current.png
+- lib/happo/public/wide-previous.png
 - lib/happo/runner.rb
 - lib/happo/server.rb
-- lib/happo/snapshot_comparer.rb
-- lib/happo/snapshot_comparison_image/base.rb
-- lib/happo/snapshot_comparison_image/gutter.rb
-- lib/happo/snapshot_comparison_image/overlayed.rb
 - lib/happo/uploader.rb
 - lib/happo/utils.rb
 - lib/happo/version.rb