live_paper 0.0.24 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 090fca8974a9aaec09e17d67fbba8b6cb2c06527
-  data.tar.gz: 280161344f75ca01fdb2e552d7a4bb1c894f7e66
+  metadata.gz: c4dfcf2f3b2dc09dd0e30bf6bebadcf716450fb7
+  data.tar.gz: 7cfdbeb94e1a4a456b05da19bbb2656482f1e1ab
 SHA512:
-  metadata.gz: 0632fd85530b8d2626ceb2ad0ee25198237f6edc280e001da54411016965550757df8ba9cff3b2a86f268f6d035e311227de0f6d5ad3514f4ef171234e882d65
-  data.tar.gz: a14b7647ec398b7f958be6f107de75b710f66df1f8ed3276a90ba8e9d1796d46eb9b335df603381c1b6a0b18445b05b85fc9dadd197ae2013e5b1fe431bc6d6f
+  metadata.gz: 646954d3eafc9b73203023364c8caefa78680630c724b1a9654dd5dc44241fe74890a5a4e931370dc43f4e3d19198234d5087ff500a471b28c18b5977f31420b
+  data.tar.gz: 5dbd3caf1e377d15132edba30c8a8f712e0f6434f78ef87a363dcb297bce8a9b60425a4acf1e2216ca024bde74565cf5fd7feafe892dcadd01aef74053b896b5

data/README.md

@@ -136,10 +136,10 @@ You can list existing resources with the list operation.
 ```ruby
   image = Image.upload "http://url/to_your_image"
 
-  t=WmTrigger.create(name: 'watermark', watermark: {strength: 10, resolution: 75, imageURL: image})
+  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
+  t.download_watermark(image, {strength: 10, resolution: 75})
 ```
 
 Alternatively, you can upload an image from your local system by providing the path to the jpg file

data/lib/live_paper.rb

@@ -65,11 +65,11 @@ module LivePaper
     def watermark_bytes(dest, image_uri)
       image = Image.upload image_uri
 
-      t=WmTrigger.create(name: 'watermark', watermark: {strength: 10, resolution: 75, imageURL: image})
+      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")
       @remote_resources={link: l, payoff: p, trigger: t}
-      t.download_watermark
+      t.download_watermark(image)
     rescue Exception => e
       puts "Exception!"
       puts e.response

data/lib/live_paper/base_object.rb

@@ -104,7 +104,7 @@ module LivePaper
       headers = {}
       headers[:authorization] = "Bearer #{$lpp_access_token}"
       headers[:accept] = options[:accept] || "application/json"
-      headers[:x_user_info] = 'app=rubygem' unless options[:skip] == :user_info  #watermark download fails if set
+      headers[:"X-user-info"] = 'app=rubygem'
       headers[:content_type] = 'application/json' unless options[:body].nil?
 
       h = {:method => verb, :url => url.to_s, :headers => headers}

data/lib/live_paper/qr_trigger.rb

@@ -19,10 +19,6 @@ module LivePaper
     end
 
     private
-    def validate_attributes!
-      raise ArgumentError, 'Required Attributes needed: name' unless all_present? [@name]
-    end
-
     def create_body
       {
         trigger: {

data/lib/live_paper/short_trigger.rb

@@ -14,10 +14,6 @@ module LivePaper
     end
 
     private
-    def validate_attributes!
-      raise ArgumentError, 'Required Attributes needed: name' unless all_present? [@name]
-    end
-
     def create_body
       {
         trigger: {

data/lib/live_paper/trigger.rb

@@ -32,6 +32,10 @@ module LivePaper
     end
 
     private
+    def validate_attributes!
+      raise ArgumentError, 'Required Attributes needed: name' unless all_present? [@name]
+    end
+ 
     def update_body
       {
         trigger: {

data/lib/live_paper/version.rb

@@ -1,3 +1,3 @@
 module LivePaper
-  VERSION = "0.0.24"
+  VERSION = "0.0.26"
 end

data/lib/live_paper/wm_trigger.rb

@@ -2,7 +2,7 @@ require_relative 'base_object'
 
 module LivePaper
   class WmTrigger < Trigger
-    attr_accessor :watermark, :wm_url
+    attr_accessor :wm_url
     WATERMARK_RESOLUTION = 75
     WATERMARK_STRENGTH = 10
     DEFAULT_SUBSCRIPTION = :month
@@ -14,30 +14,25 @@ module LivePaper
       self
     end
 
-    def download_watermark
-      response = WmTrigger.rest_request( self.wm_url, :get, accept: "image/jpg", skip: :x_user_info )
-      response.body.empty? ? nil : response.body
-    rescue Exception => e
-      puts 'Exception!\n'
-      puts e.response
+    def download_watermark(image_url, options = {})
+      resolution = options[:resolution] || WATERMARK_RESOLUTION
+      strength = options[:strength] || WATERMARK_STRENGTH
+      url = "#{self.wm_url}?imageUrl=#{CGI.escape(image_url)}&resolution=#{resolution}&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
+      end
     end
 
     private
-    def validate_attributes!
-      raise ArgumentError, 'Required Attributes needed: name and watermark.' unless all_present? [@name, @watermark]
-      raise ArgumentError, 'Required Attributes needed: watermark[:strength] and watermark[:imageURL].' unless all_keys_present? @watermark, [:strength, :imageURL]
-    end
-
     def create_body
       {
         trigger: {
           name: @name,
-          watermark: {
-            outputImageFormat: 'JPEG',
-            resolution: WATERMARK_RESOLUTION,
-            strength: @watermark[:strength],
-            imageURL: @watermark[:imageURL]
-          },
+          type: "watermark",
           subscription: {
             package: DEFAULT_SUBSCRIPTION.to_s
           }

data/spec/live_paper/trigger_spec.rb

@@ -6,14 +6,12 @@ describe LivePaper::WmTrigger do
   before do
     stub_request(:post, /.*livepaperapi.com\/auth\/token.*/).to_return(:body => lpp_auth_response_json, :status => 200)
     stub_request(:post, LivePaper::WmTrigger.api_url).to_return(:body => lpp_trigger_response_json, :status => 200)
-    stub_request(:get, 'https://fileapi/id/image').to_return(:body => lpp_watermark_response, :status => 200)
     stub_request(:get, "#{LivePaper::WmTrigger.api_url}/trigger_id").to_return(:body => lpp_trigger_response_json, :status => 200)
     stub_request(:get, "#{LivePaper::WmTrigger.api_url}/trigger_not_existent").to_return(:body => '{}', :status => 404)
 
     @data = {
       id: 'id',
       name: 'name',
-      watermark: {strength: 10, imageURL: 'url'},
       subscription: 'subscription'
     }
   end
@@ -23,10 +21,6 @@ describe LivePaper::WmTrigger do
       @trigger = LivePaper::WmTrigger.new @data
     end
 
-    it 'should map the watermark attribute.' do
-      expect(@trigger.watermark).to eq @data[:watermark]
-    end
-
     it 'should map the subscription attribute.' do
       expect(@trigger.subscription).to eq @data[:subscription]
     end
@@ -44,12 +38,7 @@ describe LivePaper::WmTrigger do
         assert_requested :post, LivePaper::WmTrigger.api_url, :body => {
           trigger: {
             name: 'name',
-            watermark: {
-              outputImageFormat: 'JPEG',
-              resolution: 75,
-              strength: 10,
-              imageURL: 'url'
-            },
+            type: 'watermark',
             subscription: {package: 'month'}
           }
         }.to_json
@@ -62,12 +51,6 @@ describe LivePaper::WmTrigger do
         trigger = LivePaper::WmTrigger.new @data
         expect { trigger.save }.to raise_error
       end
-
-      it 'should raise exception if the watermark is no provided.' do
-        @data.delete :watermark
-        trigger = LivePaper::WmTrigger.new @data
-        expect { trigger.save }.to raise_error
-      end
     end
   end
 
@@ -87,10 +70,6 @@ describe LivePaper::WmTrigger do
       expect(@trigger.name).to eq 'name'
     end
 
-    it 'should map the watermark attribute.' do
-      expect(@trigger.watermark).to eq 'watermark'
-    end
-
     it 'should map the subscription attribute.' do
       expect(@trigger.subscription).to eq 'subscription'
     end
@@ -105,7 +84,7 @@ describe LivePaper::WmTrigger do
       it 'should return the requested trigger.' do
         expect(@trigger.id).to eq 'trigger_id'
         expect(@trigger.name).to eq 'name'
-        expect(@trigger.watermark).to eq 'watermark'
+        expect(@trigger.class).to eq LivePaper::WmTrigger
         expect(@trigger.subscription).to eq 'subscription'
       end
 
@@ -140,13 +119,19 @@ describe LivePaper::WmTrigger do
   end
 
   describe '#download_watermark' do
+    let(:image_url) { 'http://lpp_file_storage/image/mine.jpg' }
+    let(:encoded_image_url) { CGI.escape(image_url) }
+    let(:resolution) { LivePaper::WmTrigger::WATERMARK_RESOLUTION }
+    let(:strength) { LivePaper::WmTrigger::WATERMARK_STRENGTH }
+
     before do
+      stub_request(:get, "https://fileapi/id/image?imageUrl=#{encoded_image_url}&resolution=#{resolution}&strength=#{strength}").to_return(:body => lpp_watermark_response, :status => 200)
       @trigger = LivePaper::WmTrigger.new @data
       @trigger.wm_url='https://fileapi/id/image'
     end
-
+    
     it 'should return the watermark image data.' do
-      expect(@trigger.download_watermark).to eq 'watermark_data'
+      expect(@trigger.download_watermark(image_url)).to eq 'watermark_data'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: live_paper
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.26
 platform: ruby
 authors:
 - Mike Whitmarsh
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: auto_tagger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby interface to use the Live Paper service by HP for creating watermarked
@@ -116,7 +116,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -150,17 +150,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby interface to the Live Paper service by HP.