pmp 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccd9974d908a4e63fce21f4e629dba99d8ffb964
-  data.tar.gz: da91fd91c23b1c07091ded1f7f60d504c552e2a7
+  metadata.gz: e20dca7592de10022ded2bda390f2e172bc8f026
+  data.tar.gz: 704f4900aa8ebcb8af896682a2f3ed743f669fc0
 SHA512:
-  metadata.gz: e57d28e41caf69a6d76732d59d8c0f05e5e0c0c1f61551fa5df046b4c945301e988dab00724ebc868b9ff144374dc01f3d86eb1919695103ca6216bfa1b96e54
-  data.tar.gz: 39a229cd3c8f8f7d2fca39e3b9f7a3fc880a8d286c307af0b7b403ed389544c310e9063cd6ab898ee151ee4b76715204b95254bb11a6cdcdfc35667e1bd98bea
+  metadata.gz: c01ba49f3108680b8353355de2a5e4c4a646816e82a699bb00f0895e7513e074582e5ad3615f96545fb91923a7041e75c5c457cadffd5c3ee18d63d1ddf452df
+  data.tar.gz: ebb7db14d83f8b167c12df7552b5c662d635e0fe95e43e0e4321a4b3aaabec9c5012a87aa8f488b37172fbc6acb2bf0b4d01c019251058e62805e8fa13ddd8da

data/README.md

@@ -2,6 +2,7 @@
 
 [![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)
+[![Code Climate](https://codeclimate.com/github/PRX/pmp.png)](https://codeclimate.com/github/PRX/pmp)
 [![Dependency Status](https://gemnasium.com/PRX/pmp.png)](https://gemnasium.com/PRX/pmp)
 [![Gem Version](https://badge.fury.io/rb/pmp.png)](http://badge.fury.io/rb/pmp)
 

data/lib/pmp/connection.rb

@@ -25,24 +25,26 @@ module PMP
       opts = process_options(options)
       Faraday::Connection.new(opts) do |faraday|
 
-        if opts[:basic_auth] && opts[:user] && opts[:password]
-          faraday.request :basic_auth, opts[:user], opts[:password]
-        elsif opts[:oauth_token]
-          faraday.request :authorization, opts[:token_type], opts[:oauth_token]
-        end
+        add_request_auth(opts, faraday)
 
-        faraday.request :multipart
-        faraday.request :url_encoded
+        [:multipart, :url_encoded].each{|mw| faraday.request(mw) }
+
+        [:mashify, :json, :raise_error].each{|mw| faraday.response(mw) }
 
-        faraday.response :mashify
-        faraday.response :json
-        faraday.response :raise_error
         faraday.response :logger if opts[:debug]
 
         faraday.adapter opts[:adapter]
       end
     end
 
+    def add_request_auth(opts, faraday)
+      if opts[:basic_auth] && opts[:user] && opts[:password]
+        faraday.request :basic_auth, opts[:user], opts[:password]
+      elsif opts[:oauth_token]
+        faraday.request :authorization, opts[:token_type], opts[:oauth_token]
+      end
+    end
+
     def process_options(opts={})
       headers = opts.delete(:headers) || {}
       options = {

data/lib/pmp/link.rb

@@ -69,8 +69,6 @@ module PMP
       method_last = method.to_s.last
       if method_last == '='
        super
-      elsif self.respond_to?(method)
-        self.send(method, *args)
       else
         # puts "mm retrieve and send: #{method}"
         self.retrieve.send(method, *args)

data/lib/pmp/token.rb

@@ -36,13 +36,13 @@ module PMP
     def connection_options(opts={})
       headers = opts.delete(:headers) || {}
       options = {
-        :headers => {
+        headers: {
           'User-Agent'   => opts[:user_agent],
           'Accept'       => 'application/json',
           'Content-Type' => 'application/x-www-form-urlencoded'
         },
-        :ssl => {:verify => false},
-        :url => opts[:endpoint]
+        ssl: {:verify => false},
+        url: opts[:endpoint]
       }.merge(opts)
       options[:headers] = options[:headers].merge(headers)
 

data/lib/pmp/version.rb

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

data/spec/collection_document_spec.rb

@@ -194,7 +194,26 @@ describe PMP::CollectionDocument do
       doc.test.must_equal link
     end
 
-    it "can save a new record" do
+    it "can save a record" 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'}).
+        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'}).
+        to_return(:status => 404, :body => '{"error":"FAIL"}')
+
+      doc = PMP::CollectionDocument.new(oauth_token: 'thisisatestvalueonly')
+      doc.guid = "c144e4df-021b-41e6-9cf3-42ac49bcbd42"
+      doc.title = "testing"
+      proc{ doc.save }.must_raise Faraday::Error::ResourceNotFound
+    end
+
+    it "should handle 404 results on a save" do
 
       # stub getting the root doc
       root_doc =  json_file(:collection_root)
@@ -212,6 +231,11 @@ describe PMP::CollectionDocument do
       doc.title = "testing"
       doc.save
       doc.href.must_equal "https://api-sandbox.pmp.io/docs/c144e4df-021b-41e6-9cf3-42ac49bcbd42"
+
+      doc.title.must_equal "testing"
+      doc.title = "testing an update"
+      doc.save
+      doc.title.must_equal "testing an update"
     end
 
     it "can delete a record" do

data/spec/fixtures/collection_links.json

@@ -0,0 +1,36 @@
+{
+  "version": "1.0",
+  "attributes": {
+    "guid": "f84e9018-5c21-4b32-93f8-d519308620f0",
+    "title": "Peers Find Less Pressure Borrowing From Each Other",
+    "published": "2013-05-10T15:17:00.598Z",
+    "valid": {
+      "from": "2013-05-10T15:17:00.598Z",
+      "to": "2213-05-10T15:17:00.598Z"
+    },
+    "byline": "by SOME PERSON",
+    "hreflang": "en",
+    "description": "",
+    "contentencoded": "...",
+    "contenttemplated": "..."
+  },
+  "items": [],
+  "links": {
+    "profile": [
+      {
+        "href": "http://api-sandbox.pmp.io/profiles/story"
+      }
+    ],
+    "self": {
+      "href": "http://api-sandbox.pmp.io/docs/f84e9018-5c21-4b32-93f8-d519308620f0"
+    },
+    "collection": [
+      {
+        "href": "http://api-sandbox.pmp.io/docs/"
+      }
+    ],
+    "queries": [],
+    "edit-form": []
+  },
+  "error": {}
+}

data/spec/parser_spec.rb

@@ -28,6 +28,12 @@ describe PMP::Parser do
     tc.parse(nil)
   end
 
+  it "will parse links without array comtainer" do
+    tc = TestParser.new
+    tc.parse(json_fixture(:collection_links))
+    tc.links['self'].href.must_equal "http://api-sandbox.pmp.io/docs/f84e9018-5c21-4b32-93f8-d519308620f0"
+  end
+
   it "will un-parse to hash for json serialization" do
     tc = TestParser.new
     tc.parse(json_fixture(:collection_basic))
@@ -45,5 +51,13 @@ describe PMP::Parser do
     tc.query.keys.sort.must_equal ["urn:pmp:hreftpl:docs", "urn:pmp:hreftpl:profiles", "urn:pmp:hreftpl:schemas", "urn:pmp:query:docs", "urn:pmp:query:groups", "urn:pmp:query:guids", "urn:pmp:query:users"]
   end
 
+  it "will unparse links" do
+    tc = TestParser.new
+    tc.parse(json_fixture(:collection_root))
+    tc.links['test1'] = PMP::Link.new(href: 'https://api-sandbox.pmp.io/test1')
+    tc.links['test2'] = [PMP::Link.new(href: 'https://api-sandbox.pmp.io/test2a'), PMP::Link.new(href: 'https://api-sandbox.pmp.io/test2b')]
+    hash = tc.as_json
+    hash['links'].keys.sort.must_equal ["creator", "edit", "navigation", "query", "test1", "test2"]
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pmp
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Andrew Kuklewicz
@@ -299,6 +299,7 @@ files:
 - spec/connection_spec.rb
 - spec/credential_spec.rb
 - spec/fixtures/collection_basic.json
+- spec/fixtures/collection_links.json
 - spec/fixtures/collection_query.json
 - spec/fixtures/collection_root.json
 - spec/link_spec.rb
@@ -340,6 +341,7 @@ test_files:
 - spec/connection_spec.rb
 - spec/credential_spec.rb
 - spec/fixtures/collection_basic.json
+- spec/fixtures/collection_links.json
 - spec/fixtures/collection_query.json
 - spec/fixtures/collection_root.json
 - spec/link_spec.rb