scimitar 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8c16f7606590c342b819bc9e8f44111e451897ca670d90321ba285ac259e892
-  data.tar.gz: db95329ce66a59ce500cb4c03b1bfbf5cac2b72b1604b72916070f647a8d6914
+  metadata.gz: 6f44cfce4b49e3f386b14081151dc38bf5bf857939fefbad36b507770d1de2e9
+  data.tar.gz: ba7fe68d41eb204a84f71e23931ed85a497645671170994043abab4e1b7dba73
 SHA512:
-  metadata.gz: f204ce89ecad62257ac04f8fe648abaa1f9a5822b7abc3597fe2ee27758a120e8a6e3f46982fbff099af80558f9bd5aee8246a3c396e9809973edd2a761d3cfb
-  data.tar.gz: 8da76599bc3740e9c3f72daebc427342f7d2112a0f750aae4c51594e53c7dcc76f950d0b18cb21e3f93edcda767647713c3169a62684a43b1cb7d94e939f44bf
+  metadata.gz: 1b267f42755f9fc94280ea7c84d08762056e95dd967a6d17535cefd9275e04f60e3abc1a20a7849ab7f3bbd8fa508047586f23cb33ed6d7bec56bc6c2d3fcf7d
+  data.tar.gz: facdf0cb0566d0b323181abb0d4707c2036f85b2f958f29dc0df0471a6244595c6147a7887895b7a96689288edea3c684cbf3d32c7119959ff70c28abc610d9e

data/app/models/scimitar/resources/mixin.rb

@@ -945,12 +945,27 @@ module Scimitar
           # Happily throws exceptions if data is not as expected / required.
           #
           def all_matching_filter(filter:, within_array:, &block)
-            filter_components = filter.split(' ')
-            raise "Unsupported matcher #{filter.inspect}" unless filter_components.size == 3 && filter_components[1].downcase == 'eq'
+            filter_components = filter.split(' ', 3)
 
             attribute = filter_components[0]
+            operator  = filter_components[1]
             value     = filter_components[2]
-            value     = value[1..-2] if value.start_with?('"') && value.end_with?('"')
+
+            # Quoted value includes closing quote but has data afterwards?
+            # Bad; implies extra conditions, e.g. '...eq "one two" and..." or
+            # just junk data.
+            #
+            # Value is *not* quoted but contains a space? Means there must be
+            # again either extra conditions or trailing junk data.
+            #
+            raise "Unsupported matcher #{filter.inspect}" if (
+              filter_components.size != 3         ||
+              operator.downcase != 'eq'           ||
+              value.strip.match?(/\".+[^\\]\".+/) || # Literal '"', any data, no-backslash-then-literal (unescaped) '"', more data
+              (!value.start_with?('"') && value.strip.include?(' '))
+            )
+
+            value = value[1..-2] if value.start_with?('"') && value.end_with?('"')
 
             within_array.each.with_index do | hash, index |
               matched = hash.key?(attribute) && hash[attribute]&.to_s == value&.to_s

data/lib/scimitar/version.rb

@@ -3,7 +3,7 @@ module Scimitar
   # Gem version. If this changes, be sure to re-run "bundle install" or
   # "bundle update".
   #
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 
   # Date for VERSION. If this changes, be sure to re-run "bundle install"
   # or "bundle update".

data/spec/models/scimitar/resources/mixin_spec.rb

@@ -522,6 +522,22 @@ RSpec.describe Scimitar::Resources::Mixin do
             end.to raise_error(RuntimeError)
           end
 
+          it 'complaints about unsupported multiple operators, handling value spaces' do
+            expect do
+              @instance.send(:all_matching_filter, filter: 'type eq "work with spaces" and primary pr', within_array: []) do
+                fail # Block should never be called!
+              end
+            end.to raise_error(RuntimeError)
+          end
+
+          it 'complaints about unquoted values with spaces' do
+            expect do
+              @instance.send(:all_matching_filter, filter: 'type eq work with spaces', within_array: []) do
+                fail # Block should never be called!
+              end
+            end.to raise_error(RuntimeError)
+          end
+
           it 'calls block with matches' do
             array = [
               {
@@ -565,6 +581,10 @@ RSpec.describe Scimitar::Resources::Mixin do
               {
                 'type'  => 'work"',
                 'value' => 'work_trailing_dquote@test.com'
+              },
+              {
+                'type'  => 'spaced',
+                'value' => 'value with spaces'
               }
             ]
 
@@ -585,7 +605,12 @@ RSpec.describe Scimitar::Resources::Mixin do
               expect(matched_hash['value']).to eql('boolean@test.com')
             end
 
-            expect(call_count).to eql(3)
+            @instance.send(:all_matching_filter, filter: 'value eq "value with spaces"', within_array: array) do |matched_hash, index|
+              call_count += 1
+              expect(matched_hash['type']).to eql('spaced')
+            end
+
+            expect(call_count).to eql(4)
           end
         end # "context '#all_matching_filter' do"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scimitar
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - RIP Global