live_paper 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54159788ca4d35d52a44ed05de7e2fdfad88998e
-  data.tar.gz: 4f319ab3b4ad6f7380828d0bc68b06ca1979433a
+  metadata.gz: 150824532bc144af1c7efd5005578e51d843a966
+  data.tar.gz: 68b48ce5fdc74376878078de4c9c16c3fc221023
 SHA512:
-  metadata.gz: a8a4256e05ff2fbf38165b9ed6098673d3602b3a387de482cc4a7f911a82961f148bf118867d7bff796f12a0ed88a3e938a30741a0edd1dcac3a4e5436ae3a33
-  data.tar.gz: c9416a9a5d40f8eabb7d3897b775c390a56346cb2b629e92616a364d2af098d4a124778fef1b6dde36c0868741d059885e6e80bce8597c0a696c0a8630c296a4
+  metadata.gz: 65f7056b9a7d6d9490051fb4e12d39808e6806948783224b05fec4888a7c439933545e1630cd9588a2edfb4421d94563da8bd6c7f1c3296ced411c383fe6a947
+  data.tar.gz: 3f53715224edf9e668d23d3988f7678e45fcd22a982a052e1557399be7c8ab4d2a505ba7baaa653e0112fab52d5bf60308b05463ff166c401a980fe942f1dd74

data/lib/live_paper.rb

@@ -23,6 +23,11 @@ module LivePaper
     def initialize(auth)
       #todo: tdd, verify hash
       $lpp_basic_auth = Base64.strict_encode64("#{auth[:id]}:#{auth[:secret]}")
+      @remote_resources={}
+    end
+
+    def resources
+      @remote_resources
     end
 
     def smart_link(dest, image=nil)
@@ -44,14 +49,16 @@ module LivePaper
     def shorten(dest)
       t=ShortTrigger.create(name: 'short trigger')
       p=Payoff.create(name: 'name', type: Payoff::TYPE[:WEB], url: dest)
-      Link.create(payoff_id: p.id, trigger_id: t.id, name: "link")
+      l=Link.create(payoff_id: p.id, trigger_id: t.id, name: "link")
+      @remote_resources={link: l, payoff: p, trigger: t}
       t.short_url
     end
 
     def qr_bytes(dest)
       t=QrTrigger.create(name: 'QR code trigger')
       p=Payoff.create(name: 'name', type: Payoff::TYPE[:WEB], url: dest)
-      Link.create(payoff_id: p.id, trigger_id: t.id, name: "link")
+      l=Link.create(payoff_id: p.id, trigger_id: t.id, name: "link")
+      @remote_resources={link: l, payoff: p, trigger: t}
       t.download_qrcode
     end
 
@@ -60,7 +67,8 @@ module LivePaper
 
       t=WmTrigger.create(name: 'watermark', watermark: {strength: 10, resolution: 75, imageURL: image})
       p=Payoff.create(name: 'name', type: Payoff::TYPE[:WEB], url: dest)
-      Link.create(payoff_id: p.id, trigger_id: t.id, name: "link")
+      l=Link.create(payoff_id: p.id, trigger_id: t.id, name: "link")
+      @remote_resources={link: l, payoff: p, trigger: t}
       t.download_watermark
     rescue Exception => e
       puts "Exception!"

data/lib/live_paper/base_object.rb

@@ -24,7 +24,7 @@ module LivePaper
     def save
       validate_attributes!
       BaseObject.request_handling_auth(self.class.api_url, 'POST') do |request|
-        response = BaseObject.send_request(request, 'application/json', create_body.to_json)
+        response = BaseObject.send_request(request, content_type: 'application/json', body: create_body.to_json)
         parse(response.body)
       end unless present? @id
       self
@@ -32,11 +32,38 @@ module LivePaper
 
     def self.get(id)
       request_handling_auth("#{api_url}/#{id}", 'GET') do |request|
-        response = send_request(request, 'application/json')
+        response = send_request(request, content_type: 'application/json')
         parse response.body
       end rescue nil
     end
 
+    def delete
+      response_code = nil
+      if self.id
+        BaseObject.request_handling_auth("#{self.class.api_url}/#{id}", 'DELETE') do |request|
+          response = BaseObject.send_request(request, content_type: 'application/json', allow_codes: [200, 409])
+          response_code = case response.code.to_i
+            when 200
+              'OK'
+            when 409
+              @errors=response.body
+              'Conflict'
+          end
+        end
+      else
+        response_code = "Object Invalid"
+      end
+      response_code
+    end
+
+    def errors
+      begin
+        JSON.parse(@errors)
+      rescue
+        @errors
+      end
+    end
+
     def self.parse(data)
       self.new().parse(data)
     end

