silkscreen 0.0.1 → 0.0.3

data/bin/silkscreen

@@ -10,26 +10,60 @@ module Silkscreen
   class App < Thor
     include Thor::Actions
 
-    desc "capture", "capture"
+    desc "capture", "Capture screenshot"
     method_option :sleep, aliases: '-s', type: :numeric, default: 2, desc: 'Time in seconds to wait after page load before taking the screenshot'
     method_option :viewport, aliases: '-v', type: :string, default: '1024x768', desc: 'The size of the viewport'
-    method_option :full, aliases: '-f', type: :boolean, default: true, desc: 'Capture full page or just the visible area'
+    method_option :max_width, aliases: '-w', type: :numeric, desc: 'The max width of the screenshot'
+    method_option :max_height, aliases: '-h', type: :numeric, desc: 'The max height of the screenshot'
+    method_option :full, aliases: '-f', type: :boolean, default: false, desc: 'Capture full page or just the visible area'
     method_option :output, aliases: '-o', type: :string, desc: 'Save the captured screenshot as a file at this path'
     def capture(url)
       driver = Selenium::WebDriver.for :chrome
-      window_width, window_height = options[:viewport].split('x')
+      window_width, window_height = options[:viewport].split('x').map { |x| x.to_i }
       driver.manage.window.resize_to window_width, window_height
       driver.navigate.to url
       sleep options[:sleep]
       img = driver.screenshot_as :png
       driver.quit
       
+      if options[:full]
+        if options[:max_width] || options[:max_height]
+          canvas = ChunkyPNG::Image.from_blob img
+          canvas = resize_canvas(canvas, options[:max_width], options[:max_height])
+          img = canvas.to_s
+        end
+      else
+        canvas = ChunkyPNG::Image.from_blob img
+        canvas.crop! 0, 0, window_width, window_height
+        canvas = resize_canvas(canvas, options[:max_width], options[:max_height])
+        img = canvas.to_s
+      end
+
+
+
       if options[:output]
         create_file options[:output], img
       else
         print img
       end
     end
+
+    private
+
+    def resize_canvas(canvas, max_width, max_height)
+      max_width ||= canvas.width
+      max_height ||= canvas.height
+      if canvas.width <= max_width && canvas.height <= max_height
+        canvas
+      else
+        width_ratio = max_width.to_f/canvas.width
+        height_ratio = max_height.to_f/canvas.height
+        lower_ratio = [width_ratio, height_ratio].min
+        new_width = (canvas.width * lower_ratio).round
+        new_height = (canvas.height * lower_ratio).round
+        canvas.resize new_width, new_height
+      end
+    end
   end
 end
 

data/lib/silkscreen/version.rb

@@ -1,3 +1,3 @@
 module Silkscreen
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: silkscreen
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: