easy_talk 1.0.1 → 1.0.3

data/lib/easy_talk/model.rb

@@ -9,6 +9,7 @@ require 'active_support/json'
 require 'active_model'
 require_relative 'builders/object_builder'
 require_relative 'schema_definition'
+require_relative 'active_record_schema_builder'
 
 module EasyTalk
   # The `Model` module is a mixin that provides functionality for defining and accessing the schema of a model.
@@ -38,6 +39,55 @@ module EasyTalk
       base.include ActiveModel::Validations
       base.extend ActiveModel::Callbacks
       base.extend(ClassMethods)
+      base.include(InstanceMethods)
+
+      # Apply ActiveRecord-specific functionality if appropriate
+      return unless defined?(ActiveRecord) && base.ancestors.include?(ActiveRecord::Base)
+
+      base.extend(ActiveRecordClassMethods)
+    end
+
+    module InstanceMethods
+      def initialize(attributes = {})
+        @additional_properties = {}
+        super
+      end
+
+      def method_missing(method_name, *args)
+        method_string = method_name.to_s
+        if method_string.end_with?('=')
+          property_name = method_string.chomp('=')
+          if self.class.additional_properties_allowed?
+            @additional_properties[property_name] = args.first
+          else
+            super
+          end
+        elsif self.class.additional_properties_allowed? && @additional_properties.key?(method_string)
+          @additional_properties[method_string]
+        else
+          super
+        end
+      end
+
+      def respond_to_missing?(method_name, include_private = false)
+        method_string = method_name.to_s
+        method_string.end_with?('=') ? method_string.chomp('=') : method_string
+        self.class.additional_properties_allowed? || super
+      end
+
+      # Add to_hash method to convert defined properties to hash
+      def to_hash
+        return {} unless self.class.properties
+
+        self.class.properties.each_with_object({}) do |prop, hash|
+          hash[prop.to_s] = send(prop)
+        end
+      end
+
+      # Override as_json to include both defined and additional properties
+      def as_json(_options = {})
+        to_hash.merge(@additional_properties)
+      end
     end
 
     # Module containing class-level methods for defining and accessing the schema of a model.
@@ -46,7 +96,16 @@ module EasyTalk
       #
       # @return [Schema] The schema for the model.
       def schema
-        @schema ||= build_schema(schema_definition)
+        @schema ||= if defined?(@schema_definition) && @schema_definition
+                      # Schema defined explicitly via define_schema
+                      build_schema(@schema_definition)
+                    elsif respond_to?(:active_record_schema_definition)
+                      # ActiveRecord model without explicit schema definition
+                      build_schema(active_record_schema_definition)
+                    else
+                      # Default case - empty schema
+                      {}
+                    end
       end
 
       # Returns the reference template for the model.
@@ -92,9 +151,12 @@ module EasyTalk
         @schema_definition ||= {}
       end
 
-      private
+      def additional_properties_allowed?
+        @schema_definition&.schema&.fetch(:additional_properties, false)
+      end
 
       # Builds the schema using the provided schema definition.
+      # This is the convergence point for all schema generation.
       #
       # @param schema_definition [SchemaDefinition] The schema definition.
       # @return [Schema] The validated schema.
@@ -102,5 +164,34 @@ module EasyTalk
         Builders::ObjectBuilder.new(schema_definition).build
       end
     end
+
+    # Module containing ActiveRecord-specific methods for schema generation
+    module ActiveRecordClassMethods
+      # Gets a SchemaDefinition that's built from the ActiveRecord database schema
+      #
+      # @return [SchemaDefinition] A schema definition built from the database
+      def active_record_schema_definition
+        @active_record_schema_definition ||= ActiveRecordSchemaBuilder.new(self).build_schema_definition
+      end
+
+      # Store enhancements to be applied to the schema
+      #
+      # @return [Hash] The schema enhancements
+      def schema_enhancements
+        @schema_enhancements ||= {}
+      end
+
+      # Enhance the generated schema with additional information
+      #
+      # @param enhancements [Hash] The schema enhancements
+      # @return [void]
+      def enhance_schema(enhancements)
+        @schema_enhancements = enhancements
+        # Clear cached values to force regeneration
+        @active_record_schema_definition = nil
+        @schema = nil
+        @json_schema = nil
+      end
+    end
   end
 end

data/lib/easy_talk/property.rb

@@ -76,7 +76,9 @@ module EasyTalk
     #
     # @return [Object] The built property.
     def build
-      if builder
+      if nilable_type?
+        build_nilable_schema
+      elsif builder
         args = builder.collection_type? ? [name, type, constraints] : [name, constraints]
         builder.new(*args).build
       elsif type.respond_to?(:schema)
@@ -105,5 +107,27 @@ module EasyTalk
     def builder
       @builder ||= TYPE_TO_BUILDER[type.class.name.to_s] || TYPE_TO_BUILDER[type.name.to_s]
     end
+
+    private
+
+    def nilable_type?
+      return unless type.respond_to?(:types)
+      return unless type.types.all? { |t| t.respond_to?(:raw_type) }
+
+      type.types.any? { |t| t.raw_type == NilClass }
+    end
+
+    def build_nilable_schema
+      # Extract the non-nil type from the Union
+      actual_type = type.types.find { |t| t != NilClass }
+
+      # Create a property with the actual type
+      non_nil_schema = Property.new(name, actual_type, constraints).build
+
+      # Merge the types into an array
+      non_nil_schema.merge(
+        type: [non_nil_schema[:type], 'null']
+      )
+    end
   end
 end

data/lib/easy_talk/schema_definition.rb

@@ -3,8 +3,6 @@
 require_relative 'keywords'
 
 module EasyTalk
-  class InvalidPropertyNameError < StandardError; end
-
   #
   #= EasyTalk \SchemaDefinition
   # SchemaDefinition provides the methods for defining a schema within the define_schema block.
@@ -20,6 +18,7 @@ module EasyTalk
 
     def initialize(name, schema = {})
       @schema = schema
+      @schema[:additional_properties] = false unless schema.key?(:additional_properties)
       @name = name
     end
 

data/lib/easy_talk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EasyTalk
-  VERSION = '1.0.1'
+  VERSION = '1.0.3'
 end

data/lib/easy_talk.rb

@@ -2,9 +2,11 @@
 
 # The EasyTalk module is the main namespace for the gem.
 module EasyTalk
-  class Error < StandardError; end
   require 'sorbet-runtime'
   require 'easy_talk/sorbet_extension'
+  require 'easy_talk/errors'
+  require 'easy_talk/errors_helper'
+  require 'easy_talk/configuration'
   require 'easy_talk/types/any_of'
   require 'easy_talk/types/all_of'
   require 'easy_talk/types/one_of'
@@ -14,6 +16,12 @@ module EasyTalk
   require 'easy_talk/tools/function_builder'
   require 'easy_talk/version'
 
-  class UnsupportedTypeError < ArgumentError; end
-  class UnsupportedConstraintError < ArgumentError; end
+  def self.assert_valid_property_options(property_name, options, *valid_keys)
+    valid_keys.flatten!
+    options.each_key do |k|
+      next if valid_keys.include?(k)
+
+      ErrorHelper.raise_unknown_option_error(property_name: property_name, option: options, valid_options: valid_keys)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: easy_talk
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Sergio Bayona
 bindir: bin
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 2025-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -51,6 +51,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +177,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.29'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Generate json-schema from plain Ruby classes.
 email:
 - bayona.sergio@gmail.com
@@ -184,6 +212,7 @@ files:
 - docs/about.markdown
 - docs/index.markdown
 - lib/easy_talk.rb
+- lib/easy_talk/active_record_schema_builder.rb
 - lib/easy_talk/builders/all_of_builder.rb
 - lib/easy_talk/builders/any_of_builder.rb
 - lib/easy_talk/builders/base_builder.rb
@@ -201,6 +230,9 @@ files:
 - lib/easy_talk/builders/time_builder.rb
 - lib/easy_talk/builders/typed_array_builder.rb
 - lib/easy_talk/builders/union_builder.rb
+- lib/easy_talk/configuration.rb
+- lib/easy_talk/errors.rb
+- lib/easy_talk/errors_helper.rb
 - lib/easy_talk/keywords.rb
 - lib/easy_talk/model.rb
 - lib/easy_talk/property.rb