rdf-ldp 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1fb8fbd183ec6b222e4a1d8f70c95a530111e09
-  data.tar.gz: fe49505fd5a0b6442af69f691ffc4450e7a301a2
+  metadata.gz: 51911c93db2822f4b81a715187dbe77ea175336d
+  data.tar.gz: 1109c3c631c59d55ff0e96e422d29363e1efcc61
 SHA512:
-  metadata.gz: 35cefba9e0d2cd219d63cca897bf423950f5baa9de5eed003c47d6e4166688beb328e00f07e56541c6e871f2dcad1bdc5cf1af31e8d9af0cfe3c6c8aa16c53a8
-  data.tar.gz: 9dfb9d04d821a4058b087ea1ebc5559ec03d26186e8356ec698cf5576b8afe06ef478fcc17f1b48f27b1988e0e92b9ccecdae83cea642df14a184c5fb19d487d
+  metadata.gz: 86057aa53d6be3dad23e16107da011b30b8e3ba039bec87dd77c0729ced5a3775c363528df35124860e70bb5ea718fb59708d44585d1523ce29ab195d803c05b
+  data.tar.gz: 3f6824f3c638733ac1f66c6eecbfb8856ada627ef9156453c9ba61ee45316f09fadefac59e35436324e6ee64f7e75c05d23eed5266a289ea5d67a3f7a81de11c

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.6.0
+-----
+ - Upgrades to RDF.rb 2.0
+ - Adds true transaction scopes for POST & PUT requests
+ - Changes behavior of direct & indirect containers to add default
+   required triples on creation if none are supplied in the request.
+   
 0.5.1
 -----
  - Fixes inserted content relation interpretations.

data/README.md

@@ -111,6 +111,14 @@ Reports are generated by the LDP test suite. To duplicate the results,
 use the `testsuite` branch, which contains a work-around for
 [w3c/ldp-testsuite#224](https://github.com/w3c/ldp-testsuite/issues/224).
 
+RDF.rb 1.x Compatibility
+--------------------------
+
+As of version 0.6.0, this software depends on RDF.rb 2.0 or greater. Support for
+Ruby RDF version 1.99 will be maintained to the degree possible on the 0.5.x
+release series. Users are encouraged to upgrade their projects to 2.0 to take
+advantage of the latest development.
+
 
 License
 ========

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/lib/rdf/ldp/container.rb

@@ -120,7 +120,7 @@ module RDF::LDP
     # @return [Container] self
     def add_containment_triple(resource, transaction = nil)
       target = transaction || graph
-      target << make_containment_triple(resource)
+      target.insert make_containment_triple(resource)
       set_last_modified(transaction)
       self
     end
@@ -201,28 +201,18 @@ module RDF::LDP
     def validate_triples!(transaction)
       existing_triples = containment_triples.to_a
       
-      inserts = transaction.inserts.select do |st|
-        st.subject == subject_uri && st.predicate == RDF::Vocab::LDP.contains
-      end
+      tx_containment = transaction.query(subject: subject_uri, 
+                                         predicate: RDF::Vocab::LDP.contains)
 
-      inserts.each do |statement|
-        existing_triples.delete(statement) do 
-          raise Conflict.new('Attempted to write unacceptable LDP ' \
-                             "containment-triple: #{statement}") 
-        end
+      tx_containment.each do |statement|
+        raise Conflict.new('Attempted to write unacceptable LDP ' \
+                           "containment-triple: #{statement}") unless
+          existing_triples.include?(statement) 
       end
 
-      deletes = transaction.deletes.select do |st| 
-        st.subject == subject_uri && 
-          predicate == RDF::Vocab::LDP.contains && 
-          !inserts.include?(st)
-      end
-      
-      deletes = deletes + existing_triples
-      
+      deletes = existing_triples.reject { |st| tx_containment.include?(st) }
       raise Conflict.new('Cannot remove containment triples in updates. ' \
-                         "Attepted to remove #{deletes}") unless
-        deletes.empty?
+                         "Attepted to remove #{deletes}") unless deletes.empty?
     end
 
     ##

data/lib/rdf/ldp/direct_container.rb

@@ -32,7 +32,22 @@ module RDF::LDP
     end
 
     ##
-    # Adds a member `resource` to the container. Handles containment and adds 
+    # @see Container#create
+    def create(input, content_type, &block)
+      super
+      # insert relation triples after the transaction, since we can't guarantee
+      # snapshot access.
+      #
+      # @todo consider just raising an error instead.
+      graph.insert(default_member_relation_statement) if
+        member_relation_statements.empty?
+      graph.insert(default_membership_resource_statement) if
+        membership_resource_statements.empty?
+      self
+    end
+
+    ##
+    # Adds a member `resource` to the container. Handles containment and adds
     # membership triple to the memebership resource.
     #
     # @see RDF::LDP::Container#add
@@ -41,7 +56,7 @@ module RDF::LDP
       process_membership_resource(resource) do |membership, quad, resource|
         super(resource, transaction)
         target = transaction || membership.graph
-        target << quad
+        target.insert(quad)
       end
       self
     end
@@ -71,19 +86,10 @@ module RDF::LDP
     # @see http://www.w3.org/TR/ldp/#dfn-membership-triples
     def membership_constant_uri
       statements = membership_resource_statements
-      case statements.count
-        when 0
-          graph << RDF::Statement(subject_uri, 
-                                  RDF::Vocab::LDP.membershipResource, 
-                                  subject_uri)
-          subject_uri
-        when 1
-          statements.first.object
-        else
-          raise NotAcceptable.new('An LDP-DC MUST have exactly ' \
-                                  'one membership resource; found ' \
-                                  "#{statements}.")
-      end
+      return statements.first.object if statements.count == 1
+
+      raise NotAcceptable.new('An LDP-DC MUST have exactly one membership ' \
+                              "resource; found #{statements.count}.")
     end
 
     ##
@@ -97,19 +103,10 @@ module RDF::LDP
     # @see http://www.w3.org/TR/ldp/#dfn-membership-predicate
     def membership_predicate
       statements = member_relation_statements
-      case statements.count
-      when 0
-        graph << RDF::Statement(subject_uri, 
-                                RELATION_TERMS.first, 
-                                RDF::Vocab::LDP.member)
-        RDF::Vocab::LDP.member
-      when 1
-        statements.first.object
-      else
-        raise NotAcceptable.new('An LDP-DC MUST have exactly ' \
-                                'one member relation triple; found ' \
-                                "#{statements.count}.")
-      end
+      return statements.first.object if statements.count == 1
+
+      raise NotAcceptable.new('An LDP-DC MUST have exactly one member ' \
+                              "relation triple; found #{statements.count}.")
     end
 
     ##
@@ -159,5 +156,15 @@ module RDF::LDP
       statement.graph_name = membership_rs.subject_uri
       yield(membership_rs, statement, resource) if block_given?
     end
+
+    def default_membership_resource_statement
+      RDF::Statement(subject_uri, 
+                     RDF::Vocab::LDP.membershipResource, 
+                     subject_uri)
+    end
+    
+    def default_member_relation_statement
+      RDF::Statement(subject_uri, RELATION_TERMS.first, RDF::Vocab::LDP.member)
+    end
   end
 end

data/lib/rdf/ldp/indirect_container.rb

@@ -28,6 +28,17 @@ module RDF::LDP
       CONTAINER_CLASSES[:indirect]
     end
 
+    ##
+    # @see Container#create
+    def create(input, content_type, &block)
+      super
+      graph.insert RDF::Statement(subject_uri, 
+                                  RDF::Vocab::LDP.insertedContentRelation, 
+                                  RDF::Vocab::LDP.MemberSubject) if
+        inserted_content_statements.empty?
+      self
+    end
+
     ##
     # Gives the inserted content relation for the indirect container. If none is
     # present in the container state, we add `ldp:MemberSubject`, effectively 
@@ -42,19 +53,11 @@ module RDF::LDP
     # @see http://www.w3.org/TR/ldp/#dfn-membership-triples
     def inserted_content_relation
       statements = inserted_content_statements
-      case statements.count
-      when 0
-        graph << RDF::Statement(subject_uri, 
-                                RDF::Vocab::LDP.insertedContentRelation, 
-                                RDF::Vocab::LDP.MemberSubject)
-        RDF::Vocab::LDP.MemberSubject
-      when 1
-        statements.first.object
-      else
-        raise NotAcceptable.new('An LDP-IC MUST have exactly ' \
-                                'one inserted content relation triple; found ' \
-                                "#{statements.count}.")
-      end
+      return statements.first.object if statements.count == 1
+
+      raise NotAcceptable.new('An LDP-IC MUST have exactly ' \
+                              'one inserted content relation triple; found ' \
+                              "#{statements.count}.")
     end
 
     private
@@ -76,17 +79,12 @@ module RDF::LDP
       raise NotAcceptable.new("#{resource.to_uri} is an LDP-NR; cannot add " \
                               'it to an IndirectContainer with a content ' \
                               'relation.') if resource.non_rdf_source?
-                              
-      resource
 
       statements = resource.graph.query([resource.subject_uri, predicate, :o])
-      case statements.count
-      when 1
-        statements.first.object
-      else
-        raise NotAcceptable.new("#{statements.count} inserted content" \
-                                "#{predicate} found on #{resource.to_uri}")
-      end
+      return statements.first.object if statements.count == 1
+
+      raise NotAcceptable.new("#{statements.count} inserted content" \
+                              "#{predicate} found on #{resource.to_uri}")
     end
   end
 end

data/lib/rdf/ldp/non_rdf_source.rb

@@ -102,7 +102,8 @@ module RDF::LDP
     # @return [StorageAdapter] the content type 
     def content_type=(content_type)
       metagraph.delete([subject_uri, FORMAT_TERM])
-      metagraph << RDF::Statement(subject_uri, RDF::DC11.format, content_type)
+      metagraph << 
+        RDF::Statement(subject_uri, RDF::Vocab::DC11.format, content_type)
     end
     
     ##

data/lib/rdf/ldp/rdf_source.rb

@@ -53,7 +53,7 @@ module RDF::LDP
     # @return [RDF::Graph] a graph representing the current persistent state of 
     #   the resource.
     def graph
-      @graph ||= RDF::Graph.new(@subject_uri, data: @data)
+      @graph ||= RDF::Graph.new(graph_name: @subject_uri, data: @data)
     end
 
     ##
@@ -98,9 +98,8 @@ module RDF::LDP
     # @return [RDF::LDP::Resource] self
     def create(input, content_type, &block)
       super do |transaction|
-        transaction.graph_name = subject_uri
         statements = parse_graph(input, content_type)
-        transaction << statements
+        transaction.insert(statements)
         yield transaction if block_given?
       end
     end
@@ -134,12 +133,10 @@ module RDF::LDP
     # @return [RDF::LDP::Resource] self
     def update(input, content_type, &block)
       super do |transaction|
-        transaction.graph_name = subject_uri
-        transaction << parse_graph(input, content_type)
+        transaction.delete(RDF::Statement(nil, nil, nil, graph_name: subject_uri))
+        transaction.insert parse_graph(input, content_type)
         yield transaction if block_given?
-        graph.clear
       end
-
       self
     end
 
@@ -148,8 +145,8 @@ module RDF::LDP
     #
     # @see RDF::LDP::Resource#destroy
     def destroy(&block)
-      super do |_|
-        graph.clear
+      super do |tx| 
+        tx.delete(RDF::Statement(nil, nil, nil, graph_name: subject_uri))
       end
     end
 
@@ -242,17 +239,17 @@ module RDF::LDP
     #
     # @raise [RDF::LDP::UnsupportedMediaType] if no appropriate reader is found
     #
-    # @todo handle cases where no content type is given? Does RDF::Reader have 
-    #   tools to help us here?
-    #
     # @see http://www.rubydoc.info/github/rack/rack/file/SPEC#The_Input_Stream 
     #   for documentation on input streams in the Rack SPEC
     def parse_graph(input, content_type)
       reader = RDF::Reader.for(content_type: content_type.to_s)
       raise(RDF::LDP::UnsupportedMediaType, content_type) if reader.nil?
+
       input = input.read if input.respond_to? :read
+
       begin
-        RDF::Graph.new << reader.new(input, base_uri: subject_uri, validate: true)
+        RDF::Graph.new(graph_name: subject_uri, data: RDF::Repository.new) << 
+          reader.new(input, base_uri: subject_uri, validate: true)
       rescue RDF::ReaderError => e
         raise RDF::LDP::BadRequest, e.message
       end  

data/lib/rdf/ldp/resource.rb

@@ -125,7 +125,7 @@ module RDF::LDP
       #   usually of a subclass
       #   from the interaction models.
       def find(uri, data)
-        graph = RDF::Graph.new(metagraph_name(uri), data: data)
+        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
@@ -196,7 +196,7 @@ module RDF::LDP
     def initialize(subject_uri, data = RDF::Repository.new)
       @subject_uri = RDF::URI(subject_uri)
       @data = data
-      @metagraph = RDF::Graph.new(metagraph_name, data: data)
+      @metagraph = RDF::Graph.new(graph_name: metagraph_name, data: data)
       yield self if block_given?
     end
 
@@ -220,7 +220,7 @@ module RDF::LDP
     def create(input, content_type, &block)
       raise Conflict if exists?
 
-      @data.transaction do |transaction|
+      @data.transaction(mutable: true) do |transaction|
         set_interaction_model(transaction)
         yield transaction if block_given?
         set_last_modified(transaction)
@@ -246,7 +246,7 @@ module RDF::LDP
     #   subclasses for the appropriate response codes.
     def update(input, content_type, &block)
       return create(input, content_type, &block) unless exists?
-      @data.transaction do |transaction|
+      @data.transaction(mutable: true) do |transaction|
         yield transaction if block_given?
         set_last_modified(transaction)
       end
@@ -267,13 +267,13 @@ module RDF::LDP
     # @todo Use of owl:Nothing is probably problematic. Define an internal
     # namespace and class represeting deletion status as a stateful property.
     def destroy(&block)
-      @data.transaction do |transaction|
+      @data.transaction(mutable: true) do |transaction|
         containers.each { |c| c.remove(self, transaction) if c.container? }
-        transaction << RDF::Statement(subject_uri,
+        transaction.insert RDF::Statement(subject_uri,
                                       RDF::Vocab::PROV.invalidatedAtTime,
                                       DateTime.now,
                                       graph_name: metagraph_name)
-        yield if block_given?
+        yield transaction if block_given?
       end
       self
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-ldp
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Tom Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -30,68 +30,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.8
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ld-patch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack-linkeddata
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -160,62 +148,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.13
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.13
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfa
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement