ldp 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c435d58f60d41a302a24df4ebf7f3bd9323d87d8
-  data.tar.gz: 25e877748727f653488862222cee9aebbca30046
+  metadata.gz: f66622678bcc98c5f6466a33d8ff1d6203fe2e4f
+  data.tar.gz: 35bc0630a59c9c881e5b6f7c4d5c07138dda3619
 SHA512:
-  metadata.gz: 732e238782ff1a21407b629bc54a13ba63f621b6494fcde36d9d2b637e5562c946573108e852c3e2746e928a1afb35ece225a7a2d2879e78c872688a157c6f8e
-  data.tar.gz: 0149eaba7795e019401075761dfa9adfe5ad9b2496153e271c4753cb32d8d62017c922d1681bd1c3b6af946928d01038d3d8deb3071c7db4bef0e4dc84fc5ef8
+  metadata.gz: 6a2d387ff7e6ccbd5c873e169c57ed49225ab6fd6b51ef783b1bd84cfac08a133ed518fb31defd5764e3be667483dde5c022a849d44394d9c08a5dde413cb27b
+  data.tar.gz: f7195ee962860939ed50c60007226d697c84e2544f897c43b926f8f971ac7406f7ab9c1facb7de01ecc11be62454f541a551cc8f2000c246d4ec28eb698841c6

data/lib/ldp/client/methods.rb

@@ -3,19 +3,19 @@ require 'faraday'
 ##
 # HTTP client methods for making requests to an LDP resource and getting a response back.
 module Ldp::Client::Methods
-  
+
   attr_reader :http
   def initialize_http_client *http_client
     if http_client.length == 1 and http_client.first.is_a? Faraday::Connection
       @http = http_client.first
-    else 
-      @http = Faraday.new *http_client  
+    else
+      @http = Faraday.new *http_client
     end
   end
-  
+
   def head url
     logger.debug "LDP: HEAD [#{url}]"
-    resp = http.head do |req|                          
+    resp = http.head do |req|
       req.url munge_to_relative_url(url)
 
       yield req if block_given?
@@ -27,7 +27,7 @@ module Ldp::Client::Methods
   # Get a LDP Resource by URI
   def get url, options = {}
     logger.debug "LDP: GET [#{url}]"
-    resp = http.get do |req|                          
+    resp = http.get do |req|
       req.url munge_to_relative_url(url)
 
       if options[:minimal]
@@ -35,7 +35,7 @@ module Ldp::Client::Methods
       else
         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", 
+        req.headers["Prefer"] = ["return=representation",
           ("include=\"#{includes.join(" ")}\"" unless includes.empty?),
           ("omit=\"#{omits.join(" ")}\"" unless omits.empty?)
         ].compact.join("; ")
@@ -49,7 +49,7 @@ module Ldp::Client::Methods
     else
       resp
     end
-    
+
     check_for_errors(resp)
   end
 
@@ -100,7 +100,7 @@ module Ldp::Client::Methods
     check_for_errors(resp)
   end
   private
-  
+
   def check_for_errors resp
     resp.tap do |resp|
       unless resp.success?
@@ -119,14 +119,14 @@ module Ldp::Client::Methods
   def default_headers
     {"Content-Type"=>"text/turtle"}
   end
-  
+
   def default_patch_headers
     {"Content-Type"=>"application/sparql-update"}
   end
   ##
   # Some valid query paths can be mistaken for absolute URIs
   # with an alternative scheme. If the scheme isn't HTTP(S), assume
-  # they meant a relative URI instead. 
+  # they meant a relative URI instead.
   def munge_to_relative_url url
     purl = URI.parse(url)
     if purl.absolute? and !((purl.scheme rescue nil) =~ /^http/)

data/lib/ldp/orm.rb

@@ -7,15 +7,15 @@ module Ldp
     def initialize resource
       @resource = resource
     end
-    
+
     def subject_uri
       resource.subject_uri
     end
-    
+
     def new?
       resource.new?
     end
-    
+
     def persisted?
       !new?
     end

data/lib/ldp/resource.rb

@@ -44,7 +44,7 @@ module Ldp
     def get
       @get ||= client.get(subject)
     end
-    
+
     def head
       @head ||= @get || client.head(subject)
     end
@@ -56,11 +56,11 @@ module Ldp
         req.headers['If-Match'] = get.etag if retrieved_content?
       end
     end
-    
+
     def save
       new? ? create : update
     end
-    
+
     ##
     # Create a new resource at the URI
     # @return [RdfSource] the new representation
@@ -68,7 +68,7 @@ module Ldp
       raise "Can't call create on an existing resource" unless new?
       verb = subject.nil? ? :post : :put
       resp = client.send(verb, (subject || @base_path), content) do |req|
-        
+
         yield req if block_given?
       end
 
@@ -76,7 +76,7 @@ module Ldp
       @subject_uri = nil
       reload
     end
-    
+
     ##
     # Update the stored graph
     def update new_content = nil
@@ -91,7 +91,7 @@ module Ldp
     def current? response = nil
       response ||= @get
       return true if new? and subject.nil?
-      
+
       new_response = client.head(subject)
 
       response.headers['ETag'] &&

data/lib/ldp/resource/rdf_source.rb

@@ -14,39 +14,61 @@ module Ldp
           raise ArgumentError, "Third argument to #{self.class}.new should be a RDF::Graph or a Ldp::Response. You provided #{graph_or_response.class}"
       end
     end
-    
+
     def create
       super do |req|
         req.headers = { "Content-Type" => "text/turtle" }
       end
     end
-    
+
     def content
       graph.dump(:ttl) if graph
     end
 
     def graph
-      @graph ||= RDF::Graph.new if new?
-      @graph ||= begin
-        original_graph = get.graph
+      @graph ||= new? ? build_empty_graph : build_graph(get.graph)
+    end
 
-        inlinedResources = get.graph.query(:predicate => Ldp.contains).map { |x| x.object }
+    def build_empty_graph
+      graph_class.new
+    end
 
-        # we want to scope this graph to just statements about this model, not contained relations
-        unless inlinedResources.empty?
-          new_graph = RDF::Graph.new
+    ##
+    # graph_class may be overridden so that a subclass of RDF::Graph
+    # is returned (e.g. an ActiveTriples resource)
+    # @returns [Class] a class that is an descendant of RDF::Graph
+    def graph_class
+      RDF::Graph
+    end
 
-          original_graph.each_statement do |s|
-            unless inlinedResources.include? s.subject
-              new_graph << s
-            end
-          end
 
-          new_graph
-        else
+
+    private
+
+      ##
+      # @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 }
+
+        # we want to scope this graph to just statements about this model, not contained relations
+        if inlined_resources.empty?
           original_graph
+        else
+          graph_without_inlined_resources(original_graph, inlined_resources)
         end
       end
-    end
+
+      def graph_without_inlined_resources(original_graph, inlined_resources)
+        new_graph = build_empty_graph
+
+        original_graph.each_statement do |s|
+          unless inlined_resources.include? s.subject
+            new_graph << s
+          end
+        end
+
+        new_graph
+      end
   end
 end

data/lib/ldp/version.rb

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

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

@@ -7,7 +7,6 @@ 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.post("/") { [201]}
       stub.put("/abs_url_object") { [201]}
     end
@@ -32,7 +31,7 @@ describe Ldp::Resource::RdfSource do
       created_resource = subject.create
       expect(created_resource).to be_kind_of Ldp::Resource::RdfSource
     end
-    
+
     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)
@@ -49,4 +48,27 @@ describe Ldp::Resource::RdfSource do
       end
     end
   end
+
+  context "When graph_class is overridden" do
+    before do
+      class SpecialGraph < RDF::Graph; end
+
+      class SpecialResource < Ldp::Resource::RdfSource
+        def graph_class
+          SpecialGraph
+        end
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :SpecialGraph)
+      Object.send(:remove_const, :SpecialResource)
+    end
+
+    subject { SpecialResource.new mock_client, nil }
+
+    it "should use the specified class" do
+      expect(subject.graph).to be_a SpecialGraph
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldp
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Linked Data Platform client library