prx_auth 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80b52f104115aa7226438db0566660e430cec97a304798bf2098467d69a73547
-  data.tar.gz: a40db03c0c4a4f529231a8d7f63c80a8c6c50b5f7010c6cc84d6d63f399e5752
+  metadata.gz: 076bc119886d252cc587e1e391ba10eaa3b1d24151ba559135c3e40d78565201
+  data.tar.gz: 40f6695953ad60bb9dcd8aef4e3483434c8274266c83632e4ce3f628e9022c5e
 SHA512:
-  metadata.gz: cb2093473b3f817c9e0b7edf4eacd9427d3efa30d3338c344956a64c004876b788e1342615f72d20f2fcfd7e3ff79a1247180da65c9691c30a960dbafd7b0e2d
-  data.tar.gz: ed0ee1c6557b1a5420e9f6e195067de9b5440175c59cb8d6708f668464e86018c89d162d146b8e92fddf5c81594aedc86011d4c48a670796a9b989a62af81026
+  metadata.gz: 169c89b6926a03cd9e1599298858e1d22fb5c468d9c3c56ade1b616c4893d87d707092f2704996edb9c18291e8ecf443a92559cb0ed2f30b5152d0abaa3be22a
+  data.tar.gz: edfb7b2f60fdf23e6d950d4c7ad2cd5efe3be300856ad829ee2724a3a8edf16c2702540185aba0813d151892b941eca9db9d8255eba25cf1b2c790af04c108c6

data/lib/prx_auth/resource_map.rb

@@ -113,15 +113,15 @@ module PrxAuth
         end
       end
 
-      if @wildcard.length > 0
-        result[WILDCARD_KEY] = @wildcard - (@wildcard - other_wildcard)
+      if @wildcard.length > 0 || other_wildcard.length > 0
+        result[WILDCARD_KEY] = @wildcard & other_wildcard
       end
 
       ResourceMap.new(result).condense
     end
 
     def as_json(opts = {})
-      super(opts).merge((@wildcard.length > 0) ? {WILDCARD_KEY => @wildcard}.as_json(opts) : {})
+      super.merge((@wildcard.length > 0) ? {WILDCARD_KEY => @wildcard}.as_json(opts) : {})
     end
 
     def resources(namespace = nil, scope = nil)

data/lib/prx_auth/scope_list.rb

@@ -36,7 +36,7 @@ module PrxAuth
       case list
       when PrxAuth::ScopeList then list
       when Array then super(list.join(" "))
-      else super(list)
+      else super
       end
     end
 

data/lib/prx_auth/version.rb

@@ -1,3 +1,3 @@
 module PrxAuth
-  VERSION = "1.8.0"
+  VERSION = "1.8.1"
 end

data/prx_auth.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "standard"
+  spec.add_development_dependency "m"
 
   spec.add_dependency "rack", ">= 1.5.2"
   spec.add_dependency "json", ">= 1.8.1"

data/test/prx_auth/resource_map_test.rb

@@ -153,6 +153,11 @@ describe PrxAuth::ResourceMap do
       assert !map.contains?("one", :four) && !map.contains?("two", :four)
       assert map.contains?("*", :wild)
     end
+
+    it "works with global scoped wildcards" do
+      map = new_map("*" => "something") & new_map("*" => "ns1:something")
+      assert map.contains?("*", "ns1", :something)
+    end
   end
 
   describe "#as_json" do

data/test/test_helper.rb

@@ -5,7 +5,6 @@ $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require "prx_auth"
 require "rack/prx_auth"
 require "pry"
-require "pry-byebug"
 
 require "minitest/autorun"
 require "minitest/spec"

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prx_auth
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Eve Asher
 - Chris Rhoden
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: standard
+  name: m
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -203,7 +202,6 @@ homepage: https://github.com/PRX/prx_auth
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,8 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Utilites for parsing PRX JWTs and Rack middleware that verifies and attaches
   the token's claims to env.