rdf-kv 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb27dba84f5646d65c33ad83bd4ac842724ed0458f943194c572ef06b9ab679
-  data.tar.gz: 150094cd1b73702b87ada062070d66752bab1c28be502aaad8ca754fa7d51815
+  metadata.gz: e5e9ee04b73aea9ca848276b9e7c28efe2e42a7617b4c4be587f26a262d1e487
+  data.tar.gz: 90a5036bbb9d090c1859c7fd1069dba484b4533ee3bcbbfb53751e7c792494e5
 SHA512:
-  metadata.gz: 49fdd4acc90ca6089385473885b8fc49a9160e7d628eaf53242ab209f9b9858941d533df9966f7a77b853b20e4b203791ac43e58b566443ebab66e4196b18cfc
-  data.tar.gz: 58f9571d7c07fadbe58ca1e171382ea0a00ed43e86b02236dbba8e496be078a9ec62b29b03ce2d927b6ac609817318320adfa52d0f0049c62755f463ee20fe83
+  metadata.gz: 13160ab47776b4fc531de45f341f0d05e7cb5eb04886b541aaf1f6418bf1aeaf5943bd2b9bfca8da0054af2f2cc964a79401757ac3d5482454fb0dd2f1d3dedd
+  data.tar.gz: 67da241b365cb8d278b0d0588fe3dc5df93984e1734c0c865d0b76a04e8fb34bfddf93f7357bca85119f649441da768ef104fd46a22479202e278b9c05fca932

data/.gitignore

@@ -12,3 +12,4 @@ Gemfile.lock
 .rspec_status
 .\#*
 \#*\#
+*.gem

data/.yardopts

@@ -0,0 +1,7 @@
+--output-dir doc/yard
+--protected
+--no-private
+--hide-void-return
+--markup markdown
+--readme README.md
+-

data/Gemfile

@@ -2,6 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in rdf-kv.gemspec
 gemspec
-
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"

data/lib/rdf/kv/version.rb

@@ -1,5 +1,5 @@
 module RDF
   class KV
-    VERSION = "0.1.0"
+    VERSION = "0.1.3"
   end
 end

data/lib/rdf/kv.rb

@@ -35,7 +35,7 @@ class RDF::KV
 
   GRAMMAR = /#{PARTIAL_STMT}/o
   MAP     = %i[modifier term1 term2 designator term1 designator graph
-             term1 term2 designator graph deref]
+             term1 term2 designator graph deref].freeze
 
   # these should be instance_exec'd
   SPECIALS = {
@@ -47,10 +47,14 @@ class RDF::KV
       val.each do |v, _|
         next unless m = /^\s*(#{NCNAME}):\s+(.*)$/o.match(v)
         prefix, uri = m.captures
-        @namespaces[prefix.to_sym] = RDF::Vocabulary.new uri
+        @prefixes[prefix.to_sym] = RDF::Vocabulary.new uri
       end
     },
-  }
+  }.freeze
+
+  def random_uuid_ncname
+    UUID::NCName.to_ncname_64 UUIDTools::UUID.random_create.to_s, version: 1
+  end
 
   # macros are initially represented as a pair: the macro value and a
   # flag denoting whether or not the macro itself contains macros and to
@@ -58,9 +62,8 @@ class RDF::KV
   GENERATED = {
     NEW_UUID:     [[-> { UUIDTools::UUID.random_create.to_s   }, false]],
     NEW_UUID_URN: [[-> { UUIDTools::UUID.random_create.to_uri }, false]],
-    NEW_BNODE:    [[-> { "_:#{UUID::NCName.to_ncname_64(
-          UUIDTools::UUID.random_create.to_s, version: 1) }" }, false]],
-  }
+    NEW_BNODE:    [[-> { "_:#{random_uuid_ncname}" }, false]],
+  }.freeze
 
   # just the classics
   DEFAULT_NS = {
@@ -70,15 +73,14 @@ class RDF::KV
     xsd:  RDF::XSD,
   }.freeze
 
+  # Given a (massaged) set of macros, dereference the given array of
+  # strings and return it.
   def deref_content strings, macros
     strings = [strings] unless strings.is_a? Array
     # bail out early if there is nothing to do
     return strings unless strings.any? { |s| /#{MACRO}/o.match s }
     out = []
     strings.each do |s|
-      # sometimes these are arrays of arrays
-      #s = s.first if s.is_a? Array
-
       # chunks are parallel output; each element is a value
       chunks = []
       s.scan(/\G#{MACROS}/o) do |m|
@@ -125,6 +127,10 @@ class RDF::KV
     out
   end
 
+  # Given the structure of macro declarations, dereference any
+  # recursively-defined macros, and return a new structure with a key
+  # and array of _values_, rather than an array of `[value, deref]`
+  # pairs.
   def massage_macros macros
     seen = {}
     done = GENERATED.transform_values { |v| v.map { |w| w.first } }
@@ -147,9 +153,7 @@ class RDF::KV
         next unless deref
 
         if deref.is_a? Array
-          deref.each do |m|
-            done[m] ? dm[m] = true : pm[m] = true
-          end
+          deref.each { |m| done[m] ? dm[m] = true : pm[m] = true }
         else
           m = {}
           val.scan(/#{MACRO}/o).compact.each do |x|
@@ -161,7 +165,8 @@ class RDF::KV
 
             done[m] ? dm[m] = true : pm[m] = true
           end
-          # push the deref
+
+          # replace the deref flag with the elements to deref with
           pair[1] = m.empty? ? false : m.keys.sort
         end
       end
@@ -174,6 +179,7 @@ class RDF::KV
           q << m
         end
 
+        # put the current key back on the queue but put the dependencies first
         queue = q + [k] + queue
         next
       end
@@ -205,7 +211,7 @@ class RDF::KV
     # ugh now we gotta do urls
     if m = /^(#{NCNAME}):(\S*)$/o.match(term)
       prefix, slug = m.captures
-      if !slug.start_with?(?/) and vocab = namespaces[prefix.to_sym]
+      if !slug.start_with?(?/) and vocab = prefixes[prefix.to_sym]
         return vocab[slug]
       end
     end
@@ -238,37 +244,39 @@ class RDF::KV
 
     # call the callback if we have one
     term = callback.call term if callback
-      
+
     term
   end
 
   public
 
-  attr_reader :subject, :graph, :namespaces, :callback
+  attr_reader :subject, :graph, :prefixes, :callback
+  # why is this :target, :source
+  alias_method :namespaces, :prefixes
 
   # Initialize the processor.
   #
-  # @param subject    [RDF::URI] The default subject. Required.
-  # @param graph      [RDF::URI] The default context. Optional.
-  # @param namespaces [Hash]     Namespace/prefix mappings. Optional.
-  # @param callback   [#call]    A callback that expects and returns a term.
+  # @param subject  [RDF::URI] The default subject. Required.
+  # @param graph    [RDF::URI] The default context. Optional.
+  # @param prefixes [Hash]     Namespace/prefix mappings. Optional.
+  # @param callback [#call]    A callback that expects and returns a term.
   #  Optional.
   #
-  def initialize subject: nil, graph: nil, namespaces: {}, callback: nil
+  def initialize subject: nil, graph: nil, prefixes: {}, callback: nil
     # look at all of our pretty assertions
     raise ArgumentError, 'subject must be an RDF::Resource' unless
       subject.is_a? RDF::Resource
     raise ArgumentError, 'graph must be an RDF::Resource' unless
       graph.nil? or graph.is_a? RDF::Resource
-    raise ArgumentError, 'namespaces must be hashable' unless
-      namespaces.respond_to? :to_h
+    raise ArgumentError, 'prefixes must be hashable' unless
+      prefixes.respond_to? :to_h
     rase ArgumentError, 'callback must be callable' unless
       callback.nil? or callback.respond_to? :call
 
-    @subject    = subject
-    @graph      = graph
-    @callback   = callback
-    @namespaces = DEFAULT_NS.merge(namespaces.to_h.map do |k, v|
+    @subject  = subject
+    @graph    = graph
+    @callback = callback
+    @prefixes = DEFAULT_NS.merge(prefixes.to_h.map do |k, v|
       k = k.to_s.to_sym    unless k.is_a? Symbol
       # coerce to uri
       v = RDF::URI(v.to_s) unless v.is_a? RDF::Resource
@@ -327,7 +335,7 @@ class RDF::KV
       end
     rescue Exception => e
       # again this should be nicer
-      raise e
+      raise Error.new e
     end
 
     # this will be our output
@@ -384,7 +392,10 @@ class RDF::KV
           o = contents[:term2] || subject
         else
           s, p = (contents[:term2] ? contents.values_at(:term1, :term2) :
-                  [subject, contents[:term1]]).map { |t| resolve_term t }
+                  [subject, contents[:term1]]).map do |t|
+              t = resolve_term t
+              callback ? callback.call(t) : t
+          end
         end
 
         # the operation depends on whether the `-` modifier is present
@@ -394,9 +405,13 @@ class RDF::KV
         # string then we're deleting a wildcard, same if we `=` overwrite
         if !reverse and op == :delete && values.include?('') ||
             contents[:modifier][?=]
+
+          # create a random variable name so we don't pass in a nil
+          var = RDF::Query::Variable.new random_uuid_ncname
+
           # i can't remember why we don't do this in reverse, probably
           # because it is too easy to shoot yourself in the foot
-          patch.delete RDF::Statement(s, p, nil, graph_name: g)
+          patch.delete RDF::Statement(s, p, var, graph_name: g)
 
           # nuke these since it will be pointless to evaluate further
           values.clear if op == :delete
@@ -418,4 +433,6 @@ class RDF::KV
 
     patch
   end
+
+  class Error < RuntimeError; end
 end

data/lib/rdf-kv.rb

@@ -0,0 +1 @@
+require 'rdf/kv'

data/rdf-kv.gemspec

@@ -29,16 +29,18 @@ RDF::Changeset.
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.7')
   # dev/test dependencies
   spec.add_development_dependency 'bundler',   '~> 2'
-  spec.add_development_dependency 'rdf-vocab', '~> 3.1'
+  spec.add_development_dependency 'rake',      '~> 13'
+  spec.add_development_dependency 'rspec',     '~> 3'
+  spec.add_development_dependency 'rdf-vocab', '~> 3'
 
   # stuff we use
-  spec.add_runtime_dependency 'rdf',       '>= 3.1.1' # include my changes
+  spec.add_runtime_dependency 'rdf',       '~> 3' # include my changes
   spec.add_runtime_dependency 'uuidtools', '~> 2'
 
   # stuff i wrote
-  spec.add_runtime_dependency 'uuid-ncname', '>= 0.2.5'
+  spec.add_runtime_dependency 'uuid-ncname', '>= 0.4'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-kv
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Dorian Taylor
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,34 +24,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: '0.4'
 description: |
   This module implements https://doriantaylor.com/rdf-kv, taking
   key-value input (e.g. from a Web form) and converting it into an
@@ -93,12 +121,14 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- lib/rdf-kv.rb
 - lib/rdf/kv.rb
 - lib/rdf/kv/version.rb
 - rdf-kv.gemspec
@@ -107,7 +137,7 @@ licenses:
 - Apache-2.0
 metadata:
   homepage_uri: https://github.com/doriantaylor/rb-rdf-kv
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,15 +145,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: Ruby implementation of the RDF-KV protocol
 test_files: []