likadan 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d88ac224659efaf127f64bc4a90731e034e28f2f
-  data.tar.gz: ccef5d9618a468ab6e7bb2f876a59f1040396b32
+  metadata.gz: 6bd6cec6d554529beb5c4492107883d5e80054d0
+  data.tar.gz: 11f2cea49136b6850c34a071f749ec66ea65228c
 SHA512:
-  metadata.gz: fbd6517535b14cb412025f12c7a34ce065a08ac84b874fb29a4adb245c66228eee8efe55831d79e595714d9c15196aecd50f7e20e96c5c2ef2da7d6e2f978b99
-  data.tar.gz: 699c8e6bbe68c82ee789d60bbaebd3d9986a77282b3aab1f779951ce453db847db05f7a1a7d809455df53f94b5ac9d8ee4ad2807ad1490945c0b636a258ff2eb
+  metadata.gz: ed89a22c58e98b897439ea9e473a37ffc61bf6c477e8ff715633d546c2f6279624797c2070f8f73061abd3430cde6098078483149d989cde37f7571b812ab778
+  data.tar.gz: 546df3614ba330b8675f5034b34634557546c528cce79ff19b529888e2b2de1104504aa0b0163db3030877ffa80a083f971613048ff137f9955bd15891728dd4

data/lib/likadan_runner.rb

@@ -17,8 +17,18 @@ def resolve_viewports(example)
   end
 end
 
-driver = Selenium::WebDriver.for LikadanUtils.config['driver'].to_sym
 begin
+  driver = Selenium::WebDriver.for LikadanUtils.config['driver'].to_sym
+rescue Selenium::WebDriver::Error::WebDriverError
+  # "unable to obtain stable firefox connection in 60 seconds"
+  #
+  # This seems to happen sporadically for some versions of Firefox, so we want
+  # to retry it in case it will work the second time around.
+  driver = Selenium::WebDriver.for LikadanUtils.config['driver'].to_sym
+end
+
+begin
+  driver.manage.timeouts.script_timeout = 3 # move to config?
   driver.navigate.to LikadanUtils.construct_url('/')
 
   # Check for errors during startup
@@ -33,7 +43,13 @@ begin
       driver.manage.window.resize_to(viewport['width'], viewport['height'])
 
       # Render the example
-      rendered = driver.execute_script('return window.likadan.renderCurrent()')
+
+      script = <<-EOS
+        var doneFunc = arguments[arguments.length - 1];
+        window.likadan.renderCurrent(doneFunc);
+      EOS
+      rendered = driver.execute_async_script(script)
+
       if error = rendered['error']
         puts <<-EOS
           Error while rendering "#{current['name']}" @#{viewport['name']}:
@@ -56,8 +72,8 @@ begin
       cropped = ChunkyPNG::Image.from_file(output_file)
       cropped.crop!(rendered['left'],
                     rendered['top'],
-                    rendered['width'],
-                    rendered['height'])
+                    [rendered['width'], 1].max,
+                    [rendered['height'], 1].max)
       cropped.save(output_file)
 
       print "Checking \"#{current['name']}\" at [#{viewport['name']}]... "

data/lib/likadan_uploader.rb

@@ -3,22 +3,23 @@ require 's3'
 require 'securerandom'
 
 class LikadanUploader
-  def initialize()
+  BUCKET_NAME = 'likadan-diffs'
+
+  def initialize
     @s3_access_key_id = LikadanUtils.config['s3_access_key_id']
     @s3_secret_access_key = LikadanUtils.config['s3_secret_access_key']
   end
 
   def upload_diffs
-    service = S3::Service.new(access_key_id: @s3_access_key_id,
-                              secret_access_key: @s3_secret_access_key)
     current_snapshots = LikadanUtils.current_snapshots
     return [] if current_snapshots[:diffs].empty?
 
