ldp 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17053f7fbf04e6b64d7ffeed9be3f913e9a26cc9
-  data.tar.gz: ce8e5c9c59bad81c8fb1fad3216578f8379027d1
+  metadata.gz: e8f3d184e1548ea9060af3c059322168f6753e13
+  data.tar.gz: 69d0817c390fbcbff78fb98adf180ddd1e0be33b
 SHA512:
-  metadata.gz: 5428c3dbfc518bd48967f849d0b4a42aad3d967d13c35f6725449189223bf0d3fd40f7c00ef349dbaa316b2a05c650cd33ba613b5969848c23e2f1bd2527bc91
-  data.tar.gz: 4bc45e92606ee0940cee48a937eb9ff53a15f2adf7bc533e81af5cc075410c4b8f46318bb8374c61f7969d30a07455655642fbaa95f7110e2ac07e8429ab78f1
+  metadata.gz: aab3b961a934cd34e826a6504c079e2531826fbfe0b6b4b13ca63e0cb6f3edefdc6595be6931994f471605c96097e5309dd13116d3dcbe86ec259dc7b9629e3f
+  data.tar.gz: 0f8212e7fd4e83f494cda059ad2acb6395129b239a36df47d8abdb7d9d67ad93bb7377d1675f1a0cd2f70a4552cedd65553477ebe2016bf27cffdea53178364e

data/ldp.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["chris@cbeer.info"]
   spec.description   = %q{Linked Data Platform client library}
   spec.summary       = spec.description
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/cbeer/ldp"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/lib/ldp/resource.rb

@@ -6,10 +6,11 @@ module Ldp
     attr_reader :client, :subject
     attr_accessor :content
 
-    def initialize client, subject, response = nil
+    def initialize client, subject, response = nil, base_path = ''
       @client = client
       @subject = subject
       @get = response if response.is_a? Faraday::Response and current? response
+      @base_path = base_path
     end
 
     ##
@@ -65,7 +66,8 @@ module Ldp
     # @return [RdfSource] the new representation
     def create &block
       raise "Can't call create on an existing resource" unless new?
-      resp = client.post((subject || ""), content) do |req|
+      verb = subject.nil? ? :post : :put
+      resp = client.send(verb, (subject || @base_path), content) do |req|
         
         yield req if block_given?
       end
@@ -79,9 +81,11 @@ module Ldp
     # Update the stored graph
     def update new_content = nil
       new_content ||= content
-      client.put subject, new_content do |req|
+      resp = client.put subject, new_content do |req|
         req.headers['If-Match'] = get.etag if retrieved_content?
       end
+      update_cached_get(resp) if retrieved_content?
+      resp
     end
 
     def current? response = nil
@@ -95,5 +99,15 @@ module Ldp
         new_response.headers['ETag'] == response.headers['ETag'] &&
         new_response.headers['Last-Modified'] == response.headers['Last-Modified']
     end
+
+    def update_cached_get response
+      Response.wrap(client, response)
+      if response.etag.nil? || response.last_modified.nil?
+        response = Response.wrap(client, client.head(subject))
+      end
+      @get.etag = response.etag
+      @get.last_modified = response.last_modified
+    end
+
   end
 end

data/lib/ldp/resource/binary_source.rb

@@ -2,8 +2,8 @@ module Ldp
   class Resource::BinarySource < Ldp::Resource
     attr_accessor :content
 
-    def initialize client, subject, content_or_response = nil
-      super client, subject, content_or_response
+    def initialize client, subject, content_or_response = nil, base_path = ''
+      super
       
       case content_or_response
       when Faraday::Response

data/lib/ldp/resource/rdf_source.rb

@@ -1,8 +1,8 @@
 module Ldp
   class Resource::RdfSource < Ldp::Resource
 
-    def initialize client, subject, graph_or_response = nil
-      super client, subject, graph_or_response
+    def initialize client, subject, graph_or_response = nil, base_path = ''
+      super
 
       case graph_or_response
         when RDF::Graph

data/lib/ldp/response.rb

@@ -15,7 +15,7 @@ module Ldp
     def self.links response
       h = {}
       Array(response.headers["Link"]).map { |x| x.split(", ") }.flatten.inject(h) do |memo, header|
-        m = header.match(/(?<link>.*);\s?rel="(?<rel>[^"]+)"/)
+        m = header.match(/<(?<link>.*)>;\s?rel="(?<rel>[^"]+)"/)
         if m
           memo[m[:rel]] ||= []
           memo[m[:rel]] << m[:link]
@@ -113,13 +113,21 @@ module Ldp
     ##
     # Extract the ETag for the resource
     def etag
-      headers['ETag']
+      @etag ||= headers['ETag']
+    end
+
+    def etag=(val)
+      @etag = val
     end
 
     ##
     # Extract the last modified header for the resource
     def last_modified
-      headers['Last-Modified']
+      @last_modified ||= headers['Last-Modified']
+    end
+
+    def last_modified=(val)
+      @last_modified = val
     end
 
     ##

data/lib/ldp/version.rb

@@ -1,3 +1,3 @@
 module Ldp
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/lib/ldp/client_spec.rb

@@ -22,8 +22,8 @@ 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.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]}
@@ -66,7 +66,7 @@ describe "Ldp::Client" do
       resp = subject.get "a_resource"
       expect(resp).to be_a_kind_of(Ldp::Response)
       expect(resp.body).to eq(simple_graph)
-      expect(resp.resource?).to be_true
+      expect(resp.resource?).to be true
     end
 
     it "should accept a block to change the HTTP request" do

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

@@ -9,7 +9,7 @@ describe Ldp::Orm do
 
   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#Resource>;rel=\"type\""}, simple_graph.dump(:ttl) ]}
       stub.head('/a_resource') { [200] }
       stub.put("/a_resource") { [204]}
     end
@@ -32,7 +32,7 @@ describe Ldp::Orm do
 
   describe "#delete" do
     it "should delete the LDP resource" do
-      test_resource.should_receive(:delete)
+      expect(test_resource).to receive(:delete)
       subject.delete
     end
   end
@@ -53,13 +53,13 @@ describe Ldp::Orm do
 
   describe "#save" do
     it "should update the resource from the graph" do
-      expect(subject.save).to be_true
+      expect(subject.save).to be true
     end
 
     it "should return false if the response was not successful" do
       conn_stubs.instance_variable_get(:@stack)[:put] = [] # erases the stubs for :put
       conn_stubs.put('/a_resource') {[412, nil, 'There was an error']}
-      expect(subject.save).to be_false
+      expect(subject.save).to be false
     end
   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\"",
                                        "ETag" => "new-tag"},
                                       updated_graph.dump(:ttl)]}
     end

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

@@ -7,9 +7,9 @@ describe Ldp::Resource::RdfSource do
 
   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 ]}
+      # stub.get('/a_resource') {[ 200, {"Link" => "<http://www.w3.org/ns/ldp#Resource>;rel=\"type\""}, simple_graph ]}
       stub.post("/") { [201]}
-      stub.post("/abs_url_object") { [201]}
+      stub.put("/abs_url_object") { [201]}
     end
   end
 
@@ -35,7 +35,7 @@ describe Ldp::Resource::RdfSource do
     
     it "should allow absolute URLs to the LDP server" do
       obj = Ldp::Resource::RdfSource.new mock_client, "http://my.ldp.server/abs_url_object"
-      obj.stub(new?: true)
+      allow(obj).to receive(:new?).and_return(true)
       created_resource = obj.create
       expect(created_resource).to be_kind_of Ldp::Resource::RdfSource
     end

data/spec/lib/ldp/resource_spec.rb

@@ -58,13 +58,52 @@ describe Ldp::Resource do
   end
   
   describe "#create" do
-    context "with initial content" do
-      let(:path) { '/a_new_resource' }
-      it "should post an RDF graph" do
-        mock_client.should_receive(:post).with(path, "xyz").and_return(double(headers: {}))
-        subject.content = "xyz"
-        subject.save
+    let(:path) { '/a_new_resource' }
+    context "with a subject uri" do
+      let(:conn_stubs) do
+        Faraday::Adapter::Test::Stubs.new do |stub|
+          stub.head(path) { [404] }
+          stub.put(path) { [200, {'Last-Modified' => 'Tue, 22 Jul 2014 02:23:32 GMT' }] }
+        end
       end
+
+      context "and without a base path" do
+        it "should post an RDF graph" do
+          subject.content = "xyz"
+          subject.save
+        end
+      end
+
+      context "and with a base path" do
+        let(:base_path) { '/foo' }
+
+        subject { Ldp::Resource.new(mock_client, path, nil, base_path) }
+
+        it "should ignore the base path" do
+          subject.content = "xyz"
+          subject.save
+        end
+      end
+    end
+
+    context "without a subject" do
+      context "and with a base path" do
+        let(:base_path) { '/foo' }
+
+        let(:conn_stubs) do
+          Faraday::Adapter::Test::Stubs.new do |stub|
+            stub.post(base_path) { [200, {'Last-Modified' => 'Tue, 22 Jul 2014 02:23:32 GMT' }] }
+          end
+        end
+
+        subject { Ldp::Resource.new(mock_client, nil, nil, base_path) }
+
+        it "should post an RDF graph" do
+          subject.content = "xyz"
+          subject.save
+        end
+      end
+
     end
   end
 end

data/spec/lib/ldp/response_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Ldp::Response do
-  LDP_RESOURCE_HEADERS = { "Link" => Ldp.resource.to_s + ";rel=\"type\""}
+  LDP_RESOURCE_HEADERS = { "Link" => "<#{Ldp.resource.to_s}>;rel=\"type\""}
 
   let(:mock_response) { double(headers: {}, env: { url: "info:a" }) }
   let(:mock_client) { double(Ldp::Client) }
@@ -19,14 +19,14 @@ describe Ldp::Response do
 
   describe ".links" do
     it "should extract link headers with relations as a hash" do
-      mock_response.stub(:headers => { 
+      allow(mock_response).to receive(:headers).and_return(
         "Link" => [
-            "xyz;rel=\"some-rel\"",
-            "abc;rel=\"some-multi-rel\"",
-            "123;rel=\"some-multi-rel\"",
-            "vanilla-link"
+            "<xyz>;rel=\"some-rel\"",
+            "<abc>;rel=\"some-multi-rel\"",
+            "<123>;rel=\"some-multi-rel\"",
+            "<vanilla-link>"
           ] 
-        })
+        )
       h = Ldp::Response.links mock_response
 
       expect(h['some-rel']).to include("xyz")
@@ -35,7 +35,7 @@ describe Ldp::Response do
     end
 
     it "should return an empty hash if no link headers are availabe" do
-      mock_response.stub(:headers => {})
+      allow(mock_response).to receive(:headers).and_return({})
       h = Ldp::Response.links mock_response
 
       expect(h).to be_empty
@@ -45,18 +45,19 @@ describe Ldp::Response do
 
   describe ".resource?" do
     it "should be a resource if a Link[rel=type] header asserts it is an ldp:resource" do
-      mock_response.stub(:headers => { 
+      allow(mock_response).to receive(:headers).and_return(
         "Link" => [
-            "#{Ldp.resource};rel=\"type\""
+            "<#{Ldp.resource}>;rel=\"type\""
           ] 
-      })
-      expect(Ldp::Response.resource? mock_response).to be_true
+        )
+      expect(Ldp::Response.resource? mock_response).to be_truthy
     end
   end
 
   describe "#graph" do
     it "should parse the response body for an RDF graph" do
-      mock_response.stub :body => "<> <info:b> <info:c> .", :headers => LDP_RESOURCE_HEADERS
+      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")) 
@@ -67,7 +68,7 @@ describe Ldp::Response do
 
   describe "#etag" do
     it "should pass through the response's ETag" do
-      mock_response.stub :headers => { 'ETag' => 'xyz'}
+      allow(mock_response).to receive(:headers).and_return('ETag' => 'xyz')
 
       expect(subject.etag).to eq('xyz')
     end
@@ -75,7 +76,7 @@ describe Ldp::Response do
 
   describe "#last_modified" do
     it "should pass through the response's Last-Modified" do
-      mock_response.stub :headers => { 'Last-Modified' => 'some-date'}
+      allow(mock_response).to receive(:headers).and_return('Last-Modified' => 'some-date')
       expect(subject.last_modified).to eq('some-date')
     end
   end
@@ -86,14 +87,16 @@ describe Ldp::Response do
 
       graph << [RDF::URI.new('info:a'), RDF.type, Ldp.page]
 
-      mock_response.stub :body => graph.dump(:ttl), :headers => LDP_RESOURCE_HEADERS
+      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
     end
 
     it "should be false otherwise" do
-      subject.stub :page_subject => RDF::URI.new('info:a')
-      mock_response.stub :body => '', :headers => LDP_RESOURCE_HEADERS
+      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
     end
   end
@@ -105,7 +108,8 @@ describe Ldp::Response do
       graph << [RDF::URI.new('info:a'), RDF.type, Ldp.page]
       graph << [RDF::URI.new('info:b'), RDF.type, Ldp.page]
 
-      mock_response.stub :body => graph.dump(:ttl), :headers => LDP_RESOURCE_HEADERS
+      allow(mock_response).to receive(:body).and_return(graph.dump(:ttl))
+      allow(mock_response).to receive(:headers).and_return(LDP_RESOURCE_HEADERS)
 
       expect(subject.page.count).to eq(1)
    
@@ -114,8 +118,9 @@ describe Ldp::Response do
 
   describe "#subject" do
     it "should extract the HTTP request URI as an RDF URI" do
-      mock_response.stub :body => '', :headers => LDP_RESOURCE_HEADERS
-      mock_response.stub :env => { :url => 'http://xyz/a'}
+      allow(mock_response).to receive(:body).and_return('')
+      allow(mock_response).to receive(:headers).and_return(LDP_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
   end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 
-require 'rspec/autorun'
 require 'ldp'
 require 'faraday'
 require 'active_support/notifications'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -146,7 +146,7 @@ files:
 - spec/lib/ldp/resource_spec.rb
 - spec/lib/ldp/response_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/cbeer/ldp
 licenses:
 - MIT
 metadata: {}