phantoshot 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmFmMzIyNDE2NmIyZTQyMDBmNzhmMDI3MjY4NzBkOTk1MDlhYmVmOQ==
+    NmI1ZjRkNjA0MDI4ZTllZmEzMGU4MmNmMDQwYzE0Y2Y2YWI0N2MyMg==
   data.tar.gz: !binary |-
-    ZDY1MDIzMzY2YWYyNjFkMjBiNThhYmU3ODI5ZGRhOWNiZTJmMDljMw==
+    Y2I5MzhiZjUxMjJkYTBmYzI5OTZiYjY1YjA4NmUxMjQxODE3OGMxNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGQ2YTQ1Y2EwNjExNWQyNDFmODllNWU4ZWM2ZmIwMzI1NGEzODdiNGI1M2Vl
-    ODEzYjg3ZTMyZGIzOGU3ZmJjODBiNDAxZDY4YjNmOWM5NjI2Y2YxYmM2ZWJl
-    MmIzYWEzYjZlNTJiODJmMWYzZGI5ZGM2MGQ1OWQ1YTYxNzUwZmE=
+    NTEyZjQwNmVmOWIyMGJlOTkyY2MwOGVlNDJlN2RmNGUwZjU1YWQ5MjQwNGEw
+    NzM4MjE0ZjJmZTcxMTdjYjRjN2RkZmZhMWI1YzQ5OTA4NGEzYzEyMjUxNmU2
+    NzI0MjExOWU0ODkxM2ZkNmE5NmY4ZDIzODc1Y2EzMjVlZDdiNDU=
   data.tar.gz: !binary |-
-    ZDg3Y2FmNjY4NjQ2ZTgyYWYxMDlkZTMyOTNhYmJjMGU0NjFhNjhlNTY2ZDY2
-    YzI1MGFmMjAyNjc1NzMzMWIzZmE4OTQzOTY4MTRiZWQ2ZTlmN2E3MmM1ZTYx
-    NWY4Y2M2YWE3ZGIwMGE0Yjc3MTE1OGJmNWVkYTgwMWNjNzliYzE=
+    MGEwNWFmMDQ5MjBmNGM4OTE0Y2I2YTQ3NzIyMWExYjQxMTljZWZiNzdjYzg2
+    NWIxZDQyOTA4NDBmYjk0OTY2ZTUxM2JiYWQ2N2IyZDkzOWM3Y2I4ZDcxODk4
+    YjFmYWIwZjExNGY4MWFjMjk1NTUyNDdlODdiYTRjYTQxNGQxZTI=

data/Gemfile

@@ -9,6 +9,7 @@ group :development do
      gem 'fakeweb'
      gem 'pry'
      gem 'fastimage'
+     gem 'rmagick'
 #     gem 'debugger'
 #     gem 'better_errors'
 end

data/Gemfile.lock

@@ -24,6 +24,7 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.4)
     rake (10.0.4)
+    rmagick (2.13.2)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -46,4 +47,5 @@ DEPENDENCIES
   phantoshot!
   pry
   rake
+  rmagick
   rspec (~> 2.8)

data/lib/phantom-shot-script.js

@@ -3,22 +3,16 @@ var system = require('system');
 
 var result = {
    url: system.args[1],
-   width: parseInt(system.args[2]),
-   height: parseInt(system.args[3])
 };
 
 
-page.viewportSize = {
-  width: result.width,
-  height: result.height
-};
-
 page.open(result.url, function() {
     
     result.file_format = 'PNG';
     result.image_data = page.renderBase64(result.file_format);    
 
-    console.log( JSON.stringify(result) );
 
+
+    console.log( JSON.stringify(result) );
     phantom.exit();
 });

data/lib/phantoshot/make_screenshot.rb

@@ -1,24 +1,53 @@
 module Phantoshot
+require 'rmagick'
+include Magick
+
    def make_screenshot(url, opts={})
 
-      width = opts[:width] || 600
-      height = opts[:height] || 400
+      desired_width = opts[:width]
+      desired_height = opts[:height]
 
-      res = MultiJson.load( phantom_command(url, width, height) )
+      res = MultiJson.load( 
+         phantom_command(url)
+      )
 
       hsh = Hashie::Mash.new(res)
 
       # Decode it for writing out to binary
-      hsh[:image_data] = Base64.decode64( hsh[:image_data] )      
+      hsh[:image_data] = Base64.decode64( hsh[:image_data] )    
+
+      tempfile = Tempfile.new('foo.png')
+      tempfile.write(hsh[:image_data])
+      tempfile.close
+
+      img = Image.read(tempfile.path)[0]
+      org_width = img.columns
+      org_height = img.rows
+
+      if desired_width
+         img = img.resize_to_fit(desired_width, org_height)
+      end
+
+      if desired_height
+         img = img.crop(0, 0, img.columns, desired_height)
+      end
+
+      tempfile2 = Tempfile.new('bar.png')
+
+      img.write(tempfile2.path)
+
+      tempfile2.close
+
+      hsh[:image_data] = open(tempfile2.path){ |f| f.read }
       return hsh
    end
 
 
    # returns JSON string with these attributes:
-   # :image_data (in base64), :width, :height, :file_format (default is PNG), and :url
+   # :image_data (in base64), :file_format (default is PNG), and :url
    #
-   def phantom_command(url, width, height)
-      cmd = "phantomjs #{JS_LIB_NAME} #{url} #{width} #{height}"
+   def phantom_command(url)
+      cmd = "phantomjs #{JS_LIB_NAME} #{url}"
       `#{cmd}`
    end
 end

data/lib/phantoshot/version.rb

@@ -1,3 +1,3 @@
 module Phantoshot
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phantoshot
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Callahan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler