ldp 0.4.1 → 0.5.0

data/lib/ldp/version.rb

@@ -1,3 +1,3 @@
 module Ldp
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/spec/lib/integration/integration_spec.rb

@@ -1,5 +1,54 @@
 require 'spec_helper'
+require 'capybara_discoball'
+require 'derby/server'
 
-describe "Integration tests" do
+describe 'Integration tests' do
+  let!(:derby_server) do
+    Capybara::Discoball::Runner.new(Derby::Server).boot
+  end
 
-end
+  let(:debug) { ENV.fetch('DEBUG', false) }
+
+  let(:client) do
+    Faraday.new(url: derby_server) do |faraday|
+      faraday.response :logger if debug
+      faraday.adapter Faraday.default_adapter
+    end
+  end
+
+  subject { Ldp::Client.new client }
+
+  it 'creates resources' do
+    subject.put '/rdf_source', ''
+    obj = subject.find_or_initialize('/rdf_source')
+    expect(obj).to be_a_kind_of Ldp::Resource::RdfSource
+  end
+
+  it 'creates binary resources' do
+    Ldp::Resource::BinarySource.new(subject, '/binary_source', 'abcdef').create
+
+    obj = subject.find_or_initialize('binary_source')
+    expect(obj).to be_a_kind_of Ldp::Resource::BinarySource
+  end
+
+  it 'creates basic containers' do
+    Ldp::Container::Basic.new(subject, '/basic_container').create
+    obj = subject.find_or_initialize('/basic_container')
+    expect(obj).not_to be_new
+    expect(obj).to be_a_kind_of Ldp::Container::Basic
+  end
+
+  it 'creates direct containers' do
+    Ldp::Container::Direct.new(subject, '/direct_container').create
+    obj = subject.find_or_initialize('/direct_container')
+    expect(obj).not_to be_new
+    expect(obj).to be_a_kind_of Ldp::Container::Direct
+  end
+
+  it 'creates indirect containers' do
+    Ldp::Container::Indirect.new(subject, '/indirect_container').create
+    obj = subject.find_or_initialize('/indirect_container')
+    expect(obj).not_to be_new
+    expect(obj).to be_a_kind_of Ldp::Container::Indirect
+  end
+end

data/spec/lib/ldp/client_spec.rb

@@ -6,16 +6,8 @@ describe "Ldp::Client" do
     graph.dump(:ttl)
   end
 
-
-  let(:paginatedGraph) do
-    graph = RDF::Graph.new << [RDF::URI.new(""), RDF::DC.title, "Hello, world!"]
-    graph << [RDF::URI.new("?firstPage"), RDF.type, Ldp.page]
-    graph << [RDF::URI.new("?firstPage"), Ldp.page_of, RDF::URI.new("")]
-    graph.dump(:ttl)
-  end
-
   let(:simple_container_graph) do
-    graph = RDF::Graph.new << [RDF::URI.new(""), RDF.type, Ldp.container]
+    graph = RDF::Graph.new << [RDF::URI.new(""), RDF.type, RDF::Vocab::LDP.Container]
     graph.dump(:ttl)
   end
 
@@ -63,6 +55,23 @@ describe "Ldp::Client" do
       client = Ldp::Client.new "http://example.com"
       expect(client.http.host).to eq("example.com")
     end
+
+    it 'accepts a connection and client options' do
+      conn = Faraday.new "http://example.com"
+      client = Ldp::Client.new conn, omit_ldpr_interaction_model: true
+      expect(client.http).to eq(conn)
+      expect(client.options[:omit_ldpr_interaction_model]).to eq true
+    end
+
+    it 'raises an ArgumentError with bad arguments' do
+      expect { Ldp::Client.new(nil, nil, nil) }.to raise_error ArgumentError
+    end
+  end
+
+  describe '#logger' do
+    it 'inherits the upstream logger' do
+      expect(subject.logger).to eq Ldp.logger
+    end
   end
 
   describe "get" do
@@ -94,12 +103,12 @@ describe "Ldp::Client" do
       end
       it "should set the include parameter" do
         subject.get "a_resource", include: "membership" do |req|
-          expect(req.headers["Prefer"]).to match "include=\"#{Ldp.prefer_membership}\""
+          expect(req.headers["Prefer"]).to match "include=\"#{RDF::Vocab::LDP.PreferMembership}\""
         end
       end
       it "should set the omit parameter" do
         subject.get "a_resource", omit: "containment" do |req|
-          expect(req.headers["Prefer"]).to match "omit=\"#{Ldp.prefer_containment}\""
+          expect(req.headers["Prefer"]).to match "omit=\"#{RDF::Vocab::LDP.PreferContainment}\""
         end
       end
     end

data/spec/lib/ldp/resource/binary_source_spec.rb

@@ -11,4 +11,29 @@ describe Ldp::Resource::BinarySource do
     expect(subject.inspect).not_to match /somecontent/
   end
 
+  describe '#described_by' do
+    context 'without a description' do
+      before do
+        allow(client).to receive(:head).and_return(double(links: { }))
+      end
+
+      it 'retrieves the description object' do
+        expect(subject.described_by).to eq nil
+      end
+    end
+
+    context 'with a description' do
+      before do
+        allow(client).to receive(:head).and_return(double(links: { 'describedby' => ['http://example.com/foo/bar/desc']}))
+        allow(client).to receive(:find_or_initialize).with('http://example.com/foo/bar/desc').and_return(desc)
+      end
+
+      let(:desc) { double }
+
+      it 'retrieves the description object' do
+        expect(subject.described_by).to eq desc
+      end
+    end
+  end
+
 end

data/spec/lib/ldp/resource/rdf_source_spec.rb

@@ -46,6 +46,30 @@ describe Ldp::Resource::RdfSource do
       created_resource = obj.create
       expect(created_resource).to be_kind_of Ldp::Resource::RdfSource
     end
+
+    describe 'basic containers' do
+      it 'sends the requested interaction model' do
+        obj = Ldp::Container::Basic.new mock_client, "http://my.ldp.server/abs_url_object"
+        created_resource = obj.create
+        expect(created_resource).to be_kind_of Ldp::Container::Basic
+      end
+    end
+
+    describe 'direct containers' do
+      it 'sends the requested interaction model' do
+        obj = Ldp::Container::Direct.new mock_client, "http://my.ldp.server/abs_url_object"
+        created_resource = obj.create
+        expect(created_resource).to be_kind_of Ldp::Container::Direct
+      end
+    end
+
+    describe 'indirect containers' do
+      it 'sends the requested interaction model' do
+        obj = Ldp::Container::Indirect.new mock_client, "http://my.ldp.server/abs_url_object"
+        created_resource = obj.create
+        expect(created_resource).to be_kind_of Ldp::Container::Indirect
+      end
+    end
   end
 
   describe "#initialize" do

data/spec/lib/ldp/resource_spec.rb

@@ -47,8 +47,7 @@ describe Ldp::Resource do
     context "when the resource is in the repository" do
       let(:path) { '/a_resource' }
       it "should get the response" do
-        expect(subject.get).to be_kind_of Faraday::Response
-        expect(subject.get.status).to eq 200
+        expect(subject.get).to be_kind_of Ldp::Response
       end
     end
   end

data/spec/lib/ldp/response_spec.rb

@@ -1,33 +1,25 @@
 require 'spec_helper'
 
 describe Ldp::Response do
-  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\""}
+  LDP_RDF_RESOURCE_HEADERS = { "Link" => "<#{RDF::Vocab::LDP.Resource}>;rel=\"type\", <#{RDF::Vocab::LDP.DirectContainer}>;rel=\"type\""}
+  LDP_NON_RDF_SOURCE_HEADERS = { "Link" => "<#{RDF::Vocab::LDP.Resource}>;rel=\"type\", <#{RDF::Vocab::LDP.NonRDFSource}>;rel=\"type\""}
 
   let(:mock_response) { double("mock response", headers: {}, env: { url: "info:a" }) }
   let(:mock_client) { double(Ldp::Client) }
 
   subject do
-    Ldp::Response.wrap mock_client, mock_response
-  end
-
-  describe ".wrap" do
-    it "should mixin Ldp::Response into the raw response" do
-      Ldp::Response.wrap(mock_client, mock_response)
-      expect(mock_response).to be_a_kind_of(Ldp::Response)
-    end
+    Ldp::Response.new mock_response
   end
 
   describe "#dup" do
     let(:mock_conn) { Faraday.new { |builder| builder.adapter :test, conn_stubs } }
     let(:client) { Ldp::Client.new mock_conn }
-    let(:raw_response) { client.get "a_container" }
     let(:conn_stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
         stub.get('/a_container') { [200, {"Link" => link}, body] }
       end
     end
-    let(:response) { Ldp::Response.wrap mock_client, raw_response }
+    let(:response) { client.get "a_container" }
 
     subject { response.dup }
 
@@ -61,7 +53,7 @@ describe Ldp::Response do
   end
 
 
-  describe ".links" do
+  describe "#links" do
     it "should extract link headers with relations as a hash" do
       allow(mock_response).to receive(:headers).and_return(
         "Link" => [
@@ -71,7 +63,7 @@ describe Ldp::Response do
             "<vanilla-link>"
           ]
         )
-      h = Ldp::Response.links mock_response
+      h = subject.links
 
       expect(h['some-rel']).to include("xyz")
       expect(h['some-multi-rel']).to include("abc", "123")
@@ -80,21 +72,21 @@ describe Ldp::Response do
 
     it "should return an empty hash if no link headers are availabe" do
       allow(mock_response).to receive(:headers).and_return({})
-      h = Ldp::Response.links mock_response
+      h = subject.links
 
       expect(h).to be_empty
     end
 
   end
 
-  describe ".resource?" do
+  describe "#resource?" do
     it "should be a resource if a Link[rel=type] header asserts it is an ldp:resource" do
       allow(mock_response).to receive(:headers).and_return(
         "Link" => [
-            "<#{Ldp.resource}>;rel=\"type\""
+            "<#{RDF::Vocab::LDP.Resource}>;rel=\"type\""
           ]
         )
-      expect(Ldp::Response.resource? mock_response).to be true
+      expect(subject.resource?).to be true
     end
   end
 
@@ -109,14 +101,6 @@ describe Ldp::Response do
         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
 
   describe "#etag" do
@@ -142,7 +126,7 @@ describe Ldp::Response 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]
+        graph << [RDF::URI.new('info:a'), RDF.type, RDF::Vocab::LDP.Page]
         allow(mock_response).to receive(:body).and_return(graph.dump(:ttl))
         expect(subject).to have_page
       end
@@ -169,8 +153,8 @@ describe Ldp::Response do
     it "should get the ldp:Page data from the query" do
       graph = RDF::Graph.new
 
-      graph << [RDF::URI.new('info:a'), RDF.type, Ldp.page]
-      graph << [RDF::URI.new('info:b'), RDF.type, Ldp.page]
+      graph << [RDF::URI.new('info:a'), RDF.type, RDF::Vocab::LDP.Page]
+      graph << [RDF::URI.new('info:b'), RDF.type, RDF::Vocab::LDP.Page]
 
       allow(mock_response).to receive(:body).and_return(graph.dump(:ttl))
       allow(mock_response).to receive(:headers).and_return(LDP_RDF_RESOURCE_HEADERS)
@@ -187,4 +171,40 @@ describe Ldp::Response do
       expect(subject.subject).to eq(RDF::URI.new("http://xyz/a"))
     end
   end
+
+  describe '#content_type' do
+    before do
+      allow(mock_response).to receive(:headers).and_return(
+        'Content-Type' => 'application/octet-stream'
+      )
+    end
+
+    it 'provides the content type from the response' do
+      expect(subject.content_type).to eq 'application/octet-stream'
+    end
+  end
+
+  describe '#content_length' do
+    before do
+      allow(mock_response).to receive(:headers).and_return(
+        'Content-Length' => '123'
+      )
+    end
+
+    it 'provides the content length from the response' do
+      expect(subject.content_length).to eq 123
+    end
+  end
+
+  describe '#content_disposition_filename' do
+    before do
+      allow(mock_response).to receive(:headers).and_return(
+        'Content-Disposition' => 'filename="xyz.txt";'
+      )
+    end
+
+    it 'provides the filename from the content disposition header' do
+      expect(subject.content_disposition_filename).to eq 'xyz.txt'
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,16 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start do
+  add_filter 'spec/'
+end
 
 require 'ldp'
 require 'faraday'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldp
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rdf-vocab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: http_logger
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: deprecation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +136,34 @@ 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: simplecov
+  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'
 description: Linked Data Platform client library
 email:
 - chris@cbeer.info
@@ -132,12 +188,12 @@ files:
 - lib/ldp/container/basic.rb
 - lib/ldp/container/direct.rb
 - lib/ldp/container/indirect.rb
+- lib/ldp/error.rb
 - lib/ldp/orm.rb
 - lib/ldp/resource.rb
 - lib/ldp/resource/binary_source.rb
 - lib/ldp/resource/rdf_source.rb
 - lib/ldp/response.rb
-- lib/ldp/response/paging.rb
 - lib/ldp/uri.rb
 - lib/ldp/version.rb
 - spec/lib/integration/integration_spec.rb
@@ -159,9 +215,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -183,4 +239,3 @@ test_files:
 - spec/lib/ldp/resource_spec.rb
 - spec/lib/ldp/response_spec.rb
 - spec/spec_helper.rb
-has_rdoc: