params-registry 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2c64c0a41224198bdd02db7960b2051e74726bf690ddc66b222bc077bdeafd0
-  data.tar.gz: 5bd14e8bb789ea29ebca723e13edd08a51174b37aaa15fdec7829041025d471f
+  metadata.gz: bcd8659d212d3467f58e09a552bc105d50e35bea4c695c40f9de744a978e4697
+  data.tar.gz: 03522f0aec72a7d4e3d329051ba18c60a6846cf96e1dfadc8efdea86c801f3d0
 SHA512:
-  metadata.gz: 6f66092cfb1c2c047d6da054b295fa6dfd7796c9f01fe7543d9bfe680e5a57f0602fe48ae6f3733a8e65ea24fa29ad21ade20d18b90259a9784008f4e0876d7d
-  data.tar.gz: e9a801b3893c7eb6a99eada97974750a1f78dd6a084202b0d7545b7464486770e062a4b138cf5466a242cf32f84a38990bc423261ea80ecf61e9e112b3858750
+  metadata.gz: 8e99fd842ae67daa05f39b60832f2ed03c1446b52b856ac6f661f7b3280cb567b0e7597d0d2f45c288542f14c188ab5be331a3989466c72378bbfdb213b2fca7
+  data.tar.gz: f5f0adaa738a61a7556c7e3e7f8eefccb498b0d835b6c774f56702ea938b8b02827f9c5d1f8289668b4d1719422febb8073b140737ce346c197fdeda34132d9c

data/lib/params/registry/instance.rb

@@ -64,8 +64,8 @@ class Params::Registry::Instance
   #
   def initialize registry, struct, defaults: false, force: false
     if registry.is_a? Params::Registry::Group
-      @group    = registry
-      @registry = registry.registry
+      @group    = registry.id
+      @registry = registry = registry.registry
     else
       @group    = nil
       @registry = registry
@@ -74,13 +74,17 @@ class Params::Registry::Instance
     @content  = {}
     @extra    = {}
 
+    # warn "wtf lol #{@registry[@group].inspect}"
+
     # canonicalize the keys of the struct
     struct = Types::Input[struct].reduce({}) do |hash, pair|
       key, value = pair
-      if t = registry[@group][key]
+      if t = @registry[@group][key]
+        # warn "yep #{key.inspect}"
         hash[t.id] = value
       else
-        extra[key] = value
+        # warn "nope #{key.inspect}"
+        @extra[key] = value
       end
 
       hash
@@ -90,15 +94,15 @@ class Params::Registry::Instance
     del = Set[] # mark for deletion
 
     # grab the complements now
-    complements = @content[registry.complement.id] =
-      registry.complement.process(*struct.fetch(registry.complement.id, []))
+    complements = @content[@registry.complement.id] =
+      @registry.complement.process(*struct.fetch(@registry.complement.id, []))
 
     # warn registry.templates.ranked.inspect
 
     # warn complements.class
 
     # now we get the ranked templates and pass them through
-    registry[@group].ranked.each do |templates|
+    @registry[@group].ranked.each do |templates|
       # give me the intersection of templates
       templates.values.each do |t|
 
@@ -178,13 +182,15 @@ class Params::Registry::Instance
   # @return [Hash] basically the same thing, minus its metadata.
   #
   def to_h slugs: true, extra: false
-    # we're gonna do damage, lol
-    out = @content.dup
+    g = registry[@group]
+
+    out = {}
 
-    # this should work?
-    out.transform_keys! do |k|
-      registry[@group][k].slug || k.to_s.to_sym
-    end if slugs
+    g.templates.each do |t|
+      next unless @content.key? t.id
+      key = slugs ? t.slug || t.id.to_s.to_sym : t.id
+      out[key] = @content[t.id]
+    end
 
     # XXX maybe enforce the ordering better??
     out.merge! @extra if extra
@@ -192,18 +198,18 @@ class Params::Registry::Instance
     out
   end
 
-  # Retrieve an {Params::Registry::Instance} that isolates the
-  # intersection of one or more groups
-  #
-  # @param group [Object] the group identifier.
-  # @param extra [false, true] whether to include any "extra" unparsed
-  #  parameters.
-  #
-  # @return [Params::Registry::Instance] an instance containing just
-  #  the group(s) identified.
-  #
-  def group *group, extra: false
-  end
+  # # Retrieve an {Params::Registry::Instance} that isolates the
+  # # intersection of one or more groups
+  # #
+  # # @param group [Object] the group identifier.
+  # # @param extra [false, true] whether to include any "extra" unparsed
+  # #  parameters.
+  # #
+  # # @return [Params::Registry::Instance] an instance containing just
+  # #  the group(s) identified.
+  # #
+  # def group *group, extra: false
+  # end
 
   # Serialize the instance back to a {::URI} query string.
   #

data/lib/params/registry/types.rb

@@ -102,6 +102,15 @@ module Params::Registry::Types
     s.to_s.upcase.to_sym
   end
 
+  # This one is symbol-*ish*
+  Symbolish = self.Constructor(::Object) do |x|
+    if [::String, ::Symbol].any? { |c| x.is_a? c }
+      Symbol[x]
+    else
+      x
+    end
+  end
+
   # @!group Dates & Times
 
   # Ye olde {::Date}
@@ -151,15 +160,16 @@ module Params::Registry::Types
     input = ::URI.decode_www_form input if input.is_a? ::String
 
     case input
-    when ::Hash then Hash.map(Symbol, Array.of(String))[input]
+    when ::Hash then Hash.map(Symbolish, Array.of(String))[input]
     when ::Array
       input.reduce({}) do |out, pair|
         k, *v = Strict::Array.constrained(min_size: 2)[pair]
-        (out[k.to_sym] ||= []).push(*v)
+        (out[Symbolish[k]] ||= []).push(*v)
         out
       end
     else
-      raise Dry::Types::CoercionError, "not sure what to do with #{input}"
+      raise Dry::Types::CoercionError,
+        "not sure what to do with #{input.inspect}"
     end
   end
 

data/lib/params/registry/version.rb

@@ -3,6 +3,6 @@
 module Params
   class Registry
     # The module version
-    VERSION = "0.1.6"
+    VERSION = "0.1.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: params-registry
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Dorian Taylor
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-06 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-types