rdf-kv 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5e9ee04b73aea9ca848276b9e7c28efe2e42a7617b4c4be587f26a262d1e487
-  data.tar.gz: 90a5036bbb9d090c1859c7fd1069dba484b4533ee3bcbbfb53751e7c792494e5
+  metadata.gz: 2f175bc353d9957490f45693644270d8ce9d82392352fefa7e22534786ad5fc7
+  data.tar.gz: 2d795adc0b253f8644ec110c4c972af8af5439fa00268a5455211df4794e46b2
 SHA512:
-  metadata.gz: 13160ab47776b4fc531de45f341f0d05e7cb5eb04886b541aaf1f6418bf1aeaf5943bd2b9bfca8da0054af2f2cc964a79401757ac3d5482454fb0dd2f1d3dedd
-  data.tar.gz: 67da241b365cb8d278b0d0588fe3dc5df93984e1734c0c865d0b76a04e8fb34bfddf93f7357bca85119f649441da768ef104fd46a22479202e278b9c05fca932
+  metadata.gz: 8a8a7542849b4d2f86fcbdf8bfe13da51deac88f436ad0238fc663e18e3afe3f9c547c774de45caa22d8e1f42ea7d54d05d0eacd740c2d07dd5dbac50361f4bf
+  data.tar.gz: 1bd0ec5aab7ab7dc88d8de63e09ebd05ddcdcd50ad20485336dcac25b14d85551565d39ef47d8915f0790cddf69b01cb06373a1b12d12a5db9d30036fa430940

data/lib/rdf/kv/version.rb

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

data/lib/rdf/kv.rb

@@ -1,6 +1,7 @@
 require 'rdf/kv/version'
 
 require 'rdf'
+require 'time'
 require 'uri'
 require 'uuidtools'
 require 'uuid-ncname'
@@ -56,6 +57,14 @@ class RDF::KV
     UUID::NCName.to_ncname_64 UUIDTools::UUID.random_create.to_s, version: 1
   end
 
+  # just the classics
+  DEFAULT_NS = {
+    rdf:  RDF::RDFV,
+    rdfs: RDF::RDFS,
+    owl:  RDF::OWL,
+    xsd:  RDF::XSD,
+  }.freeze
+
   # macros are initially represented as a pair: the macro value and a
   # flag denoting whether or not the macro itself contains macros and to
   # try to dereference it.
@@ -63,14 +72,7 @@ class RDF::KV
     NEW_UUID:     [[-> { UUIDTools::UUID.random_create.to_s   }, false]],
     NEW_UUID_URN: [[-> { UUIDTools::UUID.random_create.to_uri }, false]],
     NEW_BNODE:    [[-> { "_:#{random_uuid_ncname}" }, false]],
-  }.freeze
-
-  # just the classics
-  DEFAULT_NS = {
-    rdf:  RDF::RDFV,
-    rdfs: RDF::RDFS,
-    owl:  RDF::OWL,
-    xsd:  RDF::XSD,
+    NEW_TIME_UTC: [[-> { Time.now.utc.iso8601 }, false]],
   }.freeze
 
   # Given a (massaged) set of macros, dereference the given array of
@@ -141,6 +143,8 @@ class RDF::KV
       k = queue.shift
       seen[k] = true
 
+      # warn "key: #{k}"
+
       vals = macros[k]
 
       # done and pending macros within the macros
@@ -152,18 +156,21 @@ class RDF::KV
 
         next unless deref
 
+        # warn "pair: #{pair}"
+
+        # see a few lines below where deref is replaced
         if deref.is_a? Array
           deref.each { |m| done[m] ? dm[m] = true : pm[m] = true }
         else
           m = {}
-          val.scan(/#{MACRO}/o).compact.each do |x|
+          val.scan(/#{MACRO}/o).flatten.compact.each do |x|
             x = x.to_sym
             next unless macros[x]
             raise "Self-reference found: #{x}" if x == k
 
             m[x] = true
 
-            done[m] ? dm[m] = true : pm[m] = true
+            done[x] ? dm[x] = true : pm[x] = true
           end
 
           # replace the deref flag with the elements to deref with
@@ -181,13 +188,16 @@ class RDF::KV
 
         # put the current key back on the queue but put the dependencies first
         queue = q + [k] + queue
+        warn "queue: #{queue}"
         next
       end
 
-      unless dm.empty?
-        done[k] = deref_content vals, done
-      else
+      # warn vals.inspect
+
+      if dm.empty?
         done[k] = vals.map(&:first)
+      else
+        done[k] = deref_content vals.map(&:first), done
       end
 
       # remember to remove this guy or we'll loop forever
@@ -270,7 +280,7 @@ class RDF::KV
       graph.nil? or graph.is_a? RDF::Resource
     raise ArgumentError, 'prefixes must be hashable' unless
       prefixes.respond_to? :to_h
-    rase ArgumentError, 'callback must be callable' unless
+    raise ArgumentError, 'callback must be callable' unless
       callback.nil? or callback.respond_to? :call
 
     @subject  = subject
@@ -323,9 +333,9 @@ class RDF::KV
     # step 2: dereference all the macros (that asked to be dereferenced)
     begin
       macros = massage_macros macros
-    rescue e
+    rescue Exception => e
       # XXX we should do something more here
-      raise e
+      raise Error.new e
     end
 
     # step 3: apply special control macros (which modify self)

data/rdf-kv.gemspec

@@ -38,7 +38,7 @@ RDF::Changeset.
 
   # stuff we use
   spec.add_runtime_dependency 'rdf',       '~> 3' # include my changes
-  spec.add_runtime_dependency 'uuidtools', '~> 2'
+  spec.add_runtime_dependency 'uuidtools', '~> 3'
 
   # stuff i wrote
   spec.add_runtime_dependency 'uuid-ncname', '>= 0.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-kv
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Dorian Taylor
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: uuid-ncname
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Ruby implementation of the RDF-KV protocol