ldp 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f66622678bcc98c5f6466a33d8ff1d6203fe2e4f
-  data.tar.gz: 35bc0630a59c9c881e5b6f7c4d5c07138dda3619
+  metadata.gz: e9fff3eeeb00aa2238f94ece780c316f278afe7e
+  data.tar.gz: 64b98dd94fe94d5543effc81f2a91effcbc0a39c
 SHA512:
-  metadata.gz: 6a2d387ff7e6ccbd5c873e169c57ed49225ab6fd6b51ef783b1bd84cfac08a133ed518fb31defd5764e3be667483dde5c022a849d44394d9c08a5dde413cb27b
-  data.tar.gz: f7195ee962860939ed50c60007226d697c84e2544f897c43b926f8f971ac7406f7ab9c1facb7de01ecc11be62454f541a551cc8f2000c246d4ec28eb698841c6
+  metadata.gz: 77c0d192ad0494b4c4c0eeec7d9a453305965d4a241186fcae6157aabd8ec2150ede530cc54528d635d7eecbb0b4062436a64890a42b243688acb8a5545d1863
+  data.tar.gz: da2fee235e20c876ab531e340abd00c9c754f16fe6825b32989f7ecdc4a317d0a15fc3b22363c8f0d37424f823151bb1db91cad7f9128e3e6857d21f68faee01

data/lib/ldp.rb

@@ -18,8 +18,11 @@ module Ldp
   autoload :Orm, 'ldp/orm'
 
   class HttpError < RuntimeError; end
-  class NotFound < HttpError; end
-  class EtagMismatch < HttpError; end
+  class NotFound < HttpError; end # 404
+  class Gone < HttpError; end # 410
+  class EtagMismatch < HttpError; end # 412
+
+  class UnexpectedContentType < RuntimeError; end
 
   class << self
     def logger
@@ -27,7 +30,7 @@ module Ldp
         log.level = Logger::WARN
       end
     end
-    
+
     def instrument *args, &block
       if defined?(::ActiveSupport) && defined?(::ActiveSupport::Notifications)
         ActiveSupport::Notifications.instrument *args, &block
@@ -38,5 +41,4 @@ module Ldp
 
     attr_writer :logger
   end
-  
 end

data/lib/ldp/client/methods.rb

@@ -106,9 +106,11 @@ module Ldp::Client::Methods
       unless resp.success?
         raise case resp.status
           when 404
-            Ldp::NotFound.new(resp.body) if resp.status == 404
+            Ldp::NotFound.new(resp.body)
+          when 410
+            Ldp::Gone.new(resp.body)
           when 412
-            Ldp::EtagMismatch.new(resp.body) if resp.status == 412
+            Ldp::EtagMismatch.new(resp.body)
           else
             Ldp::HttpError.new("STATUS: #{resp.status} #{resp.body[0, 1000]}...")
           end

data/lib/ldp/response.rb

@@ -47,12 +47,19 @@ module Ldp
     # Is the response an LDP container?
     def self.container? response
       [
-        Ldp.basic_container, 
-        Ldp.direct_container, 
+        Ldp.basic_container,
+        Ldp.direct_container,
         Ldp.indirect_container
       ].any? { |x| Array(links(response)["type"]).include? x.to_s }
     end
-    
+
+    ##
+    # Is the response an LDP RDFSource?
+    #   ldp:Container is a subclass of ldp:RDFSource
+    def self.rdf_source? response
+      container?(response) || Array(links(response)["type"]).include?(Ldp.rdf_source)
+    end
+
     ##
     # Link: headers from the HTTP response
     def links
@@ -65,6 +72,12 @@ module Ldp
       Ldp::Response.resource?(self)
     end
 
+    ##
+    # Is the response an LDP rdf source?
+    def rdf_source?
+      Ldp::Response.rdf_source?(self)
+    end
+
     ##
     # Is the response an LDP container
     def container?
@@ -89,13 +102,14 @@ module Ldp
     ##
     # Is the response paginated?
     def has_page?
-      graph.has_statement? RDF::Statement.new(page_subject, RDF.type, Ldp.page)
+      rdf_source? && graph.has_statement?(RDF::Statement.new(page_subject, RDF.type, Ldp.page))
     end
 
     ##
     # Get the graph for the resource (or a blank graph if there is no metadata for the resource)
     def graph
       @graph ||= begin
+        raise UnexpectedContentType, "The resource #{page_subject} is not an RDFSource" unless rdf_source?
         graph = RDF::Graph.new
 
         if resource?

data/lib/ldp/uri.rb

@@ -8,6 +8,14 @@ module Ldp::Uri
     uri("Resource")
   end
 
+  def rdf_source
+    uri("RDFSource")
+  end
+
+  def non_rdf_source
+    uri("NonRDFSource")
+  end
+
   def container
     uri("Container")
   end
@@ -15,19 +23,19 @@ module Ldp::Uri
   def basic_container
     uri("BasicContainer")
   end
-  
+
   def direct_container
     uri("DirectContainer")
   end
-  
+
   def indirect_container
     uri("IndirectContainer")
   end
-  
+
   def contains
     uri("contains")
   end
-  
+
   def page
     uri("Page")
   end

data/lib/ldp/version.rb

@@ -1,3 +1,3 @@
 module Ldp
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/lib/ldp/client_spec.rb

@@ -21,17 +21,20 @@ describe "Ldp::Client" do
 
   let(:conn_stubs) do
     stubs = Faraday::Adapter::Test::Stubs.new do |stub|
-      stub.head('/a_resource') {[ 200 ]}  
-      stub.get('/a_resource') {[ 200, {"Link" => "<http://www.w3.org/ns/ldp#Resource>;rel=\"type\""}, simple_graph ]}
-      stub.get('/a_container') {[ 200, {"Link" => ["<http://www.w3.org/ns/ldp#Resource>;rel=\"type\"","<http://www.w3.org/ns/ldp#BasicContainer>;rel=\"type\""]}, simple_container_graph ]}
-      stub.head('/a_binary_resource') { [200]}    
-      stub.get('/a_binary_resource') { [200, {}, ""]}
+      stub.head('/a_resource') { [200] }
+      stub.get('/a_resource') { [200, {"Link" => "<http://www.w3.org/ns/ldp#Resource>;rel=\"type\""}, simple_graph] }
+      stub.get('/a_container') { [200, {"Link" => ["<http://www.w3.org/ns/ldp#Resource>;rel=\"type\"","<http://www.w3.org/ns/ldp#BasicContainer>;rel=\"type\""]}, simple_container_graph] }
+      stub.head('/a_binary_resource') { [200] }
+      stub.get('/a_binary_resource') { [200, {}, ""] }
       stub.put("/a_resource") { [204]}
-      stub.delete("/a_resource") { [204]}
-      stub.head('/a_container') {[ 200 ]}  
-      stub.post("/a_container") { [201, {"Location" => "http://example.com/a_container/subresource"}]}
+      stub.delete("/a_resource") { [204] }
+      stub.head('/a_container') { [200] }
+      stub.post("/a_container") { [201, {"Location" => "http://example.com/a_container/subresource"}] }
       stub.get("/test:1") { [200] }
       stub.get("http://test:8080/abc") { [200] }
+      stub.put("/mismatch_resource") { [412] }
+      stub.put("/conflict_resource") { [409, {}, ''] }
+      stub.get("/deleted_resource") { [410, {}, 'Gone'] }
     end
   end
 
@@ -61,7 +64,6 @@ describe "Ldp::Client" do
   end
 
   describe "get" do
-
     it "should GET content from the HTTP endpoint" do
       resp = subject.get "a_resource"
       expect(resp).to be_a_kind_of(Ldp::Response)
@@ -72,7 +74,7 @@ describe "Ldp::Client" do
     it "should accept a block to change the HTTP request" do
       expect { |b| subject.get "a_resource", &b }.to yield_control
     end
-    
+
     context "should provide convenient accessors for LDP Prefer headers" do
       it "should set the minimal header" do
         subject.get "a_resource", minimal: true do |req|
@@ -90,13 +92,13 @@ describe "Ldp::Client" do
         end
       end
     end
-    
+
     context "with an invalid relative uri" do
       it "should work" do
         subject.get "test:1"
       end
     end
-    
+
     context "with an absolute uri" do
       it "should work" do
         subject.get "http://test:8080/abc"
@@ -130,13 +132,13 @@ describe "Ldp::Client" do
 
     it "should set default Content-type" do
       subject.post "a_container", 'foo' do |req|
-        expect(req.headers).to eq({ "Content-Type" => "text/turtle" }) 
+        expect(req.headers).to eq({ "Content-Type" => "text/turtle" })
       end
     end
 
     it "should set headers" do
       subject.post "a_container", 'foo', {'Content-Type' => 'application/pdf'} do |req|
-        expect(req.headers).to eq({ "Content-Type" => "application/pdf" }) 
+        expect(req.headers).to eq({ "Content-Type" => "application/pdf" })
       end
     end
 
@@ -162,7 +164,21 @@ describe "Ldp::Client" do
 
     it "should set headers" do
       subject.put "a_resource", 'payload', {'Content-Type' => 'application/pdf'} do |req|
-        expect(req.headers).to eq({ "Content-Type" => "application/pdf" }) 
+        expect(req.headers).to eq({ "Content-Type" => "application/pdf" })
+      end
+    end
+
+    describe "error checking" do
+      it "should check for 409 errors" do
+        expect { subject.put "conflict_resource", "some-payload" }.to raise_error Ldp::HttpError
+      end
+
+      it "should check for 410 errors" do
+        expect { subject.get "deleted_resource" }.to raise_error Ldp::Gone
+      end
+
+      it "should check for 412 errors" do
+        expect { subject.put "mismatch_resource", "some-payload" }.to raise_error Ldp::EtagMismatch
       end
     end
   end
@@ -179,7 +195,7 @@ describe "Ldp::Client" do
       expect(resource).to be_a_kind_of(Ldp::Resource)
       expect(resource).to be_a_kind_of(Ldp::Container)
     end
-    
+
     it "should be a binary resource" do
       resource = subject.find_or_initialize "a_binary_resource"
       expect(resource).to be_a_kind_of(Ldp::Resource::BinarySource)

data/spec/lib/ldp/orm/orm_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe Ldp::Orm do
   subject { Ldp::Orm.new test_resource }
-  
+
   let(:simple_graph) do
     RDF::Graph.new << [RDF::URI.new(""), RDF::DC.title, "Hello, world!"]
   end
 
   let(:conn_stubs) do
     Faraday::Adapter::Test::Stubs.new do |stub|
-      stub.get('/a_resource') {[ 200, {"Link" => "<http://www.w3.org/ns/ldp#Resource>;rel=\"type\""}, simple_graph.dump(:ttl) ]}
+      stub.get('/a_resource') {[ 200, {"Link" => "<http://www.w3.org/ns/ldp#DirectContainer>;rel=\"type\", <http://www.w3.org/ns/ldp#Resource>;rel=\"type\""}, simple_graph.dump(:ttl) ]}
       stub.head('/a_resource') { [200] }
       stub.put("/a_resource") { [204]}
     end
@@ -81,7 +81,7 @@ describe Ldp::Orm do
     before do
       updated_graph = RDF::Graph.new << [RDF::URI.new(""), RDF::DC.title, "Hello again, world!"]
       conn_stubs.get('/a_resource') {[200,
-                                      {"Link" => "<http://www.w3.org/ns/ldp#Resource>;rel=\"type\"",
+                                      {"Link" => "<http://www.w3.org/ns/ldp#Resource>;rel=\"type\", <http://www.w3.org/ns/ldp#DirectContainer>;rel=\"type\"",
                                        "ETag" => "new-tag"},
                                       updated_graph.dump(:ttl)]}
     end

data/spec/lib/ldp/response_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
 describe Ldp::Response do
-  LDP_RESOURCE_HEADERS = { "Link" => "<#{Ldp.resource.to_s}>;rel=\"type\""}
+  LDP_RDF_RESOURCE_HEADERS = { "Link" => "<#{Ldp.resource.to_s}>;rel=\"type\", <#{Ldp.direct_container.to_s}>;rel=\"type\""}
+  LDP_NON_RDF_SOURCE_HEADERS = { "Link" => "<#{Ldp.resource.to_s}>;rel=\"type\", <#{Ldp.non_rdf_source.to_s}>;rel=\"type\""}
 
   let(:mock_response) { double(headers: {}, env: { url: "info:a" }) }
   let(:mock_client) { double(Ldp::Client) }
@@ -48,21 +49,30 @@ describe Ldp::Response do
       allow(mock_response).to receive(:headers).and_return(
         "Link" => [
             "<#{Ldp.resource}>;rel=\"type\""
-          ] 
+          ]
         )
-      expect(Ldp::Response.resource? mock_response).to be_truthy
+      expect(Ldp::Response.resource? mock_response).to be true
     end
   end
 
   describe "#graph" do
-    it "should parse the response body for an RDF graph" do
-      allow(mock_response).to receive(:body).and_return("<> <info:b> <info:c> .")
-      allow(mock_response).to receive(:headers).and_return(LDP_RESOURCE_HEADERS)
-      graph = subject.graph
-     
-      expect(graph).to have_subject(RDF::URI.new("info:a")) 
-      expect(graph).to have_statement RDF::Statement.new(RDF::URI.new("info:a"), RDF::URI.new("info:b"), RDF::URI.new("info:c"))
+    context "for an RDFSource (or Container)" do
+      it "should parse the response body for an RDF graph" do
+        allow(mock_response).to receive(:body).and_return("<> <info:b> <info:c> .")
+        allow(mock_response).to receive(:headers).and_return(LDP_RDF_RESOURCE_HEADERS)
+        graph = subject.graph
+
+        expect(graph).to have_subject(RDF::URI.new("info:a"))
+        expect(graph).to have_statement RDF::Statement.new(RDF::URI.new("info:a"), RDF::URI.new("info:b"), RDF::URI.new("info:c"))
+      end
+    end
 
+    context "for a NonRDFSource" do
+      it "should parse the response body for an RDF graph" do
+        allow(mock_response).to receive(:body).and_return("<> <info:b> <info:c> .")
+        allow(mock_response).to receive(:headers).and_return(LDP_NON_RDF_SOURCE_HEADERS)
+        expect { subject.graph }.to raise_error Ldp::UnexpectedContentType
+      end
     end
   end
 
@@ -81,23 +91,34 @@ describe Ldp::Response do
     end
   end
 
-  describe "#has_page" do
-    it "should see if the response has an ldp:Page statement" do
-      graph = RDF::Graph.new
-
-      graph << [RDF::URI.new('info:a'), RDF.type, Ldp.page]
-
-      allow(mock_response).to receive(:body).and_return(graph.dump(:ttl))
-      allow(mock_response).to receive(:headers).and_return(LDP_RESOURCE_HEADERS)
-
-      expect(subject).to have_page
+  describe "#has_page?" do
+    context "for an RDF Source" do
+      before do
+        allow(mock_response).to receive(:headers).and_return(LDP_RDF_RESOURCE_HEADERS)
+      end
+
+      it "should see if the response has an ldp:Page statement" do
+        graph = RDF::Graph.new
+        graph << [RDF::URI.new('info:a'), RDF.type, Ldp.page]
+        allow(mock_response).to receive(:body).and_return(graph.dump(:ttl))
+        expect(subject).to have_page
+      end
+
+      it "should be false otherwise" do
+        # allow(subject).to receive(:page_subject).and_return RDF::URI.new('info:a')
+        graph = RDF::Graph.new
+        allow(mock_response).to receive(:body).and_return(graph.dump(:ttl))
+        expect(subject).not_to have_page
+      end
     end
 
-    it "should be false otherwise" do
-      allow(subject).to receive(:page_subject).and_return RDF::URI.new('info:a')
-      allow(mock_response).to receive(:body).and_return('')
-      allow(mock_response).to receive(:headers).and_return(LDP_RESOURCE_HEADERS)
-      expect(subject).not_to have_page
+    context "with a non-rdf-source" do
+      it "should be false" do
+        # allow(subject).to receive(:page_subject).and_return RDF::URI.new('info:a')
+        # allow(mock_response).to receive(:body).and_return('')
+        allow(mock_response).to receive(:headers).and_return(LDP_NON_RDF_SOURCE_HEADERS)
+        expect(subject).not_to have_page
+      end
     end
   end
 
@@ -109,17 +130,16 @@ describe Ldp::Response do
       graph << [RDF::URI.new('info:b'), RDF.type, Ldp.page]
 
       allow(mock_response).to receive(:body).and_return(graph.dump(:ttl))
-      allow(mock_response).to receive(:headers).and_return(LDP_RESOURCE_HEADERS)
+      allow(mock_response).to receive(:headers).and_return(LDP_RDF_RESOURCE_HEADERS)
 
       expect(subject.page.count).to eq(1)
-   
     end
   end
 
   describe "#subject" do
     it "should extract the HTTP request URI as an RDF URI" do
       allow(mock_response).to receive(:body).and_return('')
-      allow(mock_response).to receive(:headers).and_return(LDP_RESOURCE_HEADERS)
+      allow(mock_response).to receive(:headers).and_return(LDP_RDF_RESOURCE_HEADERS)
       allow(mock_response).to receive(:env).and_return(:url => 'http://xyz/a')
       expect(subject.subject).to eq(RDF::URI.new("http://xyz/a"))
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldp
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday