scim-kit 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a9111686b257670cfbc534ae4f9904bfe30b974b0f162a1106506ddbc643a4e
-  data.tar.gz: dcc149efdc5dc6ac9e18447f9050454c1dde041769c4a5778b0355e76209f134
+  metadata.gz: 71f2c3e794e6d3203aacae277565ca28934f455ea4328e860d3b9227041a9e21
+  data.tar.gz: b98a7c46d298ca348c6ee51873e8dac278a6fb8dceb27bf918599f22af9263dc
 SHA512:
-  metadata.gz: fdf0fa6dcecbd0fec7af66688de603fdde756ec733029012176a44df93d19d954b90a837c2c6536d0060dddf9d6a1ee80307fb50dc414d65195b4cb6bbc96833
-  data.tar.gz: 7e796433ee04950e55470c36c1377103cef52535f913ca6456189bc4665e0701af24dd59941f7ec5c0ddbb3c47b14fcf38bdb6182405d8518ced2a39349e49dd
+  metadata.gz: 4025c01e0ce569a6c0567db2dc4d043229123543076824a7edb43cee21c66d0ce02403bded2c1dd07aa2eb6493cae612d7d8794423a2fbd76d859b7f1fa93b55
+  data.tar.gz: 15b39a9c896ee626a832b225070284d362266b83d50246de79ca67fddda306ec11d13291aecd243b3466bbf60ac924bee0765549d9ce8ae2cb3fa2e78898915c

data/lib/scim/kit/v2/attribute.rb

@@ -5,25 +5,48 @@ module Scim
     module V2
       # Represents a SCIM Attribute
       class Attribute
+        include ::ActiveModel::Validations
         include Attributable
         include Templatable
         attr_reader :type
         attr_reader :_value
 
+        validate :presence_of_value, if: proc { |x| x.type.required }
+        validate :inclusion_of_value, if: proc { |x| x.type.canonical_values }
+        validate :validate_type
+
         def initialize(type:, value: nil)
           @type = type
           @_value = value
           define_attributes_for(type.attributes)
         end
 
+        def _assign(new_value, coerce: true)
+          @_value = coerce ? type.coerce(new_value) : new_value
+        end
+
         def _value=(new_value)
-          @_value = type.coerce(new_value)
+          _assign(new_value, coerce: true)
+        end
+
+        private
+
+        def presence_of_value
+          return unless type.required && _value.blank?
+
+          errors.add(type.name, I18n.t('errors.messages.blank'))
+        end
+
+        def inclusion_of_value
+          return if type.canonical_values.include?(_value)
+
+          errors.add(type.name, I18n.t('errors.messages.inclusion'))
+        end
+
+        def validate_type
+          return if type.valid?(_value)
 
-          if type.canonical_values &&
-             !type.canonical_values.empty? &&
-             !type.canonical_values.include?(new_value)
-            raise ArgumentError, new_value
-          end
+          errors.add(type.name, I18n.t('errors.messages.invalid'))
         end
       end
     end

data/lib/scim/kit/v2/attribute_type.rb

@@ -6,23 +6,6 @@ module Scim
       # Represents a scim Attribute type
       class AttributeType
         include Templatable
-        DATATYPES = {
-          string: 'string',
-          boolean: 'boolean',
-          decimal: 'decimal',
-          integer: 'integer',
-          datetime: 'dateTime',
-          binary: 'binary',
-          reference: 'reference',
-          complex: 'complex'
-        }.freeze
-        COERCION = {
-          string: ->(x) { x.to_s },
-          decimal: ->(x) { x.to_f },
-          integer: ->(x) { x.to_i },
-          datetime: ->(x) { x.is_a?(::String) ? DateTime.parse(x) : x },
-          binary: ->(x) { Base64.strict_encode64(x) }
-        }.freeze
         attr_accessor :canonical_values
         attr_accessor :case_exact
         attr_accessor :description
@@ -80,17 +63,52 @@ module Scim
         end
 
         def coerce(value)
-          if type_is?(:boolean) && ![true, false].include?(value)
-            raise ArgumentError, value
+          return value if complex?
+
+          if multi_valued
+            return value unless value.respond_to?(:to_a)
+
+            value.to_a.map do |x|
+              COERCION.fetch(type, ->(y) { y }).call(x)
+            end
+          else
+            COERCION.fetch(type, ->(x) { x }).call(value)
+          end
+        end
+
+        def valid?(value)
+          if multi_valued
+            return false unless value.respond_to?(:to_a)
+
+            return value.to_a.all? { |x| validate(x) }
           end
-          return value if multi_valued
 
-          coercion = COERCION[type]
-          coercion ? coercion.call(value) : value
+          complex? ? valid_complex?(value) : valid_simple?(value)
         end
 
         private
 
+        def validate(value)
+          complex? ? valid_complex?(value) : valid_simple?(value)
+        end
+
+        def valid_simple?(value)
+          VALIDATIONS[type]&.call(value)
+        end
+
+        def valid_complex?(item)
+          return false unless item.is_a?(Hash)
+
+          item.keys.each do |key|
+            return false unless type_for(key)&.valid?(item[key])
+          end
+        end
+
+        def type_for(name)
+          name = name.to_s.underscore
+          attributes.find { |x| x.name.to_s.underscore == name }
+        end
+
         def string?
           type_is?(:string)
         end

data/lib/scim/kit/v2/resource.rb

@@ -5,6 +5,7 @@ module Scim
     module V2
       # Represents a SCIM Resource
       class Resource
+        include ::ActiveModel::Validations
         include Attributable
         include Templatable
 
@@ -12,6 +13,9 @@ module Scim
         attr_reader :meta
         attr_reader :schemas
 
+        validates_presence_of :id
+        validate :schema_validations
+
         def initialize(schemas:, location:)
           @meta = Meta.new(schemas[0].name, location)
           @schemas = schemas
@@ -19,6 +23,21 @@ module Scim
             define_attributes_for(schema.attributes)
           end
         end
+
+        private
+
+        def schema_validations
+          schemas.each do |schema|
+            schema.attributes.each do |type|
+              validate_attribute(type)
+            end
+          end
+        end
+
+        def validate_attribute(type)
+          attribute = attribute_for(type.name)
+          errors.copy!(attribute.errors) unless attribute.valid?
+        end
       end
     end
   end

data/lib/scim/kit/v2/schema.rb

@@ -13,6 +13,7 @@ module Scim
         def initialize(id:, name:, location:)
           @id = id
           @name = name
+          @description = ''
           @meta = Meta.new('Schema', location)
           @meta.created = @meta.last_modified = @meta.version = nil
           @attributes = []

data/lib/scim/kit/v2.rb

@@ -21,6 +21,51 @@ module Scim
   module Kit
     # Version 2 of the SCIM RFC https://tools.ietf.org/html/rfc7644
     module V2
+      BASE64 = %r(
+        \A([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?\Z
+      )x.freeze
+      BOOLEAN_VALUES = [true, false].freeze
+      DATATYPES = {
+        string: 'string',
+        boolean: 'boolean',
+        decimal: 'decimal',
+        integer: 'integer',
+        datetime: 'dateTime',
+        binary: 'binary',
+        reference: 'reference',
+        complex: 'complex'
+      }.freeze
+      COERCION = {
+        binary: lambda { |x|
+          VALIDATIONS[:binary].call(x) ? x : Base64.strict_encode64(x)
+        },
+        boolean: lambda { |x|
+          return true if x == 'true'
+          return false if x == 'false'
+
+          x
+        },
+        datetime: ->(x) { x.is_a?(::String) ? DateTime.parse(x) : x },
+        decimal: ->(x) { x.to_f },
+        integer: ->(x) { x.to_i },
+        string: ->(x) { x.to_s }
+      }.freeze
+      VALIDATIONS = {
+        binary: ->(x) { x.is_a?(String) && x.match?(BASE64) },
+        boolean: ->(x) { BOOLEAN_VALUES.include?(x) },
+        datetime: ->(x) { x.is_a?(DateTime) },
+        decimal: ->(x) { x.is_a?(Float) },
+        integer: lambda { |x|
+          begin
+            x&.integer?
+          rescue StandardError
+            false
+          end
+        },
+        reference: ->(x) { x =~ /\A#{URI.regexp(%w[http https])}\z/ },
+        string: ->(x) { x.is_a?(String) }
+      }.freeze
+
       class << self
         def configuration
           @configuration ||= ::Scim::Kit::V2::Configuration.new

data/lib/scim/kit/version.rb

@@ -2,6 +2,6 @@
 
 module Scim
   module Kit
-    VERSION = '0.2.6'
+    VERSION = '0.2.7'
   end
 end

data/lib/scim/kit.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
+require 'active_model'
+require 'active_support/core_ext/hash/indifferent_access'
 require 'tilt'
 require 'tilt/jbuilder'
-require 'active_support/core_ext/hash/indifferent_access'
 
 require 'scim/kit/dynamic_attributes'
 require 'scim/kit/templatable'

data/scim-kit.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'A SCIM library.'
   spec.description   = 'A SCIM library.'
-  spec.homepage      = 'https://www.mokhan.ca/'
+  spec.homepage      = 'https://www.github.com/mokhan/scim-kit'
   spec.license       = 'MIT'
 
   # Specify which files should be added to the gem when it is released.
@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'activemodel', '>= 5.2.0'
   spec.add_dependency 'tilt', '~> 2.0'
   spec.add_dependency 'tilt-jbuilder', '~> 0.7'
   spec.add_development_dependency 'bundler', '~> 1.17'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: scim-kit
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - mo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +221,7 @@ files:
 - lib/scim/kit/v2/uniqueness.rb
 - lib/scim/kit/version.rb
 - scim-kit.gemspec
-homepage: https://www.mokhan.ca/
+homepage: https://www.github.com/mokhan/scim-kit
 licenses:
 - MIT
 metadata: {}
@@ -226,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A SCIM library.