diffux_ci 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5143ca3e39e34a1ea00043f6f20814a72971b16
-  data.tar.gz: 6fced8ad6eccd338a886769b2ca755768ab9c0f9
+  metadata.gz: 17dabfe7fd58267914a299a9483ab949641d6257
+  data.tar.gz: 2fc79ba700188b7aba82f43d34ab7962e78f65d9
 SHA512:
-  metadata.gz: 758fe05b11a9edcc343acc0cd9988615e2035432675e88de8b2837941f2c1704de1b9d6cd2a31102df05fd1b5276dc0a7b439b83a987a7e421e0b0177e7a8679
-  data.tar.gz: feb1f5d30adea55fc3fc0f467f1079eb629d09b15a6b0248ebfe60a91d2f2679a9e086a789c5822fbac5cf7611831358090be701aaa4ea7378e97859df8fe114
+  metadata.gz: 46723a8efa95283c6d95201f45a2075d7afa47f9ee2aeea3a7cfe85f6ccfe7904473ac0345d9c7132827dcb0009a8c3f1b0c4ea3b6811c79aa8fd53de2131baa
+  data.tar.gz: 4ac1e9e47de90dae7dc9771b318a7c1c058555d05f8d3189423294d0e0fe224e18e0d06aa6625bee86832337bbc1c5b268fe6700e51ac0acf7acca5aa2425849

data/lib/diffux_ci_runner.rb

@@ -121,7 +121,7 @@ begin
       screenshot = ChunkyPNG::Image.from_blob(driver.screenshot_as(:png))
       print '.'
 
-      # In our JavScript we are rounding up, which can sometimes give us a
+      # In our JavaScript we are rounding up, which can sometimes give us a
       # dimensions that are larger than the screenshot dimensions. We need to
       # guard against that here.
       crop_width = [
@@ -133,11 +133,13 @@ begin
         screenshot.height - rendered['top']
       ].min
 
-      screenshot.crop!(rendered['left'],
-                       rendered['top'],
-                       crop_width,
-                       crop_height)
-      print '.'
+      if crop_width < screenshot.width || crop_height < screenshot.height
+        screenshot.crop!(rendered['left'],
+                         rendered['top'],
+                         crop_width,
+                         crop_height)
+        print '.'
+      end
 
       # Run the diff if needed
       baseline_path = DiffuxCIUtils.path_to(

data/lib/diffux_ci_uploader.rb

@@ -3,11 +3,10 @@ require 's3'
 require 'securerandom'
 
 class DiffuxCIUploader
-  BUCKET_NAME = 'diffux_ci-diffs'
-
   def initialize
     @s3_access_key_id = DiffuxCIUtils.config['s3_access_key_id']
     @s3_secret_access_key = DiffuxCIUtils.config['s3_secret_access_key']
+    @s3_bucket_name = DiffuxCIUtils.config['s3_bucket_name']
   end
 
   def upload_diffs
@@ -42,10 +41,10 @@ class DiffuxCIUploader
   def find_or_build_bucket
     service = S3::Service.new(access_key_id: @s3_access_key_id,
                               secret_access_key: @s3_secret_access_key)
-    bucket = service.buckets.find(BUCKET_NAME)
+    bucket = service.buckets.find(@s3_bucket_name)
 
     if bucket.nil?
-      bucket = service.buckets.build(BUCKET_NAME)
+      bucket = service.buckets.build(@s3_bucket_name)
       bucket.save(location: :us)
     end
 

data/lib/diffux_ci_version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module DiffuxCI
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/lib/public/diffux_ci-runner.js

@@ -28,15 +28,9 @@ window.diffux = {
    * @return {Array.<Object>}
    */
   getAllExamples: function() {
-    var descriptions = Object.keys(this.defined);
-
-    if (this.fdefined.length) {
-      // Some examples have been focused, so we want to filter out anything that
-      // has not been focused.
-      descriptions = descriptions.filter(function(description) {
-        return this.fdefined.indexOf(description) !== -1;
-      }.bind(this));
-    }
+    var descriptions = this.fdefined.length ?
+      this.fdefined :
+      Object.keys(this.defined);
 
     return descriptions.map(function(description) {
       var example = this.defined[description];
@@ -49,23 +43,6 @@ window.diffux = {
     }.bind(this));
   },
 
-  isElementVisible: function(element) {
-    // element.offsetParent is a cheap way to determine visibility for most
-    // elements, but it doesn't work for elements with fixed positioning so we
-    // will need to fall back to the more expensive getComputedStyle.
-    return element.offsetParent ||
-      window.getComputedStyle(element).display !== 'none';
-  },
-
-  clearVisibleElements: function() {
-    var allElements = document.querySelectorAll('body > *');
-    for (var element of allElements) {
-      if (this.isElementVisible(element)) {
-        element.parentNode.removeChild(element);
-      }
-    }
-  },
-
   handleError: function(currentExample, error) {
     console.error(error);
     return {
@@ -108,6 +85,9 @@ window.diffux = {
 
   /**
    * Clean up the DOM for a rendered element that has already been processed.
+   * This can be overridden by consumers to define their own clean out method,
+   * which can allow for this to be used to unmount React components, for
+   * example.
    *
    * @param {Object} renderedElement
    */
@@ -116,21 +96,28 @@ window.diffux = {
   },
 
   /**
+   * This function is called from Ruby asynchronously. Therefore, we need to
+   * call doneFunc when the method has completed so that Ruby knows to continue.
+   *
    * @param {String} exampleDescription
    * @param {Function} doneFunc injected by driver.execute_async_script in
    *   diffux_ci_runner.rb
    */
   renderExample: function(exampleDescription, doneFunc) {
-    var currentExample = this.defined[exampleDescription];
-    if (!currentExample) {
-      throw 'No example found with description "' + exampleDescription + '"';
-    }
-
     try {
+      var currentExample = this.defined[exampleDescription];
+      if (!currentExample) {
+        throw new Error(
+          'No example found with description "' + exampleDescription + '"');
+      }
+
+      // Clear out the body of the document
       if (this.currentRenderedElement) {
         this.cleanOutElement(this.currentRenderedElement);
       }
-      this.clearVisibleElements();
+      while (document.body.firstChild) {
+        document.body.removeChild(document.body.firstChild);
+      }
 
       var func = currentExample.func;
       if (func.length) {

data/lib/views/index.erb

@@ -17,11 +17,11 @@
       <link rel="stylesheet" type="text/css"
         href="/resource?file=<%= ERB::Util.url_encode(stylesheet) %>">
     <% end %>
-  </head>
-  <body style="background-color: #fff; margin: 0; pointer-events: none;">
     <script src="/diffux_ci-runner.js"></script>
     <% @config['source_files'].each do |source_file| %>
       <script src="/resource?file=<%= ERB::Util.url_encode(source_file) %>"></script>
     <% end %>
+  </head>
+  <body style="background-color: #fff; margin: 0; pointer-events: none;">
   </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffux_ci
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Henric Trotzig
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffux-core
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Diffux-CI