pmp 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d96e1bc799b9ca048a31b6bee2e54a1b4c3af2b
-  data.tar.gz: 8702b4b792012a2ccc7aa7a093a179eaaedd8b1b
+  metadata.gz: 1859817bdd4a4e10673682a59cd88f8db50f025c
+  data.tar.gz: f63e8e75ee4a63bb22ed0647cae4fb2ad1fc5e44
 SHA512:
-  metadata.gz: d9c4f583839c50699c93a04605d3f16ef43ae767de3baee9203cbae1c3377eaf235aa46e8e181efbfa426b99073f169a819fc05cbfaa5dc118615f78ec374dd2
-  data.tar.gz: 3d1d6850858d0d3aebe96ae55e5c8e156680347190b400ddbb12837c099002c537623f2f8fd1d66147cb3402ea953fbd263d82cc020bf702e4d4dd52edf73371
+  metadata.gz: 4039a640c7f0144681d5d57002e2ede8b296a25aef9e98c04ab6382ebe8eaa79f84cdebc73e608de248863fc4ff1ef41fd7ce0333d10e347278c4398e2949652
+  data.tar.gz: b5240080294c1f6ca77bb05acf4b6352430ee0b4a74c475bad440f5986edf343d6871ef67ae34af7a1761d22d3568d8f51736ccb4cd0f1eefedeb830db6b2230

data/lib/pmp/client.rb

@@ -22,8 +22,12 @@ module PMP
 
     def root(opts={})
       @root = nil if (opts != {})
-      opts = options.merge(href: endpoint).merge(opts)
-      @root ||= PMP::CollectionDocument.new(opts)
+      @root ||= new_root(opts)
+    end
+
+    def new_root(opts={})
+      root_options = options.merge(opts).merge(href: endpoint)
+      PMP::CollectionDocument.new(root_options).tap{|r| r.root = r }
     end
 
     def doc_of_type(type, opts={})

data/lib/pmp/collection_document.rb

@@ -42,6 +42,11 @@ 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)
+      @mutex = Mutex.new
+
+      # puts "CollectionDocument.initialize options: #{options.inspect}\n"
+      # puts "\t#{RuntimeException.new.backtrace.join("\n\t")}"
+
       apply_configuration(options)
 
       self.root       = current_options.delete(:root)
@@ -49,7 +54,6 @@ module PMP
       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)
@@ -63,6 +67,15 @@ module PMP
       @items ||= []
     end
 
+    def attributes
+      get
+      attributes_object
+    end
+
+    def attributes_object
+      @attributes || OpenStruct.new
+    end
+
     def response=(resp)
       unless (!resp || loaded?)
         @response = resp
@@ -79,13 +92,23 @@ module PMP
     end
 
     def get
-      if !loaded? && href
+      return if loaded? || !href
+      @mutex.synchronize {
         self.response = request(:get, href)
         self.loaded = true
-      end
+      }
       self
     end
 
+    def links
+      get
+      links_object
+    end
+
+    def links_object
+      @links ||= PMP::Links.new(self)
+    end
+
     def save
       set_guid_if_blank
       url = save_link.where(guid: self.guid).url
@@ -101,27 +124,28 @@ module PMP
     end
 
     def save_link
-      link = root_document.edit['urn:collectiondoc:form:documentsave']
+      link = root.edit['urn:collectiondoc:form:documentsave']
       raise 'Save link not found' unless link
       link
     end
 
     def delete_link
-      link = root_document.edit['urn:collectiondoc:form:documentdelete']
+      link = root.edit['urn:collectiondoc:form:documentdelete']
       raise 'Delete link not found' unless link
       link
     end
 
-    def root
-      @root
+    def root=(r)
+      @root = r
     end
 
-    def root=(r)
-      @root
+    def root
+      @root ||= new_root
     end
 
-    def root_document
-      @root ||= PMP::CollectionDocument.new(current_options.merge(href: endpoint))
+    def new_root
+      root_options = current_options.merge(href: endpoint)
+      PMP::CollectionDocument.new(root_options).tap{|r| r.root = r }
     end
 
     def loaded?
@@ -130,23 +154,31 @@ module PMP
 
     def setup_oauth_token
       if !oauth_token && current_options[:client_id] && current_options[:client_secret]
-        token = PMP::Token.new(current_options).get_token
+        token = PMP::Token.new(current_options.merge(root: root)).get_token
         self.oauth_token = token.token
         self.token_type  = token.params['token_type']
+
+        if @root
+          @root.oauth_token = token.token
+          @root.token_type  = token.params['token_type']
+        end
+
       end
     end
 
     # url includes any params - full url
     def request(method, url, body=nil) # :nodoc:
 
+      # puts "CD::request: obj: #{self.object_id} #{method}, #{url}, #{body.inspect}"
+
       unless ['/', ''].include?(URI::parse(url).path)
         setup_oauth_token
       end
 
       begin
-        raw = connection(current_options.merge({url: url})).send(method) do |request|
+        raw = connection(current_options.merge({url: url})).send(method) do |req|
           if [:post, :put].include?(method.to_sym) && !body.blank?
-            request.body = PMP::CollectionDocument.to_persist_json(body)
+            req.body = PMP::CollectionDocument.to_persist_json(body)
           end
         end
       rescue Faraday::Error::ResourceNotFound => not_found_ex
@@ -183,7 +215,7 @@ module PMP
 
     def method_missing(method, *args)
       get if (method.to_s.last != '=')
-      respond_to?(method) ? send(method, *args) : attributes.send(method, *args)
+      respond_to?(method) ? send(method, *args) : attributes_object.send(method, *args)
     end
 
   end

data/lib/pmp/credential.rb

@@ -10,9 +10,13 @@ module PMP
 
     CREDENTIAL_PARAMS = [:scope, :token_expires_in, :label]
 
+    attr_accessor :root
+
     def initialize(options={}, &block)
       apply_configuration(options)
 
+      self.root = current_options.delete(:root)
+
       yield(self) if block_given?
     end
 
@@ -53,19 +57,19 @@ module PMP
     end
 
     def credentials_url
-      root_document.auth['urn:collectiondoc:form:listcredentials'].url
+      root.auth['urn:collectiondoc:form:listcredentials'].url
     end
 
     def create_credentials_url
-      root_document.auth['urn:collectiondoc:form:createcredentials'].url
+      root.auth['urn:collectiondoc:form:createcredentials'].url
     end
 
     def remove_credentials_url(client_id)
-      link = root_document.auth['urn:collectiondoc:form:removecredentials']
+      link = root.auth['urn:collectiondoc:form:removecredentials']
       link.where(client_id: client_id).url
     end
 
-    def root_document
+    def root
       @root ||= PMP::CollectionDocument.new(current_options.merge(href: endpoint))
     end
 

data/lib/pmp/link.rb

@@ -27,13 +27,17 @@ module PMP
 
     def initialize(link={}, parent=nil)
       super()
-      self.parent = parent || link.delete('parent') || PMP::CollectionDocument.new
+      self.parent = parent || link.delete('parent')
       self.params = link.delete('params') || {}
       # puts "params: #{params.inspect}"
       parse_attributes(link)
       [:href, :href_template, :method].each{|m| self.send("#{m}=", nil) unless respond_to?(m)}
     end
 
+    def parent
+      @parent ||= PMP::CollectionDocument.new
+    end
+
     def where(params={})
       self.class.new(attributes_map.merge({'params'=>params}), parent)
     end

data/lib/pmp/parser.rb

@@ -44,6 +44,7 @@ module PMP
 
     def parse(doc)
       return if (!doc)
+      parse_href(doc['href'])
       parse_version(doc['version'])
       parse_attributes(doc['attributes'])
       parse_links(doc['links'])
@@ -51,6 +52,10 @@ module PMP
       # parse_error(doc)
     end
 
+    def parse_href(document)
+      self.href = document
+    end
+
     def parse_version(document)
       self.version = document || '1.0'
     end
@@ -65,7 +70,7 @@ module PMP
       Array(document).each do |k,v|
         link = parse_link(k,v)
         if link
-          self.links[k] = link
+          self.links_object[k] = link
         end
       end
     end

data/lib/pmp/token.rb

@@ -7,14 +7,18 @@ module PMP
 
     include Configuration
 
+    attr_accessor :root
+
     def initialize(options={}, &block)
       apply_configuration(options)
 
+      self.root = current_options.delete(:root)
+
       yield(self) if block_given?
     end
 
     def token_url
-      root_document.auth['urn:collectiondoc:form:issuetoken'].url
+      root.auth['urn:collectiondoc:form:issuetoken'].url
     end
 
     def get_token
@@ -50,7 +54,7 @@ module PMP
       options.select{|k,v| PMP::Connection::ALLOWED_CONNECTION_OPTIONS.include?(k.to_sym)}
     end
 
-    def root_document
+    def root
       @root ||= PMP::CollectionDocument.new(current_options.merge(href: endpoint))
     end
 

data/lib/pmp/version.rb

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

data/spec/parser_spec.rb

@@ -12,6 +12,10 @@ class TestParser < OpenStruct
   attr_accessor :version
 
   def links
+    links_object
+  end
+
+  def links_object
     @links ||= PMP::Links.new(self)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pmp
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler