ruby_llm-contract 0.2.3 → 0.3.6

data/lib/ruby_llm/contract.rb

@@ -40,25 +40,25 @@ module RubyLLM
         @eval_hosts = []
       end
 
-      def load_evals!(dir = nil)
-        dirs = if dir
-                 [dir]
-               elsif defined?(::Rails)
-                 %w[app/steps/eval app/contracts/eval].filter_map do |path|
-                   full = ::Rails.root.join(path)
-                   full.to_s if full.exist?
-                 end
-               else
-                 []
-               end
+      def load_evals!(*dirs)
+        dirs = dirs.flatten.compact
+        if dirs.empty? && defined?(::Rails)
+          dirs = %w[app/steps/eval app/contracts/eval].filter_map do |path|
+            full = ::Rails.root.join(path)
+            full.to_s if full.exist?
+          end
+        end
 
         return if dirs.empty?
 
-        # Clear existing eval definitions before reload to prevent stale state.
-        # Thread-local flag suppresses the "redefining" warning during reload.
+        # In Rails, eager-load parent directories so contract classes
+        # are available when eval files reference them.
+        eager_load_contract_dirs! if defined?(::Rails)
+
+        # Clear file-sourced evals ONCE, then load ALL dirs.
         Thread.current[:ruby_llm_contract_reloading] = true
         eval_hosts.each do |host|
-          host.clear_eval_definitions! if host.respond_to?(:clear_eval_definitions!)
+          host.clear_file_sourced_evals! if host.respond_to?(:clear_file_sourced_evals!)
         end
 
         dirs.each do |d|
@@ -70,10 +70,28 @@ module RubyLLM
 
       private
 
-      # Filter out GC'd anonymous classes and classes that no longer have evals
+      # Filter stale hosts, deduplicate by name (last wins), prune registry in-place
       def live_eval_hosts
-        eval_hosts.select do |host|
-          host.respond_to?(:eval_defined?) && host.eval_defined?
+        # Remove hosts without evals
+        @eval_hosts&.reject! { |h| !h.respond_to?(:eval_defined?) || !h.eval_defined? }
+
+        # Deduplicate: if two classes share a name (reload), keep the latest
+        seen = {}
+        @eval_hosts&.each { |h| seen[h.name || h.object_id] = h }
+        @eval_hosts = seen.values
+
+        @eval_hosts || []
+      end
+
+      def eager_load_contract_dirs!
+        %w[app/contracts app/steps].each do |path|
+          full = ::Rails.root.join(path)
+          next unless full.exist?
+
+          ::Rails.autoloaders.main.eager_load_dir(full.to_s)
+        rescue StandardError
+          # Zeitwerk not available or dir not managed — skip
+          nil
         end
       end
 
@@ -87,6 +105,7 @@ module RubyLLM
   end
 end
 
+require_relative "contract/concerns/deep_freeze"
 require_relative "contract/concerns/deep_symbolize"
 require_relative "contract/concerns/eval_host"
 require_relative "contract/concerns/trace_equality"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm-contract
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.6
 platform: ruby
 authors:
 - Justyna
@@ -82,6 +82,7 @@ files:
 - lib/ruby_llm/contract/adapters/response.rb
 - lib/ruby_llm/contract/adapters/ruby_llm.rb
 - lib/ruby_llm/contract/adapters/test.rb
+- lib/ruby_llm/contract/concerns/deep_freeze.rb
 - lib/ruby_llm/contract/concerns/deep_symbolize.rb
 - lib/ruby_llm/contract/concerns/eval_host.rb
 - lib/ruby_llm/contract/concerns/trace_equality.rb
@@ -97,6 +98,7 @@ files:
 - lib/ruby_llm/contract/dsl.rb
 - lib/ruby_llm/contract/errors.rb
 - lib/ruby_llm/contract/eval.rb
+- lib/ruby_llm/contract/eval/baseline_diff.rb
 - lib/ruby_llm/contract/eval/case_result.rb
 - lib/ruby_llm/contract/eval/contract_detail_builder.rb
 - lib/ruby_llm/contract/eval/dataset.rb