Correct addnew and deleteexisting checks.

Count deleted statements and raise error if none deleted in cut.
Check indexes against list in updateList.

Author: gkellogg

lib/ld/patch/algebra/add.rb

@@ -37,16 +37,18 @@ def execute(queryable, options = {})
         case var
         when RDF::Query::Pattern
           s = var.bind(solution)
+          # FIXME 400 Bad Request
           raise LD::Patch::Error, "Operand uses unbound pattern #{var.inspect}" if s.variable?
           s
         when RDF::Query::Variable
+          # FIXME 400 Bad Request
           raise LD::Patch::Error, "Operand uses unbound variable #{var.inspect}" unless solution.bound?(var)
           solution[var]
         end
       end
 
       # If `:new` is specified, verify that no triple in triples exists in queryable
-      if options[:new]
+      if @options[:new]
         triples.each do |triple|
           raise LD::Patch::Error, "Target graph contains added triple #{triple.to_ntriples}" if queryable.has_statement?(triple)
         end

lib/ld/patch/algebra/bind.rb

@@ -74,6 +74,7 @@ def execute(queryable, options = {})
 
       # Bind variables to path
       if value.variable?
+        # FIXME 400 Bad Request
         raise LD::Patch::Error, "Operand uses unbound variable #{value.inspect}" unless solution.bound?(value)
         value = solution[value]
       end

lib/ld/patch/algebra/cut.rb

@@ -32,18 +32,25 @@ def execute(queryable, options = {})
       var = operand(0)
 
       # Bind variable
+      # FIXME 400 Bad Request
       raise LD::Patch::Error, "Operand uses unbound variable #{var.inspect}" unless solution.bound?(var)
       var = solution[var]
 
+      cut_count = 0
       # Get triples to delete using consice bounded description
       queryable.concise_bounded_description(var) do |statement|
         queryable.delete(statement)
+        cut_count += 1
       end
 
       # Also delete triples having var in the object position
       queryable.query(object: var).each do |statement|
         queryable.delete(statement)
+        cut_count += 1
       end
+
+      raise LD::Patch::Error, "Cut removed no triples" unless cut_count > 0
+
       bindings
     end
   end

lib/ld/patch/algebra/delete.rb

@@ -37,16 +37,18 @@ def execute(queryable, options = {})
         case var
         when RDF::Query::Pattern
           s = var.bind(solution)
+          # FIXME 400 Bad Request
           raise LD::Patch::Error, "Operand uses unbound pattern #{var.inspect}" if s.variable?
           s
         when RDF::Query::Variable
+          # FIXME 400 Bad Request
           raise LD::Patch::Error, "Operand uses unbound variable #{var.inspect}" unless solution.bound?(var)
           solution[var]
         end
       end
 
       # If `:new` is specified, verify that no triple in triples exists in queryable
-      if options[:existing]
+      if @options[:existing]
         triples.each do |triple|
           raise LD::Patch::Error, "Target graph does not contain triple #{triple.to_ntriples}" unless queryable.has_statement?(triple)
         end

lib/ld/patch/algebra/update_list.rb

@@ -31,6 +31,7 @@ def execute(queryable, options = {})
 
       # Bind variables to path
       if var_or_iri.variable?
+        # FIXME 400 Bad Request
         raise LD::Patch::Error, "Operand uses unbound variable #{var_or_iri.inspect}" unless solution.bound?(var_or_iri)
         var_or_iri = solution[variable]
       end
@@ -54,7 +55,13 @@ def execute(queryable, options = {})
       when slice2 < 0 then list.length + slice2.to_i
       else slice2.to_i
       end
+
+      # FIXME 400 Bad Request
+      raise LD::Patch::Error, "UpdateList slice indexes out of order #{start}..#{finish}}" if finish < start
+      
       length = finish - start
+      raise LD::Patch::Error, "UpdateList out of bounds #{start}..#{finish}}" if start + length > list.length
+      raise LD::Patch::Error, "UpdateList out of bounds #{start}..#{finish}}" if start < 0
 
       # Uses #[]= logic in RDF::List
       list[start, length] = collection

lib/ld/patch/parser.rb

@@ -573,6 +573,7 @@ def iri(value)
     end
 
     def ns(prefix, suffix)
+      # FIXME 400 Bad Request
       error("pname", "undefined prefix #{prefix.inspect}") unless prefix(prefix)
       base = prefix(prefix).to_s
       suffix = suffix.to_s.sub(/^\#/, "") if base.index("#")