api-regulator 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21f65fe067c5267aa27557544c2ff86d4bc860be047322336b9489562d6912fa
-  data.tar.gz: c87cb89c91c7d5f8a5d2d0454db67c80672696b34594e0f18aab5d0721db39bf
+  metadata.gz: c1d041ae7a972c291795b539d3543fbda9da721c10f505966af5eca71c00fac4
+  data.tar.gz: 592189f17e96f0c676adb9d393698ae32617a6f9558b5a255911b97ea422b6b9
 SHA512:
-  metadata.gz: 02f6d4e3824a31fe8ac562d08c87ec1c5c3bb80050e7589ab76b9a2aee172ca06a96965bcc714d54729d263aa85c4eca245608eaaf98dff487f36b4cbdc65c60
-  data.tar.gz: 294239002947154ea624821f5f73d4e9600113ce380a7d3344315dba9c3a36be77e77c1a41e28c02890f9fe56ccab981d2a63e177f14069fb0938a3cd023febf
+  metadata.gz: 29f9365bde56835debcffe256e6496d0cf3e8a9abe09aebeb88493141e893b38943cdfe83116cfd1bb7f1e95b73e59281849977b76834731cbf5d6ab022154ff
+  data.tar.gz: 2c3bcd87b072eb9cb5877d15224a1782c9a90e16700050cb9d594367c741a2d8d27da992ca0c99d9f48e6ea959390e93ca44d6fa1b0099aafb861f97cf68cc74

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api-regulator (0.1.7)
+    api-regulator (0.1.9)
       activemodel (~> 8.0)
       activesupport (~> 8.0)
 

data/lib/api_regulator/controller_mixin.rb

@@ -36,9 +36,16 @@ module ApiRegulator
 
       body_params = api_definition.params.select(&:body?)
       permitted_body = body_params.each_with_object({}) do |param, hash|
-        if params.key?(param.name)
-          params.require(param.name).permit(*build_permitted_keys(param.children)).to_h.symbolize_keys
-          hash[param.name.to_sym] = params.require(param.name).permit(*build_permitted_keys(param.children)).to_h.symbolize_keys
+        if param.type == :object
+          if param.required?
+            nested = params.expect(param.name => build_permitted_keys(param.children)).to_h.symbolize_keys
+            hash[param.name.to_sym] = nested
+          else
+            nested = params.permit(param.name => build_permitted_keys(param.children)).to_h.symbolize_keys
+            hash.merge!(nested)
+          end
+        else
+          hash[param.name.to_sym] = params[param.name]
         end
       end.symbolize_keys
 

data/lib/api_regulator/open_api_generator.rb

@@ -142,7 +142,7 @@ module ApiRegulator
         elsif param.options[:format][:with] == Formats::DATE
           schema[:format] = 'date'
         elsif param.options[:format][:with] == Formats::DATETIME
-          schema[:format] = 'date-type'
+          schema[:format] = 'date-time'
         elsif param.options[:format][:with] == Formats::URI
           schema[:format] = 'uri'
         elsif param.options[:format][:with].is_a?(Regexp)

data/lib/api_regulator/param.rb

@@ -37,6 +37,10 @@ module ApiRegulator
       end
     end
 
+    def required?
+      !!@options[:presence]
+    end
+
     def body?
       location == :body
     end

data/lib/api_regulator/validator.rb

@@ -56,9 +56,13 @@ module ApiRegulator
           # Build a nested validator class for array items
           item_validator_class = build_nested_validator_class(param.children, param.name, self)
           validate -> { validate_array_of_objects(full_key, item_validator_class, param) }
+
+          # Store the nested validator
+          nested_validators[full_key] = [item_validator_class]
         elsif param.item_type
           # Scalar array with specific item type
           validate -> { validate_array_of_scalars(full_key, param) }
+          nested_validators[full_key] = :scalars
         else
           raise "Arrays must have children or an item_type"
         end
@@ -84,11 +88,11 @@ module ApiRegulator
             allowed_attributes = attributes.slice(*self.class.defined_attributes.map(&:to_sym))
             super(allowed_attributes)
           end
-        end
 
-        # Add child attributes and validations
-        children.each do |child|
-          nested_validator_class.define_attribute_and_validations(child)
+          # Add child attributes and validations
+          children.each do |child|
+            define_attribute_and_validations(child)
+          end
         end
 
         # Store the nested class under the parent class namespace
@@ -214,32 +218,62 @@ module ApiRegulator
     def self.build_all(api_definitions)
       api_definitions.each do |api_definition|
         class_name = "#{api_definition.controller_path}/#{api_definition.action_name}".gsub("/", "_").camelcase
-        validator_class = build_class(api_definition)
+        validator_class = build_class(api_definition.params)
         @validators[[api_definition.controller_path, api_definition.action_name]] = validator_class
         Validator.const_set(class_name, validator_class)
       end
     end
 
-    def self.get(controller, action)
-      @validators[[controller, action]]
+    def self.build_response_validators(api_definitions = ApiRegulator.api_definitions)
+      api_definitions.each do |api_definition|
+        api_definition.responses.each do |code, params|
+          class_name = "#{api_definition.controller_path}/#{api_definition.action_name}/Response#{code}".gsub("/", "_").camelcase
+
+          validator_class = build_class(params.children)
+          @validators[[api_definition.controller_path, api_definition.action_name, code]] = validator_class
+          Validator.const_set(class_name, validator_class)
+        end
+      end
+    end
+
+    def self.get(controller, action, code = nil)
+      @validators[[controller.to_s, action.to_s, code].compact]
     end
 
-    def self.build_class(api_definition)
-      Class.new(self) do
-        api_definition.params.each do |param|
+    def self.build_class(params)
+      Class.new do
+        include ActiveModel::Model
+        include ActiveModel::Attributes
+        include AttributeDefinitionMixin
+
+        def initialize(attributes = {})
+          @raw_attributes = attributes.deep_symbolize_keys
+          self.class.defined_attributes
+          allowed_attributes = attributes.slice(*self.class.defined_attributes.map(&:to_sym))
+          super(allowed_attributes)
+        end
+
+        params.each do |param|
           define_attribute_and_validations(param)
         end
       end
     end
 
-    def self.reset_validators
-      @validators = {}
+    def self.validate_response(controller, action, code, body)
+      validator_class = get(controller, action, code)
+
+      unless validator_class
+        raise "No validator found"
+      end
+
+      validator = validator_class.new(body)
+      unless validator.valid?
+        raise ApiRegulator::ValidationError.new(validator.errors)
+      end
     end
 
-    def initialize(attributes = {})
-      @raw_attributes = attributes.deep_symbolize_keys
-      allowed_attributes = attributes.slice(*self.class.defined_attributes.map(&:to_sym))
-      super(allowed_attributes)
+    def self.reset_validators
+      @validators = {}
     end
   end
 end

data/lib/api_regulator/version.rb

@@ -1,3 +1,3 @@
 module ApiRegulator
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api-regulator
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Geoff Massanek
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-20 00:00:00.000000000 Z
+date: 2025-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport