pmp 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a47c78760623b6ac3b5a2d94856ab3805a10ca60
-  data.tar.gz: cb6374e79fabe5c1a54ef29b7157ff10e1999980
+  metadata.gz: 5cce90ecfafd14dcd4d8a6806bef81fdd182df3c
+  data.tar.gz: cf0030b9a98badfd1e1c1a773632c1a56575c40a
 SHA512:
-  metadata.gz: 12c57ef346ba305cc1c0f638d539db6a5bbecd56ffd3bd02cb40714dcd55baa9b2e8279e4d86c0c8119466a90bcc695fc9078ab84c68343bd65b4898dd3c23db
-  data.tar.gz: c64f50f97ef3f06401f639fb85cc7631f54ecf015dbbb92a8e34f5b358e1f9a17974908a17c603860a23647abce66c6b0f373df9ad3992f62ddd0956e48a3eb4
+  metadata.gz: e9f447c64eea0f8b6a371d0175ad0050e9d52c1dbc0633458e99366a122bef942b2500dd2bdc7cca5907661b062ebd523ba6a56ad5e57d2edcf85661585da339
+  data.tar.gz: 84b56b31009fe0f3e69134a39d1463649e8676290fbbb6f137eb20cc0e92726d7d1317bb5c37722229e869e1d41fadc494e3e0bb299615e87d568a4a2b06dc5b

data/example/permissions_result.txt

@@ -16,7 +16,7 @@ Step 1 complete: organizations: [
       "profile": [
         {
           "href": "https://api-sandbox.pmp.io/profiles/user",
-          "type": "application/vnd.pmp.collection.doc+json"
+          "type": "application/vnd.collection.doc+json"
         }
       ]
     },
@@ -39,7 +39,7 @@ Step 1 complete: organizations: [
       "profile": [
         {
           "href": "https://api-sandbox.pmp.io/profiles/user",
-          "type": "application/vnd.pmp.collection.doc+json"
+          "type": "application/vnd.collection.doc+json"
         }
       ]
     },
@@ -62,7 +62,7 @@ Step 1 complete: organizations: [
       "profile": [
         {
           "href": "https://api-sandbox.pmp.io/profiles/user",
-          "type": "application/vnd.pmp.collection.doc+json"
+          "type": "application/vnd.collection.doc+json"
         }
       ]
     },
@@ -90,7 +90,7 @@ Step 2 complete: permission_groups: [
       "profile": [
         {
           "href": "https://api-sandbox.pmp.io/profiles/group",
-          "type": "application/vnd.pmp.collection.doc+json"
+          "type": "application/vnd.collection.doc+json"
         }
       ],
       "item": [
@@ -116,7 +116,7 @@ Step 2 complete: permission_groups: [
       "profile": [
         {
           "href": "https://api-sandbox.pmp.io/profiles/group",
-          "type": "application/vnd.pmp.collection.doc+json"
+          "type": "application/vnd.collection.doc+json"
         }
       ],
       "item": [
@@ -139,7 +139,7 @@ Step 2 complete: permission_groups: [
       "profile": [
         {
           "href": "https://api-sandbox.pmp.io/profiles/group",
-          "type": "application/vnd.pmp.collection.doc+json"
+          "type": "application/vnd.collection.doc+json"
         }
       ],
       "item": [
@@ -162,7 +162,7 @@ Step 2 complete: permission_groups: [
       "profile": [
         {
           "href": "https://api-sandbox.pmp.io/profiles/group",
-          "type": "application/vnd.pmp.collection.doc+json"
+          "type": "application/vnd.collection.doc+json"
         }
       ]
     },
@@ -185,7 +185,7 @@ Step 3 complete: documents: [
       "profile": [
         {
           "href": "https://api-sandbox.pmp.io/profiles/story",
-          "type": "application/vnd.pmp.collection.doc+json"
+          "type": "application/vnd.collection.doc+json"
         }
       ],
       "permission": [
@@ -210,7 +210,7 @@ Step 3 complete: documents: [
       "profile": [
         {
           "href": "https://api-sandbox.pmp.io/profiles/story",
-          "type": "application/vnd.pmp.collection.doc+json"
+          "type": "application/vnd.collection.doc+json"
         }
       ],
       "permission": [
@@ -240,7 +240,7 @@ Step 3 complete: documents: [
       "profile": [
         {
           "href": "https://api-sandbox.pmp.io/profiles/story",
-          "type": "application/vnd.pmp.collection.doc+json"
+          "type": "application/vnd.collection.doc+json"
         }
       ]
     },
@@ -259,7 +259,7 @@ Step 3 complete: documents: [
       "profile": [
         {
           "href": "https://api-sandbox.pmp.io/profiles/story",
-          "type": "application/vnd.pmp.collection.doc+json"
+          "type": "application/vnd.collection.doc+json"
         }
       ],
       "permission": [
@@ -490,7 +490,7 @@ retrieved: {
         },
         "hints": {
           "formats": [
-            "application/vnd.pmp.collection.doc+json"
+            "application/vnd.collection.doc+json"
           ],
           "allow": [
             "PUT",
@@ -510,7 +510,7 @@ retrieved: {
         },
         "hints": {
           "formats": [
-            "application/vnd.pmp.collection.doc+json"
+            "application/vnd.collection.doc+json"
           ],
           "allow": [
             "PUT",
@@ -742,7 +742,7 @@ retrieved: {
         },
         "hints": {
           "formats": [
-            "application/vnd.pmp.collection.doc+json"
+            "application/vnd.collection.doc+json"
           ],
           "allow": [
             "PUT",
@@ -762,7 +762,7 @@ retrieved: {
         },
         "hints": {
           "formats": [
-            "application/vnd.pmp.collection.doc+json"
+            "application/vnd.collection.doc+json"
           ],
           "allow": [
             "PUT",
@@ -991,7 +991,7 @@ retrieved: {
         },
         "hints": {
           "formats": [
-            "application/vnd.pmp.collection.doc+json"
+            "application/vnd.collection.doc+json"
           ],
           "allow": [
             "PUT",
@@ -1011,7 +1011,7 @@ retrieved: {
         },
         "hints": {
           "formats": [
-            "application/vnd.pmp.collection.doc+json"
+            "application/vnd.collection.doc+json"
           ],
           "allow": [
             "PUT",

data/lib/pmp/client.rb

@@ -28,7 +28,7 @@ module PMP
 
     def doc_of_type(type, opts={})
       doc = PMP::CollectionDocument.new(options.merge(root:root(opts)).merge(opts))
-      doc.links['profile'] = Link.new(href: profile_href_for_type(type), type: "application/vnd.pmp.collection.doc+json")
+      doc.links['profile'] = Link.new(href: profile_href_for_type(type), type: "application/vnd.collection.doc+json")
       doc
     end
 

data/lib/pmp/collection_document.rb

@@ -3,7 +3,7 @@ require 'ostruct'
 module PMP
 
   # Using OpenStruct for now - perhaps use ActiveModel? hmm...
-  class CollectionDocument < OpenStruct
+  class CollectionDocument
 
     include Configuration
     include Connection
@@ -27,6 +27,9 @@ module PMP
     # has this resource actually been loaded from remote url or json document?
     attr_accessor :loaded
 
+    # private var to save attributes obj, to handle object attributes
+    attr_accessor :attributes
+
     # private var to save links obj, to handle link additions
     attr_accessor :links
 
@@ -38,18 +41,18 @@ module PMP
     # assumption is that doc is a parsed json doc confirming to collection.doc+json
     # TODO: check if this is a json string or hash, for now assume it has been mashified
     def initialize(options={}, &block)
-      super()
       apply_configuration(options)
 
-      self.root     = current_options.delete(:root)
-      self.href     = current_options.delete(:href)
-      self.version  = current_options.delete(:version) || '1.0'
-
-      self.links    = PMP::Links.new(self)
-
+      self.root       = current_options.delete(:root)
+      self.href       = current_options.delete(:href)
+      self.version    = current_options.delete(:version) || '1.0'
+      
+      self.attributes = OpenStruct.new
+      self.links      = PMP::Links.new(self)
+      
       # if there is a doc to be had, pull it out
-      self.response = current_options.delete(:response)
-      self.original = current_options.delete(:document)
+      self.response   = current_options.delete(:response)
+      self.original   = current_options.delete(:document)
 
       yield(self) if block_given?
     end
@@ -59,10 +62,6 @@ module PMP
       @items ||= []
     end
 
-    def attributes
-      HashWithIndifferentAccess.new(marshal_dump.delete_if{|k,v| links.keys.include?(k.to_s)})
-    end
-
     def response=(resp)
       unless (!resp || loaded?)
         @response = resp
@@ -89,7 +88,7 @@ module PMP
     def save
       set_guid_if_blank
       url = edit_link('PUT').where(guid: self.guid).url
-      response = request(:put, url, self)
+      self.response = request(:put, url, self)
       self.href = response.body['url']
     end
 
@@ -101,7 +100,7 @@ module PMP
     end
 
     def edit_link(method)
-      link = root_document.edit['urn:pmp:form:documentsave']
+      link = root_document.edit['urn:collectiondoc:form:documentsave']
       raise "Edit link does not specify saving via #{method}" unless (link && link.hints.allow.include?(method))
       link
     end
@@ -123,7 +122,7 @@ module PMP
     end
 
     def setup_oauth_token
-      if !oauth_token
+      if !oauth_token && current_options[:client_id] && current_options[:client_secret]
         token = PMP::Token.new(current_options).get_token
         self.oauth_token = token.token
         self.token_type  = token.params['token_type']
@@ -138,7 +137,7 @@ module PMP
       begin
         raw = connection(current_options.merge({url: url})).send(method) do |request|
           if [:post, :put].include?(method.to_sym) && !body.blank?
-            request.body = body.is_a?(String) ? body : body.to_json
+            request.body = PMP::CollectionDocument.to_persist_json(body)
           end
         end
       rescue Faraday::Error::ResourceNotFound=>not_found_ex
@@ -153,17 +152,29 @@ module PMP
       PMP::Response.new(raw, {method: method, url: url, body: body})
     end
 
+    # static method to filter out static parts of c.doc+j hash before PUT/POST to PMP server
+    # in the future this should be fixed in PMP API to no longer be necessary
+    def self.to_persist_json(body)
+      return body.to_s if body.is_a?(String) || !body.respond_to?(:as_json)
+
+      result = body.as_json.select! { |k,v| %w(attributes links).include?(k) }
+      result['attributes'].reject! { |k,v| %w(created modified).include?(k) }
+      result['links'].reject! { |k,v| %w(creator query edit auth).include?(k) }
+
+      result.to_json
+    end
+
+    def attributes_map
+      HashWithIndifferentAccess.new(attributes.marshal_dump)
+    end
+
     def set_guid_if_blank
       self.guid = SecureRandom.uuid if guid.blank?
     end
 
     def method_missing(method, *args)
-      if (method.to_s.last != '=') && !loaded?
-        load
-        return self.send(method, *args) if self.respond_to?(method)
-      end
-
-      super
+      load if (method.to_s.last != '=')
+      respond_to?(method) ? send(method, *args) : attributes.send(method, *args)
     end
 
   end

data/lib/pmp/connection.rb

@@ -45,8 +45,8 @@ module PMP
         :headers => {
           # generic http headers
           'User-Agent'   => opts[:user_agent],
-          'Accept'       => "application/vnd.pmp.collection.doc+json",
-          'Content-Type' => "application/vnd.pmp.collection.doc+json"
+          'Accept'       => "application/vnd.collection.doc+json",
+          'Content-Type' => "application/vnd.collection.doc+json"
         },
         :ssl => {:verify => false},
         :url => opts[:endpoint]

data/lib/pmp/credential.rb

@@ -22,7 +22,12 @@ module PMP
     end
 
     def create(params={})
-      response = request(:post, credentials_url, create_params(params))
+      response = request(:post, create_credentials_url, create_params(params))
+      response.body
+    end
+
+    def destroy(client_id)
+      response = request(:delete, remove_credentials_url(client_id))
       response.body
     end
 
@@ -51,5 +56,18 @@ module PMP
       "#{endpoint}auth/credentials"
     end
 
+    def create_credentials_url
+      root_document.auth['urn:collectiondoc:form:createcredentials'].url
+    end
+
+    def remove_credentials_url(client_id)
+      link = root_document.auth['urn:collectiondoc:form:removecredentials']
+      link.where(client_id: client_id).url
+    end
+
+    def root_document
+      @root ||= PMP::CollectionDocument.new(current_options.merge(href: endpoint))
+    end
+
   end
 end

data/lib/pmp/link.rb

@@ -9,7 +9,7 @@ require 'ostruct'
 # :href_vars,     # { "collection": "https://github.com/publicmediaplatform/pmpdocs/wiki/Content-Retrieval" }
 # :hreflang,      # Language of the linked document
 # :hints,         # Hints about interacting with the link, such as HTTP methods, e.g. "hints": { "allow": ["GET", "PUT", "DELETE"] }
-# :rels,          # [ "urn:pmp:query:users" ]
+# :rels,          # [ "urn:collectiondoc:query:users" ]
 # :method,        # http method - get, post, put, etc.
 # :type,          # 'image/png' - mime type of linked resource
 # :title,         # name/title of thing linked in
@@ -34,14 +34,8 @@ module PMP
       [:href, :href_template, :method].each{|m| self.send("#{m}=", nil) unless respond_to?(m)}
     end
 
-    def attributes
-      attrs = HashWithIndifferentAccess.new(marshal_dump)
-      attrs.delete(attrs[:href_template].blank? ? :href_template : :href)
-      attrs
-    end
-
     def where(params={})
-      self.class.new(attributes.merge({'params'=>params}), parent)
+      self.class.new(attributes_map.merge({'params'=>params}), parent)
     end
 
     def as_json(options={})
@@ -61,6 +55,12 @@ module PMP
       @doc ||= PMP::CollectionDocument.new(parent.options.merge(href: url, root: parent.root))
     end
 
+    def attributes_map
+      attrs = HashWithIndifferentAccess.new(marshal_dump)
+      attrs.delete(attrs[:href_template].blank? ? :href_template : :href)
+      attrs
+    end
+
     def method_missing(method, *args)
       # puts "mm: #{method}"
       # this is a method the link supports, call the link

data/lib/pmp/links.rb

@@ -22,7 +22,7 @@ module PMP
       name = name.to_sym
       unless parent.respond_to?(name)
         parent.define_singleton_method(name) { self.links[name] }
-        parent.define_singleton_method("#{name}=") { |x|  puts "setter: #{self.inspect}";  self.links[name] = x }
+        parent.define_singleton_method("#{name}=") { |x| self.links[name] = x }
       end
     end
 

data/lib/pmp/parser.rb

@@ -15,7 +15,7 @@ module PMP
     end
 
     def extract_attributes(obj=self)
-      obj.attributes.inject({}) do |result, pair|
+      obj.attributes_map.inject({}) do |result, pair|
         value = pair.last
         name = to_json_key_name(pair.first)
         result[name] = value
@@ -71,7 +71,7 @@ module PMP
     end
 
     def parse_link(name, info)
-      if ['query', 'edit', 'navigation'].include?(name.to_s)
+      if ['query', 'edit', 'navigation', 'auth'].include?(name.to_s)
         parse_links_list(info)
       elsif !info.is_a?(Array)
         Link.new(info)

data/lib/pmp/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module PMP
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/spec/client_spec.rb

@@ -24,7 +24,7 @@ describe PMP::Client do
     root_doc =  json_file(:collection_root)
 
     stub_request(:get, "https://api.pmp.io/").
-      with(:headers => {'Accept'=>'application/vnd.pmp.collection.doc+json', 'Content-Type'=>'application/vnd.pmp.collection.doc+json', 'Host'=>'api.pmp.io:443'}).
+      with(:headers => {'Accept'=>'application/vnd.collection.doc+json', 'Content-Type'=>'application/vnd.collection.doc+json', 'Host'=>'api.pmp.io:443'}).
       to_return(:status => 200, :body => root_doc, :headers => {})
 
     @root = @pmp.root
@@ -35,7 +35,7 @@ describe PMP::Client do
     root_doc =  json_file(:collection_root)
 
     stub_request(:get, "https://api.pmp.io/").
-      with(:headers => {'Accept'=>'application/vnd.pmp.collection.doc+json', 'Content-Type'=>'application/vnd.pmp.collection.doc+json', 'Host'=>'api.pmp.io:443'}).
+      with(:headers => {'Accept'=>'application/vnd.collection.doc+json', 'Content-Type'=>'application/vnd.collection.doc+json', 'Host'=>'api.pmp.io:443'}).
       to_return(:status => 200, :body => root_doc, :headers => {})
 
     @pmp.creator.first.must_be_instance_of PMP::Link

data/spec/collection_document_spec.rb

@@ -26,7 +26,7 @@ describe PMP::CollectionDocument do
     it "should default href to endpoint" do
       @doc.href.must_be_nil
       @doc.href = "https://api.pmp.io/"
-      @doc.href.must_equal "https://api.pmp.io/"      
+      @doc.href.must_equal "https://api.pmp.io/"
     end
   end
 
@@ -78,8 +78,8 @@ describe PMP::CollectionDocument do
     end
 
     it "provides list of attributes (not links)" do
-      @doc.attributes.keys.must_be :include?, 'title'
-      @doc.attributes.keys.wont_be :include?, 'self'
+      @doc.attributes_map.keys.must_be :include?, 'title'
+      @doc.attributes_map.keys.wont_be :include?, 'self'
     end
 
   end
@@ -90,7 +90,7 @@ describe PMP::CollectionDocument do
       root_doc =  json_file(:collection_root)
 
       stub_request(:get, "https://api.pmp.io/").
-        with(:headers => {'Accept'=>'application/vnd.pmp.collection.doc+json', 'Authorization'=>'Bearer thisisatesttoken', 'Content-Type'=>'application/vnd.pmp.collection.doc+json', 'Host'=>'api.pmp.io:443'}).
+        with(:headers => {'Accept'=>'application/vnd.collection.doc+json', 'Authorization'=>'Bearer thisisatesttoken', 'Content-Type'=>'application/vnd.collection.doc+json', 'Host'=>'api.pmp.io:443'}).
         to_return(:status => 200, :body => root_doc, :headers => {})
 
       @doc = PMP::CollectionDocument.new(oauth_token: 'thisisatesttoken', href: "https://api.pmp.io/", client_id: "fake", client_secret: "fake")
@@ -139,7 +139,7 @@ describe PMP::CollectionDocument do
 
     it "should provide a list of links" do
       @doc.load
-      @doc.links.keys.sort.must_equal ["creator", "edit", "navigation", "query"]
+      @doc.links.keys.sort.must_equal ["auth", "bookmark", "creator", "edit", "item", "navigation", "query"]
       @doc.links['creator'].first.must_be_instance_of PMP::Link
     end
 
@@ -151,7 +151,7 @@ describe PMP::CollectionDocument do
       root_doc =  json_file(:collection_root)
 
       stub_request(:get, "https://api.pmp.io/").
-        with(:headers => {'Accept'=>'application/vnd.pmp.collection.doc+json', 'Authorization'=>'Bearer thisisatesttoken', 'Content-Type'=>'application/vnd.pmp.collection.doc+json', 'Host'=>'api.pmp.io:443'}).
+        with(:headers => {'Accept'=>'application/vnd.collection.doc+json', 'Authorization'=>'Bearer thisisatesttoken', 'Content-Type'=>'application/vnd.collection.doc+json', 'Host'=>'api.pmp.io:443'}).
         to_return(:status => 200, :body => root_doc, :headers => {})
 
       @doc = PMP::CollectionDocument.new(oauth_token: 'thisisatesttoken', href: "https://api.pmp.io/")
@@ -164,16 +164,16 @@ describe PMP::CollectionDocument do
 
     it "should get a query by rels" do
       queries = @doc.query
-      queries["urn:pmp:query:docs"].must_be_instance_of PMP::Link
+      queries["urn:collectiondoc:query:docs"].must_be_instance_of PMP::Link
     end
 
     it "should handle 404 results on a search" do
 
       stub_request(:get, "https://api-sandbox.pmp.io/docs").
-        with(:headers => {'Accept'=>'application/vnd.pmp.collection.doc+json', 'Authorization'=>'Bearer thisisatesttoken', 'Content-Type'=>'application/vnd.pmp.collection.doc+json', 'Host'=>'api-sandbox.pmp.io:443'}).
-        to_return(:status=>404, :body=>"Not Found", :remote_ip=>"107.20.158.113", :headers=>{"Access-Control-Allow-Headers"=>"origin, x-http-method-override, accept, content-type, authorization, x-pingother", "Access-Control-Allow-Methods"=>"GET,OPTIONS,HEAD,PUT,POST,DELETE,PATCH", "Access-Control-Allow-Origin"=>"*", "Content-Type"=>"application/vnd.pmp.collection.doc+json", "Date"=>"Thu, 24 Oct 2013 17:20:04 GMT", "Vary"=>"Accept-Encoding", "X-Powered-By"=>"Express", "X-Response-Time"=>"18ms", "Content-Length"=>"9", "Connection"=>"keep-alive"})
+        with(:headers => {'Accept'=>'application/vnd.collection.doc+json', 'Authorization'=>'Bearer thisisatesttoken', 'Content-Type'=>'application/vnd.collection.doc+json', 'Host'=>'api-sandbox.pmp.io:443'}).
+        to_return(:status=>404, :body=>"Not Found", :remote_ip=>"107.20.158.113", :headers=>{"Access-Control-Allow-Headers"=>"origin, x-http-method-override, accept, content-type, authorization, x-pingother", "Access-Control-Allow-Methods"=>"GET,OPTIONS,HEAD,PUT,POST,DELETE,PATCH", "Access-Control-Allow-Origin"=>"*", "Content-Type"=>"application/vnd.collection.doc+json", "Date"=>"Thu, 24 Oct 2013 17:20:04 GMT", "Vary"=>"Accept-Encoding", "X-Powered-By"=>"Express", "X-Response-Time"=>"18ms", "Content-Length"=>"9", "Connection"=>"keep-alive"})
 
-      @doc.query["urn:pmp:query:docs"].items.must_equal []
+      @doc.query["urn:collectiondoc:query:docs"].items.must_equal []
     end
 
   end
@@ -199,12 +199,12 @@ describe PMP::CollectionDocument do
       # stub getting the root doc
       root_doc =  json_file(:collection_root)
       stub_request(:get, "https://api.pmp.io/").
-        with(:headers => {'Accept'=>'application/vnd.pmp.collection.doc+json', 'Content-Type'=>'application/vnd.pmp.collection.doc+json', 'Host'=>'api.pmp.io:443'}).
+        with(:headers => {'Accept'=>'application/vnd.collection.doc+json', 'Content-Type'=>'application/vnd.collection.doc+json', 'Host'=>'api.pmp.io:443'}).
         to_return(:status => 200, :body => root_doc, :headers => {})
 
       # stub saving the new doc
       stub_request(:put, "https://publish-sandbox.pmp.io/docs/c144e4df-021b-41e6-9cf3-42ac49bcbd42").
-        with(:headers => {'Accept'=>'application/vnd.pmp.collection.doc+json', 'Content-Type'=>'application/vnd.pmp.collection.doc+json', 'Host'=>'publish-sandbox.pmp.io:443'}).
+        with(:headers => {'Accept'=>'application/vnd.collection.doc+json', 'Content-Type'=>'application/vnd.collection.doc+json', 'Host'=>'publish-sandbox.pmp.io:443'}).
         to_return(:status => 404, :body => '{"error":"FAIL"}')
 
       doc = PMP::CollectionDocument.new(oauth_token: 'thisisatestvalueonly')
@@ -217,21 +217,33 @@ describe PMP::CollectionDocument do
 
       # stub getting the root doc
       root_doc =  json_file(:collection_root)
+
       stub_request(:get, "https://api.pmp.io/").
-        with(:headers => {'Accept'=>'application/vnd.pmp.collection.doc+json', 'Content-Type'=>'application/vnd.pmp.collection.doc+json', 'Host'=>'api.pmp.io:443'}).
+        with(:headers => {'Accept'=>'application/vnd.collection.doc+json', 'Content-Type'=>'application/vnd.collection.doc+json', 'Host'=>'api.pmp.io:443'}).
         to_return(:status => 200, :body => root_doc, :headers => {})
 
-      # stub saving the new doc
+      doc = PMP::CollectionDocument.new(oauth_token: 'thisisatestvalueonly')
+
+
       stub_request(:put, "https://publish-sandbox.pmp.io/docs/c144e4df-021b-41e6-9cf3-42ac49bcbd42").
-        with(:headers => {'Accept'=>'application/vnd.pmp.collection.doc+json', 'Content-Type'=>'application/vnd.pmp.collection.doc+json', 'Host'=>'publish-sandbox.pmp.io:443'}).
+        with(:body => "{\"links\":{},\"attributes\":{\"guid\":\"c144e4df-021b-41e6-9cf3-42ac49bcbd42\",\"title\":\"testing\"}}",
+             :headers => {'Accept'=>'application/vnd.collection.doc+json', 'Authorization'=>'Bearer thisisatestvalueonly', 'Content-Type'=>'application/vnd.collection.doc+json', 'Host'=>'publish-sandbox.pmp.io:443'}).
         to_return(:status => 200, :body => '{"url":"https://api-sandbox.pmp.io/docs/c144e4df-021b-41e6-9cf3-42ac49bcbd42"}')
 
-      doc = PMP::CollectionDocument.new(oauth_token: 'thisisatestvalueonly')
       doc.guid = "c144e4df-021b-41e6-9cf3-42ac49bcbd42"
       doc.title = "testing"
+      doc.wont_be :loaded
       doc.save
+      
+      doc.must_be :loaded
       doc.href.must_equal "https://api-sandbox.pmp.io/docs/c144e4df-021b-41e6-9cf3-42ac49bcbd42"
 
+
+      stub_request(:put, "https://publish-sandbox.pmp.io/docs/c144e4df-021b-41e6-9cf3-42ac49bcbd42").
+        with(:body => "{\"links\":{},\"attributes\":{\"guid\":\"c144e4df-021b-41e6-9cf3-42ac49bcbd42\",\"title\":\"testing an update\"}}",
+             :headers => {'Accept'=>'application/vnd.collection.doc+json', 'Authorization'=>'Bearer thisisatestvalueonly', 'Content-Type'=>'application/vnd.collection.doc+json', 'Host'=>'publish-sandbox.pmp.io:443'}).
+        to_return(:status => 200, :body => '{"url":"https://api-sandbox.pmp.io/docs/c144e4df-021b-41e6-9cf3-42ac49bcbd42"}')
+
       doc.title.must_equal "testing"
       doc.title = "testing an update"
       doc.save
@@ -243,11 +255,11 @@ describe PMP::CollectionDocument do
       # stub getting the root doc
       root_doc =  json_file(:collection_root)
       stub_request(:get, "https://api.pmp.io/").
-        with(:headers => {'Accept'=>'application/vnd.pmp.collection.doc+json', 'Content-Type'=>'application/vnd.pmp.collection.doc+json', 'Host'=>'api.pmp.io:443'}).
+        with(:headers => {'Accept'=>'application/vnd.collection.doc+json', 'Content-Type'=>'application/vnd.collection.doc+json', 'Host'=>'api.pmp.io:443'}).
         to_return(:status => 200, :body => root_doc, :headers => {})
 
       stub_request(:delete, "https://publish-sandbox.pmp.io/docs/c144e4df-021b-41e6-9cf3-42ac49bcbd42").
-        with(:headers => {'Accept'=>'application/vnd.pmp.collection.doc+json', 'Content-Type'=>'application/vnd.pmp.collection.doc+json', 'Host'=>'publish-sandbox.pmp.io:443'}).
+        with(:headers => {'Accept'=>'application/vnd.collection.doc+json', 'Content-Type'=>'application/vnd.collection.doc+json', 'Host'=>'publish-sandbox.pmp.io:443'}).
         to_return(:status => 204, :body => "", :headers => {})
 
       doc = PMP::CollectionDocument.new(oauth_token: 'thisisatestvalueonly')