rdf-kv 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ae8b165dd5ec6b9b0d5537be00fd9bdad78451db3a7d26004b83dc891e132f8
-  data.tar.gz: 2e66180337cd279075ef50978b175c04799d1e3d22206c6d12cc1cfc55c31a31
+  metadata.gz: 2f175bc353d9957490f45693644270d8ce9d82392352fefa7e22534786ad5fc7
+  data.tar.gz: 2d795adc0b253f8644ec110c4c972af8af5439fa00268a5455211df4794e46b2
 SHA512:
-  metadata.gz: 46fe633378e76f51b004b26c6e3ceea96acedd4ab64dcc2e2801cd71c771cb4e879a9d13e87133fd9be6c2119423d2be04369954919f10dbc86bccaa72345063
-  data.tar.gz: b43fa6bf6d8106d67d016548c7313c41cebe883559fef3149c256727fb56a1f6af8646ec6064a5150115df560391db89ad65f940ddf38105f07202f13f4eb3c4
+  metadata.gz: 8a8a7542849b4d2f86fcbdf8bfe13da51deac88f436ad0238fc663e18e3afe3f9c547c774de45caa22d8e1f42ea7d54d05d0eacd740c2d07dd5dbac50361f4bf
+  data.tar.gz: 1bd0ec5aab7ab7dc88d8de63e09ebd05ddcdcd50ad20485336dcac25b14d85551565d39ef47d8915f0790cddf69b01cb06373a1b12d12a5db9d30036fa430940

data/lib/rdf/kv/version.rb

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

data/lib/rdf/kv.rb

@@ -143,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
@@ -154,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
@@ -183,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
@@ -325,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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-kv
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Dorian Taylor