lib/yamg/screenshot.rb in yamg-0.3.5 vs lib/yamg/screenshot.rb in yamg-0.3.7

@@ -4,17 +4,18 @@
   #
   class Screenshot
     attr_accessor :url, :size, :command
 
     # Uses PhantomJS
-    def initialize(ss)
-      @name, opts =  *ss
-      fail 'No screen size provided' unless opts['size']
+    def initialize(*ss)
+      @name, opts =  ss
+      fail 'No screen size provided' unless opts && opts['size']
       uri = URI.parse(opts['url'])
       @url = "http://#{uri}"
       @size = opts['size']
       @size = @size.split(/\s?,\s?/) if @size.respond_to?(:split)
-      @dpi = opts['dpi']
+      @dpi = @size.pop if @size.length > 2
+      @dpi ||= opts['dpi']
       @fetcher = Screencap::Fetcher.new(@url)
     end
 
     def android
       # adb -e shell screencap -p | perl -pe 's/\x0D\x0A/\x0A/g' > screen.png