expectant 0.1.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7c8fb47dd089d48a02b00fb0c106265f4a96b8f6d66915291cbbf22bb0b99fd
-  data.tar.gz: b44f3f15b5c63e07ae4d50ca2befec46359a35120df9e9ac237250cbc6d7c625
+  metadata.gz: 06e38c364b8d2d666a81174ddafa2b426153ce1627c155bd996c8b1a912c6212
+  data.tar.gz: 7d5d662b9971375813d280f5c129aeb0ec80d960b5520368063714c7057ce794
 SHA512:
-  metadata.gz: a364cf6475de054400a7c3a764eca3eccbe4200cac42a886bcc2e4fe22c3ac1e5846a66aa5a285acaaf04f103cfa40595d838681b5fd7423c31e7d1d3baffeaf
-  data.tar.gz: 96869a7a4aca6edf679c1247a6e7514d92ecadba0f5805ea920c9368f878fb074a34890092b771d1247a730d88052bc5bbdfa3e334ce8c8229df2add794daa4a
+  metadata.gz: 04545df86e467ffcb8bd6c48f8cb702f90527ef5f9c5bf745d265bcc95ab80f84a606dafec9b57a345058d148ad61f7e7702476cbcc749d5471ed9ca7b5e2d7f
+  data.tar.gz: 7c427ebfc893ee72957783526adba4189f23e032f08c574ae9785932f01ac783cc7d0a4ae25a64743b5529d8c324ae966e1330ff79be3f869383c6ef796d5680

data/.rspec

@@ -1,3 +1,3 @@
---format documentation
---color
---require spec_helper
+--format documentation
+--color
+--require spec_helper

data/.standard.yml

