ldp 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe92f6866205a3b27b56215e6f55184f38dd9dfa
-  data.tar.gz: 5b92b3da6682fa7d5fc329a79c42acf198294d57
+  metadata.gz: 5891836d3638c426292b938c2e815bc78963a486
+  data.tar.gz: e846d7a47515ee66db76b539979b01024b39f56d
 SHA512:
-  metadata.gz: 746f3dac610884ad80e1db2cb0b6924c63891e4731a2efd1f5c77285eb3cf7aee3c3e153216570ef8f0cfa756e021b87dadca32d30a9f3c51b9e13e4ec2e8bdc
-  data.tar.gz: 1fe3736a07b3bac70583327dbc3a1ceb1a60c5438ce52c21e0c815f9b8f21118c8487e7a1ffc22d957132be343a5ba0bf22f3d3c46bd868f2beab0bca2358610
+  metadata.gz: f82a7c37efd44e165cfba252c64073255d805074ba78e92a3a5ea2d988407b13987b9947614102b120b006578a15ddb43f68e30904cdcc006765ab79c48dec36
+  data.tar.gz: 44771b0779cbd68c5c0f8b2917176ca9de4a36290b3d433318bf859b77688e1e6164e28150af0ee3a66612ea304944ce235c886ffd5f93f8ac7cb626645e1bb7

data/lib/ldp.rb

@@ -1,6 +1,7 @@
 require 'ldp/version'
 require 'linkeddata'
 require 'logger'
+require 'singleton'
 
 module Ldp
   RDF::Graph.send(:include, RDF::Isomorphic)
@@ -17,12 +18,20 @@ module Ldp
   autoload :Orm, 'ldp/orm'
 
   class HttpError < RuntimeError; end
+  class BadRequest < HttpError; end # 400
   class NotFound < HttpError; end # 404
   class Gone < HttpError; end # 410
   class EtagMismatch < HttpError; end # 412
 
   class UnexpectedContentType < RuntimeError; end
 
+  # Returned when there is no result (e.g. 404)
+  class NoneClass
+    include Singleton
+  end
+  # The single global instance of NoneClass, representing the empty Option
+  None = NoneClass.instance # :doc:
+
   class << self
     def logger
       @logger ||= Logger.new(STDOUT).tap do |log|

data/lib/ldp/client/methods.rb

@@ -105,6 +105,14 @@ module Ldp::Client::Methods
     resp.tap do |resp|
       unless resp.success?
         raise case resp.status
+          when 400
+            if resp.env.method == :head
+              # If the request was a HEAD request (which only retrieves HTTP headers),
+              # re-run it as a GET in order to retrieve a message body (which is passed on as the error message)
+              get(resp.env.url.path)
+            else
+              Ldp::BadRequest.new(resp.body)
+            end
           when 404
             Ldp::NotFound.new(resp.body)
           when 410

data/lib/ldp/resource.rb

@@ -28,9 +28,7 @@ module Ldp
     ##
     # Is the resource new, or does it exist in the LDP server?
     def new?
-      subject.nil? || !head
-    rescue Ldp::NotFound
-      true
+      subject.nil? || head == None
     end
 
     ##
@@ -46,7 +44,11 @@ module Ldp
     end
 
     def head
-      @head ||= @get || client.head(subject)
+      @head ||= begin
+        @get || client.head(subject)
+      rescue Ldp::NotFound
+        None
+      end
     end
 
     ##

data/lib/ldp/version.rb

@@ -1,3 +1,3 @@
 module Ldp
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/lib/ldp/resource_spec.rb

@@ -5,6 +5,8 @@ describe Ldp::Resource do
 
   let(:conn_stubs) do
     stubs = Faraday::Adapter::Test::Stubs.new do |stub|
+      stub.head('/bad_request_resource') { [400] }  # HEAD requests do not have message bodies.
+      stub.get('/bad_request_resource') { [400, {}, "The namespace prefix (fooooooo) has not been registered"] }
       stub.head('/not_found_resource') { [404] }
       stub.get('/not_found_resource') { [404] }
       stub.head('/a_new_resource') { [404] }
@@ -31,6 +33,16 @@ describe Ldp::Resource do
         expect{ subject.get }.to raise_error Ldp::NotFound
       end
     end
+    context "when the request is bad" do
+      let(:path) { '/bad_request_resource' }
+      it "should return a meaningful error message" do
+        # Ensures that failed head requests rerun as a GET request in order to get a meaningful error message
+        expect{ subject.head }.to raise_error Ldp::BadRequest, "The namespace prefix (fooooooo) has not been registered"
+      end
+      it "should raise an error with error message" do
+        expect{ subject.get }.to raise_error Ldp::BadRequest, "The namespace prefix (fooooooo) has not been registered"
+      end
+    end
 
     context "when the resource is in the repository" do
       let(:path) { '/a_resource' }
@@ -40,23 +52,37 @@ describe Ldp::Resource do
       end
     end
   end
-  
+
   describe "#new?" do
     context "with an object not in the repository" do
       let(:path) { '/not_found_resource' }
-      it "should be true" do  
+      it "should be true" do
         expect(subject).to be_new
       end
     end
-    
+
     context "with an object in the repository" do
       let(:path) { '/a_resource' }
-      it "should be false" do  
+      it "should be false" do
         expect(subject).to_not be_new
       end
     end
   end
-  
+
+  describe "#head" do
+    context "with an object not in the repository" do
+      let(:path) { '/not_found_resource' }
+      it "should be true" do
+        expect(subject.head).to eq Ldp::None
+      end
+
+      it "should cache requests" do
+        expect(subject.client).to receive(:head).and_raise(Ldp::NotFound).once
+        2.times { subject.head }
+      end
+    end
+  end
+
   describe "#create" do
     let(:path) { '/a_new_resource' }
     context "with a subject uri" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday