happo 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5838ef8f0db830d6dc8e742de8d68c8f421d3bb8
-  data.tar.gz: 81578571296075c8ad8acf18fcc0f09ccef84124
+  metadata.gz: 5a09a6eec66779447b6ca4ab2bae97639a1b0580
+  data.tar.gz: fc22584f040c324fc81c00ae3f50eacd78ad7bbb
 SHA512:
-  metadata.gz: 79ec55650363bebf05e2099441cf08d805ed83fbcda9e4da2c7baaedf22badf71e20e4e93d88741b365eb6345b86e6a3a306cfe6739b2b6705dfb577d25770f9
-  data.tar.gz: 37ddd1fcba910ac54e78073fe60f5ff8608fa4879173eb9c7a83285425eb16aa325791975e162d7092c545d822f3436e5148d95febff46fc7fab82fa0eafa667
+  metadata.gz: 4b20a65e01766a900074ef668295ef21d807dbcbf731230335ee304cd4628647d324dca7bfcf63cb174fa04dd2ba4f214e74a25a9f01f5aa1ba94c745824c09a
+  data.tar.gz: 2158fbc4558027fa4e5a9f4af41d1361c3b9ccf098e151aa6f56cca23f8c154c638eaf557a53051ff71d32719eb68970b2e8abaf24f6ee76d1d527bb570f58bd

data/lib/happo/uploader.rb

@@ -19,19 +19,19 @@ module Happo
       return [] if result_summary[:diff_examples].empty? &&
                    result_summary[:new_examples].empty?
 
-      diff_images = result_summary[:diff_examples].map do |image|
-        image[:previous] = upload_image(image, 'previous')
-        image[:diff] = upload_image(image, 'diff')
-        image[:current] = upload_image(image, 'current')
-        image
+      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
 
-      new_images = result_summary[:new_examples].map do |image|
-        image[:current] = upload_image(image, 'current')
-        image
+      new_images = result_summary[:new_examples].map do |example|
+        example[:current] = upload_image(example, 'current')
+        example
       end
 
-      html = find_or_build_bucket.objects.build("#{directory}/index.html")
+      html = build_object('index.html')
       path = File.expand_path(
         File.join(File.dirname(__FILE__), 'views', 'diffs.erb')
       )
@@ -54,23 +54,28 @@ module Happo
       end
     end
 
+    def build_object(file_name)
+      find_or_build_bucket.objects.build("#{directory}/#{file_name}")
+    end
+
     def directory
-      if @s3_bucket_path.nil? || @s3_bucket_path.empty?
-        SecureRandom.uuid
-      else
-        File.join(@s3_bucket_path, SecureRandom.uuid)
+      @directory ||= begin
+        if @s3_bucket_path.nil? || @s3_bucket_path.empty?
+          SecureRandom.uuid
+        else
+          File.join(@s3_bucket_path, SecureRandom.uuid)
+        end
       end
     end
 
-    def upload_image(image, variant)
-      bucket = find_or_build_bucket
-      img_name = "#{image[:description]}_#{image[:viewport]}_#{variant}.png"
-      s3_image = bucket.objects.build("#{directory}/#{img_name}")
-      s3_image.content = open(Happo::Utils.path_to(image[:description],
-                                                   image[:viewport],
-                                                   "#{variant}.png"))
-      s3_image.content_type = 'image/png'
-      s3_image.save
+    def upload_image(example, variant)
+      img_name = "#{example[:description]}_#{example[:viewport]}_#{variant}.png"
+      image = build_object(img_name)
+      image.content = open(Happo::Utils.path_to(example[:description],
+                                                example[:viewport],
+                                                "#{variant}.png"))
+      image.content_type = 'image/png'
+      image.save
       URI.escape(img_name)
     end
   end

data/lib/happo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happo
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Henric Trotzig