pmp 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e96a6950ad0285f1269552f82ec2ceb83abc756
-  data.tar.gz: c0d564eb5a48aa79242bba4033acff0c38c207ab
+  metadata.gz: 499ef7d634987ac1b12ec8ff9ac7c11032f3f29d
+  data.tar.gz: 731e197a1ba576417cc28d30c47ae21f9ece371b
 SHA512:
-  metadata.gz: ffef1af394ef66319065fa9d09c76211bc7a6f48bf897cc0b4b878057856b08f450bb7851786cda12709003c8ecf3faaff02543ae8fbc337acf8ac49763f582d
-  data.tar.gz: 07f5be73a5e7749597080b8c16af46e9cb6a1050e80a6b37961158dc46cd90f54adfd62392d7147166f389233a1b45f09450acc1a422b3e5235da1261ee32ddd
+  metadata.gz: 7c9da9f1703bc732ab9c5fe421a57d52a0d9fdcb57f1c3577b4aeab87164c7057867c9c94bff8224d5d6a7441ca94cc2b63f3bba698702b8027abaace538c056
+  data.tar.gz: b65cc1b02e347d3b87772cd82bd137f53b1b018a57c48bdb9ba11a28251aeb1604780e725db5a4c38d4051ba5fad1fc99eaf442200800a4f62ec2bb405dbe027

data/README.md

@@ -1,6 +1,7 @@
 # PMP gem
 
 [![Build Status](https://travis-ci.org/PRX/pmp.png)](https://travis-ci.org/PRX/pmp)
+[![Coverage Status](https://coveralls.io/repos/PRX/pmp/badge.png)](https://coveralls.io/r/PRX/pmp)
 
 Gem to make it easier to use the PMP API, which is a hypermedia API using the collection.doc+json format.
 

data/lib/pmp/client.rb

@@ -11,14 +11,17 @@ module PMP
     end
 
     def credentials(opts={})
+      @credentials = nil if (opts != {})
       @credentials ||= PMP::Credential.new(options.merge(opts))
     end
 
     def token(opts={})
+      @token = nil if (opts != {})
       @token ||= PMP::Token.new(options.merge(opts)).get_token
     end
 
     def root(opts={})
+      @root = nil if (opts != {})
       opts = options.merge(href: endpoint).merge(opts)
       @root ||= PMP::CollectionDocument.new(opts)
     end
@@ -35,5 +38,10 @@ module PMP
       "#{endpoint}profiles/#{type}"
     end
 
+    # assume you want to make a call on the root doc for stuff it can do
+    def method_missing(method, *args)
+      self.root.send(method, *args)
+    end
+
   end
 end

data/lib/pmp/collection_document.rb

@@ -55,7 +55,7 @@ module PMP
 
     def items
       load
-      @items
+      @items ||= []
     end
 
     def attributes
@@ -126,9 +126,17 @@ module PMP
 
       setup_oauth_token
 
-      raw = connection(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
+      begin
+        raw = connection(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
+        end
+      rescue Faraday::Error::ResourceNotFound=>not_found_ex
+        if (method.to_sym == :get)
+          raw = OpenStruct.new(body: nil, status: 404)
+        else
+          raise not_found_ex
         end
       end
 

data/lib/pmp/connection.rb

@@ -30,12 +30,13 @@ module PMP
           faraday.request :authorization, 'Bearer', opts[:oauth_token]
         end
 
-        faraday.request :url_encoded
         faraday.request :multipart
+        faraday.request :url_encoded
 
         faraday.response :mashify
         faraday.response :logger if opts[:debug]
         faraday.response :json
+        faraday.response :raise_error
 
         faraday.adapter opts[:adapter]
       end

data/lib/pmp/parser.rb

@@ -91,7 +91,7 @@ module PMP
     end
 
     def parse_items(document)
-      self.items = Array(document).collect{|i| PMP::CollectionDocument.new(document:i)}
+      self.items = Array(document).collect{|i| PMP::CollectionDocument.new(options.merge(document:i))}
     end
 
   end

data/lib/pmp/response.rb

@@ -8,20 +8,20 @@ module PMP
       @raw     = raw
       @request = request
 
-      check_for_error(raw)
+      # check_for_error(raw)
     end
 
-    def check_for_error(response)
-      status_code_type = response.status.to_s[0]
-      case status_code_type
-      when "2"
-        # puts "all is well, status: #{response.status}"
-      when "4", "5"
-        raise "Whoops, error back from PMP: #{response.status}"
-      else
-        raise "Unrecongized status code: #{response.status}"
-      end
-    end
+    # def check_for_error(response)
+    #   status_code_type = response.status.to_s[0]
+    #   case status_code_type
+    #   when "2"
+    #     # puts "all is well, status: #{response.status}"
+    #   when "4", "5"
+    #     raise "Whoops, error back from PMP: #{response.status}"
+    #   else
+    #     raise "Unrecongized status code: #{response.status}"
+    #   end
+    # end
 
     def body
       self.raw.body

data/lib/pmp/version.rb

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

data/pmp.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('guard-bundler')
   gem.add_development_dependency('guard-minitest')
   gem.add_development_dependency('simplecov')
+  gem.add_development_dependency('coveralls')
 
   gem.add_runtime_dependency('faraday')
   gem.add_runtime_dependency('faraday_middleware')

data/spec/client_spec.rb

@@ -21,7 +21,6 @@ describe PMP::Client do
   end
 
   it "root doc can be loaded" do
-
     root_doc =  json_file(:collection_root)
 
     stub_request(:get, "https://api.pmp.io/").
@@ -32,6 +31,17 @@ describe PMP::Client do
     @root.creator.must_be_instance_of PMP::Link
   end
 
+  it "calls the root doc when client does not have method" 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'}).
+      to_return(:status => 200, :body => root_doc, :headers => {})
+
+    @pmp.creator.must_be_instance_of PMP::Link    
+  end
+
+
   it "gets a credentials object" do
     @pmp.credentials.wont_be_nil
   end

data/spec/collection_document_spec.rb

@@ -100,6 +100,25 @@ describe PMP::CollectionDocument do
       @doc.oauth_token.must_equal 'thisisatesttoken'
     end
 
+    it "should should get oauth_token if missing" do
+
+      response_body = {
+        access_token: 'thisisalsoatesttoken',
+        token_type: "Bearer",
+        token_issue_date: DateTime.now,
+        token_expires_in: 24*60*60
+      }.to_json
+
+      stub_request(:post, "https://api.pmp.io/auth/access_token").
+        with(:body => {"grant_type"=>"client_credentials"},
+             :headers => {'Accept'=>'application/json', 'Authorization'=>'Basic Og==', 'Content-Type'=>'application/x-www-form-urlencoded', 'Host'=>'api.pmp.io:443'}).
+        to_return(:status => 200, :body => response_body, :headers => {'Content-Type' => 'application/json; charset=utf-8'})
+
+      @doc.oauth_token = nil
+      @doc.setup_oauth_token
+      @doc.oauth_token.must_equal 'thisisalsoatesttoken'
+    end
+
     it "should load" do
       @doc.wont_be :loaded
       @doc.load
@@ -148,6 +167,15 @@ describe PMP::CollectionDocument do
       queries["urn:pmp: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', 'User-Agent'=>'PMP Ruby Gem 0.2.0'}).
+        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 []
+    end
+
   end
 
   describe 'persistence' do

data/spec/response_spec.rb

@@ -18,11 +18,15 @@ describe PMP::Response do
     response = PMP::Response.new(@raw, @request)
   end
 
-  it "can raise an error" do
-    raw = Minitest::Mock.new
-    raw.expect(:status, 500).expect(:status, 500)
-    proc{ PMP::Response.new(raw, @request) }.must_raise RuntimeError
-  end
+  # it "can raise an error" do
+  #   raw = Minitest::Mock.new
+  #   raw.expect(:status, 500).expect(:status, 500)
+  #   proc{ PMP::Response.new(raw, @request) }.must_raise RuntimeError
+
+  #   raw = Minitest::Mock.new
+  #   raw.expect(:status, 600).expect(:status, 600)
+  #   proc{ PMP::Response.new(raw, @request) }.must_raise RuntimeError
+  # end
 
   it "can return body" do
     @raw.expect(:body, {foo: 'bar'})

data/spec/spec_helper.rb

@@ -1,7 +1,13 @@
 # -*- encoding: utf-8 -*-
 
 require 'simplecov'
+require 'coveralls'
+
 SimpleCov.command_name 'Unit Tests'
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
 SimpleCov.start
 
 require 'minitest'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pmp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew Kuklewicz
@@ -136,6 +136,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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: faraday
   requirement: !ruby/object:Gem::Requirement