@@ -1,3 +1,3 @@
-# For available configuration options, see:
-#   https://github.com/standardrb/standard
-ruby_version: 3.1
+# For available configuration options, see:
+#   https://github.com/standardrb/standard
+ruby_version: 3.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
-## [Unreleased]
-
-## [0.1.0] - 2025-10-02
-
-- Initial release
+## [Unreleased]
+
+## [0.3.0] - 2025-10-09
+
+- Re-wrote the API for simplicity
+
+## [0.1.0] - 2025-10-02
+
+- Initial release

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2025 Javi Medina Fetterman
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2025 Hector Medina Fetterman
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,43 +1,152 @@
-# Expectant
-
-TODO: Delete this and the text below, and describe your gem
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/expectant`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-## Installation
-
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
-
-Install the gem and add to the application's Gemfile by executing:
-
-```bash
-bundle add UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
-```
-
-If bundler is not being used to manage dependencies, install the gem by executing:
-
-```bash
-gem install UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
-```
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/expectant. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/expectant/blob/master/CODE_OF_CONDUCT.md).
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the Expectant project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/expectant/blob/master/CODE_OF_CONDUCT.md).
+# Expectant
+
+[![Gem Version](https://img.shields.io/gem/v/expectant?style=flat&label=Expectant)](https://rubygems.org/gems/expectant)
+[![Ruby Test](https://github.com/DigitalHospital/expectant/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/expectant/actions/workflows/main.yml)</span> 
+
+A Ruby DSL for defining validation schemas with type coercion, defaults, and fallbacks. Built on [dry-validation](https://dry-rb.org/gems/dry-validation/) and [dry-types](https://dry-rb.org/gems/dry-types/).
+
+## Installation
+
+```ruby
+gem 'expectant'
+```
+
+## Quick Start
+
+```ruby
+class InvoiceService
+  include Expectant::DSL
+
+  expects :inputs
+
+  input :customer_id, type: :integer
+  input :amount, type: :float
+  input :status, type: :string, default: "draft"
+  input :description, type: :string, optional: true
+
+  input_rule(:amount) do
+    key.failure("must be positive") if value && value <= 0
+  end
+
+  def process(data)
+    result = inputs.validate(data)
+
+    if result.success?
+      # Use validated data: result.to_h
+    else
+      # Handle errors: result.errors.to_h
+    end
+  end
+end
+```
+
+## Core Features
+
+### Types
+
+```ruby
+expects :inputs
+
+input :name, type: :string
+input :age, type: :integer
+input :price, type: :float
+input :active, type: :boolean
+input :date, type: :date
+input :time, type: :datetime
+input :data, type: :hash
+input :tags, type: :array
+input :user, type: User  # Custom class
+```
+
+### Defaults and Optional Fields
+
+```ruby
+# Optional (can be omitted)
+input :description, type: :string, optional: true
+
+# Static default
+input :status, type: :string, default: "draft"
+
+# Dynamic default (proc)
+input :created_at, type: :datetime, default: -> { Time.now }
+```
+
+### Fallbacks
+
+Automatically substitute values when validation fails:
+
+```ruby
+input :per_page, type: :integer, default: 25, fallback: 25
+
+input_rule(:per_page) do
+  key.failure("max 100") if value && value > 100
+end
+
+# If per_page: 500 is provided, validation succeeds with fallback value 25
+```
+
+### Validation Rules
+
+```ruby
+# Single field
+input_rule(:email) do
+  key.failure("invalid") unless value&.include?("@")
+end
+
+# Multiple fields
+input_rule(:start_date, :end_date) do
+  base.failure("start must be before end") if values[:start_date] > values[:end_date]
+end
+
+# Global rule
+input_rule do
+  base.failure("error") if some_condition
+end
+```
+
+### Context
+
+```ruby
+input_rule(:order) do
+  valid = context[:orderable_columns] || []
+  key.failure("invalid column") unless valid.include?(value)
+end
+
+# Pass context when validating
+inputs.validate(data, context: { orderable_columns: ["id", "name"] })
+```
+
+### Multiple Schemas
+
+```ruby
+expects :inputs
+expects :outputs
+
+input :data, type: :hash
+output :result, type: :string
+
+inputs.validate(input_data)
+outputs.validate(output_data)
+```
+
+## Configuration
+
+Customize validator method names:
+
+```ruby
+Expectant.configure do |config|
+  config.validator_suffix = "validation"  # input_validation instead of input_rule
+  config.validator_prefix = "validate"    # validate_input
+end
+```
+
+## Development
+
+```bash
+bundle install
+bundle exec rspec
+```
+
+## License
+
+MIT License

data/Rakefile

@@ -1,10 +1,10 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-require "standard/rake"
-
-task default: %i[spec standard]
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+require "standard/rake"
+
+task default: %i[spec standard]

data/lib/expectant/bound_schema.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Expectant
+  # Instance-bound schema wrapper that provides validation with instance context
+  class BoundSchema
+    def initialize(instance, schema)
+      @instance = instance
+      @schema = schema
+    end
+
+    def validate(data, context: {})
+      # Apply proc defaults before validation
+      data = apply_defaults(data)
+
+      # Create contract instance with context, then validate
+      contract_class = @schema.contract
+      contract = contract_class.new(instance: @instance, context: context)
+      result = contract.call(data)
+
+      # If validation failed, apply fallbacks for fields with errors and retry
+      if !result.success?
+        data_with_fallbacks = apply_fallbacks(data, result)
+        if data_with_fallbacks != data
+          # Re-validate with fallback values
+          result = contract.call(data_with_fallbacks)
+        end
+      end
+
+      result
+    end
+
+    def keys
+      @schema.keys
+    end
+
+    def contract
+      @schema.contract
+    end
+
+    private
+
+    # Apply default values for missing fields (especially proc defaults)
+    def apply_defaults(data)
+      data = data.dup
+
+      @schema.fields.each do |field|
+        # Skip if value already provided
+        next if data.key?(field.name)
+
+        # Apply proc defaults, static defaults are handled by dry-types
+        if field.default.respond_to?(:call)
+          data[field.name] = @instance.instance_exec(&field.default)
+        end
+      end
+
+      data
+    end
+
+    # Apply fallback values to fields that have errors
+    def apply_fallbacks(data, result)
+      data = data.dup
+
+      @schema.fields.each do |field|
+        next unless field.has_fallback?
+
+        # Apply fallback if field has an error
+        if result.errors[field.name]&.any?
+          fallback_value = if field.fallback.respond_to?(:call)
+            # Proc fallback - evaluate in instance context
+            @instance.instance_exec(&field.fallback)
+          else
+            field.fallback
+          end
+          data[field.name] = fallback_value
+        end
+      end
+
+      data
+    end
+  end
+end

data/lib/expectant/configuration.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Expectant
+  class Configuration
+    attr_accessor :validator_prefix, :validator_suffix
+
+    def initialize
+      @validator_prefix = nil # default: no prefix
+      @validator_suffix = "rule" # default: schema_name_rule
+    end
+  end
+end

data/lib/expectant/dsl.rb

@@ -1,77 +1,120 @@
 # frozen_string_literal: true
 
+require_relative "utils"
+require_relative "schema"
+require_relative "bound_schema"
+
 module Expectant
   module DSL
-    def self.extended(base)
-      base.class_eval do
-        @schemas = {}
-        @schema_definitions = {}
-      end
+    def self.included(base)
+      base.include(Types)
+      base.extend(ClassMethods)
     end
 
-    # Define a new schema type (e.g., :expects, :promises, :params, :outputs)
-    def expectation(schema_name)
-      schema_name = schema_name.to_sym
-      (@schema_definitions ||= {})[schema_name] = {
-        fields: [],
-        rules: []
-      }
+    module ClassMethods
+      def self.extended(base)
+        base.class_eval do
+          @_expectant_schemas = {}
+        end
+      end
 
-      # Dynamically define the field definition method (e.g., expects, promises)
-      define_singleton_method(schema_name) do |name, **options|
-        expectation = Expectation.new(name, **options)
-        @schema_definitions[schema_name][:fields] << expectation
+      def inherited(sub)
+        return unless instance_variable_defined?(:@_expectant_schemas)
+        return if @_expectant_schemas.empty?
 
-        # Define attribute accessor
-        attr_accessor name
+        # Deep copy each schema (fields + validators)
+        parent_schemas = @_expectant_schemas
+        duped = parent_schemas.transform_values { |schema| schema.duplicate }
 
-        expectation
+        sub.instance_variable_set(:@_expectant_schemas, duped)
       end
 
-      # Dynamically define the rule method (e.g., expects_rule, promises_rule)
-      rule_method_name = "#{schema_name}_rule"
-      define_singleton_method(rule_method_name) do |*field_names, &block|
-        @schema_definitions[schema_name][:rules] << {
-          name: field_names.empty? ? nil : (field_names.size == 1 ? field_names.first : field_names),
-          block: block
-        }
+      # Define a new expectation schema
+      # Options:
+      #   collision: :error|:force -> method name collision policy for dynamic definitions
+      #   singular: string|symbol  -> control singular name for the schema
+      def expects(schema_name, collision: :error, singular: nil)
+        field_method_name = Utils.singularize(schema_name.to_sym)
+        if !singular.nil?
+          if singular.is_a?(String) || singular.is_a?(Symbol)
+            field_method_name = singular.to_sym
+          else
+            raise ConfigurationError, "Invalid singular option: #{singular.inspect}"
+          end
+        end
+        schema = schema_name.to_sym
+
+        if @_expectant_schemas.key?(schema)
+          raise SchemaError, "Schema :#{schema} already defined"
+        else
+          create_schema(schema, collision: collision, field_method_name: field_method_name)
+        end
+
+        self
       end
-    end
 
-    # Get the schema definition for a given schema name
-    def schema_definitions
-      @schema_definitions ||= {}
-    end
+      def reset_inherited_expectations!
+        @_expectant_schemas = {}
+      end
 
-    # Build and return a dry-schema for a specific schema type
-    def get_schema(schema_name)
-      schema_name = schema_name.to_sym
-      (@schemas ||= {})[schema_name] ||= SchemaBuilder.new(
-        schema_definitions[schema_name]
-      ).build
-    end
+      private
 
-    # Validate data against a specific schema
-    def validate(schema_name, data)
-      get_schema(schema_name).call(data)
-    end
+      def create_schema(schema_name, collision: :error, field_method_name: nil)
+        @_expectant_schemas[schema_name] = Schema.new(schema_name)
 
-    def new(*args, **kwargs)
-      instance = super(*args, **kwargs)
-
-      # Set default values for all schema fields
-      schema_definitions.each do |_schema_name, definition|
-        definition[:fields].each do |expectation|
-          if expectation.default
-            default_value = expectation.default.respond_to?(:call) ?
-                           expectation.default.call :
-                           expectation.default
-            instance.send("#{expectation.name}=", default_value)
+        # Dynamically define the field definition method
+        # (e.g. input for :inputs, datum for :data)
+        Utils.define_with_collision_policy(singleton_class, field_method_name, collision: collision) do
+          define_singleton_method(field_method_name) do |name, **options|
+            expectation = Expectation.new(name, **options)
+            @_expectant_schemas[schema_name].add_field(expectation)
+            expectation
+          end
+        end
+
+        # Reset a schema
+        reset_method_name = "reset_#{schema_name}!"
+        Utils.define_with_collision_policy(singleton_class, reset_method_name, collision: collision) do
+          define_singleton_method(reset_method_name) do
+            @_expectant_schemas[schema_name].reset!
+          end
+        end
+
+        # Define validators
+        method_name = Utils.validator_method_name(field_method_name, Expectant.configuration)
+        Utils.define_with_collision_policy(singleton_class, method_name, collision: collision) do
+          define_singleton_method(method_name) do |*field_names, &block|
+            @_expectant_schemas[schema_name].add_validator({
+              name: if field_names.empty?
+                      nil
+                    else
+                      ((field_names.size == 1) ? field_names.first : field_names)
+                    end,
+              block: block
+            })
           end
         end
-      end
 
-      instance
+        # Add class-level schema accessor method (e.g. MyClass.inputs)
+        Utils.define_with_collision_policy(singleton_class, schema_name, collision: collision) do
+          define_singleton_method(schema_name) do
+            @_expectant_schemas[schema_name]
+          end
+        end
+
+        # Add instance-level schema accessor method (e.g. instance.inputs)
+        if !instance_methods(false).include?(schema_name)
+          define_method(schema_name) do
+            BoundSchema.new(self, self.class.instance_variable_get(:@_expectant_schemas)[schema_name])
+          end
+        elsif collision == :force
+          define_method(schema_name) do
+            BoundSchema.new(self, self.class.instance_variable_get(:@_expectant_schemas)[schema_name])
+          end
+        elsif collision == :error
+          raise ConfigurationError, "Instance method #{schema_name} already defined"
+        end
+      end
     end
   end
-end
+end

data/lib/expectant/errors.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Expectant
+  class Error < StandardError; end
+  class ConfigurationError < Error; end
+  class SchemaError < Error; end
+  class ValidationError < Error; end
+end

data/lib/expectant/expectation.rb

@@ -2,65 +2,36 @@
 
 module Expectant
   class Expectation
-    attr_reader :name, :type, :optional, :default
+    attr_reader :name, :type, :dry_type, :fallback, :default, :metadata
 
-    def initialize(name, type: nil, optional: false, default: nil, **options)
+    def initialize(name, type: nil, default: nil, optional: false, fallback: nil, **options)
       @name = name
       @type = type
-      @optional = optional
       @default = default
-      @options = options
+      @fallback = fallback
+      @metadata = options
+
+      base_type = Types.resolve(type)
+      base_type = base_type.optional if optional
+      # if default is a proc, we call it at runtime
+      @dry_type = if !default.nil? && !default.respond_to?(:call)
+        base_type.default(default)
+      else
+        base_type
+      end
     end
 
+    # A field is required if it's not optional and has no default
     def required?
-      !optional && default.nil?
+      !@dry_type.optional? && !has_default?
     end
 
     def has_default?
-      !default.nil?
+      @dry_type.default? || !@default.nil?
     end
 
-    def type_class
-      case type
-      when :integer, :int
-        Integer
-      when :float
-        Float
-      when :string, :str
-        String
-      when :boolean, :bool
-        [TrueClass, FalseClass]
-      when :array
-        Array
-      when :hash
-        Hash
-      when Class
-        type
-      else
-        nil
-      end
-    end
-
-    def dry_validation_type
-      case type
-      when :integer, :int
-        :integer
-      when :float
-        :float
-      when :string, :str
-        :string
-      when :boolean, :bool
-        :bool
-      when :array
-        :array
-      when :hash
-        :hash
-      when Class
-        # For custom classes, we'll use :any and add custom validation
-        :any
-      else
-        :any
-      end
+    def has_fallback?
+      !@fallback.nil?
     end
   end
-end
+end

data/lib/expectant/schema.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require "dry/validation"
+
+module Expectant
+  class Schema
+    attr_reader :name, :fields, :validators
+
+    def initialize(name)
+      @name = name
+      @fields = []
+      @validators = []
+      @contract_class = nil
+    end
+
+    def keys
+      @fields.map(&:name)
+    end
+
+    def contract
+      @contract_class ||= build_contract
+    end
+
+    def duplicate
+      dup = self.class.new(@name)
+      dup.instance_variable_set(:@fields, @fields.dup)
+      dup.instance_variable_set(:@validators, @validators.dup)
+      dup
+    end
+
+    def add_field(expectation)
+      @fields << expectation
+      @contract_class = nil
+    end
+
+    def add_validator(validator_def)
+      @validators << validator_def
+      @contract_class = nil
+    end
+
+    def freeze
+      @fields.freeze
+      @validators.freeze
+      super
+    end
+
+    def reset!
+      @fields = []
+      @validators = []
+      @contract_class = nil
+    end
+
+    private
+
+    def build_contract
+      fields = @fields
+      validators = @validators
+
+      Class.new(Dry::Validation::Contract) do
+        # Enable option passing (allows context and instance to be passed at validation time)
+        option :context, default: proc { {} }
+        option :instance, optional: true
+
+        # Define schema based on fields using dry-types
+        params do
+          fields.each do |field|
+            dry_type = field.dry_type
+
+            if field.required?
+              required(field.name).value(dry_type)
+            else
+              optional(field.name).value(dry_type)
+            end
+          end
+        end
+
+        # Add custom validators
+        validators.each do |validator_def|
+          if validator_def[:name]
+            # Single key or multiple keys
+            if validator_def[:name].is_a?(Array)
+              rule(*validator_def[:name], &validator_def[:block])
+            else
+              rule(validator_def[:name], &validator_def[:block])
+            end
+          else
+            # Global rule without a specific field
+            rule(&validator_def[:block])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/expectant/types.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "dry-types"
+
+module Expectant
+  module Types
+    include Dry.Types()
+
+    def self.resolve(type_definition)
+      case type_definition
+      when nil
+        Any
+      when Symbol
+        resolve_symbol(type_definition)
+      when Dry::Types::Type
+        # Already a dry-type, return as-is
+        type_definition
+      when Class
+        Instance(type_definition)
+      else
+        raise ConfigurationError, "Invalid type definition: #{type_definition}"
+      end
+    end
+
+    def self.resolve_symbol(symbol)
+      case symbol
+      when :string, :str
+        Params::String
+      when :integer, :int
+        Params::Integer
+      when :float
+        Params::Float
+      when :decimal
+        Params::Decimal
+      when :boolean, :bool
+        Params::Bool
+      when :date
+        Params::Date
+      when :datetime
+        Params::DateTime
+      when :time
+        Params::Time
+      when :array
+        Params::Array
+      when :hash
+        Params::Hash
+      when :symbol, :sym
+        Symbol
+      when :any, :nil
+        Any
+      else
+        raise ConfigurationError, "Unknown type symbol: #{symbol}"
+      end
+    end
+  end
+end

data/lib/expectant/utils.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "active_support/inflector"
+
+module Expectant
+  module Utils
+    module_function
+
+    def singularize(word)
+      ActiveSupport::Inflector.singularize(word.to_s).to_sym
+    end
+
+    def validator_method_name(schema_name, configuration)
+      prefix = configuration.validator_prefix
+      suffix = configuration.validator_suffix
+
+      parts = []
+      parts << prefix if prefix
+      parts << schema_name
+      parts << suffix if suffix
+
+      parts.join("_")
+    end
+
+    def define_with_collision_policy(target, method_name, collision:, &block)
+      method_name = method_name.to_sym
+      if target.method_defined?(method_name) || target.private_method_defined?(method_name)
+        case collision
+        when :error
+          raise ConfigurationError, "Method #{method_name} already defined"
+        when :force
+          begin
+            target.send(:remove_method, method_name)
+          rescue
+            nil
+          end
+          block.call
+        else
+          raise ConfigurationError, "Unknown collision policy: #{collision}"
+        end
+      else
+        block.call
+      end
+    end
+  end
+end

data/lib/expectant/version.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
-
-module Expectant
-  VERSION = "0.1.0"
-end
+# frozen_string_literal: true
+
+module Expectant
+  VERSION = "0.3.1"
+end

data/lib/expectant.rb

@@ -1,14 +1,26 @@
-# frozen_string_literal: true
-
-require_relative "expectant/version"
-require_relative "expectant/dsl"
-require_relative "expectant/schema_builder"
-require_relative "expectant/expectation"
-
-module Expectant
-  class Error < StandardError; end
-  
-  def self.included(base)
-    base.extend(DSL)
-  end
-end
+# frozen_string_literal: true
+
+require_relative "expectant/version"
+require_relative "expectant/errors"
+require_relative "expectant/configuration"
+require_relative "expectant/types"
+require_relative "expectant/dsl"
+require_relative "expectant/expectation"
+
+module Expectant
+  class << self
+    attr_writer :configuration
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    def configure
+      yield(configuration)
+    end
+
+    def reset_configuration!
+      @configuration = Configuration.new
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expectant
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
-- Javi Medina Fetterman
+- Hector Medina Fetterman
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-02 00:00:00.000000000 Z
+date: 2026-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-validation
@@ -24,7 +24,38 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-description: Write a longer description or delete this line.
+- !ruby/object:Gem::Dependency
+  name: dry-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+description: Expectant provides a clean DSL for defining multiple validation schemas
+  in a single class. Built on dry-validation and dry-types, it supports custom rules,
+  defaults, fallbacks, and context-aware validations, making it easy to validate inputs,
+  outputs, and any structured data in your Ruby applications.
 email:
 - javi@digitalhospital.com
 executables: []
@@ -34,16 +65,19 @@ files:
 - ".rspec"
 - ".standard.yml"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/expectant.rb
+- lib/expectant/bound_schema.rb
+- lib/expectant/configuration.rb
 - lib/expectant/dsl.rb
+- lib/expectant/errors.rb
 - lib/expectant/expectation.rb
-- lib/expectant/schema_builder.rb
+- lib/expectant/schema.rb
+- lib/expectant/types.rb
+- lib/expectant/utils.rb
 - lib/expectant/version.rb
-- sig/expectant.rbs
 homepage: https://github.com/DigitalHospital/expectant
 licenses:
 - MIT
@@ -66,8 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
-summary: Write a short summary, because RubyGems requires one.
+summary: A flexible DSL for defining reusable validation schemas
 test_files: []

data/CODE_OF_CONDUCT.md

@@ -1,132 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-  community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official email address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-[INSERT CONTACT METHOD].
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations

data/lib/expectant/schema_builder.rb

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-require 'dry/validation'
-
-module Expectant
-  class SchemaBuilder
-    def initialize(schema_definition)
-      @fields = schema_definition[:fields]
-      @rules = schema_definition[:rules]
-    end
-
-    def build
-      fields = @fields
-      rules = @rules
-
-      Dry::Validation.Contract do
-        # Define schema based on fields
-        params do
-          fields.each do |field|
-            if field.required?
-              case field.dry_validation_type
-              when :integer
-                required(field.name).value(:integer)
-              when :float
-                required(field.name).value(:float)
-              when :string
-                required(field.name).value(:string)
-              when :bool
-                required(field.name).value(:bool)
-              when :array
-                required(field.name).value(:array)
-              when :hash
-                required(field.name).value(:hash)
-              else
-                required(field.name).filled
-              end
-            else
-              case field.dry_validation_type
-              when :integer
-                optional(field.name).maybe(:integer)
-              when :float
-                optional(field.name).maybe(:float)
-              when :string
-                optional(field.name).maybe(:string)
-              when :bool
-                optional(field.name).maybe(:bool)
-              when :array
-                optional(field.name).maybe(:array)
-              when :hash
-                optional(field.name).maybe(:hash)
-              else
-                optional(field.name).value(:any)
-              end
-            end
-          end
-        end
-
-        # Add custom rules
-        rules.each do |rule_def|
-          if rule_def[:name]
-            # Single key or multiple keys
-            if rule_def[:name].is_a?(Array)
-              rule(*rule_def[:name], &rule_def[:block])
-            else
-              rule(rule_def[:name], &rule_def[:block])
-            end
-          else
-            # Global rule without a specific field
-            rule(&rule_def[:block])
-          end
-        end
-
-        # Add type validation for custom classes
-        fields.each do |field|
-          next unless field.type.is_a?(Class)
-
-          rule(field.name) do
-            if value && !value.is_a?(field.type)
-              key.failure("must be an instance of #{field.type}")
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/sig/expectant.rbs

@@ -1,4 +0,0 @@
-module Expectant
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
-end