live_paper 0.0.31 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4676cbec23ccb78f889c521e7103e67e07b5769f
-  data.tar.gz: 69a223c392f5ba6031c8bbaa44d270efae5bba2d
+  metadata.gz: fcecf58dac7040fe27c0853853f7125c2a0fbf0a
+  data.tar.gz: be2a76fa20d093f03cd050af0a6a53c1e249b48b
 SHA512:
-  metadata.gz: 93d8df53b26cb76ac98592683d4d4106cd92b7670f6fd03b471d31b457a529bdae79154e59a10fbc422836dcdb046e9fe8955246518b910a83863bf8091d367a
-  data.tar.gz: f2a195e25d7c23a8a39e58f19a5c74d3cbf952b8bb4f82768eea2db0565315b8f48a4bd2a01daabe793d39c24e348028e7ddcf02b8addd3bfcfc0ac6ec9fb13d
+  metadata.gz: 2eb042a037a18cfbdf09dc739320dc72e69dc1edbb6330a9ad6cbfdee79301f477f9ec4dd89eeccbd499215367e18f86d7c109f7a2382e3473360ec459d77004
+  data.tar.gz: c66086f3ccaae104be3fcccef70e6aae4089fae36218c1ccda4bf0883ecdd6680cef419ff03bd67a9b5d7ecf974d0f21736ffe16fd0989222f88496a990e0251

data/README.md

@@ -149,7 +149,7 @@ You can list existing resources with the list operation.
   t=WmTrigger.create(name: 'watermark')
   p=Payoff.create(name: 'name', type: Payoff::TYPE[:WEB], url: dest)
   l=Link.create(payoff_id: p.id, trigger_id: t.id, name: "link")
-  t.download_watermark(image, {strength: 10, resolution: 75, ppi: 72})
+  t.download_watermark(image, {strength: 10, wpi: 75, ppi: 72})
 ```
 
 Alternatively, you can upload an image from your local system by providing the path to the jpg file

data/lib/live_paper/version.rb

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

data/lib/live_paper/wm_trigger.rb

@@ -16,7 +16,7 @@ module LivePaper
     end
 
     def download_watermark(image_url, options = {})
-      resolution = options[:resolution] || WATERMARK_RESOLUTION
+      wpi = options[:wpi] || WATERMARK_RESOLUTION
       strength = options[:strength] || WATERMARK_STRENGTH
       ppi = options[:ppi]
       if ppi.blank?
@@ -28,7 +28,7 @@ module LivePaper
         ppi = DEFAULT_IMAGE_RESOLUTION
       end
       
-      url = "#{self.wm_url}?imageURL=#{CGI.escape(image_url)}&resolution=#{resolution}&ppi=#{ppi}&strength=#{strength}"
+      url = "#{self.wm_url}?imageURL=#{CGI.escape(image_url)}&wpi=#{wpi}&ppi=#{ppi}&strength=#{strength}"
       begin
         response = WmTrigger.rest_request( url, :get, accept: "image/jpg" )
         response.body.empty? ? nil : response.body

data/spec/live_paper/trigger_spec.rb

@@ -161,14 +161,17 @@ end
   end
 
   describe '#download_watermark' do
-    let(:image_url) { 'http://lpp_file_storage/image/mine.jpg' }
+    let(:image_url) { 'http://lpp.com/image/mine.jpg' }
     let(:encoded_image_url) { CGI.escape(image_url) }
-    let(:resolution) { LivePaper::WmTrigger::WATERMARK_RESOLUTION }
+    let(:wpi) { LivePaper::WmTrigger::WATERMARK_RESOLUTION }
     let(:strength) { LivePaper::WmTrigger::WATERMARK_STRENGTH }
     let(:ppi) { LivePaper::WmTrigger::DEFAULT_IMAGE_RESOLUTION }
 
     before do
-      stub_request(:get, "https://fileapi/id/image?imageURL=#{encoded_image_url}&resolution=#{resolution}&ppi=#{ppi}&strength=#{strength}").to_return(:body => lpp_watermark_response, :status => 200)
+      stub_request(:get, "https://fileapi/id/image?imageURL=#{encoded_image_url}&wpi=#{wpi}&ppi=#{ppi}&strength=#{strength}").to_return(:body => lpp_watermark_response, :status => 200)
+      image_file_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_assets', 'Bear.jpg'))
+      image_bytes = File.binread(image_file_path)
+      stub_request(:get, "#{image_url}?access_token=#{$lpp_access_token}").to_return(:body => image_bytes, :status => 200)
       @trigger = LivePaper::WmTrigger.new data
       @trigger.wm_url='https://fileapi/id/image'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: live_paper
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors:
 - Mike Whitmarsh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -169,6 +169,7 @@ files:
 - spec/live_paper/trigger_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helpers/lpp_client.rb
+- spec/test_assets/Bear.jpg
 homepage: https://github.com/IPGPTP/live_paper_rubygem
 licenses:
 - MIT
@@ -201,3 +202,4 @@ test_files:
 - spec/live_paper/trigger_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helpers/lpp_client.rb
+- spec/test_assets/Bear.jpg