ldp 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2674ad59a41058590a896596558af878b3374fe570b5b082a618ff11125d55e6
-  data.tar.gz: daca7e05e686169d4518e5c5d1c0495aef46f461e74dabbfffc36ef148e2e41c
+  metadata.gz: db21a1bac397bd2aebca07c57331dcbe7ab895642f2505728b543aa4ef5a1cdd
+  data.tar.gz: 6f4e2a5195c5ceb69b60b7f6d4b3f471e224b7c80dfb647342c422234a9bc615
 SHA512:
-  metadata.gz: bf52366a7386e19f4e777aaab2fd789f168263d645940dbd7660abe0fa14b22422bd59caf12da4c050908f47c5b9c9c9e5fde0b50f56830b21cfe90f1568c445
-  data.tar.gz: b670c997ba25a63fe2298e336b2dccb7833c3893631a1d3f90cd775de26a559ff08e83d4ef38911a198b341827e48ab74b6fa0dd56e28d6e2a1ca4c2757b038e
+  metadata.gz: de19de70dba6611052910192d18f2f3f28d5d4821bbe402385e2e26a8bfeddfa64559727f572b81dffb5f2fc7dd14ab3e7f2b12f0968734ec3a8d97f2933b1b9
+  data.tar.gz: c77a9e35d78be05782fb958740d5615ad51b9f8a42b311327d8f9c2db0a710fb42e58533ebe5d9b830800238da53e49277afa9cadb252c13b87cf9f907732244

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [1.0.2](https://github.com/samvera/ldp/tree/1.0.1) (2021-05-14)
+
+[Full Changelog](https://github.com/samvera/ldp/compare/v1.0.1...1.0.2)
+
+This release includes major performance improvements and memory optimizations.
+
+These optimizations replace linear complexity data access operations with
+constant-time equivalents. They also prevent repeated wholesale copying of
+(potentially large) RDF graphs in-memory when deserializing LDP responses.
+
+This should result in broad performance improvements in all cases. The biggest
+impact will be on RDF Sources with many `ldp:contains` relationships.
+
+**Merged pull requests:**
+
+- don't loop over statements manually; use the library [#118](https://github.com/samvera/ldp/pull/118)
+- optimize subject filtering [#119](https://github.com/samvera/ldp/pull/119)
+- Adding CONTRIBUTING.md This was uploaded via automation. [#116](https://github.com/samvera/ldp/pull/116)
+- fix a regression in handling for custom graph classes in `RDFSource` [#120](https://github.com/samvera/ldp/pull/120)
+
 ## [1.0.1](https://github.com/samvera/ldp/tree/1.0.1) (2020-06-12)
 
 [Full Changelog](https://github.com/samvera/ldp/compare/v1.0.1-beta1...1.0.1)

data/CONTRIBUTING.md

@@ -22,6 +22,28 @@ https://wiki.duraspace.org/display/samvera/Samvera+Community+Intellectual+Proper
 
 You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
 
+## Language
+
+The language we use matters.  Today, tomorrow, and for years to come
+people will read the code we write.  They will judge us for our
+design, logic, and the words we use to describe the system.
+
+Our words should be accessible.  Favor descriptive words that give
+meaning while avoiding reinforcing systemic inequities.  For example,
+in the Samvera community, we should favor using allowed\_list instead
+of whitelist, denied\_list instead of blacklist, or source/copy
+instead of master/slave.
+
+We're going to get it wrong, but this is a call to keep working to
+make it right.  View our code and the words we choose as a chance to
+have a conversation. A chance to grow an understanding of the systems
+we develop as well as the systems in which we live.
+
+See [“Blacklists” and “whitelists”: a salutary warning concerning the
+prevalence of racist language in discussions of predatory
+publishing](https://www.ncbi.nlm.nih.gov/pmc/articles/PMC6148600/) for
+further details.
+
 ## Contribution Tasks
 
 * Reporting Issues
@@ -34,7 +56,7 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 ### Reporting Issues
 
 * Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a [Github issue](https://github.com/samvera/ldp/issues) by:
+* Submit a [Github issue](https://github.com/samvera/ldp/issues/) by:
   * Clearly describing the issue
     * Provide a descriptive summary
     * Explain the expected behavior

data/lib/ldp/resource/rdf_source.rb

@@ -67,40 +67,36 @@ module Ldp
     private
 
     ##
+    # @note tries to avoid doing a large scale copy of the {RDF::Repository}
+    #   data structure by using the existing {Ldp::Response#graph} if
+    #   {#graph_class} is {RDF::Graph}. otherwise, it tries to instantiate a
+    #   new graph projected over the same underlying {RDF::Graph#data}. finally,
+    #   if {#graph_class}'s initailizer doesn't accept a `data:` parameter, it
+    #   shovels {Ldp::Response#graph} into a new object of that class.
+    #
     # @param [Faraday::Response] graph query response
     # @return [RDF::Graph]
     def response_as_graph(resp)
-      graph = build_empty_graph
-      resp.each_statement do |stmt|
-        graph << stmt
+      if graph_class == RDF::Graph
+        resp.graph
+      else
+        graph_class.new(data: resp.graph.data)
       end
-      graph
+    rescue ArgumentError
+      build_empty_graph << resp.graph
     end
 
     ##
     # @param [RDF::Graph] original_graph The graph returned by the LDP server
     # @return [RDF::Graph] A graph stripped of any inlined resources present in the original
     def filtered_graph(original_graph)
-      inlined_resources = original_graph.query(predicate: RDF::Vocab::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
-
-    def graph_without_inlined_resources(original_graph, inlined_resources)
-      new_graph = build_empty_graph
+      contains_statements = original_graph.query(predicate: RDF::Vocab::LDP.contains)
 
-      original_graph.each_statement do |s|
-        unless inlined_resources.include? s.subject
-          new_graph << s
-        end
+      contains_statements.each_object do |contained_uri|
+        original_graph.delete(original_graph.query(subject: contained_uri))
       end
 
-      new_graph
+      original_graph
     end
   end
 end

data/lib/ldp/response.rb

@@ -105,9 +105,7 @@ module Ldp
     # Get the graph for the resource (or a blank graph if there is no metadata for the resource)
     def graph
       @graph ||= begin
-        graph = RDF::Graph.new
-        each_statement { |s| graph << s }
-        graph
+        RDF::Graph.new << reader
       end
     end
 
@@ -115,6 +113,8 @@ module Ldp
       reader_for_content_type.new(body, base_uri: page_subject, &block)
     end
 
+    ##
+    # @deprecated use {#graph} instead
     def each_statement(&block)
       reader do |reader|
         reader.each_statement(&block)
@@ -155,17 +155,9 @@ module Ldp
     # Statements about the page
     def page
       @page_graph ||= begin
-        g = RDF::Graph.new
-
-        if resource?
-          res = graph.query RDF::Statement.new(page_subject, nil, nil)
-
-          res.each_statement do |s|
-            g << s
-          end
-        end
-
-        g
+        page_graph = RDF::Graph.new
+        page_graph << graph.query([page_subject, nil, nil]) if resource?
+        page_graph
       end
     end
 

data/lib/ldp/version.rb

@@ -1,3 +1,3 @@
 module Ldp
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

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

@@ -107,6 +107,24 @@ describe Ldp::Resource::RdfSource do
         expect(subject.graph.size).to eql(1)
       end
     end
+
+    context 'with inlined resources' do
+      subject { Ldp::Resource::RdfSource.new mock_client, "http://my.ldp.server/existing_object" }
+
+      let(:simple_graph) do
+        graph = RDF::Graph.new
+        graph << [RDF::URI.new(), RDF::Vocab::DC.title, "Hello, world!"]
+        graph << [RDF::URI.new(), RDF::Vocab::LDP.contains, contained_uri]
+        graph << [contained_uri, RDF::Vocab::DC.title, "delete me"]
+      end
+
+      let(:contained_uri) { RDF::URI.new('http://example.com/contained') }
+
+      it do
+        expect(subject.graph.subjects)
+          .to contain_exactly(RDF::URI('http://my.ldp.server/existing_object'))
+      end
+    end
   end
 
   context "When graph_class is overridden" do
@@ -130,5 +148,14 @@ describe Ldp::Resource::RdfSource do
     it "should use the specified class" do
       expect(subject.graph).to be_a SpecialGraph
     end
+
+    context "with a response body" do
+      subject { SpecialResource.new mock_client, "http://my.ldp.server/existing_object" }
+
+
+      it "should use the specified class" do
+        expect(subject.graph).to be_a SpecialGraph
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Chris Beer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -300,7 +300,7 @@ homepage: https://github.com/projecthydra/ldp
 licenses:
 - APACHE2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -315,8 +315,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Linked Data Platform client library
 test_files: