prx_auth 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6b1ad46cadbbeddae8e3bebd398582339573c0cd93a16e1ec32d81640c57132
-  data.tar.gz: e16653c6a43a3398d770dee31c1cc414a5a1eedb38434e8568c9d7fad3f74e78
+  metadata.gz: 1a851973aab51bd36533ff3959ab4d494886d0c6803fa1be1359ee1a5e0a68c0
+  data.tar.gz: 9033b3e43be7f508ec7956df7be578e4b860f3285169ac1de6c5ee80b1e21c89
 SHA512:
-  metadata.gz: ef892e741fce211dd772a141dd0b80741b395cc8a926651322c79e9bcb91e141c556164c5b46a2f617a5297bc26ab04c0e6f1b954c6d7440ecd42d78831d1025
-  data.tar.gz: 50f52aa960307c3f2117cef31586c946338b032183c5d0f85d1098af448e0fe4e27b97365a782970b95738eec4e6be90f05f35dde1597841f70e0ede9a2a4aa4
+  metadata.gz: 92e74203143a4920470336dd93bedfe07fe03235bbcafc20229f4076bdfabe5240e5908b0765b035c9471c0a8bfbc001435e08e61830dd954f64e65f0d0f2e26
+  data.tar.gz: 139726fa863102b0e179c63e29df3d42f4fa03082e1208668cc6f9d32062bcab1995921677f22138718449a5b6a1cb67694003e141b829f585f0b6cc141e5dc9

data/lib/prx_auth/scope_list.rb

@@ -4,19 +4,15 @@ module PrxAuth
     NAMESPACE_SEPARATOR = ':'
     NO_NAMESPACE = :_
 
-    Entry = Struct.new(:namespace, :scope)
+    Entry = Struct.new(:namespace, :scope, :string)
 
     class Entry
-      def equal?(other_entry)
+      def ==(other_entry)
         namespace == other_entry.namespace && scope == other_entry.scope
       end
 
       def to_s
-        if namespaced?
-          "#{namespace}:#{scope}"
-        else
-          scope.to_s
-        end
+        string
       end
 
       def namespaced?
@@ -25,11 +21,15 @@ module PrxAuth
 
       def unnamespaced
         if namespaced?
-          Entry.new(NO_NAMESPACE, scope)
+          Entry.new(NO_NAMESPACE, scope, string.split(':').last)
         else
           self
         end
       end
+
+      def inspect
+        "#<ScopeList::Entry \"#{to_s}\">"
+      end
     end
 
     def self.new(list)
@@ -47,9 +47,9 @@ module PrxAuth
 
         parts = value.split(NAMESPACE_SEPARATOR, 2)
         if parts.length == 2
-          push Entry.new(symbolize(parts[0]), symbolize(parts[1]))
+          push Entry.new(symbolize(parts[0]), symbolize(parts[1]), value)
         else
-          push Entry.new(NO_NAMESPACE, symbolize(parts[0]))
+          push Entry.new(NO_NAMESPACE, symbolize(parts[0]), value)
         end
       end
     end
@@ -57,11 +57,11 @@ module PrxAuth
     def contains?(namespace, scope=nil)
       entries = if scope.nil?
                   scope, namespace = namespace, NO_NAMESPACE 
-                  [Entry.new(namespace, symbolize(scope))]
+                  [Entry.new(namespace, symbolize(scope), nil)]
                 else
                   scope = symbolize(scope)
                   namespace = symbolize(namespace)
-                  [Entry.new(namespace, scope), Entry.new(NO_NAMESPACE, scope)]
+                  [Entry.new(namespace, scope, nil), Entry.new(NO_NAMESPACE, scope, nil)]
                 end
       
       entries.any? do |possible_match|

data/lib/prx_auth/version.rb

@@ -1,3 +1,3 @@
 module PrxAuth
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/test/prx_auth/scope_list_test.rb

@@ -70,6 +70,12 @@ describe PrxAuth::ScopeList do
       sl = new_list('one two') - nil
       assert sl.contains?(:one) && sl.contains?(:two)
     end
+
+    it 'maintains dashes and capitalization in the result' do
+      sl = new_list('The-Beginning the-middle the-end') - new_list('the-Middle')
+      assert sl.to_s == 'The-Beginning the-end'
+    end
+
   end
 
   describe '#+' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prx_auth
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Eve Asher
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-05 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler