rdf-ldp 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51911c93db2822f4b81a715187dbe77ea175336d
-  data.tar.gz: 1109c3c631c59d55ff0e96e422d29363e1efcc61
+  metadata.gz: c6984fe1fabab30524697db0471c39721f68fb54
+  data.tar.gz: fc3b6d95051b4c82b02cb9d474a379b15e5584d0
 SHA512:
-  metadata.gz: 86057aa53d6be3dad23e16107da011b30b8e3ba039bec87dd77c0729ced5a3775c363528df35124860e70bb5ea718fb59708d44585d1523ce29ab195d803c05b
-  data.tar.gz: 3f6824f3c638733ac1f66c6eecbfb8856ada627ef9156453c9ba61ee45316f09fadefac59e35436324e6ee64f7e75c05d23eed5266a289ea5d67a3f7a81de11c
+  metadata.gz: 0243e142e3b59232c19360ad4b507dda9e32ea9643e794318fb5227fe653261b64a61b82e655620976a05fec535f35193c5c7fccb225ed65669ff07192875693
+  data.tar.gz: 7256e7bb1c2c2a59c16e64def71c9101e5cd1b071d6f2432564d1dfb3d8feb559732b85821a3e0a71773f15f69cab5d8ee1da9e36af3dc1d4ee3b29793d89811

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+0.7.0
+-----
+ - Changes handling of input streams to be compliant with Rack. Allows
+   the server to run with `Rack::Lint` middleware. In the process, the
+   `RDFSource` and `NonRDFSource` interfaces are changed to accept only
+   IO-like objects conforming to Rack's input expectations. `String`
+   objects are no longer handled.
+
 0.6.0
 -----
  - Upgrades to RDF.rb 2.0

data/IMPLEMENTATION.md

@@ -14,8 +14,10 @@ LDP Implementation Overview
  creation.
  - __4.2.1.3__: Etags are generated for all LDPRs and returned for all requests
  to the resource.
- - __4.2.1.4__: Link headers for the resquested resource are added by
- `Rack::LDP::Headers` middleware.
+ - __4.2.1.4__: Link headers for the __returned__ resource are added by
+ `Rack::LDP::Headers` middleware. The requirement to return Link headers for
+ the requested resource is ignored in the case of successful POST requests;
+ instead, the headers for the created resource are given.
  - __4.2.1.5__: Relative URI resolution in RDF graphs is handled with
  `RDF::Reader#base_uri`. This is tested for Turtle input.
  - __4.2.1.6__: Constraints are published in the {CONSTRAINED_BY.md} file in

data/README.md

@@ -106,10 +106,10 @@ $ rackup
 Compliance
 ----------
 
-Current compliance reports for Lamprey are located in [/reports](reports/).
-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).
+Current compliance reports for Lamprey are located in [/report](report/).
+Reports are generated by the LDP test suite. We use the
+[`ldp_testsuite_wrapper`](https://github.com/cbeer/ldp_testsuite_wrapper)
+gem to run the suite and generate the tests.
 
 RDF.rb 1.x Compatibility
 --------------------------

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/app/lamprey.rb

@@ -2,7 +2,7 @@ require 'rack/ldp'
 require 'sinatra/base'
 
 class RDF::Lamprey < Sinatra::Base
-
+  use Rack::Lint
   use Rack::LDP::ContentNegotiation
   use Rack::LDP::Errors
   use Rack::LDP::Responses
@@ -16,7 +16,7 @@ class RDF::Lamprey < Sinatra::Base
 
   get '/*' do
     RDF::LDP::Container.new(RDF::URI(request.url), settings.repository)
-      .create('', 'text/turtle') if settings.repository.empty?    
+      .create(StringIO.new, 'text/turtle') if settings.repository.empty?    
     RDF::LDP::Resource.find(RDF::URI(request.url), settings.repository)
   end
 

data/lib/rdf/ldp/direct_container.rb

@@ -32,17 +32,27 @@ module RDF::LDP
     end
 
     ##
+    # Creates and inserts default relation triples if none are given.
+    #
+    # @note the addition of default triples is handled in a separate 
+    #   transaction. It is possible for the second transaction to fail, causing
+    #   the resource to persist in an invalid state. It is also possible for a
+    #   read to occur between the two transactions.
+    # @todo Make atomic. Consider just raising an error instead of adding 
+    #   triples. There's a need to handle this issue for repositories with 
+    #   snapshot reads, as well as those without.
+    #
     # @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?
+
+      graph.transaction(mutable: true) do |tx|
+        tx.insert(default_member_relation_statement) if
+          member_relation_statements.empty?
+        tx.insert(default_membership_resource_statement) if
+          membership_resource_statements.empty?
+      end
+
       self
     end
 

data/lib/rdf/ldp/indirect_container.rb

@@ -29,13 +29,20 @@ module RDF::LDP
     end
 
     ##
-    # @see Container#create
+    # Creates and inserts default relation triples if none are given.
+    #
+    # @see DirectContainer#create for information about the behavior and 
+    #   transactionality of this method.
     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?
+
+      graph.transaction(mutable: true) do |tx|
+        tx.insert RDF::Statement(subject_uri, 
+                                 RDF::Vocab::LDP.insertedContentRelation, 
+                                 RDF::Vocab::LDP.MemberSubject) if
+          inserted_content_statements.empty?
+      end
+
       self
     end
 

data/lib/rdf/ldp/non_rdf_source.rb

@@ -47,17 +47,20 @@ module RDF::LDP
     #
     # @see RDF::LDP::Resource#create
     def create(input, c_type)
-      storage.io { |io| IO.copy_stream(input.binmode, io) }
+      storage.io { |io| IO.copy_stream(input, io) }
       super
       self.content_type = c_type
-      RDFSource.new(description_uri, @data).create('', 'application/n-triples')
+
+      RDFSource.new(description_uri, @data)
+        .create(StringIO.new, 'application/n-triples')
+
       self
     end
 
     ##
     # @see RDF::LDP::Resource#update
     def update(input, c_type)
-      storage.io { |io| IO.copy_stream(input.binmode, io) }
+      storage.io { |io| IO.copy_stream(input, io) }
       super
       self.content_type = c_type
       self
@@ -180,7 +183,7 @@ module RDF::LDP
     #
     # @example writing to a `StorageAdapter`
     #   storage = StorageAdapter.new(an_nr_source)
-    #   storage.io { |io| io.write('moomin')
+    #   storage.io { |io| io.write('moomin') }
     #
     # Beyond this interface, implementations are permitted to behave as desired.
     # They may, for instance, reject undesirable content or alter the graph (or 

data/lib/rdf/ldp/rdf_source.rb

@@ -98,8 +98,7 @@ module RDF::LDP
     # @return [RDF::LDP::Resource] self
     def create(input, content_type, &block)
       super do |transaction|
-        statements = parse_graph(input, content_type)
-        transaction.insert(statements)
+        transaction.insert(parse_graph(input, content_type))
         yield transaction if block_given?
       end
     end
@@ -137,7 +136,6 @@ module RDF::LDP
         transaction.insert parse_graph(input, content_type)
         yield transaction if block_given?
       end
-      self
     end
 
     ##
@@ -193,13 +191,13 @@ module RDF::LDP
     end
    
     def ld_patch(input, graph, &block)
-      LD::Patch.parse(input).execute(graph)
+      LD::Patch.parse(input.read).execute(graph)
     rescue LD::Patch::Error => e
       raise BadRequest, e.message
     end
 
     def sparql_update(input, graph)
-      SPARQL.execute(input, graph, update: true)
+      SPARQL.execute(input.read, graph, update: true)
     rescue SPARQL::MalformedQuery => e
       raise BadRequest, e.message
     end
@@ -245,11 +243,10 @@ module RDF::LDP
       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
+        input.rewind
         RDF::Graph.new(graph_name: subject_uri, data: RDF::Repository.new) << 
-          reader.new(input, base_uri: subject_uri, validate: true)
+          reader.new(input.read, base_uri: subject_uri, validate: true)
       rescue RDF::ReaderError => e
         raise RDF::LDP::BadRequest, e.message
       end  

data/lib/rdf/ldp/resource.rb

@@ -246,10 +246,12 @@ 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(mutable: true) do |transaction|
         yield transaction if block_given?
         set_last_modified(transaction)
       end
+
       self
     end
 
@@ -455,7 +457,9 @@ module RDF::LDP
     ##
     # Process & generate response for DELETE requests.
     def delete(status, headers, env)
-      [204, headers, destroy]
+      destroy
+      headers.delete('Content-Type')
+      [204, headers, []]
     end
 
     ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-ldp
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Tom Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2016-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -296,6 +296,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara_discoball
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ldp_testsuite_wrapper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 description: Implements a Linked Data Platform domain model, Rack middleware for server
   implementers, and a simple Sinatra-based server for RDF.rb
 email: public-rdf-ruby@w3.org
@@ -335,7 +377,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -343,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A suite of LDP software and middleware for RDF.rb.