eazypi 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3039b06d210f7a865957a6eb86b1946e0a7ae2ea63091ada95eed28ad47e8a7b
-  data.tar.gz: c5b7ad7943c65cb84eb94b27c6c0b63978bc03f42b14b140df9b52f0caebe24d
+  metadata.gz: a16005235e7c868a0c1d3ef77636f537ab583938ac15785a14c82387a6143d57
+  data.tar.gz: 05a041c6f609455795d160ecb7084f5d76e3d2e41e32d7f189a4001ba5ad7a06
 SHA512:
-  metadata.gz: 184707f28d37b10fea94dd4c245dc5143e484b22b089061b3d9efe8cea7b2e48edf38f238dc07dd9fdda728520e482689d505571998c3e52b20913fa828254f6
-  data.tar.gz: 00011c9d53005e80ada9eabf45fc4ce98fde60160fb418048a5dd46852ed8db8ee0d4d2c97455605229651d98ed1ce680a70f8a1979382733e66c1853337ad15
+  metadata.gz: 9976ca262116dfb775a64d63ee89a1a2b73f806356cbe183a20fe254cf6b387b326aa0eedba7aa937ae7e63bb2336ade03b9b0a6d238b8eb96c7a06c6660313b
+  data.tar.gz: 0ec474f7e638f62efbf2c60372e716ea3ef4c7f8471f812c4071a01c3908b31ce5ac656a1e3e4204d71f1acc8b559726aa4490fc8f48d54be5315e4fa88e9ffe

data/lib/eazypi/components.rb

@@ -8,7 +8,8 @@ module Eazypi
     end
 
     def add_schema(name, schema)
-      @schemas[name] = schema.dup # Make sure it never gets a reference
+      # Make sure it never gets a changed copy + never gets overwritten
+      @schemas[name] = schema.dup unless @schemas.key?(name)
 
       "#/components/schemas/#{name}"
     end

data/lib/eazypi/schema/array.rb

@@ -10,8 +10,10 @@ module Eazypi
         @item_schema = item_schema
       end
 
-      def collect_components(schemas: nil, **_kwargs)
+      def collect_components(schemas: nil, **kwargs)
         schemas&.call(@item_schema)
+
+        @item_schema.collect_components(schemas: schemas, **kwargs)
       end
 
       def to_openapi_spec

data/lib/eazypi/schema/object.rb

@@ -15,6 +15,7 @@ module Eazypi
 
       def reference!(reference)
         @reference = reference
+        self
       end
 
       def property(name, schema, required: false)

data/lib/eazypi/schema.rb

@@ -3,21 +3,29 @@
 module Eazypi
   # JSON schema
   module Schema
-    def self.from_object(object) # rubocop:todo Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
+    def self.from_object(object, parent = nil) # rubocop:todo Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
       if object == :boolean
         Schema::Primitive.new(type: "boolean")
       elsif object.is_a?(::Array)
         raise "Array needs to have one element" if object.length != 1
 
-        Schema::Array.new(Schema.from_object(object[0]))
+        Schema::Array.new(Schema.from_object(object[0], parent))
       elsif object == String
         Schema::Primitive.new(type: "string")
+      elsif object == Date
+        Schema::Primitive.new(type: "string", format: "date")
+      elsif object == Time
+        Schema::Primitive.new(type: "string", format: "date-time")
       elsif object == Integer
         Schema::Primitive.new(type: "integer")
       elsif object == Float
         Schema::Primitive.new(type: "number")
       elsif object.respond_to?(:to_schema)
-        object.to_schema
+        if object == parent
+          object.to_schema_reference
+        else
+          object.to_schema
+        end
       else
         raise "Can not convert #{object} to a schema"
       end

data/lib/eazypi/serializer.rb

@@ -33,11 +33,17 @@ module Eazypi
         end
       end
 
-      def value(object)
+      def value(object) # rubocop:disable Metrics/MethodLength
         if @method
           @method.call(object)
         elsif @method_name
           object.send(@method_name)
+        elsif object.is_a?(Hash) 
+          if object.key?(@name)
+            object[@name]
+          elsif object.key?(@name.to_s)
+            object[@name.to_s]
+          end
         else
           object.send(@name)
         end
@@ -56,7 +62,7 @@ module Eazypi
       end
     end
 
-    included do
+    included do # rubocop:disable Metrics/BlockLength
       @attributes = []
 
       def self.attribute(attribute_name, type:, method: nil, method_name: nil, required: false)
@@ -74,14 +80,22 @@ module Eazypi
       end
 
       def self.to_schema
-        schema = Schema::Object.new(name.split("::").last)
+        schema = Schema::Object.new(object_name)
 
         @attributes.each do |attribute|
-          schema.property attribute.name.to_s, Schema.from_object(attribute.type), required: attribute.required
+          schema.property attribute.name.to_s, Schema.from_object(attribute.type, self), required: attribute.required
         end
 
         schema
       end
+
+      def self.to_schema_reference
+        Schema::Object.new(object_name).reference!("#/components/schemas/#{object_name}")
+      end
+
+      def self.object_name
+        name.split("::").last
+      end
     end
 
     def self.serialize_object(type_object, object) # rubocop:disable Metrics/MethodLength
@@ -91,6 +105,8 @@ module Eazypi
         object&.map do |value|
           serialize_object(type_object[0], value)
         end
+      elsif [Date, Time].include?(type_object)
+        object&.iso8601
       elsif [String, Integer, Float].include?(type_object)
         object
       else

data/lib/eazypi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Eazypi
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eazypi
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Nathan Samson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-18 00:00:00.000000000 Z
+date: 2024-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack