flash_flow 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcac5f48c7e0f0cf6700988e91ac9dbaa949050b
-  data.tar.gz: d51fa3318c6841aefcbc0ef09787c4758e575bab
+  metadata.gz: 8e906c19c6979dd04796aa3a4a120c43708b8b31
+  data.tar.gz: a711a9219a03243b4cae5b79f5bf9fb000593995
 SHA512:
-  metadata.gz: f415a2e12db0081979a922a26b319e42762bd5dad73e2bb383281234250c1001f0d73858b731caa85cf884b5617598a3708bd78e975ba9442ad33d1342d6714b
-  data.tar.gz: 749e4d8213f85e8a37ac3bbf35369b6ef2dc4579ed231cc47f19120670411952e8c3a180be2ab3f41fea30c441464d047b247180a2de00059f4648003a9113f5
+  metadata.gz: d93ca428a41c0af6328589732b5623eec00327e4fca74d943f247ba27089786a83006f90478ad4d49db59290af34b13bae5c6b0b28beb2a7c58fe00c8c159daf
+  data.tar.gz: 55777d04af267fb1dfd287285ade1f268876386838c6a0e077983eeedd92793961f5c5c67a72749fb820110ece023d62b08d30de77dbb8644a87e5ce15d2948c

data/lib/flash_flow/release/pdf_diff_generator.rb

@@ -47,15 +47,15 @@ module FlashFlow
         pdf.text("Compliance Diffs Generated At: #{Time.now.to_s}")
       end
 
-      def compute_scale_factor(column_width, page_height, info)
-        x_scale_factor = column_width / info[:width]
-        y_scale_factor = page_height / info[:height]
+      def compute_scale_factor(column_width, page_height, width, height)
+        x_scale_factor = column_width / width
+        y_scale_factor = page_height / height
         [x_scale_factor, y_scale_factor].min
       end
 
-      def compute_scale_and_orientation(info)
-        scale_portrait = compute_scale_factor(@column_portrait, [@page_width, @page_height].max, info)
-        scale_landscape = compute_scale_factor(@column_landscape, [@page_width, @page_height].min, info)
+      def compute_scale_and_orientation(width, height)
+        scale_portrait = compute_scale_factor(@column_portrait, [@page_width, @page_height].max, width, height)
+        scale_landscape = compute_scale_factor(@column_landscape, [@page_width, @page_height].min, width, height)
         if scale_portrait > scale_landscape
           @orientation = :portrait
           @column_width = @column_portrait
@@ -67,14 +67,25 @@ module FlashFlow
         end
       end
 
+      def max_width(comparison)
+        max_by(comparison, :width)
+      end
+
+      def max_height(comparison)
+        max_by(comparison, :height)
+      end
+
+      def max_by(comparison, key)
+        [comparison['head-screenshot'][key], comparison['base-screenshot'][key], comparison['pdiff'][key]].max
+      end
+
       def add_comparison_to_pdf(pdf, comparison)
-        scale_factor = compute_scale_and_orientation(comparison['head-screenshot'])
+        scale_factor = compute_scale_and_orientation(max_width(comparison), max_height(comparison))
         options = { vposition: :top, scale: scale_factor }
 
         pdf.start_new_page(layout: @orientation)
-
-        place_image(pdf, comparison.dig('head-screenshot', :url), options, 1)
-        place_image(pdf, comparison.dig('base-screenshot', :url), options, 2)
+        place_image(pdf, comparison.dig('base-screenshot', :url), options, 1)
+        place_image(pdf, comparison.dig('head-screenshot', :url), options, 2)
         place_image(pdf, comparison.dig('base-screenshot', :url), options, 3)
         place_image(pdf, comparison.dig('pdiff', :url), options, 3)
       end
@@ -82,10 +93,15 @@ module FlashFlow
       def place_image(pdf, url, options, column)
         pdf.float do
           options[:position] = (column - 1) * (@column_width + SPACE_BETWEEN)
-          pdf.image(open(url), options)
+          pdf.image(get_url_once(url), options)
         end
       end
 
+      def get_url_once(url)
+        @already_gotten_urls ||= {}
+        @already_gotten_urls[url] ||= open(url)
+      end
+
       ####################################
       #                                  #
       # Methods to traverse Percy output #
@@ -93,14 +109,11 @@ module FlashFlow
       ####################################
 
       def collect_comparison_info(compare_info, threshold=0.0)
-        [].tap do |result|
-          compare_info['data'].each do |record|
-            if record['type'] == 'comparisons'
-              comparison_urls = get_comparison_info(record, compare_info)
-              result << comparison_urls if comparison_urls&.dig('diff-ratio').to_f > threshold
-            end
-          end
-        end
+        compare_info['data']
+            .select { |record| record['type'] == 'comparisons' }
+            .map { |record| get_comparison_info(record, compare_info) }
+            .select { |record| record&.dig('diff-ratio').to_f > threshold }
+            .sort { |a, b| b['diff-ratio'] <=> a['diff-ratio'] }
       end
 
       def get_comparison_info(record, data)

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Flashfunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: Implementation of the flashfunders workflow