mortymer 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1733f673e867c239bda30efbc34f45f7452ebbee12a702e201dffbcbb02f621
-  data.tar.gz: 9ff44dd993b2ed7a82971437048731e80cb97b1a15d96fbdeb758d9797b6f3e4
+  metadata.gz: c0eb00a3e60d92a8d272157afe72dbb9512fbf9b7ccb8cfa2ea5304f9e058081
+  data.tar.gz: b9810cdf3c4e15d4942c18656b3d45aaefdde2798304610543adb739e67c97a8
 SHA512:
-  metadata.gz: cd31959f30b91390ad9c40efb0fd18154e78829057df484a4b67c8efc5630f0ce97b3bfc47bff4c557bed421226311c6ad5cab077e1aa89da24d9b193defba51
-  data.tar.gz: b9b604148b9ff54cde6cb26bc15d2752e2f8542a9df414cc1d9feb466d8f5e803697336fbfbffab1fb51d8de7b14a5c8a69f53ce3a50638b9df1e4fc36943814
+  metadata.gz: 669eeff9fa6da0866cbed09bf7e1f52b31b2a8451db278d40f7b8b4be184bfd3abae04307f750287a70aa6ce83429da74452d284cbc03d81a09adccb37d52be7
+  data.tar.gz: '09d2c7aba2808274d6a2a034b8227e622a5cb42104423e4545ba307c8021ae3e3d73461a5eece2e33d02f12f22f45bc343dd28e63ec1ee6c3f49c96d7daef8af'

data/lib/mortymer/contract.rb

@@ -24,7 +24,7 @@ module Mortymer
     end
 
     def self.__internal_struct_repr__
-      @__internal_struct_repr__ || StructCompiler.new.compile(schema.json_schema)
+      @__internal_struct_repr__ ||= StructCompiler.new.compile(schema.json_schema)
     end
 
     def self.json_schema
@@ -32,6 +32,11 @@ module Mortymer
     end
 
     def self.structify(params)
+      # If params are already built using the internal struct, then there is
+      # no need to re-validate it
+      return params if params.instance_of?(__internal_struct_repr__)
+
+      params = params.to_h if params.is_a?(Dry::Struct)
       result = new.call(params)
       raise ContractError, result.errors.to_h unless result.errors.empty?
 

data/lib/mortymer/model.rb

@@ -24,7 +24,13 @@ module Mortymer
     end
 
     def [](key)
-      @attributes[key.to_sym]
+      public_send(key)
     end
+
+    def key?(attr)
+      attributes.key?(attr.to_sym)
+    end
+
+    alias has_key? key?
   end
 end

data/lib/mortymer/sigil.rb

@@ -45,7 +45,15 @@ module Mortymer
             end
 
             begin
-              procced_args << (type.respond_to?(:structify) ? type.structify(arg) : type.call(arg))
+              procced_args << if type.respond_to?(:structify)
+                                type.structify(arg)
+                              elsif type.respond_to?(:call)
+                                type.call(arg)
+                              elsif arg.is_a?(type)
+                                arg
+                              else
+                                raise TypeError, "Invalid type for argument #{idx}: expected #{type}, got #{arg.class}"
+                              end
             rescue Dry::Types::CoercionError => e
               raise TypeError, "Invalid type for argument #{idx}: expected #{type}, got #{arg.class} - #{e.message}"
             end
@@ -72,7 +80,18 @@ module Mortymer
           # Validate return type if specified
           if (return_type = signature[:returns])
             begin
-              return return_type.respond_to?(:structify) ? return_type.structify(result) : return_type.call(result)
+              # A mortymer model or contract
+              if return_type.respond_to?(:structify)
+                return return_type.structify(result)
+              # A dry type
+              elsif return_type.respond_to?(:call)
+                return return_type.call(result)
+              # A custom object
+              elsif result.is_a?(return_type)
+                return result
+              else
+                raise TypeError, "Invalid return type: expected #{return_type}, got #{result.class}"
+              end
             rescue Dry::Types::CoercionError => e
               raise TypeError, "Invalid return type: expected #{return_type}, got #{result.class} - #{e.message}"
             end

data/lib/mortymer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mortymer
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mortymer
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Adrian Gonzalez
 bindir: exe
 cert_chain: []
-date: 2025-04-05 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct