rdf-kv 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ace8319f10ea7f736fc8881d6546b19c908284189e5a40f1d0e08659bad5b19
-  data.tar.gz: f38dd9a9e778c037aad1199d6fc753bf6c037ba00acf0d6ee6e437e81efc0034
+  metadata.gz: 0ae8b165dd5ec6b9b0d5537be00fd9bdad78451db3a7d26004b83dc891e132f8
+  data.tar.gz: 2e66180337cd279075ef50978b175c04799d1e3d22206c6d12cc1cfc55c31a31
 SHA512:
-  metadata.gz: efc28fc50193b33e5b461e053eff1e2eed46da55e29dd569b0546b0ef606f05b71dc36430eefed20031b35c25d5a2f455edcebda07f7fe327de7d43cf9373a68
-  data.tar.gz: 053f381f9cf6d907183103f50e47ffd2e5a3f5f85c86b7017dfca0d7733b993cc5994e37feb4890183a8c9f3bbfe7dd5c63829fb9e0b39ccc63b25747c5bc3c4
+  metadata.gz: 46fe633378e76f51b004b26c6e3ceea96acedd4ab64dcc2e2801cd71c771cb4e879a9d13e87133fd9be6c2119423d2be04369954919f10dbc86bccaa72345063
+  data.tar.gz: b43fa6bf6d8106d67d016548c7313c41cebe883559fef3149c256727fb56a1f6af8646ec6064a5150115df560391db89ad65f940ddf38105f07202f13f4eb3c4

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.1"
+    VERSION = "0.1.4"
   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'
@@ -52,15 +53,9 @@ class RDF::KV
     },
   }.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.
-  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]],
-  }.freeze
+  def random_uuid_ncname
+    UUID::NCName.to_ncname_64 UUIDTools::UUID.random_create.to_s, version: 1
+  end
 
   # just the classics
   DEFAULT_NS = {
@@ -70,6 +65,16 @@ class RDF::KV
     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.
+  GENERATED = {
+    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]],
+    NEW_TIME_UTC: [[-> { Time.now.utc.iso8601 }, false]],
+  }.freeze
+
   # Given a (massaged) set of macros, dereference the given array of
   # strings and return it.
   def deref_content strings, macros
@@ -267,7 +272,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
@@ -389,7 +394,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
@@ -399,9 +407,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

data/rdf-kv.gemspec

@@ -32,11 +32,13 @@ RDF::Changeset.
   spec.required_ruby_version = Gem::Requirement.new('>= 2.7')
   # dev/test dependencies
   spec.add_development_dependency 'bundler',   '~> 2'
+  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' # 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.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Dorian Taylor
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-18 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,34 @@ 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
@@ -58,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
@@ -124,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