data/lib/live_paper/http_client.rb

@@ -9,18 +9,19 @@ module LivePaper
     LP_API_HOST="https://www.livepaperapi.com"
     AUTH_URL = "#{LP_API_HOST}/auth/token"
 
-    def send_request(request, content_type = nil, body = nil)
-      request['Content-type'] = content_type if content_type
-      request.body = body if body
+    def send_request(request, options={})
+      request['Content-type'] = options[:content_type] if options[:content_type]
+      request.body = options[:body] if options[:body]
+      options[:allow_codes] ||= [200,201]
       response = @http.request(request)
-      check_response(response)
+      check_response(response, options[:allow_codes])
       response
     end
 
-    def check_response(response)
+    def check_response(response, allow_codes)
       status = response.code.to_i
       raise NotAuthenticatedError.new("Unauthorized") if status == 401
-      unless Array(200..201).include?(status)
+      unless allow_codes.include?(status)
         raise "Request failed with code #{status}"
       end
     end
@@ -62,6 +63,8 @@ module LivePaper
           Net::HTTP::Post.new(uri.request_uri)
         when 'GET'
           Net::HTTP::Get.new(uri.request_uri)
+        when 'DELETE'
+          Net::HTTP::Delete.new(uri.request_uri)
         else
           raise "Method '#{method}' not supported."
       end

data/lib/live_paper/version.rb

@@ -1,3 +1,3 @@
 module LivePaper
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/live_paper/base_object_spec.rb

@@ -9,7 +9,7 @@ end
 
 describe LivePaper::BaseObject do
   before do
-    @api_url = "#{LivePaper::LP_API_HOST}/objects"
+    @api_url = "#{LivePaper::LP_API_HOST}/v99/objects"
     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)
 
@@ -127,19 +127,68 @@ describe LivePaper::BaseObject do
     end
   end
 
+  describe '.delete' do
+    before do
+      stub_unimplemented_methods
+      @data = {
+        name: 'name',
+        id: 'obj_id',
+        date_created: 'date_created',
+        date_modified: 'date_modified',
+        link: [
+          { :rel => "self", :href => "/api/v1/objects/obj_id" },
+          { :rel => "analytics", :href => "/analytics/v1/objects/obj_id" }
+        ]
+      }
+      @obj = LivePaper::BaseObject.create @data
+      @self_link = "#{@api_url}/#{@obj.id}"
+    end
+
+    it 'should not DELETE if the object does not have an id.' do
+      @obj.id = nil
+      ret_val = @obj.delete
+      assert_not_requested :delete, @self_link
+      expect(ret_val).to eq 'Object Invalid'
+    end
+
+    context 'successful delete' do
+      before do
+        stub_request(:delete, @self_link).to_return(:status => 200, :body => "")
+      end
+      it 'should DELETE when there is an ID' do
+        result=@obj.delete
+        assert_requested :delete, "#{@api_url}/#{@obj.id}"
+        expect(result).to eq 'OK'
+      end
+    end
+
+    context 'when link points to object' do
+      before do
+        @bodee = lpp_delete_error_response
+        stub_request(:delete, @self_link).to_return(:status => 409, :body => @bodee)
+      end
+      it 'should fail' do
+        result=@obj.delete
+        assert_requested :delete, "#{@api_url}/#{@obj.id}"
+        expect(result).to eq 'Conflict'
+        expect(@obj.errors).to eq JSON.parse @bodee
+      end
+    end
+  end
+
   describe '#rel' do
     before do
       stub_unimplemented_methods
-            @data = {
-              name: 'name',
-              date_created: 'date_created',
-              date_modified: 'date_modified',
-              link: [
-                { :rel => "self", :href => "/api/v1/payoffs/payoff_id" },
-                { :rel => "analytics", :href => "/analytics/v1/payoffs/payoff_id" }
-              ]
-            }
-            @obj = LivePaper::BaseObject.create @data
+      @data = {
+        name: 'name',
+        date_created: 'date_created',
+        date_modified: 'date_modified',
+        link: [
+          { :rel => "self", :href => "/api/v1/payoffs/payoff_id" },
+          { :rel => "analytics", :href => "/analytics/v1/payoffs/payoff_id" }
+        ]
+      }
+      @obj = LivePaper::BaseObject.create @data
     end
 
     it 'should return href for rel link' do

data/spec/live_paper/http_client_spec.rb

@@ -26,27 +26,35 @@ describe LivePaper::HttpClient do
     it 'should add the content type to the request' do
       expect(@request).to receive(:[]=).with('Content-type', 'image/jpg')
       allow(@request).to receive(:body=)
-      @http_client.send_request @request, 'image/jpg', 'body'
+      @http_client.send_request @request, content_type: 'image/jpg', body: 'body'
     end
 
     it 'should add the body to the request' do
       expect(@request).to receive(:body=).with('body')
       allow(@request).to receive(:[]=)
-      @http_client.send(:send_request, @request, 'image/jpg', 'body')
+      @http_client.send(:send_request, @request, content_type: 'image/jpg', body: 'body')
     end
 
     it 'should call the request method from the http instance' do
       allow(@request).to receive(:body=)
       allow(@request).to receive(:[]=)
       expect(@http).to receive(:request)
-      @http_client.send(:send_request, @request, 'image/jpg', 'body')
+      @http_client.send(:send_request, @request, content_type: 'image/jpg', body: 'body')
     end
 
-    it 'should check the response' do
+    it 'should check the response with default allow_codes' do
       allow(@request).to receive(:body=)
       allow(@request).to receive(:[]=)
-      expect(@http_client).to receive(:check_response)
-      @http_client.send(:send_request, @request, 'image/jpg', 'body')
+      expect(@http_client).to receive(:check_response).with(anything, [200, 201])
+      @http_client.send(:send_request, @request, content_type: 'image/jpg', body: 'body')
+    end
+
+    it 'should call check_response with the provided allow_codes' do
+      allow(@request).to receive(:body=)
+      allow(@request).to receive(:[]=)
+      allow_codes = [200, 201, 409]
+      expect(@http_client).to receive(:check_response).with(anything, allow_codes)
+      @http_client.send(:send_request, @request, content_type: 'image/jpg', body: 'body', allow_codes: allow_codes)
     end
   end
 
@@ -55,21 +63,22 @@ describe LivePaper::HttpClient do
     before(:each) do
       @response = double('A mock for a response')
       allow(@response).to receive(:body)
+      @allow=[200, 201]
     end
 
     it 'should raise NotAuthenticatedError if the response code is 401' do
       allow(@response).to receive(:code).and_return('401')
-      expect { @http_client.send(:check_response, @response) }.to raise_error NotAuthenticatedError
+      expect { @http_client.send(:check_response, @response, @allow) }.to raise_error NotAuthenticatedError
     end
 
     it 'should not raise any exception if the response code is 200..201' do
       allow(@response).to receive(:code).and_return('201')
-      expect { @http_client.send(:check_response, @response) }.to_not raise_error
+      expect { @http_client.send(:check_response, @response, @allow) }.to_not raise_error
     end
 
     it 'should raise exception if the response code is other than 200..201|401' do
       allow(@response).to receive(:code).and_return('500')
-      expect { @http_client.send(:check_response, @response) }.to raise_error
+      expect { @http_client.send(:check_response, @response, @allow) }.to raise_error
     end
   end
 
@@ -161,6 +170,11 @@ describe LivePaper::HttpClient do
       @http_client.send(:http_request, @host, 'GET')
     end
 
+    it 'should create and return a Net::HTTP::Delete instance if DELETE method is chosen.' do
+      expect(Net::HTTP::Delete).to receive(:new).and_call_original
+      @http_client.send(:http_request, @host, 'DELETE')
+    end
+
     it 'should use ssl' do
       allow(Net::HTTP).to receive(:new).and_return(@http)
       expect(@http).to receive(:use_ssl=)

data/spec/spec_helpers/lpp_client.rb

@@ -108,7 +108,7 @@ def lpp_delete_error_response
 { "associatedLinks": "1",
   "link": [{
       "rel": "associatedLinks",
-      "href": "https://dev.livepaperapi.com/api/v1/links?trigger=uMTGQ0xoS7exSL3iujHJSA"
+      "href": "https://dev.livepaperapi.com/api/v1/links?trigger=my_trigger_id"
   }],
   "error": {
       "title": "409 Conflict",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: live_paper
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Mike Whitmarsh
@@ -9,76 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-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
@@ -122,12 +122,12 @@ 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: []