-    bucket = service.buckets.build(SecureRandom.hex)
-    bucket.save(location: :us)
+    bucket = find_or_build_bucket
+
+    dir = SecureRandom.uuid
 
     diff_images = current_snapshots[:diffs].map do |diff|
-      image = bucket.objects.build("#{diff[:name]}_#{diff[:viewport]}.png")
+      image = bucket.objects.build("#{dir}/#{diff[:name]}_#{diff[:viewport]}.png")
       image.content = open(diff[:file])
       image.content_type = 'image/png'
       image.save
@@ -26,7 +27,7 @@ class LikadanUploader
       diff
     end
 
-    html = bucket.objects.build('likadan-diffs.html')
+    html = bucket.objects.build("#{dir}/index.html")
     html.content =
       ERB.new(
         File.read(File.expand_path(
@@ -36,4 +37,19 @@ class LikadanUploader
     html.save
     html.url
   end
+
+  private
+
+  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)
+
+    if bucket.nil?
+      bucket = service.buckets.build(BUCKET_NAME)
+      bucket.save(location: :us)
+    end
+
+    bucket
+  end
 end

data/lib/public/likadan-runner.js

@@ -56,10 +56,80 @@ window.likadan = {
     });
   },
 
-  renderCurrent: function() {
+  handleError: function(error) {
+    console.error(error);
+    return {
+      name: this.currentExample.name,
+      error: error.message
+    };
+  },
+
+  /**
+   * @param {Function} func The likadan.describe function from the current
+   *   example being rendered. This function takes a callback as an argument
+   *   that is called when it is done.
+   * @return {Promise}
+   */
+  tryAsync: function(func) {
+    return new Promise(function(resolve, reject) {
+      // Saftey valve: if the function does not finish after 3s, then something
+      // went haywire and we need to move on.
+      var timeout = setTimeout(function() {
+        reject(new Error('Async callback was not invoked within timeout.'));
+      }, 3000);
+
+      // This function is called by the example when it is done executing.
+      var doneCallback = function(elem) {
+        clearTimeout(timeout);
+
+        if (!arguments.length) {
+          return reject(new Error(
+            'The async done callback expects the rendered element as an ' +
+            'argument, but there were no arguments.'
+          ));
+        }
+
+        resolve(elem);
+      };
+
+      func(doneCallback);
+    });
+  },
+
+  /**
+   * @param {Function} doneFunc injected by driver.execute_async_script in
+   *   likadan_runner.rb
+   */
+  renderCurrent: function(doneFunc) {
     try {
       this.clearVisibleElements();
-      var elem = this.currentExample.func();
+
+      var func = this.currentExample.func;
+      if (func.length) {
+        // The function takes an argument, which is a callback that is called
+        // once it is done executing. This can be used to write functions that
+        // have asynchronous code in them.
+        this.tryAsync(func).then(function(elem) {
+          doneFunc(this.processElem(elem));
+        }.bind(this)).catch(function(error) {
+          doneFunc(this.handleError(error));
+        }.bind(this));
+      } else {
+        // The function does not take an argument, so we can run it
+        // synchronously.
+        var elem = func();
+        doneFunc(this.processElem(elem));
+      }
+    } catch (error) {
+      doneFunc(this.handleError(error));
+    }
+  },
+
+  processElem: function(elem) {
+    try {
+      // TODO: elem.getDOMNode is deprecated in React, so we need to convert
+      // this to React.findDOMNode(elem) at some point, or push this requirement
+      // into the examples.
       if (elem.getDOMNode) {
         // Soft-dependency to React here. If the thing returned has a
         // `getDOMNode` method, call it to get the real DOM node.
@@ -87,11 +157,7 @@ window.likadan = {
         left: left
       };
     } catch (error) {
-      console.error(error);
-      return {
-        name: this.currentExample.name,
-        error: error.message
-      };
+      return this.handleError(error);
     }
   }
 };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: likadan
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Henric Trotzig