live_paper 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d8e85b4d1411632bd21583973f51f85b3cf51bd
-  data.tar.gz: 1745011dfe2dd65fe657dcb8d68148181c754d52
+  metadata.gz: b489f0bf261b6914c0c19e4a8a195c29cbab70cc
+  data.tar.gz: 02d0367b53900498aeef78b9167f1711950ecf05
 SHA512:
-  metadata.gz: 289a6bb4a5f101a53dd76a1720e3bb29ed99559cc99d0f5240d2ca8e7b95b82038690076a828774556a444aed86022312ca3f9a04b7fde671b9a899e4029dde3
-  data.tar.gz: f26ad8dcdb9c3ed95e97addb6b002e11c837b37bffe5689393cffdbf5dd70cf2dc922f8910ca1b5f58df925872fc831563069513976665d4832b000394faafd1
+  metadata.gz: 0940231ff1e32b771bb54fa88338598339a1194650fd433a23ad5d5cb95cadd51d351bfd15fcc495fabe5b7c7d14b6bce8195acec078f8928b23362fa1654434
+  data.tar.gz: b3d7a0c30820492c7cdf299f061498ff15526a71ba890daacbb57f738272557c9bc2728c3e2206e67d9d9808c896ab770b15ea377f4d11344bc800ff6c3bbf8d

data/Rakefile

@@ -7,4 +7,4 @@ RSpec::Core::RakeTask.new(:spec) do |task|
   task.rspec_opts = ['--color', '--format', 'documentation']
 end
 
-task :default => :spec
+task :default => :spec

data/lib/live_paper.rb

@@ -24,6 +24,9 @@ module LivePaper
     def initialize(auth)
       #todo: tdd, verify hash
       $lpp_basic_auth = Base64.strict_encode64("#{auth[:id]}:#{auth[:secret]}")
+      BaseObject::request_access_token
+      BaseObject::request_project_id if $lpp_access_token
+
       @remote_resources={}
     end
 

data/lib/live_paper/base_object.rb

@@ -8,6 +8,7 @@ module LivePaper
 
     LP_API_HOST="https://www.livepaperapi.com"
     AUTH_URL = "#{LP_API_HOST}/auth/token"
+    AUTH_VALIDATION_URL = "#{LP_API_HOST}/auth/v1/validate"
 
     attr_accessor :id, :name, :date_created, :date_modified, :link
 
@@ -101,6 +102,7 @@ module LivePaper
       raise "Method '#{verb}' not supported." unless [:get, :post, :put, :delete].include?(verb)
 
       request_access_token unless $lpp_access_token
+      request_project_id unless $project_id
       headers = {}
       headers[:authorization] = "Bearer #{$lpp_access_token}"
       headers[:accept] = options[:accept] || "application/json"
@@ -117,6 +119,7 @@ module LivePaper
         tries += 1
         if tries < 3
           request_access_token
+          request_project_id
           headers[:authorization] = "Bearer #{$lpp_access_token}"
           retry
         else
@@ -142,6 +145,20 @@ module LivePaper
       $lpp_access_token = @access_token
     end
 
+    def self.request_project_id
+      project = nil
+
+      RestClient.proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
+      request = {}.to_json
+      res = RestClient.post AUTH_VALIDATION_URL, request, { :Authorization => "Bearer #{$lpp_access_token}", :Accept => 'application/json'}
+      @project = res.headers[:project_id]
+
+      if @project.nil?
+        raise "Project id not in response header"
+      end
+
+      $project_id = @project
+    end
 
     def errors
       begin

data/lib/live_paper/image.rb

@@ -6,7 +6,7 @@ module LivePaper
 
     attr_accessor :url
 
-    API_URL = 'https://storage.livepaperapi.com/objects/v1/files'
+    API_URL = 'https://storage.livepaperapi.com/objects/v2/projects/PROJECTID/files'
 
     def self.upload(image_uri)
       # return the original img uri if it is LivePaper storage
@@ -21,10 +21,16 @@ module LivePaper
       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'
