prx_auth 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e89ea4feff47dadbac479d38e5a35fa04be2e148cb10ebe4b41d800e2df48c3
-  data.tar.gz: b3ae9ed7381ff2765abc01c4126c3b7ede3db2f06a73cbd9da6918c9ac3a41ab
+  metadata.gz: b11c5af8dd4126044aa9d468a50dee909483bc6de84b6fa8f46362e208dac776
+  data.tar.gz: 8e308914d3c6f254130bbc02f245ec9a690ea3efbd67c7e03af27d89248e1285
 SHA512:
-  metadata.gz: 17ffcb56a69a9c5d674f418967a56405a9f44dac40a0359d9bac42bd93421e7273af08632b311718ca10844ac3a37347d1b8753f1cac7f661b62d75752d25875
-  data.tar.gz: bb3d2a19cabf47a5f6d3d62edebf9bdb0ac368521b6c6128c1dc73edb00f2a2d353c8e0a17a46c52334e651a3c2926cfaf9215053d4f260d258a75793ee13d14
+  metadata.gz: 1e41ac8e49eb3bbf6e77a60dbd7a607766dceecc131a221eaefb9d1c6251507cf9b526a7d031dc0a686dd32683ef9113031db1a6de957a86a19738ec9ad5a7d5
+  data.tar.gz: 27a2c10518729f37f366ff301835618c959ea7ef5a8446ee0ed0176b6f3046e820fedc58cbce6ce790f114875f98b2c68fbbc06592e8d9685a4eb985e0305d43

data/lib/prx_auth/scope_list.rb

@@ -42,7 +42,7 @@ module PrxAuth
 
     def initialize(list)
       @string = list
-      @string.split(SCOPE_SEPARATOR).each do |value|
+      @string.split(SCOPE_SEPARATOR).uniq.each do |value|
         next if value.length < 1
 
         parts = value.split(NAMESPACE_SEPARATOR, 2)
@@ -56,21 +56,21 @@ module PrxAuth
 
     def contains?(namespace, scope=nil)
       entries = if scope.nil?
-                  scope, namespace = namespace, NO_NAMESPACE 
+                  scope, namespace = namespace, NO_NAMESPACE
                   [Entry.new(namespace, symbolize(scope), nil)]
                 else
                   scope = symbolize(scope)
                   namespace = symbolize(namespace)
                   [Entry.new(namespace, scope, nil), Entry.new(NO_NAMESPACE, scope, nil)]
                 end
-      
+
       entries.any? do |possible_match|
         include?(possible_match)
       end
     end
 
     def to_s
-      @string
+      entries.join(SCOPE_SEPARATOR)
     end
 
     def condense
@@ -125,7 +125,7 @@ module PrxAuth
 
     def &(other_list)
       return ScopeList.new('') if other_list.nil?
-      
+
       self - (self - other_list) + (other_list - (other_list - self))
     end
 

data/lib/prx_auth/version.rb

@@ -1,3 +1,3 @@
 module PrxAuth
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 end

data/test/prx_auth/scope_list_test.rb

@@ -12,7 +12,7 @@ describe PrxAuth::ScopeList do
   it 'looks up successfully for a given scope' do
     assert list.contains?('write')
   end
-  
+
   it 'scans for symbols' do
     assert list.contains?(:read)
   end
@@ -27,7 +27,7 @@ describe PrxAuth::ScopeList do
 
   describe 'with namespace' do
     let (:scopes) { 'ns1:hello ns2:goodbye aloha 1:23' }
-    
+
     it 'works for namespaced lookups' do
       assert list.contains?(:ns1, :hello)
     end
@@ -76,6 +76,11 @@ describe PrxAuth::ScopeList do
       assert sl.to_s == 'The-Beginning the-end'
     end
 
+    it 'dedups and condenses' do
+      sl = new_list('one ns1:two ns2:two one three three') - new_list('ns1:two three')
+      assert_equal sl.length, 2
+      assert_equal sl.to_s, 'one ns2:two'
+    end
   end
 
   describe '#+' do
@@ -86,6 +91,12 @@ describe PrxAuth::ScopeList do
       assert sl.contains?(:two)
     end
 
+    it 'dedups and condenses' do
+      sl = new_list('one ns1:one two') + new_list('two three') + new_list('two')
+      assert_equal sl.length, 3
+      assert_equal sl.to_s, 'one two three'
+    end
+
     it 'accepts nil' do
       sl = new_list('one two') + nil
       assert sl.contains?(:one) && sl.contains?(:two)
@@ -126,4 +137,4 @@ describe PrxAuth::ScopeList do
       refute_equal PrxAuth::ScopeList.new("foo bar"), PrxAuth::ScopeList.new("foo:bar bar:foo")
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prx_auth
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Eve Asher
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler