pmp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a973bed0cc15ec213cce42e732f6592d627c5e0
-  data.tar.gz: 3b75ef9379836b6b773e6508c111ecf4b34d4945
+  metadata.gz: 1aaa1c5c06065ba12e2b7b0ed571fb423b4bc845
+  data.tar.gz: 614cac49e7b7e22ce65a84e8f9378f3ca69cfa78
 SHA512:
-  metadata.gz: 6563f341fcbf74f75a8cc19731f8add4812126811710b9a02fd49bedd50efb4cd9c365a3e1eb474f4cd0260b2cb4ca374f53e0c341c926d9bd530f0be58a2fb4
-  data.tar.gz: 955430a5c6be07476f746f57af4b3d79efdd834447d9442495dd34da982252bcbe778ca7de8a625666c33b591f5ad5e9893420a1c161c7e13defe8816deb3401
+  metadata.gz: afc288ea482769b5b8423403242bb0951ed9c7aa9c279da3b687a4d5c7d405596a96bf2459a42052a2a57d21b534368075e5460109d3aa691348f587d677a14c
+  data.tar.gz: aa8b076cb62f6b9f0d635836208633a31f79129c6aa77dc210f744abb6bd8cb6e7558d6e755df31e071b787e3d5e8bc693d116d6670ca901872cb3ab0d321cb4

data/lib/pmp/client.rb

@@ -11,11 +11,11 @@ module PMP
     end
 
     def token(opts={})
-      PMP::Token.new(options.merge(opts)).get_token
+      @token ||= PMP::Token.new(options.merge(opts)).get_token
     end
 
-    def root(opts={}, &block)      
-      PMP::CollectionDocument.new(options.merge(opts), &block)
+    def root(opts={}, &block)
+      @root ||= PMP::CollectionDocument.new(options.merge(opts), &block)
     end
 
   end

data/lib/pmp/collection_document.rb

@@ -30,6 +30,10 @@ module PMP
     # private var to save links obj, to handle link additions
     attr_accessor :links
 
+    # this is a tricky, read-only list of items, same as if loaded from link->item links
+    # do not put into json form of this doc
+    attr_accessor :items
+
     # document is the original json derived doc used to create this resource
     # 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

data/lib/pmp/link.rb

@@ -25,13 +25,26 @@ module PMP
 
     attr_accessor :params
 
-    def initialize(parent, link)
+    def initialize(parent=PMP::CollectionDocument.new, link={})
       super()
-      self.parent = parent || PMP::CollectionDocument.new
+      self.parent = parent
       self.params = link.delete('params') || {}
+      # puts "params: #{params.inspect}"
       parse_attributes(link)
     end
 
+    def href
+      self[:href]
+    end
+
+    def href_template
+      self[:href_template]
+    end
+
+    def method
+      self[:method]
+    end
+
     def attributes
       HashWithIndifferentAccess.new(marshal_dump)
     end
@@ -45,17 +58,28 @@ module PMP
     end
 
     def url
+      # puts "url href_template: #{href_template}"
+      # puts "url href: #{href}"
       URITemplate.new(href_template || href).expand(params)
     end
 
     def retrieve
-      @_retrieved ||= parent.request((method || 'get').to_sym, url)
+      # puts "retrieve method: #{method}"
+      # puts "retrieve url: #{url}"
+      parent.request((method || 'get').to_sym, url)
     end
 
     def method_missing(method, *args)
-      begin
-        super
-      rescue NoMethodError => err
+      # puts "mm: #{method}"
+      # this is a method the link supports, call the link
+      # if this is an assignment, assign to the link
+      # if you want to assign to a linked doc(s), need to retrieve first
+      if self.respond_to?(method)
+        self.send(method, *args)
+      elsif method.to_s.last == '='
+       super
+      else
+        # puts "mm retrieve and send: #{method}"
         self.retrieve.send(method, *args)
       end
     end

data/lib/pmp/parser.rb

@@ -11,9 +11,6 @@ module PMP
       result['links']      = extract_links
       result['attributes'] = extract_attributes
 
-      # more elegant?
-      result['attributes'].delete('items')
-
       result
     end
 
@@ -74,19 +71,16 @@ module PMP
     end
 
     def parse_link(name, info)
-
-      return parse_query_links(info) if (name.to_s == 'query')
-
       if !info.is_a?(Array)
         Link.new(self, info)
       elsif info.size == 1
         Link.new(self, info.first)
       elsif info.size > 0
-        info.map{|l| Link.new(self, l)}
+        parse_links_list(info)
       end
     end
 
-    def parse_query_links(links)
+    def parse_links_list(links)
       links.inject({}) do |results, query|
         rel = query['rels'].first
         results[rel] = Link.new(self, query)

data/lib/pmp/version.rb

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

data/spec/link_spec.rb

@@ -18,6 +18,14 @@ describe PMP::Link do
     @link.wont_be_nil
   end
 
+  it "has a parent" do
+    @link = PMP::Link.new
+    @link.parent.wont_be_nil
+
+    @link = PMP::Link.new({}, @info)
+    @link.parent.must_equal({})
+  end
+
   it "can save params to attributes" do
     @link.href.must_equal 'http://api-sandbox.pmp.io/docs/'
   end
@@ -31,7 +39,12 @@ describe PMP::Link do
   end
 
   it "gets a url based on an href string" do
-    @link.url.must_equal 'http://api-sandbox.pmp.io/docs/'
+    @link.href.must_equal 'http://api-sandbox.pmp.io/docs/'
+    @link.href_template.must_be_nil
+    @link.params.must_equal({})
+
+    url = @link.url
+    url.must_equal 'http://api-sandbox.pmp.io/docs/'
   end
 
   it "can get a link for templated href" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pmp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrew Kuklewicz