pmp 0.2.1 → 0.2.2

data/lib/pmp.rb

@@ -20,4 +20,5 @@ require 'pmp/credential'
 require 'pmp/client'
 
 module PMP
+  extend Configuration
 end

data/lib/pmp/client.rb

@@ -27,7 +27,7 @@ module PMP
     end
 
     def doc_of_type(type, opts={})
-      doc = PMP::CollectionDocument.new(options.merge(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
     end

data/lib/pmp/collection_document.rb

@@ -39,16 +39,17 @@ module PMP
     # 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.version  = options.delete(:version) || '1.0'
-      self.href     = options.delete(:href)
 
       # if there is a doc to be had, pull it out
-      self.response = options.delete(:response)
-      self.original = options.delete(:document)
-
-      apply_configuration(options)
+      self.response = current_options.delete(:response)
+      self.original = current_options.delete(:document)
 
       yield(self) if block_given?
     end
@@ -100,14 +101,21 @@ module PMP
     end
 
     def edit_link(method)
-      # first, need the root, use the endpoint
       link = root_document.edit['urn:pmp:form:documentsave']
       raise "Edit link does not specify saving via #{method}" unless (link && link.hints.allow.include?(method))
       link
     end
 
+    def root
+      @root
+    end
+
+    def root=(r)
+      @root
+    end
+
     def root_document
-      PMP::CollectionDocument.new(options.merge(href: endpoint))
+      @root ||= PMP::CollectionDocument.new(current_options.merge(href: endpoint))
     end
 
     def loaded?
@@ -116,7 +124,7 @@ module PMP
 
     def setup_oauth_token
       if !oauth_token
-        token = PMP::Token.new(options).get_token
+        token = PMP::Token.new(current_options).get_token
         self.oauth_token = token.token
       end
     end
@@ -127,7 +135,7 @@ module PMP
       setup_oauth_token
 
       begin
-        raw = connection(options.merge({url: url})).send(method) do |request|
+        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
           end

data/lib/pmp/configuration.rb

@@ -38,20 +38,26 @@ module PMP
 
     included do
 
-      attr_accessor :options
+      attr_accessor :current_options
 
       VALID_OPTIONS_KEYS.each do |key|
         define_method "#{key}=" do |arg|
           self.instance_variable_set("@#{key}", arg)
-          self.options.merge!({:"#{key}" => arg})
+          self.current_options.merge!({:"#{key}" => arg})
         end
       end
 
     end
 
+    def options
+      options = {}
+      VALID_OPTIONS_KEYS.each { |k| options[k] = send(k) }
+      options
+    end
+
     def apply_configuration(opts={})
-      reset! unless @options
-      self.options = options.merge(opts)
+      options = PMP.options.merge(opts)
+      self.current_options = options
       VALID_OPTIONS_KEYS.each do |key|
         send("#{key}=", options[key])
       end
@@ -74,6 +80,10 @@ module PMP
       self
     end
 
+    def self.extended(base)
+      base.reset!
+    end
+
     module ClassMethods
 
       def keys

data/lib/pmp/connection.rb

@@ -34,9 +34,9 @@ module PMP
         faraday.request :url_encoded
 
         faraday.response :mashify
-        faraday.response :logger if opts[:debug]
         faraday.response :json
         faraday.response :raise_error
+        faraday.response :logger if opts[:debug]
 
         faraday.adapter opts[:adapter]
       end

data/lib/pmp/credential.rb

@@ -41,7 +41,7 @@ module PMP
         'Content-Type' => [:put, :post].include?(method) ? "application/x-www-form-urlencoded" : nil
       }
 
-      conn_opts = options.merge({headers: headers, basic_auth: true})
+      conn_opts = current_options.merge({headers: headers, basic_auth: true})
 
       raw = connection(conn_opts).send(method, url, body)
       PMP::Response.new(raw, {method: method, url: url, body: body})

data/lib/pmp/link.rb

@@ -44,7 +44,7 @@ module PMP
       self.class.new(attributes.merge({'params'=>params}), parent)
     end
 
-    def as_json
+    def as_json(options={})
       extract_attributes
     end
 
@@ -58,7 +58,7 @@ module PMP
       # puts "retrieve method: #{method}"
       # puts "retrieve url: #{url}"
       # response = parent.request((method || 'get').to_sym, url)
-      PMP::CollectionDocument.new(parent.options.merge(href: url))
+      @doc ||= PMP::CollectionDocument.new(parent.options.merge(href: url, root: parent.root))
     end
 
     def method_missing(method, *args)

data/lib/pmp/version.rb

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

data/spec/collection_document_spec.rb

@@ -170,7 +170,7 @@ describe PMP::CollectionDocument do
     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', 'User-Agent'=>'PMP Ruby Gem 0.2.0'}).
+        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"})
 
       @doc.query["urn:pmp:query:docs"].items.must_equal []

data/spec/pmp_spec.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe PMP do
+
+  it "has default configuration" do
+    PMP.options.wont_be_nil
+    PMP.options[:endpoint].must_equal "https://api.pmp.io/"
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pmp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -278,6 +278,7 @@ files:
 - README.md
 - Rakefile
 - example/permissions.rb
+- example/permissions_result.txt
 - lib/pmp.rb
 - lib/pmp/client.rb
 - lib/pmp/collection_document.rb
@@ -303,6 +304,7 @@ files:
 - spec/link_spec.rb
 - spec/links_spec.rb
 - spec/parser_spec.rb
+- spec/pmp_spec.rb
 - spec/response_spec.rb
 - spec/spec_helper.rb
 - spec/token_spec.rb
@@ -343,6 +345,7 @@ test_files:
 - spec/link_spec.rb
 - spec/links_spec.rb
 - spec/parser_spec.rb
+- spec/pmp_spec.rb
 - spec/response_spec.rb
 - spec/spec_helper.rb
 - spec/token_spec.rb