+      BaseObject.request_project_id unless $project_id
+      begin
+        response = RestClient.post API_URL.gsub(/PROJECTID/,$project_id),
+                                   image_bytes,
+                                   authorization: "Bearer #{$lpp_access_token}",
+                                   content_type: 'image/jpeg',
+                                   accept: '*/*'
+      rescue Exception => e
+        puts e.message
+      end
       response.headers[:location]
 
     end

data/lib/live_paper/link.rb

@@ -20,7 +20,7 @@ module LivePaper
     end
 
     def self.api_url
-      "#{LP_API_HOST}/api/v1/links"
+      "#{LP_API_HOST}/api/v2/projects/#{$project_id}/links"
     end
 
     def self.list_key
@@ -55,4 +55,4 @@ module LivePaper
     end
 
   end
-end
+end

data/lib/live_paper/payoff.rb

@@ -25,7 +25,7 @@ module LivePaper
     end
 
     def self.api_url
-      "#{LP_API_HOST}/api/v1/payoffs"
+      "#{LP_API_HOST}/api/v2/projects/#{$project_id}/payoffs"
     end
 
     private
@@ -44,7 +44,7 @@ module LivePaper
 
     def parse_webpayoff(data)
       @type = TYPE[:WEB]
-      @url = data[:URL]
+      @url = data[:url]
     end
 
     def update_body
@@ -67,13 +67,15 @@ module LivePaper
     def create_webpayoff_body
       {
         name: @name,
-        URL: @url
+        type: 'url',
+        url: @url
       }
     end
 
     def create_richpayoff_body
       {
         name: @name,
+        type: 'richPayoff',
         richPayoff: {
           version: 1,
           private: {

data/lib/live_paper/qr_trigger.rb

@@ -7,7 +7,7 @@ module LivePaper
     def parse(data)
       data = JSON.parse(data, symbolize_names: true)[:trigger]
       assign_attributes data
-      self.qrcode_url=data[:link].select { |item| item[:rel] == "image" }.first[:href]
+      self.qrcode_url=data[:link].select { |item| item[:rel] == "download" }.first[:href]
       self
     end
 

data/lib/live_paper/trigger.rb

@@ -6,7 +6,7 @@ module LivePaper
     attr_accessor :state, :start_date, :end_date
 
     def self.api_url
-      "#{LP_API_HOST}/api/v1/triggers"
+      "#{LP_API_HOST}/api/v2/projects/#{$project_id}/triggers"
     end
 
     def self.item_key
@@ -55,4 +55,4 @@ module LivePaper
 
   end
 
-end
+end

data/lib/live_paper/version.rb

@@ -1,3 +1,3 @@
 module LivePaper
-  VERSION = "0.0.28"
+  VERSION = "0.0.29"
 end

data/lib/live_paper/wm_trigger.rb

@@ -9,14 +9,14 @@ module LivePaper
     def parse(data)
       data = JSON.parse(data, symbolize_names: true)[:trigger]
       assign_attributes data
-      self.wm_url=data[:link].select { |item| item[:rel] == "image" }.first[:href]
+      self.wm_url=data[:link].select { |item| item[:rel] == "download" }.first[:href]
       self
     end
 
     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}"
+      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

data/spec/live_paper/base_object_spec.rb

@@ -22,7 +22,8 @@ describe LivePaper::BaseObject do
   before do
     stub_request(:post, /.*livepaperapi.com\/auth\/token.*/).to_return(:body => lpp_auth_response_json, :status => 200)
     stub_request(:post, api_url).to_return(:body => lpp_richpayoff_response_json, :status => 200)
-  end
+    stub_request(:post, LivePaper::BaseObject::AUTH_VALIDATION_URL).to_return(:status => 201, :body => "", :headers => { project_id: 'pid'})
+end
 
   describe '#initialize' do
     let(:data) {
@@ -373,13 +374,21 @@ describe LivePaper::BaseObject do
   end
 
   describe '.request_access_token' do
-    it 'should corerectly get the token' do
+    it 'should correctly get the token' do
       $lpp_access_token = nil
       LivePaper::BaseObject.request_access_token
       expect($lpp_access_token).to eq 'SECRETTOKEN'
     end
   end
 
+  describe '.request_project_id' do
+    it 'should correctly get the project id' do
+      $project_id = nil
+      LivePaper::BaseObject.request_project_id
+      expect($project_id).to eq 'pid'
+    end
+  end
+
   describe 'rest_request' do
     before do
 
@@ -395,6 +404,16 @@ describe LivePaper::BaseObject do
       end
     end
 
+    context 'when there is no project id' do
+      before do
+        $project_id = nil
+      end
+      it 'should request the project_id' do
+        expect(LivePaper::BaseObject).to receive(:request_project_id)
+        LivePaper::BaseObject.rest_request(api_url, :post)
+      end
+    end
+
     context 'when there is an access token' do
       before do
         $lpp_access_token = 'TOPSECRET'
@@ -407,6 +426,9 @@ describe LivePaper::BaseObject do
 
       context 'when the access token is invalid' do
         before do
+          allow(LivePaper::BaseObject).to receive(:request_project_id) do
+            @project_id = $project_id = 'pid'
+          end
           $lpp_access_token = 'invalid'
 
           @response = double('A mock for a response')
@@ -423,5 +445,37 @@ describe LivePaper::BaseObject do
       end
     end
 
+    context 'when there is a project id' do
+      before do
+        $lpp_access_token = 'TOPSECRET'
+        $project_id = 'mypid'
+      end
+
+      it 'should NOT call request_project_id' do
+        expect(LivePaper::BaseObject).to receive(:request_project_id).exactly(0).times
+        LivePaper::BaseObject.rest_request(api_url, :post)
+      end
+
+      context 'when the access token is invalid' do
+        before do
+          allow(LivePaper::BaseObject).to receive(:request_project_id) do
+            @project_id = $project_id = 'pid'
+          end
+          $lpp_access_token = 'invalid'
+
+          @response = double('A mock for a response')
+          allow(@response).to receive(:body) { '{ "accessToken" : "valid_access_token" }' }
+          @response.stub(:code).and_return(401, 401, 200) #fail first two calls
+          RestClient::Request.stub(:execute).and_return(@response)
+        end
+
+        it 'should request a project id' do
+          expect(LivePaper::BaseObject).to receive(:request_project_id).exactly(2).times
+          LivePaper::BaseObject.rest_request(api_url, :put, body: data.to_json)
+        end
+
+      end
+    end
+
   end
-end
+end

data/spec/live_paper/image_spec.rb

@@ -6,10 +6,11 @@ describe LivePaper::Image do
   before do
     $lpp_access_token = "YouBeenHacked"
 
-    stub_request(:post, LivePaper::Image::API_URL).
+    stub_request(:post, LivePaper::Image::API_URL.gsub(/PROJECTID/,'pid')).
       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'}).
+           :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip, deflate', 'Authorization'=>'Bearer YouBeenHacked', 'Content-Length'=>'14', 'Content-Type'=>'image/jpeg', 'User-Agent'=>'Ruby'}).
       to_return(:status => 201, :body => "", :headers => {location: lpp_img_uri})
+      stub_request(:post, LivePaper::BaseObject::AUTH_VALIDATION_URL).to_return(:status => 201, :body => "", :headers => { project_id: 'pid'})
   end
 
   context 'local file' do

data/spec/live_paper/link_spec.rb

@@ -6,6 +6,7 @@ describe LivePaper::Link do
     stub_request(:post, LivePaper::Link.api_url).to_return(:body => lpp_link_response_json, :status => 200)
     stub_request(:get, "#{LivePaper::Link.api_url}/link_id").to_return(:body => lpp_link_response_json, :status => 200)
     stub_request(:get, "#{LivePaper::Link.api_url}/link_not_existent").to_return(:body => '{}', :status => 404)
+    stub_request(:post, LivePaper::BaseObject::AUTH_VALIDATION_URL).to_return(:status => 201, :body => "", :headers => { project_id: 'pid'})
 
     @data = {
       id: 'id',

data/spec/live_paper/payoff_spec.rb

@@ -6,7 +6,8 @@ describe LivePaper::Payoff do
     stub_request(:post, LivePaper::Payoff.api_url).to_return(:body => lpp_richpayoff_response_json, :status => 200)
     stub_request(:get, "#{LivePaper::Payoff.api_url}/payoff_id").to_return(:body => lpp_payoff_response_json, :status => 200)
     stub_request(:get, "#{LivePaper::Payoff.api_url}/payoff_not_existent").to_return(:body => '{}', :status => 404)
-  end
+    stub_request(:post, LivePaper::BaseObject::AUTH_VALIDATION_URL).to_return(:status => 201, :body => "", :headers => { project_id: 'pid'})
+end
 
   let(:data) {
     {
@@ -78,6 +79,7 @@ describe LivePaper::Payoff do
           assert_requested :post, LivePaper::Payoff.api_url, :body => {
                                   payoff: {
                                     name: 'name',
+                                    type: 'richPayoff',
                                     richPayoff: {
                                       version: 1,
                                       private: {
@@ -107,7 +109,8 @@ describe LivePaper::Payoff do
           assert_requested :post, LivePaper::Payoff.api_url, :body => {
                                   payoff: {
                                     name: data[:name],
-                                    URL: data[:url]
+                                    type: 'url',
+                                    url: data[:url]
                                   }
                                 }.to_json
         end
@@ -221,4 +224,4 @@ describe LivePaper::Payoff do
     end
   end
 
-end
+end

data/spec/live_paper/trigger_spec.rb

@@ -19,10 +19,11 @@ describe LivePaper::WmTrigger do
     stub_request(:post, LivePaper::WmTrigger.api_url).to_return(:body => lpp_trigger_response_json, :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)
-  end
+    stub_request(:post, LivePaper::BaseObject::AUTH_VALIDATION_URL).to_return(:status => 201, :body => "", :headers => { project_id: 'pid'})
+end
 
   describe '#initialize without specifying start_date end_date' do
-    let(:data){ 
+    let(:data){
       {
         id: 'id',
         name: 'name'
@@ -116,7 +117,7 @@ describe LivePaper::WmTrigger do
     context 'the requested trigger exists.' do
       let(:lpp_start_date_response_json) { JSON.parse(lpp_trigger_response_json)['trigger']['startDate'] }
       let(:lpp_end_date_response_json) { JSON.parse(lpp_trigger_response_json)['trigger']['endDate'] }
-      
+
       before do
         @trigger = LivePaper::Trigger.get('trigger_id')
       end
@@ -166,13 +167,13 @@ describe LivePaper::WmTrigger do
     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)
+      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(image_url)).to eq 'watermark_data'
     end
   end
-end
+end

data/spec/spec_helpers/lpp_client.rb

@@ -15,7 +15,8 @@ def lpp_payoff_response_json
   "payoff": {
     "id": "payoff_id",
     "name": "name",
-    "URL": "url"
+    "type": "url",
+    "url": "url"
   }
 }
   RESPONSE
@@ -27,6 +28,7 @@ def lpp_richpayoff_response_json
   "payoff": {
     "id": "payoff_id",
     "name": "name",
+    "type": "richPayoff",
     "dateCreated":"2014-10-07T20:57:01.083+0000",
     "dateModified":"2014-10-07T20:57:01.083+0000",
     "link":[
@@ -65,12 +67,11 @@ def lpp_trigger_response_json(type='watermark')
     "link": [
       {"rel":"self", "href": "https://www.livepaperapi.com/api/v1/triggers/trigger_id"},
       {"rel":"analytics", "href": "https://www.livepaperapi.com/analytics/v1/triggers/trigger_id"},
-      {"rel":"image", "href": "https://fileapi/trigger_id/image"},
+      {"rel":"download", "href": "https://fileapi/trigger_id/image"},
       {"rel":"shortURL", "href": "http://hpgo.co/abc123"}
     ],
     "state": "ACTIVE",
     "type": "#{type}",
-    "watermark": "watermark",
     "startDate":"2014-10-08T20:40:26.376+0000",
     "endDate":"2015-10-09T02:29:12.376+0000"
   }
@@ -127,4 +128,4 @@ def lpp_delete_error_response
 }
   RESPONSE
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: live_paper
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Mike Whitmarsh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport