rdf-ldp 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18904525367275a1836e08e9185538f21c63ec9d
-  data.tar.gz: 409697fda7683e668615bfc44835931c736f953d
+  metadata.gz: 608eab3122c07390b9ea22a578ab0744fe18fe02
+  data.tar.gz: ddcd8b00538a683ef78f4cbda395573cebacdc23
 SHA512:
-  metadata.gz: 9d64846610138dbc4a68c447b2afc249ca5eee384ee8b95d4845c6dd89c7071896be631afd8a9f888becec3269c5c5ea60a59164ff9a29dbc5084a10734f2485
-  data.tar.gz: 5e36d6e154d7260f1db8db5d5ede91ddc9493391a1e84ab4d4fd9b210bec12fd9f5ca1605b52e98a9f7becd2b01f86976e6dd801824b4533507c2a0802f53a8b
+  metadata.gz: 29b2ba9c4f2f3baab28bc2d554f5e782cc3756fad291e277486c393e54166a11ccd3ce331c1de11c46849da36548df9ba3a092abbd8424989ee98e9bfb77a57d
+  data.tar.gz: 2e52d0ea153620570b1be88497ff0edb1be04ac860715280e69c9389d01361614c8a39b7d26337007985a8b13d97f546a4d4384fa90f7eb850c5c3e49100aa55

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.9.2
+-----
+  - Reduce memory allocation for URIs by using `RDF::URI#intern`.
+  - Make interaction models pluggable via `InteractionModel#register`.
+  
 0.9.1
 -----
   - Add support for relative IRIs in SPARQL Update PATCH requests.

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/lib/rdf/ldp.rb

@@ -9,6 +9,7 @@ require 'rdf/ldp/non_rdf_source'
 require 'rdf/ldp/container'
 require 'rdf/ldp/direct_container'
 require 'rdf/ldp/indirect_container'
+require 'rdf/ldp/interaction_model'
 
 module RDF
   ##
@@ -20,20 +21,12 @@ module RDF
   # @see RDF::LDP::Resource
   # @see http://www.w3.org/TR/ldp/ for the Linked Data platform specification
   module LDP
-    ##
-    # Interaction models are in reverse order of preference for POST/PUT
-    # requests; e.g. if a client sends a request with Resource, RDFSource, and
-    # BasicContainer headers, the server gives a basic container.
-    INTERACTION_MODELS = {
-      RDF::Vocab::LDP.Resource => RDF::LDP::RDFSource,
-      RDF::LDP::RDFSource.to_uri => RDF::LDP::RDFSource,
-      RDF::LDP::Container.to_uri => RDF::LDP::Container,
-      RDF::Vocab::LDP.BasicContainer => RDF::LDP::Container,
-      RDF::LDP::DirectContainer.to_uri => RDF::LDP::DirectContainer,
-      RDF::LDP::IndirectContainer.to_uri => RDF::LDP::IndirectContainer,
-      RDF::LDP::NonRDFSource.to_uri => RDF::LDP::NonRDFSource
-    }.freeze
-
+    InteractionModel.register(RDF::LDP::RDFSource, default: true)
+    InteractionModel.register(RDF::LDP::Container, for: RDF::Vocab::LDP.BasicContainer)
+    InteractionModel.register(RDF::LDP::DirectContainer)
+    InteractionModel.register(RDF::LDP::IndirectContainer)
+    InteractionModel.register(RDF::LDP::NonRDFSource)
+    
     CONTAINER_CLASSES = {
       basic:    RDF::Vocab::LDP.BasicContainer.freeze,
       direct:   RDF::LDP::DirectContainer.to_uri.freeze,

data/lib/rdf/ldp/interaction_model.rb

@@ -0,0 +1,87 @@
+module RDF
+  module LDP
+    class InteractionModel
+      class << self
+        ##
+        # Interaction models are in reverse order of preference for POST/PUT
+        # requests; e.g. if a client sends a request with Resource, RDFSource, and
+        # BasicContainer headers, the server gives a basic container.
+        #
+        # Interaction models are initialized in the correct order, but with no classed
+        # registered to handle them.
+        @@interaction_models = {
+          RDF::LDP::RDFSource.to_uri         => nil,
+          RDF::LDP::Container.to_uri         => nil,
+          RDF::Vocab::LDP.BasicContainer     => nil,
+          RDF::LDP::DirectContainer.to_uri   => nil,
+          RDF::LDP::IndirectContainer.to_uri => nil,
+          RDF::LDP::NonRDFSource.to_uri      => nil
+        }
+        
+        ##
+        # Register a new interaction model for one or more Link header URIs. klass.to_uri
+        # will automatically be registered.
+        #
+        # @param [RDF::LDP::Resource] klass  the implementation class to register
+        # @param [Hash <Symbol, *>] opts   registration options:
+        #   :default [true, false]  if true, klass will become the new default klass for
+        #     unrecognized Link headers
+        #   :for [RDF::URI, Array<RDF::URI>]  additional URIs for which klass should become 
+        #     the interaction model
+        #
+        # @return [RDF::LDP::Resource] klass
+        def register(klass, opts={})
+          unless klass.ancestors.include?(RDF::LDP::Resource)
+            raise ArgumentError, "Interaction models must subclass `RDF::LDP::Resource`" 
+          end
+          @@default = klass if opts[:default] or @@default.nil?
+          @@interaction_models[klass.to_uri] = klass
+          Array(opts[:for]).each do |model|
+            @@interaction_models[model] = klass
+          end
+          klass
+        end
+        
+        ##
+        # Find the appropriate interaction model given a set of Link header URIs.
+        #
+        # @param [Array<RDF::URI>] uris
+        #
+        # @return [Class] a subclass of {RDF::LDP::Resource} that most narrowly matches the
+        #   supplied `uris`, or the default interaction model if nothing matches
+        def find(uris)
+          match = @@interaction_models.keys.reverse.find { |u| uris.include? u } 
+          self.for(match) || @@default
+        end
+        
+        ##
+        # Find the interaction model registered for a given uri
+        #
+        # @param [RDF::URI] uri
+        #
+        # @return [Class] the {RDF::LDP::Resource} subclass registered to `uri`
+        def for(uri)
+          @@interaction_models[uri]
+        end
+        
+        ##
+        # The default registered interaction model
+        def default
+          @@default
+        end
+        
+        ##
+        # Test an array of URIs to see if their interaction models are compatible (e.g., all of the URIs
+        # refer either to RDF models or non-RDF models, but not a combination of both).
+        #
+        # @param [Array<RDF::URI>] uris
+        # @return [TrueClass or FalseClass]  true if the models specified by `uris` are compatible
+        def compatible?(uris)
+          classes = uris.collect { |m| self.for(m) }
+          (rdf,non_rdf) = classes.compact.partition { |c| c.ancestors.include?(RDFSource) }
+          rdf.empty? or non_rdf.empty?
+        end
+      end
+    end
+  end
+end

data/lib/rdf/ldp/resource.rb

@@ -132,8 +132,10 @@ module RDF::LDP
         graph = RDF::Graph.new(graph_name: metagraph_name(uri), data: data)
         raise NotFound if graph.empty?
 
-        rdf_class = graph.query([uri, RDF.type, :o]).first
-        klass = INTERACTION_MODELS[rdf_class.object] if rdf_class
+        klass = graph.query([uri, RDF.type, :o]).find do |rdf_class|
+          candidate = InteractionModel.for(rdf_class.object)
+          break candidate unless candidate.nil?
+        end
         klass ||= RDFSource
 
         klass.new(uri, data)
@@ -156,21 +158,13 @@ module RDF::LDP
         models =
           LinkHeader.parse(link_header)
                     .links.select { |link| link['rel'].casecmp 'type' }
-                    .map { |link| link.href }
-
-        return RDFSource if models.empty?
-        match = INTERACTION_MODELS.keys.reverse.find { |u| models.include? u }
-
-        if match == RDF::LDP::NonRDFSource.to_uri
-          raise NotAcceptable if
-            models.include?(RDF::LDP::RDFSource.to_uri)         ||
-            models.include?(RDF::LDP::Container.to_uri)         ||
-            models.include?(RDF::LDP::DirectContainer.to_uri)   ||
-            models.include?(RDF::LDP::IndirectContainer.to_uri) ||
-            models.include?(RDF::URI('http://www.w3.org/ns/ldp#BasicContainer'))
-        end
+                    .map { |link| RDF::URI.intern(link.href) }
+
+        return InteractionModel.default if models.empty?
+        
+        raise NotAcceptable unless InteractionModel.compatible?(models)
 
-        INTERACTION_MODELS[match] || RDFSource
+        InteractionModel.find(models)
       end
 
       ##
@@ -199,7 +193,7 @@ module RDF::LDP
     #   end
     #
     def initialize(subject_uri, data = RDF::Repository.new)
-      @subject_uri = RDF::URI(subject_uri)
+      @subject_uri = RDF::URI.intern(subject_uri)
       @data = data
       @metagraph = RDF::Graph.new(graph_name: metagraph_name, data: data)
       yield self if block_given?
@@ -585,7 +579,7 @@ module RDF::LDP
     end
 
     ##
-    # Sets the last modified date/time to the URI for this resource's class
+    # Sets the interaction model to the URI for this resource's class
     def set_interaction_model(transaction)
       transaction.insert(RDF::Statement(subject_uri,
                                         RDF.type,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-ldp
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Tom Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -360,6 +360,7 @@ files:
 - lib/rdf/ldp/container.rb
 - lib/rdf/ldp/direct_container.rb
 - lib/rdf/ldp/indirect_container.rb
+- lib/rdf/ldp/interaction_model.rb
 - lib/rdf/ldp/non_rdf_source.rb
 - lib/rdf/ldp/rdf_source.rb
 - lib/rdf/ldp/resource.rb
@@ -386,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A suite of LDP software and middleware for RDF.rb.