ldp 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aed769ef892aa0d5ba1e4c05b3800348191d64c9
-  data.tar.gz: e46dfc3a68c8028b857f9158c191d2bf953a630e
+  metadata.gz: 4d377a827832fb58b1a8a62f81bd434dd75c30a4
+  data.tar.gz: 707fd5fcd162dadb2eef16f0b726427f9de51811
 SHA512:
-  metadata.gz: 21151cf14c58ab5901e02f487a04592909080b2edba9ad23c447ccf266e1d0a7085a6dd973dbdff932207c4d9f29af08796ab11d183ab0125623edbb3a284056
-  data.tar.gz: b4dd704c77df50f18d3420eff5ec4ce35671fc793ecef6e001abba69dc5cb7f8c11408c09a2fd801c48d2c1527f506a57d21bb1e38c697cdf3c17f90aa9d002a
+  metadata.gz: 2c7eba449185e70f93692dea2a991efecbb3900a69e2384b5692a761d74eab62fd5233753bc850298b2645c1788efa4519011769fe6f66d3d97fd80b3f4a49f9
+  data.tar.gz: ed5c4424c1aca7a8b745b0571812258b4b5f552b2b009007c1fa7dade50127ee5707d8d534fbc79cefcc862401ee469219deade75be19fc21b699b6db298fa41

data/.travis.yml

@@ -5,8 +5,6 @@ env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 rvm:
-  - 1.9.3
-  - 2.0
   - 2.1
   - 2.2
-  - jruby-19mode
+  - jruby

data/README.md

@@ -1,6 +1,6 @@
 # Ldp.rb
 
-[![Build Status](https://travis-ci.org/cbeer/ldp.png?branch=master)](https://travis-ci.org/cbeer/ldp)
+[![Build Status](https://travis-ci.org/projecthydra/ldp.png?branch=master)](https://travis-ci.org/projecthydra/ldp)
 
 Linked Data Platform client library for Ruby
 
@@ -39,8 +39,8 @@ orm.save
 
 ### Fedora Commons notes
 Due to some discrepancies with alpha version of Fedora Commons, you may need to do some things differently:
-* [Can't load resources from Fedora 4](https://github.com/cbeer/ldp/issues/1)
-* [orm.save with an rdf:type doesn't work with Fedora 4.0.0-alpha-3](https://github.com/cbeer/ldp/issues/2)
+* [Can't load resources from Fedora 4](https://github.com/projecthydra/ldp/issues/1)
+* [orm.save with an rdf:type doesn't work with Fedora 4.0.0-alpha-3](https://github.com/projecthydra/ldp/issues/2)
 
 ## Contributing
 

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      = "https://github.com/cbeer/ldp"
+  spec.homepage      = "https://github.com/projecthydra/ldp"
   spec.license       = "APACHE2"
 
   spec.files         = `git ls-files`.split($/)

data/lib/ldp/client.rb

@@ -4,6 +4,7 @@ module Ldp
   class Client
 
     require 'ldp/client/methods'
+    require 'ldp/client/prefer_headers'
     include Ldp::Client::Methods
 
     def initialize *http_client

data/lib/ldp/client/methods.rb

@@ -29,17 +29,18 @@ module Ldp::Client::Methods
     logger.debug "LDP: GET [#{url}]"
     resp = http.get do |req|
       req.url munge_to_relative_url(url)
+      prefer_headers = ::Ldp::PreferHeaders.new
 
       if options[:minimal]
-        req.headers["Prefer"] = "return=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}" }
-        req.headers["Prefer"] = ["return=representation",
-          ("include=\"#{includes.join(" ")}\"" unless includes.empty?),
-          ("omit=\"#{omits.join(" ")}\"" unless omits.empty?)
-        ].compact.join("; ")
+        prefer_headers.include = includes
+        prefer_headers.omit = omits
       end
+      req.headers["Prefer"] = prefer_headers.to_s
 
       yield req if block_given?
     end

data/lib/ldp/client/prefer_headers.rb

@@ -0,0 +1,64 @@
+module Ldp
+  class PreferHeaders
+    attr_reader :headers_string
+
+    def initialize(headers_string="")
+      @headers_string = headers_string
+    end
+
+    def omit
+      @omit ||= options["omit"] || []
+    end
+
+    def include
+      @include ||= options["include"] || []
+    end
+
+    def return
+      @return ||= options["return"].first || ""
+    end
+
+    def include=(vals)
+      @include = Array(vals)
+      serialize
+    end
+
+    def omit=(vals)
+      @omit = Array(vals)
+      serialize
+    end
+
+    def return=(vals)
+      @return = Array(vals).first
+      serialize
+    end
+
+    def to_s
+      headers_string.to_s
+    end
+
+    private
+
+    def serialize
+      head_string = []
+      unless self.return.empty?
+        head_string << "return=#{self.return}"
+      end
+      unless omit.empty?
+        head_string << "omit=\"#{omit.join(" ")}\""
+      end
+      unless self.include.empty?
+        head_string << "include=\"#{self.include.join(" ")}\""
+      end
+      @headers_string = head_string.join("; ")
+    end
+
+    def options
+      headers_string.gsub('"',"").
+        split(";").
+        map{|x| x.strip.split("=")}.
+        map{|x| { x[0] => x[1].split(" ") }}.
+        inject({}, &:merge)
+    end
+  end
+end

data/lib/ldp/resource/rdf_source.rb

@@ -1,3 +1,5 @@
+require 'rdf/turtle'
+require 'rdf/rdfxml'
 module Ldp
   class Resource::RdfSource < Ldp::Resource
 
@@ -26,7 +28,7 @@ module Ldp
     end
 
     def graph
-      @graph ||= new? ? build_empty_graph : build_graph(get.graph)
+      @graph ||= new? ? build_empty_graph : build_graph(response_as_graph(get))
     end
 
     def build_empty_graph
@@ -44,12 +46,26 @@ module Ldp
 
 
     private
-
+      ##
+      # @param [Faraday::Response] graph query response
+      # @return [RDF::Graph]
+      def response_as_graph(resp)
+        content_type = resp.headers['Content-Type'] || 'text/turtle'
+        content_type = Array(content_type).first
+        format = Array(RDF::Format.content_types[content_type]).first
+        source = resp.body
+        reader = RDF::Reader.for(content_type:content_type).new(source, base_uri:subject)
+        graph = build_empty_graph
+        reader.each_statement do |stmt|
+          graph << stmt
+        end
+        graph
+      end
       ##
       # @param [RDF::Graph] original_graph The graph returned by the LDP server
       # @return [RDF::Graph] A graph striped of any inlined resources present in the original
       def build_graph(original_graph)
-        inlined_resources = get.graph.query(predicate: Ldp.contains).map { |x| x.object }
+        inlined_resources = response_as_graph(get).query(predicate: Ldp.contains).map { |x| x.object }
 
         # we want to scope this graph to just statements about this model, not contained relations
         if inlined_resources.empty?

data/lib/ldp/version.rb

@@ -1,3 +1,3 @@
 module Ldp
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/spec/lib/ldp/client/prefer_headers_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+RSpec.describe Ldp::PreferHeaders do
+  let(:header_string) { "return=representation; omit=\"http://1.1.1 http://2.3/b\"; include=\"http://2.2.2\"" }
+  subject { described_class.new(header_string) }
+
+  describe "#return" do
+    it "should return what's being returned" do
+      expect(subject.return).to eq "representation"
+    end
+  end
+
+  describe "#omit" do
+    it "should return omit array" do
+      expect(subject.omit).to eq ["http://1.1.1", "http://2.3/b"]
+    end
+  end
+
+  describe "#include" do
+    it "should return include array" do
+      expect(subject.include).to eq ["http://2.2.2"]
+    end
+  end
+
+  describe "#include=" do
+    it "should set include" do
+      subject.include = ["http://3.3.3", "http://1.1.1"]
+      
+      expect(subject.include).to eq ["http://3.3.3", "http://1.1.1"]
+      expect(subject.to_s).to eq "return=representation; omit=\"http://1.1.1 http://2.3/b\"; include=\"http://3.3.3 http://1.1.1\""
+    end
+    it "should be able to set a single value" do
+      subject.include = "http://3.3.3"
+      expect(subject.to_s).to eq "return=representation; omit=\"http://1.1.1 http://2.3/b\"; include=\"http://3.3.3\""
+    end
+    context "when set to nothing" do
+      it "should not serialize that value" do
+        subject.include = []
+        expect(subject.to_s).to eq "return=representation; omit=\"http://1.1.1 http://2.3/b\""
+      end
+    end
+  end
+
+  describe "#return=" do
+    it "should set return" do
+      subject.return = "bananas"
+
+      expect(subject.return).to eq "bananas"
+      expect(subject.to_s).to eq "return=bananas; omit=\"http://1.1.1 http://2.3/b\"; include=\"http://2.2.2\""
+    end
+  end
+
+  describe "#omit=" do
+    it "should set omit" do
+      subject.omit = ["http://3.3.3", "http://1.1.1"]
+
+      expect(subject.omit).to eq ["http://3.3.3", "http://1.1.1"]
+      expect(subject.to_s).to eq "return=representation; omit=\"http://3.3.3 http://1.1.1\"; include=\"http://2.2.2\""
+    end
+    context "when set to nothing" do
+      it "should not serialize that value" do
+        subject.omit = []
+        expect(subject.to_s).to eq "return=representation; include=\"http://2.2.2\""
+      end
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
+require 'stringio'
 require 'spec_helper'
 
 describe Ldp::Resource::RdfSource do
@@ -5,10 +6,18 @@ describe Ldp::Resource::RdfSource do
     RDF::Graph.new << [RDF::URI.new(), RDF::DC.title, "Hello, world!"]
   end
 
+  let(:simple_graph_source) do
+    io = StringIO.new
+    RDF::Writer.for(content_type:'text/turtle').dump(simple_graph,io)
+    io.string
+  end
   let(:conn_stubs) do
     Faraday::Adapter::Test::Stubs.new do |stub|
       stub.post("/") { [201]}
       stub.put("/abs_url_object") { [201]}
+      stub.head("/abs_url_object") {[404]}
+      stub.head("/existing_object") {[200, {'Content-Type'=>'text/turtle'}]}
+      stub.get("/existing_object") {[200, {'Content-Type'=>'text/turtle'}, simple_graph_source]}
     end
   end
 
@@ -34,7 +43,6 @@ 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"
-      allow(obj).to receive(:new?).and_return(true)
       created_resource = obj.create
       expect(created_resource).to be_kind_of Ldp::Resource::RdfSource
     end
@@ -49,6 +57,21 @@ describe Ldp::Resource::RdfSource do
     end
   end
 
+  describe '#graph' do
+    context 'for a new object' do
+      subject { Ldp::Resource::RdfSource.new mock_client, nil }
+      it do
+        expect(subject.graph.size).to eql(0)
+      end
+    end
+    context 'for an existing object' do
+      subject { Ldp::Resource::RdfSource.new mock_client, "http://my.ldp.server/existing_object" }
+      it do 
+        expect(subject.graph.size).to eql(1)
+      end
+    end
+  end
+
   context "When graph_class is overridden" do
     before do
       class SpecialGraph < RDF::Graph; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldp
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -127,6 +127,7 @@ files:
 - lib/ldp.rb
 - lib/ldp/client.rb
 - lib/ldp/client/methods.rb
+- lib/ldp/client/prefer_headers.rb
 - lib/ldp/container.rb
 - lib/ldp/container/basic.rb
 - lib/ldp/container/direct.rb
@@ -140,6 +141,7 @@ files:
 - lib/ldp/uri.rb
 - lib/ldp/version.rb
 - spec/lib/integration/integration_spec.rb
+- spec/lib/ldp/client/prefer_headers_spec.rb
 - spec/lib/ldp/client_spec.rb
 - spec/lib/ldp/orm/orm_spec.rb
 - spec/lib/ldp/resource/binary_source_spec.rb
@@ -147,7 +149,7 @@ files:
 - spec/lib/ldp/resource_spec.rb
 - spec/lib/ldp/response_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/cbeer/ldp
+homepage: https://github.com/projecthydra/ldp
 licenses:
 - APACHE2
 metadata: {}
@@ -173,6 +175,7 @@ specification_version: 4
 summary: Linked Data Platform client library
 test_files:
 - spec/lib/integration/integration_spec.rb
+- spec/lib/ldp/client/prefer_headers_spec.rb
 - spec/lib/ldp/client_spec.rb
 - spec/lib/ldp/orm/orm_spec.rb
 - spec/lib/ldp/resource/binary_source_spec.rb
@@ -180,3 +183,4 @@ test_files:
 - spec/lib/ldp/resource_spec.rb
 - spec/lib/ldp/response_spec.rb
 - spec/spec_helper.rb
+has_rdoc: