Merge pull request #15 from trotzig/static-html

Bundle uploaded diffs in HTML file
Galooshi · Jul 25, 2015 · 2d36561 · 2d36561
2 parents 54f02a0 + 528440a
commit 2d36561
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 9 deletions.
diff --git a/bin/likadan b/bin/likadan
@@ -30,9 +30,8 @@ when 'approve', 'reject'
   LikadanAction.new(example_name, width).send(action)
 
 when 'upload_diffs'
-  LikadanUploader.new.upload_diffs.each do |url|
-    puts url
-  end
+  # `upload_diffs` returns a URL to a static html file
+  puts LikadanUploader.new.upload_diffs
 else
   abort "Unknown action \"#{action}\""
 end
diff --git a/lib/likadan-diffs.html.erb b/lib/likadan-diffs.html.erb
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Likadan diffs</title>
+  </head>
+  <body>
+    <h1>Likadan diffs</h1>
+    <p>File generated: <%= Time.now %></p>
+
+    <% diff_images.each do |diff| %>
+      <h3>
+        <%= diff[:name] %> @ <%= diff[:width] %>
+      </h3>
+      <p><img src="<%= diff[:url] %>"></p>
+    <% end %>
+  </body>
+</html>
diff --git a/lib/likadan_uploader.rb b/lib/likadan_uploader.rb
@@ -17,12 +17,23 @@ def upload_diffs
     bucket = service.buckets.build(SecureRandom.hex)
     bucket.save(location: :us)
 
-    current_snapshots[:diffs].map do |diff|
-      object = bucket.objects.build("#{diff[:name]}_#{diff[:width]}.png")
-      object.content = open(diff[:file])
-      object.content_type = 'image/png'
-      object.save
-      object.url
+    diff_images = current_snapshots[:diffs].map do |diff|
+      image = bucket.objects.build("#{diff[:name]}_#{diff[:width]}.png")
+      image.content = open(diff[:file])
+      image.content_type = 'image/png'
+      image.save
+      diff[:url] = image.url
+      diff
     end
+
+    html = bucket.objects.build('likadan-diffs.html')
+    html.content =
+      ERB.new(
+        File.read(File.expand_path(
+          File.join(File.dirname(__FILE__), 'likadan-diffs.html.erb')))
+      ).result(binding)
+    html.content_type = 'text/html'
+    html.save
+    html.url
   end
 end