scimitar 1.1.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 834a7c3f5dba88856dfea8fdfcc1807f49b36739d1c5886e0dc96e7ca5621642
-  data.tar.gz: 7aaa9fae826b8142c3c3418b825ca86c7de46bb543dcdfb19b042caea15f988e
+  metadata.gz: 7723c0e58ed5580a8e1940d49cda020543ea5a3d1412b2c217a9ad614aeec309
+  data.tar.gz: d920fd2f994fb85a830f615fad2a58057a2de29d284cbc8139565150c336ff69
 SHA512:
-  metadata.gz: c3db5de7ca04d57be95f3638183936ab1cd4621b3aba22e0bcd6eaa3b2e876dfe2e79f86711da6de1106908ae96fd444c060b6bc10055e0b8f476faff6e18ca0
-  data.tar.gz: 701c4cb7d93f9dcfa89906bcfb222ba734d4ed83f0f2404969d8375df2a963c2376629508733d7e2852250d8652dac8e9ec07a6482f3a382fa64aaf2ac4ef9e0
+  metadata.gz: 5c495cc86a7a53baa21297d6d7e3945a8b9d0ce0e57b1d035e2fe972c9c4434f07f47358fd95003c4d59bb4252fd27b7cfee20fec9ed3ee6cd8b087dcf5a2532
+  data.tar.gz: '09048b4b209857aeeb55cf64306a95c3968e24d8bea88c7d245cfaa38b745c2170f8ee29b236168099b3afc546320be3e911f8871b042b8920dda371a00ef431'

data/app/controllers/scimitar/active_record_backed_resources_controller.rb

@@ -131,8 +131,8 @@ module Scimitar
         raise NotImplementedError
       end
 
-      # Find a RIP user record. Subclasses can override this if they need
-      # special lookup behaviour.
+      # Find a record by ID. Subclasses can override this if they need special
+      # lookup behaviour.
       #
       # +record_id+:: Record ID (SCIM schema 'id' value - "our" ID).
       #

data/app/models/scimitar/errors.rb

@@ -1,6 +1,6 @@
 module Scimitar
   module Errors
-    def add_errors_from_hash(errors_hash, prefix: nil)
+    def add_errors_from_hash(errors_hash:, prefix: nil)
       errors_hash.each_pair do |key, value|
         new_key = prefix.nil? ? key : "#{prefix}.#{key}".to_sym
         if value.is_a?(Array)

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

@@ -138,7 +138,7 @@ module Scimitar
       end
 
       def as_json(options = {})
-        self.meta = Meta.new unless self.meta
+        self.meta = Meta.new unless self.meta && self.meta.is_a?(Meta)
         meta.resourceType = self.class.resource_type_id
         original_hash = super(options).except('errors')
         original_hash.merge!('schemas' => self.class.schemas.map(&:id))

data/app/models/scimitar/schema/attribute.rb

@@ -88,7 +88,7 @@ module Scimitar
         end
         value.class.schema.valid?(value)
         return true if value.errors.empty?
-        add_errors_from_hash(value.errors.to_hash, prefix: self.name)
+        add_errors_from_hash(errors_hash: value.errors.to_hash, prefix: self.name)
         false
       end
 

data/app/models/scimitar/schema/base.rb

@@ -26,7 +26,9 @@ module Scimitar
       #
       def self.valid?(resource)
         cloned_scim_attributes.each do |scim_attribute|
-          resource.add_errors_from_hash(scim_attribute.errors.to_hash) unless scim_attribute.valid?(resource.send(scim_attribute.name))
+          unless scim_attribute.valid?(resource.send(scim_attribute.name))
+            resource.add_errors_from_hash(errors_hash: scim_attribute.errors.to_hash)
+          end
         end
       end
 

data/config/initializers/scimitar.rb

@@ -2,81 +2,85 @@
 #
 # For supporting information and rationale, please see README.md.
 
-# =============================================================================
-# SERVICE PROVIDER CONFIGURATION
-# =============================================================================
-#
-# This is a Ruby abstraction over a SCIM entity that declares the capabilities
-# supported by a particular implementation.
-#
-# Typically this is used to declare parts of the standard unsupported, if you
-# don't need them and don't want to provide subclass support.
-#
-Scimitar.service_provider_configuration = Scimitar::ServiceProviderConfiguration.new({
+Rails.application.config.to_prepare do # (required for >= Rails 7 / Zeitwerk)
 
-  # See https://tools.ietf.org/html/rfc7643#section-8.5 for properties.
+  # ===========================================================================
+  # SERVICE PROVIDER CONFIGURATION
+  # ===========================================================================
   #
-  # See Gem source file 'app/models/scimitar/service_provider_configuration.rb'
-  # for defaults. Define Hash keys here that override defaults; e.g. to declare
-  # that filters are not supported so that calling clients shouldn't use them:
+  # This is a Ruby abstraction over a SCIM entity that declares the
+  # capabilities supported by a particular implementation.
   #
-  #   filter: Scimitar::Supported.unsupported
+  # Typically this is used to declare parts of the standard unsupported, if you
+  # don't need them and don't want to provide subclass support.
+  #
+  Scimitar.service_provider_configuration = Scimitar::ServiceProviderConfiguration.new({
 
-})
+    # See https://tools.ietf.org/html/rfc7643#section-8.5 for properties.
+    #
+    # See Gem file 'app/models/scimitar/service_provider_configuration.rb'
+    # for defaults. Define Hash keys here that override defaults; e.g. to
+    # declare that filters are not supported so that calling clients shouldn't
+    # use them:
+    #
+    #   filter: Scimitar::Supported.unsupported
 
-# =============================================================================
-# ENGINE CONFIGURATION
-# =============================================================================
-#
-# This is where you provide callbacks for things like authorisation or mixins
-# that get included into all Scimitar-derived controllers (for things like
-# before-actions that apply to all Scimitar controller-based routes).
-#
-Scimitar.engine_configuration = Scimitar::EngineConfiguration.new({
+  })
 
-  # If you have filters you want to run for any Scimitar action/route, you can
-  # define them here. For example, you might use a before-action to set up some
-  # multi-tenancy related state, or skip Rails CSRF token verification/
-  #
-  # For example:
+  # ===========================================================================
+  # ENGINE CONFIGURATION
+  # ===========================================================================
   #
-  #     application_controller_mixin: Module.new do
-  #       def self.included(base)
-  #         base.class_eval do
+  # This is where you provide callbacks for things like authorisation or mixins
+  # that get included into all Scimitar-derived controllers (for things like
+  # before-actions that apply to all Scimitar controller-based routes).
   #
-  #           # Anything here is written just as you'd write it at the top of
-  #           # one of your controller classes, but it gets included in all
-  #           # Scimitar classes too.
-  #
-  #           skip_before_action    :verify_authenticity_token
-  #           prepend_before_action :setup_some_kind_of_multi_tenancy_data
-  #         end
-  #       end
-  #     end, # ...other configuration entries might follow...
+  Scimitar.engine_configuration = Scimitar::EngineConfiguration.new({
 
-  # If you want to support username/password authentication:
-  #
-  #     basic_authenticator: Proc.new do | username, password |
-  #       # Check username/password and return 'true' if valid, else 'false'.
-  #     end, # ...other configuration entries might follow...
-  #
-  # The 'username' and 'password' parameters come from Rails:
-  #
-  #   https://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Basic.html
-  #   https://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Basic/ControllerMethods.html#method-i-authenticate_with_http_basic
+    # If you have filters you want to run for any Scimitar action/route, you
+    # can define them here. For example, you might use a before-action to set
+    # up some multi-tenancy related state, or skip Rails CSRF token
+    # verification. For example:
+    #
+    #     application_controller_mixin: Module.new do
+    #       def self.included(base)
+    #         base.class_eval do
+    #
+    #           # Anything here is written just as you'd write it at the top of
+    #           # one of your controller classes, but it gets included in all
+    #           # Scimitar classes too.
+    #
+    #           skip_before_action    :verify_authenticity_token
+    #           prepend_before_action :setup_some_kind_of_multi_tenancy_data
+    #         end
+    #       end
+    #     end, # ...other configuration entries might follow...
 
-  # If you want to support HTTP bearer token (OAuth-style) authentication:
-  #
-  #     token_authenticator: Proc.new do | token, options |
-  #       # Check token and return 'true' if valid, else 'false'.
-  #     end, # ...other configuration entries might follow...
-  #
-  # The 'token' and 'options' parameters come from Rails:
-  #
-  #   https://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token.html
-  #   https://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token/ControllerMethods.html#method-i-authenticate_with_http_token
-  #
-  # Note that both basic and token authentication can be declared, with the
-  # parameters in the inbound HTTP request determining which is invoked.
+    # If you want to support username/password authentication:
+    #
+    #     basic_authenticator: Proc.new do | username, password |
+    #       # Check username/password and return 'true' if valid, else 'false'.
+    #     end, # ...other configuration entries might follow...
+    #
+    # The 'username' and 'password' parameters come from Rails:
+    #
+    #   https://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Basic.html
+    #   https://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Basic/ControllerMethods.html#method-i-authenticate_with_http_basic
+
+    # If you want to support HTTP bearer token (OAuth-style) authentication:
+    #
+    #     token_authenticator: Proc.new do | token, options |
+    #       # Check token and return 'true' if valid, else 'false'.
+    #     end, # ...other configuration entries might follow...
+    #
+    # The 'token' and 'options' parameters come from Rails:
+    #
+    #   https://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token.html
+    #   https://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token/ControllerMethods.html#method-i-authenticate_with_http_token
+    #
+    # Note that both basic and token authentication can be declared, with the
+    # parameters in the inbound HTTP request determining which is invoked.
+
+  })
 
-})
+end

data/lib/scimitar/version.rb

@@ -3,11 +3,11 @@ module Scimitar
   # Gem version. If this changes, be sure to re-run "bundle install" or
   # "bundle update".
   #
-  VERSION = '1.1.0'
+  VERSION = '2.0.1'
 
   # Date for VERSION. If this changes, be sure to re-run "bundle install"
   # or "bundle update".
   #
-  DATE = '2021-09-15'
+  DATE = '2022-04-20'
 
 end

data/spec/apps/dummy/config/application.rb

@@ -12,6 +12,7 @@ require 'scimitar'
 
 module Dummy
   class Application < Rails::Application
+    config.load_defaults 7.0
   end
 end
 

data/spec/apps/dummy/config/environments/test.rb

@@ -1,15 +1,38 @@
+require 'active_support/core_ext/integer/time'
+
 Rails.application.configure do
   config.cache_classes = true
   config.eager_load = false
-  config.serve_static_files = true
-  config.static_cache_control = 'public, max-age=3600'
-  config.consider_all_requests_local = true
 
-  config.action_dispatch.show_exceptions = false
+  # Configure public file server for tests with Cache-Control for performance.
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+  }
 
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
+  config.cache_store = :null_store
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
-  config.active_support.test_order = :random
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
+  # Raises error for missing translations.
+  config.i18n.raise_on_missing_translations = true
+
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
 end

data/spec/apps/dummy/config/initializers/scimitar.rb

@@ -1,14 +1,16 @@
 # Test app configuration.
 #
-Scimitar.engine_configuration = Scimitar::EngineConfiguration.new({
+Rails.application.config.to_prepare do
+  Scimitar.engine_configuration = Scimitar::EngineConfiguration.new({
 
-  application_controller_mixin: Module.new do
-    def self.included(base)
-      base.class_eval do
-        def test_hook; end
-        before_action :test_hook
+    application_controller_mixin: Module.new do
+      def self.included(base)
+        base.class_eval do
+          def test_hook; end
+          before_action :test_hook
+        end
       end
     end
-  end
 
-})
+  })
+end

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

@@ -42,25 +42,25 @@ RSpec.describe Scimitar::Resources::User do
     let(:user) { described_class.new }
 
     it 'adds the error when the value is a string' do
-      user.add_errors_from_hash(key: 'some error')
+      user.add_errors_from_hash(errors_hash: {key: 'some error'})
       expect(user.errors.messages.to_h).to eql({key: ['some error']})
       expect(user.errors.full_messages).to eql(['Key some error'])
     end
 
     it 'adds the error when the value is an array' do
-      user.add_errors_from_hash(key: ['error1', 'error2'])
+      user.add_errors_from_hash(errors_hash: {key: ['error1', 'error2']})
       expect(user.errors.messages.to_h).to eql({key: ['error1', 'error2']})
       expect(user.errors.full_messages).to eql(['Key error1', 'Key error2'])
     end
 
     it 'adds the error with prefix when the value is a string' do
-      user.add_errors_from_hash({key: 'some error'}, prefix: :pre)
+      user.add_errors_from_hash(errors_hash: {key: 'some error'}, prefix: :pre)
       expect(user.errors.messages.to_h).to eql({:'pre.key' => ['some error']})
       expect(user.errors.full_messages).to eql(['Pre key some error'])
     end
 
     it 'adds the error wity prefix when the value is an array' do
-      user.add_errors_from_hash({key: ['error1', 'error2']}, prefix: :pre)
+      user.add_errors_from_hash(errors_hash: {key: ['error1', 'error2']}, prefix: :pre)
       expect(user.errors.messages.to_h).to eql({:'pre.key' => ['error1', 'error2']})
       expect(user.errors.full_messages).to eql(['Pre key error1', 'Pre key error2'])
     end

data/spec/requests/active_record_backed_resources_controller_spec.rb

@@ -180,6 +180,7 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
               givenName: 'Given',
               familyName: 'Family'
             },
+            meta: { resourceType: 'User' },
             emails: [
               {
                 type: 'work',

data/spec/requests/application_controller_spec.rb

@@ -23,7 +23,6 @@ RSpec.describe Scimitar::ApplicationController do
 
       expect(response).to have_http_status(:bad_request)
       expect(JSON.parse(response.body)['detail']).to start_with('Invalid JSON - ')
-      expect(JSON.parse(response.body)['detail']).to include("'not-json-12345'")
     end
 
     it 'translates Content-Type to Rails request format' do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: scimitar
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.1
 platform: ruby
 authors:
-- RIP Global
+- RIPA Global
 - Andrew David Hodgkinson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.3'
+        version: '6.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.3'
+        version: '6.4'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -115,17 +115,17 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 description: SCIM v2 support for Users and Groups in Ruby On Rails
 email:
-- dev@ripglobal.com
+- dev@ripaglobal.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -237,12 +237,15 @@ files:
 - spec/spec_helper.rb
 - spec/spec_helper_spec.rb
 - spec/support/hash_with_indifferent_case_insensitive_access_spec.rb
-homepage: https://ripglobal.com/
+homepage: https://www.ripaglobal.com/
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/RIPGlobal/scimitar
-post_install_message: 
+  homepage_uri: https://www.ripaglobal.com/
+  source_code_uri: https://github.com/RIPAGlobal/scimitar/
+  bug_tracker_uri: https://github.com/RIPAGlobal/scimitar/issues/
+  changelog_uri: https://github.com/RIPAGlobal/scimitar/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -257,51 +260,51 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: SCIM v2 for Rails
 test_files:
-- spec/spec_helper.rb
-- spec/models/scimitar/lists/query_parser_spec.rb
+- spec/apps/dummy/app/controllers/custom_destroy_mock_users_controller.rb
+- spec/apps/dummy/app/controllers/custom_request_verifiers_controller.rb
+- spec/apps/dummy/app/controllers/mock_groups_controller.rb
+- spec/apps/dummy/app/controllers/mock_users_controller.rb
+- spec/apps/dummy/app/models/mock_group.rb
+- spec/apps/dummy/app/models/mock_user.rb
+- spec/apps/dummy/config/application.rb
+- spec/apps/dummy/config/boot.rb
+- spec/apps/dummy/config/environment.rb
+- spec/apps/dummy/config/environments/test.rb
+- spec/apps/dummy/config/initializers/cookies_serializer.rb
+- spec/apps/dummy/config/initializers/scimitar.rb
+- spec/apps/dummy/config/initializers/session_store.rb
+- spec/apps/dummy/config/routes.rb
+- spec/apps/dummy/db/migrate/20210304014602_create_mock_users.rb
+- spec/apps/dummy/db/migrate/20210308020313_create_mock_groups.rb
+- spec/apps/dummy/db/migrate/20210308044214_create_join_table_mock_groups_mock_users.rb
+- spec/apps/dummy/db/schema.rb
+- spec/controllers/scimitar/application_controller_spec.rb
+- spec/controllers/scimitar/resource_types_controller_spec.rb
+- spec/controllers/scimitar/resources_controller_spec.rb
+- spec/controllers/scimitar/schemas_controller_spec.rb
+- spec/controllers/scimitar/service_provider_configurations_controller_spec.rb
+- spec/models/scimitar/complex_types/address_spec.rb
+- spec/models/scimitar/complex_types/email_spec.rb
 - spec/models/scimitar/lists/count_spec.rb
+- spec/models/scimitar/lists/query_parser_spec.rb
+- spec/models/scimitar/resource_type_spec.rb
+- spec/models/scimitar/resources/base_spec.rb
 - spec/models/scimitar/resources/base_validation_spec.rb
 - spec/models/scimitar/resources/mixin_spec.rb
 - spec/models/scimitar/resources/user_spec.rb
-- spec/models/scimitar/resources/base_spec.rb
 - spec/models/scimitar/schema/attribute_spec.rb
+- spec/models/scimitar/schema/base_spec.rb
 - spec/models/scimitar/schema/group_spec.rb
 - spec/models/scimitar/schema/user_spec.rb
-- spec/models/scimitar/schema/base_spec.rb
-- spec/models/scimitar/resource_type_spec.rb
-- spec/models/scimitar/complex_types/email_spec.rb
-- spec/models/scimitar/complex_types/address_spec.rb
-- spec/requests/controller_configuration_spec.rb
-- spec/requests/engine_spec.rb
 - spec/requests/active_record_backed_resources_controller_spec.rb
 - spec/requests/application_controller_spec.rb
+- spec/requests/controller_configuration_spec.rb
+- spec/requests/engine_spec.rb
+- spec/spec_helper.rb
 - spec/spec_helper_spec.rb
 - spec/support/hash_with_indifferent_case_insensitive_access_spec.rb
-- spec/controllers/scimitar/schemas_controller_spec.rb
-- spec/controllers/scimitar/resource_types_controller_spec.rb
-- spec/controllers/scimitar/resources_controller_spec.rb
-- spec/controllers/scimitar/service_provider_configurations_controller_spec.rb
-- spec/controllers/scimitar/application_controller_spec.rb
-- spec/apps/dummy/app/models/mock_group.rb
-- spec/apps/dummy/app/models/mock_user.rb
-- spec/apps/dummy/app/controllers/custom_request_verifiers_controller.rb
-- spec/apps/dummy/app/controllers/custom_destroy_mock_users_controller.rb
-- spec/apps/dummy/app/controllers/mock_groups_controller.rb
-- spec/apps/dummy/app/controllers/mock_users_controller.rb
-- spec/apps/dummy/config/routes.rb
-- spec/apps/dummy/config/environments/test.rb
-- spec/apps/dummy/config/environment.rb
-- spec/apps/dummy/config/application.rb
-- spec/apps/dummy/config/boot.rb
-- spec/apps/dummy/config/initializers/session_store.rb
-- spec/apps/dummy/config/initializers/cookies_serializer.rb
-- spec/apps/dummy/config/initializers/scimitar.rb
-- spec/apps/dummy/db/schema.rb
-- spec/apps/dummy/db/migrate/20210308020313_create_mock_groups.rb
-- spec/apps/dummy/db/migrate/20210308044214_create_join_table_mock_groups_mock_users.rb
-- spec/apps/dummy/db/migrate/20210304014602_create_mock_users.rb