rdf-ldp 0.9.2 → 2.1.0

data/lib/rdf/ldp/indirect_container.rb

@@ -13,9 +13,9 @@ module RDF::LDP
   # Acceptable`. LDP-NR's cannot be added since indirect membership is not well
   # defined for them, per _LDP 5.5.1.2_.
   #
-  # @see http://www.w3.org/TR/ldp/#h-ldpic-indirectmbr for an explanation if
+  # @see https://www.w3.org/TR/ldp/#h-ldpic-indirectmbr for an explanation if
   #   indirect membership and limitiations surrounding LDP-NRs.
-  # @see http://www.w3.org/TR/ldp/#dfn-linked-data-platform-indirect-container
+  # @see https://www.w3.org/TR/ldp/#dfn-linked-data-platform-indirect-container
   #   definition of LDP Indirect Container
   class IndirectContainer < DirectContainer
     INSERTED_CONTENT_REL_URI = RDF::Vocab::LDP.insertedContentRelation.freeze
@@ -61,7 +61,7 @@ module RDF::LDP
     # @raise [RDF::LDP::NotAcceptable] if multiple inserted content relations
     #   exist.
     #
-    # @see http://www.w3.org/TR/ldp/#dfn-membership-triples
+    # @see https://www.w3.org/TR/ldp/#dfn-membership-triples
     def inserted_content_relation
       statements = inserted_content_statements
       return statements.first.object if statements.count == 1
@@ -87,9 +87,11 @@ module RDF::LDP
       predicate = inserted_content_relation
       return resource.to_uri if predicate == MEMBER_SUBJECT_URI
 
-      raise(NotAcceptable, "#{resource.to_uri} is an LDP-NR; cannot add " \
-                           'it to an IndirectContainer with a content '   \
-                           'relation.') if resource.non_rdf_source?
+      if resource.non_rdf_source?
+        raise(NotAcceptable, "#{resource.to_uri} is an LDP-NR; cannot add " \
+                             'it to an IndirectContainer with a content '   \
+                             'relation.')
+      end
 
       target = transaction || resource.graph
       statements = target.query([resource.subject_uri, predicate, :o])

data/lib/rdf/ldp/interaction_model.rb

@@ -1,14 +1,16 @@
 module RDF
   module LDP
+    ##
+    # Provides an interaction model registry.
     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.
+        # requests; e.g. if a client sends a request with Resource, RDFSource,
+        # oand 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 are initialized in the correct order, but with no
+        # class registered to handle them.
         @@interaction_models = {
           RDF::LDP::RDFSource.to_uri         => nil,
           RDF::LDP::Container.to_uri         => nil,
@@ -17,43 +19,47 @@ module RDF
           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.
+        # 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 [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
+        #   :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={})
+        def register(klass, opts = {})
           unless klass.ancestors.include?(RDF::LDP::Resource)
-            raise ArgumentError, "Interaction models must subclass `RDF::LDP::Resource`" 
+            raise ArgumentError,
+                  'Interaction models must subclass `RDF::LDP::Resource`'
           end
-          @@default = klass if opts[:default] or @@default.nil?
+          @@default = klass if opts[:default] || @@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.
+        # 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
+        # @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 } 
+          match = @@interaction_models.keys.reverse.find { |u| uris.include? u }
           self.for(match) || @@default
         end
-        
+
         ##
         # Find the interaction model registered for a given uri
         #
@@ -63,23 +69,27 @@ module RDF
         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).
+        # 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
+        # @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?
+          classes        = uris.collect { |m| self.for(m) }
+          (rdf, non_rdf) =
+            classes.compact.partition { |c| c.ancestors.include?(RDFSource) }
+
+          rdf.empty? || non_rdf.empty?
         end
       end
     end

data/lib/rdf/ldp/non_rdf_source.rb

@@ -15,7 +15,7 @@ module RDF::LDP
   # the resource itself is returned by `#description`.
   #
   # @see RDF::LDP::Resource
-  # @see http://www.w3.org/TR/ldp/#dfn-linked-data-platform-non-rdf-source for
+  # @see https://www.w3.org/TR/ldp/#dfn-linked-data-platform-non-rdf-source for
   #   a definition of NonRDFSource in LDP
   class NonRDFSource < Resource
     attr_reader :storage
@@ -27,10 +27,14 @@ module RDF::LDP
     FORMAT_TERM = RDF::Vocab::DC11.format.freeze
 
     ##
-    # @param [storage_adapter] a class implementing the StorageAdapter interface
+    # @param [RDF::URI] subject_uri
+    # @param [RDF::Queryable] data
+    # @param [StorageAdapter] storage_adapter a class implementing the StorageAdapter interface
     #
     # @see RDF::LDP::Resource#initialize
-    def initialize(subject_uri, data = RDF::Repository.new, storage_adapter = DEFAULT_ADAPTER)
+    def initialize(subject_uri,
+                   data            = RDF::Repository.new,
+                   storage_adapter = DEFAULT_ADAPTER)
       data ||= RDF::Repository.new # allows explict `nil` pass
       @storage = storage_adapter.new(self)
       super(subject_uri, data)
@@ -40,7 +44,7 @@ module RDF::LDP
     # @return [RDF::URI] uri with lexical representation
     #   'http://www.w3.org/ns/ldp#NonRDFSource'
     #
-    # @see http://www.w3.org/TR/ldp/#dfn-linked-data-platform-non-rdf-source
+    # @see https://www.w3.org/TR/ldp/#dfn-linked-data-platform-non-rdf-source
     def self.to_uri
       RDF::Vocab::LDP.NonRDFSource
     end
@@ -109,7 +113,7 @@ module RDF::LDP
     ##
     # Sets the MIME type for the resource in `metagraph`.
     #
-    # @param [String] a string representing the content type for this LDP-NR.
+    # @param [String] content_type a string representing the content type for this LDP-NR.
     #   This SHOULD be a regisered MIME type.
     #
     # @return [StorageAdapter] the content type
@@ -132,7 +136,7 @@ module RDF::LDP
     #
     # @raise [RDF::LDP::RequestError] when the request fails
     def to_response
-      (exists? && !destroyed?) ? storage.io : []
+      exists? && !destroyed? ? storage.io : []
     end
 
     private

data/lib/rdf/ldp/rdf_source.rb

@@ -25,7 +25,7 @@ module RDF::LDP
   #   but MAY be absent from (or in conflict with) the representation of its
   #   state in `#graph`.
   #
-  # @see http://www.w3.org/TR/ldp/#dfn-linked-data-platform-rdf-source
+  # @see https://www.w3.org/TR/ldp/#dfn-linked-data-platform-rdf-source
   #   Definition of ldp:RDFSource in the LDP specification
   class RDFSource < Resource
     class << self
@@ -33,7 +33,7 @@ module RDF::LDP
       # @return [RDF::URI] uri with lexical representation
       #   'http://www.w3.org/ns/ldp#RDFSource'
       #
-      # @see http://www.w3.org/TR/ldp/#dfn-linked-data-platform-rdf-source
+      # @see https://www.w3.org/TR/ldp/#dfn-linked-data-platform-rdf-source
       def to_uri
         RDF::Vocab::LDP.RDFSource
       end
@@ -241,7 +241,7 @@ module RDF::LDP
     #
     # @raise [RDF::LDP::UnsupportedMediaType] if no appropriate reader is found
     #
-    # @see http://www.rubydoc.info/github/rack/rack/file/SPEC#The_Input_Stream
+    # @see https://www.rubydoc.info/github/rack/rack/file/SPEC#The_Input_Stream
     #   Documentation on input streams in the Rack SPEC
     def parse_graph(input, content_type)
       reader = RDF::Reader.for(content_type: content_type.to_s)

data/lib/rdf/ldp/resource.rb

@@ -38,14 +38,15 @@ module RDF::LDP
   #   resource.exists? # => true
   #   resource.metagraph.dump :ttl
   #   # => "<http://example.org/moomin> a <http://www.w3.org/ns/ldp#Resource>;
-  #           <http://purl.org/dc/terms/modified> "2015-10-25T14:24:56-07:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> ."
+  #   #       <http://purl.org/dc/terms/modified>
+  #   #         "2015-10-25T14:24:56-07:00"^^xsd:dateTime ."
   #
   # @example updating a Resource updates the `#last_modified` date
   #   resource.last_modified
-  #   # => #<DateTime: 2015-10-25T14:32:01-07:00 ((2457321j,77521s,571858283n),-25200s,2299161j)>
+  #   # => #<DateTime: 2015-10-25T14:32:01-07:00...>
   #   resource.update('blah', 'text/plain')
   #   resource.last_modified
-  #   # => #<DateTime: 2015-10-25T14:32:04-07:00 ((2457321j,77524s,330658065n),-25200s,2299161j)>
+  #   # => #<DateTime: 2015-10-25T14:32:04-07:00...>
   #
   # @example destroying a Resource
   #   resource.exists? # => true
@@ -75,13 +76,13 @@ module RDF::LDP
   #         #<RDF::LDP::Resource:0x00564f4a646028
   #           @data=#<RDF::Repository:0x2b27a5391708()>,
   #           @exists=true,
-  #           @metagraph=#<RDF::Graph:0x2b27a5322538(http://example.org/moomin#meta)>,
-  #           @subject_uri=#<RDF::URI:0x2b27a5322fec URI:http://example.org/moomin>>]
+  #           @metagraph=#<RDF::Graph:0xea7(http://example.org/moomin#meta)>,
+  #           @subject_uri=#<RDF::URI:0xea8 URI:http://example.org/moomin>>]
   #
   #   resource.request(:put, 200, {}, {}) # RDF::LDP::MethodNotAllowed: put
   #
-  # @see http://www.w3.org/TR/ldp/ Linked Data platform Specification
-  # @see http://www.w3.org/TR/ldp/#dfn-linked-data-platform-resource Definition
+  # @see https://www.w3.org/TR/ldp/ Linked Data platform Specification
+  # @see https://www.w3.org/TR/ldp/#dfn-linked-data-platform-resource Definition
   #   of 'Resource' in LDP
   class Resource
     CONTAINS_URI       = RDF::Vocab::LDP.contains.freeze
@@ -101,7 +102,7 @@ module RDF::LDP
       # @return [RDF::URI] uri with lexical representation
       #   'http://www.w3.org/ns/ldp#Resource'
       #
-      # @see http://www.w3.org/TR/ldp/#dfn-linked-data-platform-resource
+      # @see https://www.w3.org/TR/ldp/#dfn-linked-data-platform-resource
       def to_uri
         RDF::Vocab::LDP.Resource
       end
@@ -109,7 +110,7 @@ module RDF::LDP
       ##
       # Creates an unique id (URI Slug) for a resource.
       #
-      # @note the current implementation uses {SecureRandom#uuid}.
+      # @note the current implementation uses `SecureRandom#uuid`.
       #
       # @return [String] a unique ID
       def gen_id
@@ -161,7 +162,7 @@ module RDF::LDP
                     .map { |link| RDF::URI.intern(link.href) }
 
         return InteractionModel.default if models.empty?
-        
+
         raise NotAcceptable unless InteractionModel.compatible?(models)
 
         InteractionModel.find(models)
@@ -202,9 +203,9 @@ module RDF::LDP
     ##
     # @abstract creates the resource
     #
-    # @param [IO, File] input  input (usually from a Rack env's
+    # @param [IO, File] _input  input (usually from a Rack env's
     #   `rack.input` key) used to determine the Resource's initial state.
-    # @param [#to_s] content_type  a MIME content_type used to interpret the
+    # @param [#to_s] _content_type  a MIME content_type used to interpret the
     #   input. This MAY be used as a content type for the created Resource
     #   (especially for `LDP::NonRDFSource`s).
     #
@@ -302,13 +303,13 @@ module RDF::LDP
     #
     # @return [String] an HTTP Etag
     #
-    # @note these etags are weak, but we allow clients to use them in 
+    # @note these etags are weak, but we allow clients to use them in
     #   `If-Match` headers, and use weak comparison. This is in conflict with
-    #   https://tools.ietf.org/html/rfc7232#section-3.1. See: 
+    #   https://tools.ietf.org/html/rfc7232#section-3.1. See:
     #   https://github.com/ruby-rdf/rdf-ldp/issues/68
     #
-    # @see http://www.w3.org/TR/ldp#h-ldpr-gen-etags  LDP ETag clause for GET
-    # @see http://www.w3.org/TR/ldp#h-ldpr-put-precond  LDP ETag clause for PUT
+    # @see https://www.w3.org/TR/ldp#h-ldpr-gen-etags  LDP ETag clause for GET
+    # @see https://www.w3.org/TR/ldp#h-ldpr-put-precond  LDP ETag clause for PUT
     # @see https://tools.ietf.org/html/rfc7232#section-2.1
     #   Weak vs. strong validators
     def etag
@@ -392,7 +393,7 @@ module RDF::LDP
     # Runs the request and returns the object's desired HTTP response body,
     # conforming to the Rack interfare.
     #
-    # @see http://www.rubydoc.info/github/rack/rack/master/file/SPEC#The_Body
+    # @see https://www.rubydoc.info/github/rack/rack/master/file/SPEC#The_Body
     #   Rack body documentation
     def to_response
       []
@@ -535,10 +536,10 @@ module RDF::LDP
     # @return [Array<String>] an array of link headers to add to the
     #   existing ones
     #
-    # @see http://www.w3.org/TR/ldp/#h-ldpr-gen-linktypehdr
-    # @see http://www.w3.org/TR/ldp/#h-ldprs-are-ldpr
-    # @see http://www.w3.org/TR/ldp/#h-ldpnr-type
-    # @see http://www.w3.org/TR/ldp/#h-ldpc-linktypehdr
+    # @see https://www.w3.org/TR/ldp/#h-ldpr-gen-linktypehdr
+    # @see https://www.w3.org/TR/ldp/#h-ldprs-are-ldpr
+    # @see https://www.w3.org/TR/ldp/#h-ldpnr-type
+    # @see https://www.w3.org/TR/ldp/#h-ldpc-linktypehdr
     def link_headers
       return [] unless is_a? RDF::LDP::Resource
       headers = [link_type_header(RDF::LDP::Resource.to_uri)]
@@ -558,24 +559,25 @@ module RDF::LDP
     ##
     # Sets the last modified date/time to now
     #
-    # @param transaction [RDF::Transaction] the transaction scope in which to 
+    # @param transaction [RDF::Transaction] the transaction scope in which to
     #   apply changes. If none (or `nil`) is given, the change is made outside
     #   any transaction scope.
     def set_last_modified(transaction = nil)
-      if transaction
-        # transactions do not support updates or pattern deletes, so we must
-        # ask the Repository for the current last_modified to delete the statement
-        # transactionally
+      return metagraph.update([subject_uri, MODIFIED_URI, DateTime.now]) unless
         transaction
-          .delete RDF::Statement(subject_uri, MODIFIED_URI, last_modified,
-                                 graph_name: metagraph_name) if last_modified
 
+      # transactions do not support updates or pattern deletes, so we must
+      # ask the Repository for the current last_modified to delete the
+      # statement transactionally
+      if last_modified
         transaction
-          .insert RDF::Statement(subject_uri, MODIFIED_URI, DateTime.now,
+          .delete RDF::Statement(subject_uri, MODIFIED_URI, last_modified,
                                  graph_name: metagraph_name)
-      else
-        metagraph.update([subject_uri, MODIFIED_URI, DateTime.now])
       end
+
+      transaction
+        .insert RDF::Statement(subject_uri, MODIFIED_URI, DateTime.now,
+                               graph_name: metagraph_name)
     end
 
     ##