likadan 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bdf5b94276da8220ca5344b009e26e11e900afc
-  data.tar.gz: 55145af24ef76484e796629f18a980f5c332ff38
+  metadata.gz: 957b1cda6eb70bcb989807e528334c7d41058326
+  data.tar.gz: 28610f653c625a8437d057d7cff5cc8f2a90b014
 SHA512:
-  metadata.gz: 8109fd809d7d81f6c99779a972446e27402a7632b8cedc4a0288eecff586e7bbb3ee7e187694b7478de00a91c94c1672fdfdc6b956516370ef003144eb0bde2b
-  data.tar.gz: 038492a9885d98a506d0279a35a20a22e6db256200e598fc7a3c9813ff707c11c637d5010c6bda27f738b34d6de313ffe0004e3a6c6ff8295adaf5fd063d3dff
+  metadata.gz: bce71e0320443c5ce1a036a4f0033a641201decb0d7e2b44bfd6dae70df88d550c586fe0074c259f1973f759c769a81c2c019f2868143d5c2fd9fbc1ad7ea910
+  data.tar.gz: 7515a142377ed7ec6c23e521ab54403d4a3755d7dda20e85dbd700493d553529c8c1dee44e0093421594654128a07b1a0c3bce1f8e9813285a6a89e5589f87c8

data/lib/likadan_runner.rb

@@ -19,6 +19,15 @@ begin
 
       # Render the example
       rendered = driver.execute_script('return window.likadan.renderCurrent()')
+      if error = rendered['error']
+        puts <<-EOS
+          Error while rendering "#{current['name']}" @#{width}px:
+            #{rendered['error']}
+          Debug by pointing your browser to
+          #{LikadanUtils.construct_url('/', name: current['name'])}
+        EOS
+        next
+      end
       output_file = LikadanUtils.path_to(current['name'], width, 'candidate.png')
 
       # Create the folder structure if it doesn't already exist

data/lib/likadan_utils.rb

@@ -23,7 +23,14 @@ class LikadanUtils
     )
   end
 
-  def self.construct_url(absolute_path)
-    return "http://localhost:#{config['port']}#{absolute_path}"
+  def self.construct_url(absolute_path, params = {})
+    params_str = params.map do |key, value|
+      "#{key}=#{URI.escape(value)}"
+    end.join('&')
+    unless params_str.empty?
+      params_str = "?#{params_str}"
+    end
+
+    return "http://localhost:#{config['port']}#{absolute_path}#{params_str}"
   end
 end

data/lib/public/likadan-runner.js

@@ -2,6 +2,7 @@ window.likadan = {
   defined: [],
   currentIndex: 0,
   currentExample: undefined,
+  currentRenderedElement: undefined,
 
   define: function(name, func, viewportWidths, options) {
     this.defined.push({
@@ -15,6 +16,13 @@ window.likadan = {
   },
 
   next: function() {
+    if (this.currentRenderedElement) {
+      if (React) {
+        React.unmountComponentAtNode(document.body.lastChild);
+      } else {
+        this.currentRenderedElement.parentNode.removeChild(this.currentRenderedElement);
+      }
+    }
     this.currentExample = this.defined[this.currentIndex];
     if (!this.currentExample) {
       return;
@@ -23,17 +31,20 @@ window.likadan = {
     return this.currentExample;
   },
 
-  getOutputElement: function() {
-    return document.getElementById('likadan-output');
+  setCurrent: function(exampleName) {
+    this.defined.forEach(function(example, index) {
+      if (example.name === exampleName) {
+        this.currentExample = example;
+      }
+    }.bind(this));
+    if (!this.currentExample) {
+      throw 'No example found with name "' + exampleName + '"';
+    }
   },
 
   clearVisibleElements: function() {
-    var out = this.getOutputElement();
     var allElements = Array.prototype.slice.call(document.querySelectorAll('body > *'));
     allElements.forEach(function(element) {
-      if (element === out) {
-        return;
-      }
       var style = window.getComputedStyle(element);
       if (style.display !== 'none') {
         element.parentNode.removeChild(element);
@@ -42,32 +53,59 @@ window.likadan = {
   },
 
   renderCurrent: function() {
-    var out = this.getOutputElement();
-    out.innerHTML = '';
-
-    // We need to clear out anything currently visible. There's no guarantee
-    // that examples only render inside the .likadan-output container.
-    this.clearVisibleElements();
+    try {
+      this.clearVisibleElements();
+      var elem = this.currentExample.func();
+      if (elem.getDOMNode) {
+        // Soft-dependency to React here. If the thing returned has a
+        // `getDOMNode` method, call it to get the real DOM node.
+        elem = elem.getDOMNode();
+      }
 
-    var elem = this.currentExample.func();
-    if (elem.getDOMNode) {
-      // Soft-dependency to React here. If the thing returned has a
-      // `getDOMNode` method, call it to get the real DOM node.
-      elem = elem.getDOMNode();
-    }
-    out.appendChild(elem);
+      this.currentRenderedElement = elem;
 
-    var width = elem.offsetWidth;
-    var height = elem.offsetHeight;
+      var width = elem.offsetWidth;
+      var height = elem.offsetHeight;
 
-    if (this.currentExample.options.snapshotEntireScreen) {
-      width = window.innerWidth;
-      height = window.innerHeight;
+      if (this.currentExample.options.snapshotEntireScreen) {
+        width = window.innerWidth;
+        height = window.innerHeight;
+      }
+      return {
+        name: this.currentExample.name,
+        width: width,
+        height: height,
+      };
+    } catch (error) {
+      console.error(error);
+      return {
+        name: this.currentExample.name,
+        error: error.message
+      };
     }
-    return {
-      name: this.currentExample.name,
-      width: width,
-      height: height
-    };
   }
 };
+
+window.addEventListener('load', function() {
+  var matches = window.location.search.match(/name=([^&]*)/);
+  if (!matches) {
+    return;
+  }
+  var example = decodeURIComponent(matches[1]);
+  window.likadan.setCurrent(example);
+  window.likadan.renderCurrent();
+});
+
+// We need to redefine a few global functions that halt execution. Without this,
+// there's a chance that the Ruby code can't communicate with the browser.
+window.alert = function(message) {
+  console.log('`window.alert` called', message);
+};
+window.confirm = function(message) {
+  console.log('`window.confirm` called', message);
+  return true;
+};
+window.prompt = function(message, value) {
+  console.log('`window.prompt` called', message, value);
+  return null;
+};

data/lib/views/index.erb

@@ -18,7 +18,6 @@
     <% end %>
   </head>
   <body style="margin: 0; background-color: #fff;">
-    <div id="likadan-output"/>
     <script src="/likadan-runner.js"></script>
     <% @config['source_files'].each do |source_file| %>
       <script src="/resource?file=<%= ERB::Util.url_encode(source_file) %>"></script>

metadata

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