scimitar 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4361be0d5f54ce11106a22215c7ec4167a877961dc775908e902f3c6abc281e
-  data.tar.gz: b4e721e5f247b4ed1f3fa1a65f0f68b4572bc4d41ad44a68d37578c41d71e718
+  metadata.gz: 69cae1bb9cbd4ddcdf7914e35b4ac23ad7359c2d566d99071dfb346ae8b2f9d2
+  data.tar.gz: c1636e01e98e1938a1f62ffd27b8aa0c00a787860f93a95f445158cb8e7e6064
 SHA512:
-  metadata.gz: f373036a611555190e8d15bfd021be1bda8dc3bd358d58dfc8825f656bcdd648a5b7b2c06e091c58455b7eadec6277ccbf58646dd2b26bc4f9864dd6aa2761e7
-  data.tar.gz: e05d6fd73646929393c7edfea91076bf475fb1f997be0692130a5ba12b2d0f56ee8e106f775b1cdabdf8ed8723d56042b4941c110f66ce800b6868336d6762f7
+  metadata.gz: 321cf5943bf587c925c827d909cb8dda138be977a03e211b1a7496e0c608da1055a0e4fb9aaa1d8f9877d5631a34dbba5f16c00b50098ca08b5bdfa6fed2cff2
+  data.tar.gz: 910f2e4f85c7722f71229cdbd680af6af64aa7d1186e8464ad6050b338f97bf6849042407b241acfc409a63ce8fe48023f1f251d3712d1ec8298cb91d911ce0f

data/app/controllers/scimitar/application_controller.rb

@@ -82,12 +82,17 @@ module Scimitar
       # request and subclass processing.
       #
       def require_scim
-        if request.content_type&.downcase == Mime::Type.lookup_by_extension(:scim).to_s
+        scim_mime_type = Mime::Type.lookup_by_extension(:scim).to_s
+
+        if request.content_type.nil?
+          request.format = :scim
+          request.headers['CONTENT_TYPE'] = scim_mime_type
+        elsif request.content_type&.downcase == scim_mime_type
           request.format = :scim
         elsif request.format == :scim
-          request.headers['CONTENT_TYPE'] = Mime::Type.lookup_by_extension(:scim).to_s
+          request.headers['CONTENT_TYPE'] = scim_mime_type
         else
-          handle_scim_error(ErrorResponse.new(status: 406, detail: "Only #{Mime::Type.lookup_by_extension(:scim)} type is accepted."))
+          handle_scim_error(ErrorResponse.new(status: 406, detail: "Only #{scim_mime_type} type is accepted."))
         end
       end
 

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/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.2.0'
+  VERSION = '1.2.1'
 
   # Date for VERSION. If this changes, be sure to re-run "bundle install"
   # or "bundle update".
   #
-  DATE = '2021-09-27'
+  DATE = '2022-06-15'
 
 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

@@ -11,11 +11,14 @@ RSpec.describe Scimitar::ApplicationController do
   end
 
   context 'format handling' do
-    it 'renders "not acceptable" if the request does not use SCIM type' do
+    it 'renders "OK" if the request does not provide any Content-Type value' do
       get '/CustomRequestVerifiers', params: { format: :html }
 
-      expect(response).to have_http_status(:not_acceptable)
-      expect(JSON.parse(response.body)['detail']).to eql('Only application/scim+json type is accepted.')
+      expect(response).to have_http_status(:ok)
+      parsed_body = JSON.parse(response.body)
+      expect(parsed_body['request']['is_scim'     ]).to eql(true)
+      expect(parsed_body['request']['format'      ]).to eql('application/scim+json')
+      expect(parsed_body['request']['content_type']).to eql('application/scim+json')
     end
 
     it 'renders 400 if given bad JSON' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scimitar
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - RIPA Global
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: SCIM v2 for Rails