live_paper 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cabaa0a8b62afd08a1ec6637580396269646cb63
-  data.tar.gz: d0e5162054a4ffd11b888430fb984c434c2e3a92
+  metadata.gz: 0c4320a4fff367170dba5cd8daa539c6c5824cb4
+  data.tar.gz: 0707ddc9c784f3f2ba71629398a26a1084cc9c78
 SHA512:
-  metadata.gz: 30028ca41fb031fc9ba4527d2250707b802008192063ae4639590d060bc7528920b2b0e5cae181d4eef459ff62ce606706908b42277952b5e513de40bb1ad24f
-  data.tar.gz: 085e4b79a3c95668fe4d9b355b37481808064e01411d2fd051e47db1bbaff538c84f102803ced59fcff2e3b13f7dd2882c62d6825cbcb487466f43b3c0c332bf
+  metadata.gz: 9f3211494b2a9bc62edfa8b17c611a0ecd6bd15ca597f918b7343d0c5bfea772c1a925d402d8f4a5c880ad83758f4ee0c281eb618fb489f6d6be1948c682cafa
+  data.tar.gz: c672265db80b82db5078864510ce1d7925bfb53efae98350fc5dd45a649553f4b94dc9db68548a9e15d3a417dad9199cefb5057c0a4d6333f44f6163d7fe2cdd

data/lib/live_paper.rb

@@ -62,8 +62,8 @@ module LivePaper
       t.download_qrcode
     end
 
-    def watermark_bytes(dest, image_url)
-      image = Image.upload image_url
+    def watermark_bytes(dest, image_uri)
+      image = Image.upload image_uri
 
       t=WmTrigger.create(name: 'watermark', watermark: {strength: 10, resolution: 75, imageURL: image})
       p=Payoff.create(name: 'name', type: Payoff::TYPE[:WEB], url: dest)

data/lib/live_paper/image.rb

@@ -8,25 +8,25 @@ module LivePaper
 
     API_URL = 'https://storage.livepaperapi.com/objects/v1/files'
 
-    def self.upload(img)
+    def self.upload(image_uri)
       # return the original img uri if it is LivePaper storage
-      if img.include? API_URL
-        return img
+      if image_uri.include? API_URL
+        return image_uri
       end
-      begin
-        src_image = RestClient.get(img, Accept: 'image/jpg')
-        BaseObject.request_access_token unless $lpp_access_token
-        response = RestClient.post API_URL,
-                                   src_image.body,
-                                   authorization: "Bearer #{$lpp_access_token}",
-                                   content_type: 'image/jpg'
-        response.headers[:location]
-      rescue Exception => e
-        puts "Exception! ******\n#{e}"
-        puts e.response
-        img
+      image_bytes = case
+        when image_uri.include?('http://') || image_uri.include?('https://')
+          RestClient.get(image_uri, Accept: 'image/jpg').body
+        else
+          File.binread(image_uri)
       end
-    end
 
+      BaseObject.request_access_token unless $lpp_access_token
+      response = RestClient.post API_URL,
+                                 image_bytes,
+                                 authorization: "Bearer #{$lpp_access_token}",
+                                 content_type: 'image/jpg'
+      response.headers[:location]
+
+    end
   end
 end

data/lib/live_paper/version.rb

@@ -1,3 +1,3 @@
 module LivePaper
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

data/spec/live_paper/image_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe LivePaper::Image do
+  let(:srcBytes) { 'YOURIMAGEBYTES' }
+  let(:lpp_img_uri) { 'ALLYOURBYTESAREBELONGTOUS' }
+  before do
+    $lpp_access_token = "YouBeenHacked"
+
+    stub_request(:post, LivePaper::Image::API_URL).
+      with(:body => "YOURIMAGEBYTES",
+           :headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Authorization'=>'Bearer YouBeenHacked', 'Content-Length'=>'14', 'Content-Type'=>'image/jpg', 'User-Agent'=>'Ruby'}).
+      to_return(:status => 201, :body => "", :headers => {location: lpp_img_uri})
+  end
+
+  context 'local file' do
+    let(:source_uri) { 'foo.jpg' }
+
+    before do
+      expect(File).to receive(:binread).with(source_uri).and_return(srcBytes)
+    end
+
+    it 'upload should return stored image url' do
+      expect(LivePaper::Image.upload(source_uri)).to eq(lpp_img_uri)
+    end
+  end
+
+  context 'web file' do
+      let(:source_uri) { 'http://anythingbutapiurl.com/anypath/internetphoto.jpg' }
+
+      before do
+        receiver = double('receiver')
+        expect(receiver).to receive(:body).and_return(srcBytes)
+        expect(RestClient).to receive(:get).with(source_uri, Accept: 'image/jpg').and_return(receiver)
+      end
+
+      it 'upload should return stored image url' do
+        expect(LivePaper::Image.upload(source_uri)).to eq(lpp_img_uri)
+      end
+    end
+  context 'lpp stored image file' do
+      let(:source_uri) { "#{LivePaper::Image::API_URL}/path/already_uploaded.jpg" }
+
+      it 'upload should return original image url' do
+        expect(LivePaper::Image.upload(source_uri)).to eq(source_uri)
+      end
+    end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: live_paper
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Mike Whitmarsh
@@ -9,76 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-15 00:00:00.000000000 Z
+date: 2015-03-05 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'
 description: Ruby interface to use the Live Paper service by HP for creating watermarked
@@ -88,7 +88,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -105,6 +105,7 @@ files:
 - lib/live_paper/wm_trigger.rb
 - live_paper.gemspec
 - spec/live_paper/base_object_spec.rb
+- spec/live_paper/image_spec.rb
 - spec/live_paper/link_spec.rb
 - spec/live_paper/payoff_spec.rb
 - spec/live_paper/trigger_spec.rb
@@ -121,22 +122,23 @@ 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.6
 signing_key: 
 specification_version: 4
 summary: Ruby interface to the Live Paper service by HP.
 test_files:
 - spec/live_paper/base_object_spec.rb
+- spec/live_paper/image_spec.rb
 - spec/live_paper/link_spec.rb
 - spec/live_paper/payoff_spec.rb
 - spec/live_paper/trigger_spec.rb