live_paper 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3a33bcee29e2d5803a25dee71fcde7623c4f4bf
-  data.tar.gz: f2c95bfd09d248703728c87af7dc6df872b8341e
+  metadata.gz: 4676cbec23ccb78f889c521e7103e67e07b5769f
+  data.tar.gz: 69a223c392f5ba6031c8bbaa44d270efae5bba2d
 SHA512:
-  metadata.gz: 1a70a21715ca5af629541e1e1f89e6bf1d040edc376cac587d1bf7cffb6063b046c9da0720e74ec6647745b3c23503ab695905d4c40fe59c6c4125164ba4fb66
-  data.tar.gz: 2a3c1e20b8427dcd43f4651cf762cda52e1be38c3e5e29bf4b971014ae3ac999eb1d36e16ff71c4f14e9a4b7109b532bf92678ff38c7f58e09f59d9dc2812129
+  metadata.gz: 93d8df53b26cb76ac98592683d4d4106cd92b7670f6fd03b471d31b457a529bdae79154e59a10fbc422836dcdb046e9fe8955246518b910a83863bf8091d367a
+  data.tar.gz: f2a195e25d7c23a8a39e58f19a5c74d3cbf952b8bb4f82768eea2db0565315b8f48a4bd2a01daabe793d39c24e348028e7ddcf02b8addd3bfcfc0ac6ec9fb13d

data/README.md

@@ -4,6 +4,16 @@ Provides a ruby interface to the Live Paper service by HP for creating watermark
 
 [![Gem Version](https://badge.fury.io/rb/live_paper.svg)](http://badge.fury.io/rb/live_paper)
 
+## Requirements
+
+ImageMagick or GraphicsMagick command-line tool has to be installed.  You can check if you have it installed by running
+```
+$ convert -version
+Version: ImageMagick 6.8.9-5 Q16 x86_64 2014-07-25 http://www.imagemagick.org
+Copyright: Copyright (C) 1999-2014 ImageMagick Studio LLC
+Features: DPC Modules
+Delegates: bzlib freetype jng jpeg ltdl lzma png xml zlib
+```
 
 ## Installation
 

data/lib/live_paper/version.rb

@@ -1,3 +1,3 @@
 module LivePaper
-  VERSION = "0.0.30"
+  VERSION = "0.0.31"
 end

data/lib/live_paper/wm_trigger.rb

@@ -1,4 +1,5 @@
 require_relative 'base_object'
+require 'mini_magick'
 
 module LivePaper
   class WmTrigger < Trigger
@@ -17,14 +18,22 @@ module LivePaper
     def download_watermark(image_url, options = {})
       resolution = options[:resolution] || WATERMARK_RESOLUTION
       strength = options[:strength] || WATERMARK_STRENGTH
-      ppi = options[:ppi] || DEFAULT_IMAGE_RESOLUTION
+      ppi = options[:ppi]
+      if ppi.blank?
+        image = MiniMagick::Image.open(image_url + "?access_token=" + $lpp_access_token)
+        ppiArray = image.resolution("PixelsPerInch") #This returns the [xResolution, yResolution]
+        ppi = ppiArray[0] if (ppiArray.present? && ppiArray.length > 0)
+      end
+      if ppi.blank?
+        ppi = DEFAULT_IMAGE_RESOLUTION
+      end
+      
       url = "#{self.wm_url}?imageURL=#{CGI.escape(image_url)}&resolution=#{resolution}&ppi=#{ppi}&strength=#{strength}"
       begin
         response = WmTrigger.rest_request( url, :get, accept: "image/jpg" )
         response.body.empty? ? nil : response.body
       rescue Exception => e
-        puts 'Exception!\n'
-        puts e.response
+        puts "Exception : #{e.to_s}\n"
       end
     end
 

data/live_paper.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"
+  spec.add_dependency "mini_magick"
   spec.add_runtime_dependency "rest-client"
 
   spec.add_development_dependency "bundler", "~> 1.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: live_paper
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Mike Whitmarsh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,6 +25,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement