ldp 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99bebef6b32281c8905d392e0f0fa8d721e68261
-  data.tar.gz: 5433d136b94341c604498c9ba2e48beeb0e7339c
+  metadata.gz: 53b76804d5ae9a00e6d4801434481e5054b451ce
+  data.tar.gz: c63c931afd361d37207d88b336daf8c23e5db197
 SHA512:
-  metadata.gz: bb175075b93c4d285900ce7699e905e191711cede50853e55b633c79f001e1f40a468eefcedf49ce02c4e4cc207d548f5802574d0d781718cf348df6bcdb2552
-  data.tar.gz: b3ffc95e6771ba09ebfeb679da4a4351bbb1de5cfbfb382919c16780da40712f41dfcef8f0ae2a73f546961f515b7dcbaf79779a49494a0f7ffeb345a7e4ff07
+  metadata.gz: 724f8bda3e97e7fc24dcea133072b6d754ccfb40112edae54973b39f35878619e2973f920308cfa52ae87795ae7a6ffd125a68199a224cd8b625f9f574dd6b62
+  data.tar.gz: 0309e7ff339a512828c5c065bd6ff26bed7a283e2b457f3e9ca8e4d57504f73ce6efc6ed76df21433aeb527cb049022e7efddacb3e07f4264edd8e019f9a0d7a

data/lib/ldp.rb

@@ -20,6 +20,7 @@ module Ldp
   class HttpError < RuntimeError; end
   class BadRequest < HttpError; end # 400
   class NotFound < HttpError; end # 404
+  class Conflict < HttpError; end # 409
   class Gone < HttpError; end # 410
   class EtagMismatch < HttpError; end # 412
 

data/lib/ldp/client/methods.rb

@@ -14,92 +14,105 @@ module Ldp::Client::Methods
   end
 
   def head url
-    logger.debug "LDP: HEAD [#{url}]"
-    resp = http.head do |req|
-      req.url munge_to_relative_url(url)
+    ActiveSupport::Notifications.instrument("http.ldp",
+                 url: url, name: "HEAD", ldp_client: object_id) do
+      resp = http.head do |req|
+        req.url munge_to_relative_url(url)
 
-      yield req if block_given?
-    end
+        yield req if block_given?
+      end
 
-    check_for_errors(resp)
+      check_for_errors(resp)
+    end
   end
 
   # Get a LDP Resource by URI
   def get url, options = {}
-    logger.debug "LDP: GET [#{url}]"
-    resp = http.get do |req|
-      req.url munge_to_relative_url(url)
-      prefer_headers = ::Ldp::PreferHeaders.new
+    ActiveSupport::Notifications.instrument("http.ldp",
+                 url: url, name: "GET", ldp_client: object_id) do
+      resp = http.get do |req|
+        req.url munge_to_relative_url(url)
+        prefer_headers = ::Ldp::PreferHeaders.new
+
+        if options[:minimal]
+          prefer_headers.return = "minimal"
+        else
+          prefer_headers.return = "representation"
+          includes = Array(options[:include]).map { |x| Ldp.send("prefer_#{x}") if Ldp.respond_to? "prefer_#{x}" }
+          omits = Array(options[:omit]).map { |x| Ldp.send("prefer_#{x}") if Ldp.respond_to? "prefer_#{x}" }
+          prefer_headers.include = includes
+          prefer_headers.omit = omits
+        end
+        req.headers["Prefer"] = prefer_headers.to_s
+
+        yield req if block_given?
+      end
 
-      if options[:minimal]
-        prefer_headers.return = "minimal"
+      if Ldp::Response.resource? resp
+        Ldp::Response.wrap self, resp
       else
-        prefer_headers.return = "representation"
-        includes = Array(options[:include]).map { |x| Ldp.send("prefer_#{x}") if Ldp.respond_to? "prefer_#{x}" }
-        omits = Array(options[:omit]).map { |x| Ldp.send("prefer_#{x}") if Ldp.respond_to? "prefer_#{x}" }
-        prefer_headers.include = includes
-        prefer_headers.omit = omits
+        resp
       end
-      req.headers["Prefer"] = prefer_headers.to_s
 
-      yield req if block_given?
+      check_for_errors(resp)
     end
-
-    if Ldp::Response.resource? resp
-      Ldp::Response.wrap self, resp
-    else
-      resp
-    end
-
-    check_for_errors(resp)
   end
 
   # Delete a LDP Resource by URI
   def delete url
-    logger.debug "LDP: DELETE [#{url}]"
-    resp = http.delete do |req|
-      req.url munge_to_relative_url(url)
-      yield req if block_given?
-    end
+    ActiveSupport::Notifications.instrument("http.ldp",
+                 url: url, name: "DELETE", ldp_client: object_id) do
+      resp = http.delete do |req|
+        req.url munge_to_relative_url(url)
+        yield req if block_given?
+      end
 
-    check_for_errors(resp)
+      check_for_errors(resp)
+    end
   end
 
   # Post TTL to an LDP Resource
   def post url, body = nil, headers = {}
-    logger.debug "LDP: POST [#{url}]"
-    resp = http.post do |req|
-      req.url munge_to_relative_url(url)
-      req.headers.merge!(default_headers).merge!(headers)
-      req.body = body
-      yield req if block_given?
+    ActiveSupport::Notifications.instrument("http.ldp",
+                 url: url, name: "POST", ldp_client: object_id) do
+      resp = http.post do |req|
+        req.url munge_to_relative_url(url)
+        req.headers.merge!(default_headers).merge!(headers)
+        req.body = body
+        yield req if block_given?
+      end
+      check_for_errors(resp)
     end
-    check_for_errors(resp)
   end
 
   # Update an LDP resource with TTL by URI
   def put url, body, headers = {}
-    logger.debug "LDP: PUT [#{url}]"
-    resp = http.put do |req|
-      req.url munge_to_relative_url(url)
-      req.headers.merge!(default_headers).merge!(headers)
-      req.body = body
-      yield req if block_given?
+    ActiveSupport::Notifications.instrument("http.ldp",
+                 url: url, name: "PUT", ldp_client: object_id) do
+      resp = http.put do |req|
+        req.url munge_to_relative_url(url)
+        req.headers.merge!(default_headers).merge!(headers)
+        req.body = body
+        yield req if block_given?
+      end
+      check_for_errors(resp)
     end
-    check_for_errors(resp)
   end
 
   # Update an LDP resource with TTL by URI
   def patch url, body, headers = {}
-    logger.debug "LDP: PATCH [#{url}]"
-    resp = http.patch do |req|
-      req.url munge_to_relative_url(url)
-      req.headers.merge!(default_patch_headers).merge!(headers)
-      req.body = body
-      yield req if block_given?
+    ActiveSupport::Notifications.instrument("http.ldp",
+                 url: url, name: "PATCH", ldp_client: object_id) do
+      resp = http.patch do |req|
+        req.url munge_to_relative_url(url)
+        req.headers.merge!(default_patch_headers).merge!(headers)
+        req.body = body
+        yield req if block_given?
+      end
+      check_for_errors(resp)
     end
-    check_for_errors(resp)
   end
+
   private
 
   def check_for_errors resp
@@ -116,6 +129,8 @@ module Ldp::Client::Methods
             end
           when 404
             Ldp::NotFound.new(resp.body)
+          when 409
+            Ldp::Conflict.new(resp.body)
           when 410
             Ldp::Gone.new(resp.body)
           when 412

data/lib/ldp/version.rb

@@ -1,3 +1,3 @@
 module Ldp
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/lib/ldp/client_spec.rb

@@ -34,6 +34,7 @@ describe "Ldp::Client" do
       stub.get("/test:1") { [200] }
       stub.get("http://test:8080/abc") { [200] }
       stub.put("/mismatch_resource") { [412] }
+      stub.put("/forbidden_resource") { [403, {}, ''] }
       stub.put("/conflict_resource") { [409, {}, ''] }
       stub.get("/deleted_resource") { [410, {}, 'Gone'] }
     end
@@ -72,6 +73,15 @@ describe "Ldp::Client" do
       expect(resp.resource?).to be true
     end
 
+    it "is instrumented" do
+      vals = []
+      ActiveSupport::Notifications.subscribe('http.ldp') do |name, start, finish, id, payload|
+        vals << payload[:name]
+      end
+      subject.get "a_resource"
+      expect(vals).to eq ['GET']
+    end
+
     it "should accept a block to change the HTTP request" do
       expect { |b| subject.get "a_resource", &b }.to yield_control
     end
@@ -113,6 +123,15 @@ describe "Ldp::Client" do
       expect(resp.status).to eq(204)
     end
 
+    it "is instrumented" do
+      vals = []
+      ActiveSupport::Notifications.subscribe('http.ldp') do |name, start, finish, id, payload|
+        vals << payload[:name]
+      end
+      subject.delete "a_resource"
+      expect(vals).to eq ['DELETE']
+    end
+
     it "should accept a block to change the HTTP request" do
       expect { |b| subject.delete "a_resource", &b }.to yield_control
     end
@@ -125,6 +144,15 @@ describe "Ldp::Client" do
       expect(resp.headers[:Location]).to eq("http://example.com/a_container/subresource")
     end
 
+    it "is instrumented" do
+      vals = []
+      ActiveSupport::Notifications.subscribe('http.ldp') do |name, start, finish, id, payload|
+        vals << payload[:name]
+      end
+      subject.post "a_container"
+      expect(vals).to eq ['POST']
+    end
+
     it "should set content" do
       subject.post "a_container", 'foo' do |req|
         expect(req.body).to eq 'foo'
@@ -166,6 +194,15 @@ describe "Ldp::Client" do
       expect(resp.status).to eq(204)
     end
 
+    it "is instrumented" do
+      vals = []
+      ActiveSupport::Notifications.subscribe('http.ldp') do |name, start, finish, id, payload|
+        vals << payload[:name]
+      end
+      subject.put "a_resource", "some-payload"
+      expect(vals).to eq ['PUT']
+    end
+
     it "should accept a block to change the HTTP request" do
       expect { |b| subject.put "a_resource", "some-payload", &b }.to yield_control
     end
@@ -177,15 +214,19 @@ describe "Ldp::Client" do
     end
 
     describe "error checking" do
-      it "should check for 409 errors" do
-        expect { subject.put "conflict_resource", "some-payload" }.to raise_error Ldp::HttpError
+      it "checks for other kinds of 4xx errors" do
+        expect { subject.put "forbidden_resource", "some-payload" }.to raise_error Ldp::HttpError
+      end
+
+      it "checks for 409 errors" do
+        expect { subject.put "conflict_resource", "some-payload" }.to raise_error Ldp::Conflict
       end
 
-      it "should check for 410 errors" do
+      it "checks for 410 errors" do
         expect { subject.get "deleted_resource" }.to raise_error Ldp::Gone
       end
 
-      it "should check for 412 errors" do
+      it "checks for 412 errors" do
         expect { subject.put "mismatch_resource", "some-payload" }.to raise_error Ldp::EtagMismatch
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldp
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Linked Data Platform client library
@@ -183,4 +183,3 @@ test_files:
 - spec/lib/ldp/resource_spec.rb
 - spec/lib/ldp/response_spec.rb
 - spec/spec_helper.rb
-has_rdoc: