easy-admin-rails 0.1.10 → 0.1.12

data/app/components/easy_admin/fields/form/date_component.rb

@@ -18,6 +18,7 @@ module EasyAdmin
               class: input_classes,
               required: required?
             )
+            render_field_errors
             if field[:help_text]
               p(class: "mt-1 text-sm text-gray-500") { field[:help_text] }
             end
@@ -32,8 +33,8 @@ module EasyAdmin
 
         def input_classes
           base_classes = "block w-full px-3 py-2 border rounded-md shadow-sm text-sm"
-          state_classes = "border-gray-300 placeholder-gray-400"
-          focus_classes = "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+          state_classes = has_field_errors? ? "border-red-300 placeholder-red-400" : "border-gray-300 placeholder-gray-400"
+          focus_classes = has_field_errors? ? "focus:outline-none focus:ring-1 focus:ring-red-500 focus:border-red-500" : "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           hover_classes = "hover:border-gray-400"
           transition_classes = "transition-colors duration-200"
           

data/app/components/easy_admin/fields/form/datetime_component.rb

@@ -18,6 +18,7 @@ module EasyAdmin
               class: input_classes,
               required: required?
             )
+            render_field_errors
             if field[:help_text]
               p(class: "mt-1 text-sm text-gray-500") { field[:help_text] }
             end
@@ -32,8 +33,8 @@ module EasyAdmin
 
         def input_classes
           base_classes = "block w-full px-3 py-2 border rounded-md shadow-sm text-sm"
-          state_classes = "border-gray-300 placeholder-gray-400"
-          focus_classes = "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+          state_classes = has_field_errors? ? "border-red-300 placeholder-red-400" : "border-gray-300 placeholder-gray-400"
+          focus_classes = has_field_errors? ? "focus:outline-none focus:ring-1 focus:ring-red-500 focus:border-red-500" : "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           hover_classes = "hover:border-gray-400"
           transition_classes = "transition-colors duration-200"
           

data/app/components/easy_admin/fields/form/email_component.rb

@@ -19,6 +19,7 @@ module EasyAdmin
               required: required?,
               placeholder: field[:placeholder] || "Enter #{field_label.downcase}"
             )
+            render_field_errors
             if field[:help_text]
               p(class: "mt-1 text-sm text-gray-500") { field[:help_text] }
             end
@@ -33,8 +34,8 @@ module EasyAdmin
 
         def input_classes
           base_classes = "block w-full px-3 py-2 border rounded-md shadow-sm text-sm"
-          state_classes = "border-gray-300 placeholder-gray-400"
-          focus_classes = "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+          state_classes = has_field_errors? ? "border-red-300 placeholder-red-400" : "border-gray-300 placeholder-gray-400"
+          focus_classes = has_field_errors? ? "focus:outline-none focus:ring-1 focus:ring-red-500 focus:border-red-500" : "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           hover_classes = "hover:border-gray-400"
           transition_classes = "transition-colors duration-200"
           

data/app/components/easy_admin/fields/form/file_component.rb

@@ -8,6 +8,7 @@ module EasyAdmin
           div(class: "mb-6", data: { controller: "file" }) do
             render_label if field_label
             render_file_input
+            render_field_errors
             render_preview_area
             render_help_text if field[:help_text]
             render_current_file if current_file_exists?
@@ -28,7 +29,7 @@ module EasyAdmin
             type: "file",
             id: field_id,
             name: form_field_name,
-            class: css_classes("block w-full text-sm text-gray-900 border border-gray-300 rounded-lg cursor-pointer bg-gray-50 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 file:me-4 file:py-2 file:px-4 file:rounded-s-lg file:border-0 file:text-sm file:font-medium file:bg-blue-50 file:text-blue-700 hover:file:bg-blue-100", size_class, validation_classes),
+            class: css_classes("block w-full text-sm text-gray-900 border rounded-lg cursor-pointer bg-gray-50 file:me-4 file:py-2 file:px-4 file:rounded-s-lg file:border-0 file:text-sm file:font-medium file:bg-blue-50 file:text-blue-700 hover:file:bg-blue-100", size_class, file_input_error_classes),
             data: { file_target: "input" },
             **file_input_attributes
           )
@@ -112,13 +113,11 @@ module EasyAdmin
           end
         end
 
-        def validation_classes
-          return "" unless form&.object&.errors
-
-          if form.object.errors[field_name].any?
-            "border-red-300 focus:border-red-500 focus:ring-red-500"
+        def file_input_error_classes
+          if has_field_errors?
+            "border-red-300 focus:border-red-500 focus:ring-2 focus:ring-red-500"
           else
-            ""
+            "border-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
           end
         end
 

data/app/components/easy_admin/fields/form/number_component.rb

@@ -19,6 +19,7 @@ module EasyAdmin
               required: required?,
               placeholder: field[:placeholder] || "Enter #{field_label.downcase}"
             )
+            render_field_errors
             if field[:help_text]
               p(class: "mt-1 text-sm text-gray-500") { field[:help_text] }
             end
@@ -33,8 +34,8 @@ module EasyAdmin
 
         def input_classes
           base_classes = "block w-full px-3 py-2 border rounded-md shadow-sm text-sm"
-          state_classes = "border-gray-300 placeholder-gray-400"
-          focus_classes = "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+          state_classes = has_field_errors? ? "border-red-300 placeholder-red-400" : "border-gray-300 placeholder-gray-400"
+          focus_classes = has_field_errors? ? "focus:outline-none focus:ring-1 focus:ring-red-500 focus:border-red-500" : "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           hover_classes = "hover:border-gray-400"
           transition_classes = "transition-colors duration-200"
           

data/app/components/easy_admin/fields/form/select_component.rb

@@ -32,6 +32,7 @@ module EasyAdmin
               render_hidden_inputs
             end
             
+            render_field_errors
             if field[:help_text]
               p(class: "mt-1 text-sm text-gray-500") { field[:help_text] }
             end
@@ -91,7 +92,8 @@ module EasyAdmin
         end
 
         def render_multiple_select_container
-          div(class: "relative border border-gray-300 rounded-md bg-white min-h-10 focus-within:ring-1 focus-within:ring-blue-500 focus-within:border-blue-500 transition-colors duration-200") do
+          error_classes = has_field_errors? ? "border-red-300 focus-within:ring-red-500 focus-within:border-red-500" : "border-gray-300 focus-within:ring-blue-500 focus-within:border-blue-500"
+          div(class: "relative border #{error_classes} rounded-md bg-white min-h-10 focus-within:ring-1 transition-colors duration-200") do
             div(class: "flex flex-wrap items-center gap-1 p-2 pr-8") do
               # Selected items container - will be populated by Stimulus controller
               div(class: "flex flex-wrap items-center gap-1", data: { select_field_target: "selectedItems" }) do
@@ -163,8 +165,8 @@ module EasyAdmin
 
         def single_select_input_classes
           base_classes = "block w-full px-3 py-2 pr-10 text-sm border rounded-md cursor-pointer"
-          state_classes = "border-gray-300 placeholder-gray-400 bg-white"
-          focus_classes = "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+          state_classes = has_field_errors? ? "border-red-300 placeholder-red-400 bg-white" : "border-gray-300 placeholder-gray-400 bg-white"
+          focus_classes = has_field_errors? ? "focus:outline-none focus:ring-1 focus:ring-red-500 focus:border-red-500" : "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           hover_classes = "hover:border-gray-400"
           transition_classes = "transition-colors duration-200"
           

data/app/components/easy_admin/fields/form/text_component.rb

@@ -19,6 +19,7 @@ module EasyAdmin
               required: required?,
               placeholder: field[:placeholder] || "Enter #{field_label.downcase}"
             )
+            render_field_errors
             if field[:help_text]
               p(class: "mt-1 text-sm text-gray-500") { field[:help_text] }
             end
@@ -33,8 +34,8 @@ module EasyAdmin
 
         def input_classes
           base_classes = "block w-full px-3 py-2 border rounded-md shadow-sm text-sm"
-          state_classes = "border-gray-300 placeholder-gray-400"
-          focus_classes = "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+          state_classes = has_field_errors? ? "border-red-300 placeholder-red-400" : "border-gray-300 placeholder-gray-400"
+          focus_classes = has_field_errors? ? "focus:outline-none focus:ring-1 focus:ring-red-500 focus:border-red-500" : "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           hover_classes = "hover:border-gray-400"
           transition_classes = "transition-colors duration-200"
           

data/app/components/easy_admin/fields/form/textarea_component.rb

@@ -18,6 +18,7 @@ module EasyAdmin
               rows: field[:rows] || 4,
               placeholder: field[:placeholder] || "Enter #{field_label.downcase}"
             ) { current_value }
+            render_field_errors
             if field[:help_text]
               p(class: "mt-1 text-sm text-gray-500") { field[:help_text] }
             end
@@ -32,8 +33,8 @@ module EasyAdmin
 
         def textarea_classes
           base_classes = "block w-full px-3 py-2 border rounded-md shadow-sm text-sm resize-y"
-          state_classes = "border-gray-300 placeholder-gray-400"
-          focus_classes = "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+          state_classes = has_field_errors? ? "border-red-300 placeholder-red-400" : "border-gray-300 placeholder-gray-400"
+          focus_classes = has_field_errors? ? "focus:outline-none focus:ring-1 focus:ring-red-500 focus:border-red-500" : "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           hover_classes = "hover:border-gray-400"
           transition_classes = "transition-colors duration-200"
           

data/app/components/easy_admin/versions/diff_component.rb

@@ -0,0 +1,184 @@
+module EasyAdmin
+  module Versions
+    class DiffComponent < BaseComponent
+      def initialize(version:, display_mode: :inline)
+        @version = version
+        @display_mode = display_mode
+        @changes = extract_changes
+      end
+
+      def view_template
+        div(class: "version-diff") do
+          render_header
+          render_diff_content
+        end
+      end
+
+      private
+
+      def render_header
+        div(class: "border-b pb-4 mb-4") do
+          h4(class: "text-lg font-semibold mb-2") do
+            "Version ##{@version.id} - #{@version.event.capitalize}"
+          end
+          
+          div(class: "flex items-center gap-4 text-sm text-gray-600") do
+            span { "#{time_ago_in_words(@version.created_at)} ago" }
+            span { @version.created_at.strftime("%B %d, %Y at %I:%M %p") }
+            
+            if @version.whodunnit
+              span(class: "px-2 py-1 bg-gray-100 rounded") { "User ##{@version.whodunnit}" }
+            end
+          end
+        end
+      end
+
+      def render_diff_content
+        if @changes.any?
+          div(class: "space-y-4") do
+            @changes.each do |field, change|
+              render_field_diff(field, change)
+            end
+          end
+        else
+          render_no_changes
+        end
+      end
+
+      def render_field_diff(field, change)
+        div(class: "border rounded-lg p-4") do
+          h5(class: "font-medium text-gray-900 mb-3") { field.humanize }
+          
+          case @display_mode
+          when :inline
+            render_inline_diff(change)
+          when :side_by_side
+            render_side_by_side_diff(change)
+          else
+            render_inline_diff(change)
+          end
+        end
+      end
+
+      def render_inline_diff(change)
+        div(class: "space-y-2") do
+          if change[:old]
+            div(class: "flex items-center gap-2") do
+              span(class: "text-sm font-medium text-red-600") { "Before:" }
+              span(class: "px-2 py-1 bg-red-100 text-red-800 rounded text-sm line-through") do
+                format_value_for_display(change[:old])
+              end
+            end
+          end
+          
+          if change[:new]
+            div(class: "flex items-center gap-2") do
+              span(class: "text-sm font-medium text-green-600") { "After:" }
+              span(class: "px-2 py-1 bg-green-100 text-green-800 rounded text-sm") do
+                format_value_for_display(change[:new])
+              end
+            end
+          end
+        end
+      end
+
+      def render_side_by_side_diff(change)
+        div(class: "grid grid-cols-2 gap-4") do
+          # Before column
+          div do
+            h6(class: "text-sm font-medium text-red-600 mb-2") { "Before" }
+            div(class: "p-3 bg-red-50 border border-red-200 rounded text-sm") do
+              if change[:old]
+                span(class: "text-red-800") { format_value_for_display(change[:old]) }
+              else
+                span(class: "text-gray-400 italic") { "Not set" }
+              end
+            end
+          end
+          
+          # After column  
+          div do
+            h6(class: "text-sm font-medium text-green-600 mb-2") { "After" }
+            div(class: "p-3 bg-green-50 border border-green-200 rounded text-sm") do
+              if change[:new]
+                span(class: "text-green-800") { format_value_for_display(change[:new]) }
+              else
+                span(class: "text-gray-400 italic") { "Removed" }
+              end
+            end
+          end
+        end
+      end
+
+      def render_no_changes
+        div(class: "text-center py-8 text-gray-500") do
+          p { "No changes detected in this version" }
+        end
+      end
+
+      def extract_changes
+        return {} unless @version.object
+
+        begin
+          old_attrs = parse_version_object(@version.object)
+          current_item = @version.item
+          
+          return {} unless current_item && old_attrs.is_a?(Hash)
+          
+          changes = {}
+          current_attrs = current_item.attributes
+
+          (old_attrs.keys + current_attrs.keys).uniq.each do |key|
+            next if skip_field?(key)
+            
+            old_val = old_attrs[key]
+            new_val = current_attrs[key]
+            
+            if old_val != new_val
+              changes[key] = { old: old_val, new: new_val }
+            end
+          end
+          
+          changes
+        rescue => e
+          Rails.logger.error "Error parsing version #{@version.id}: #{e.message}"
+          {}
+        end
+      end
+
+      def parse_version_object(object_yaml)
+        YAML.safe_load(object_yaml, permitted_classes: [Time, Date, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone])
+      rescue Psych::DisallowedClass
+        # Fallback for ActiveSupport objects
+        YAML.load(object_yaml, aliases: true)
+      rescue
+        {}
+      end
+
+      def skip_field?(field)
+        %w[id created_at updated_at].include?(field.to_s)
+      end
+
+      def format_value_for_display(value)
+        case value
+        when Time, DateTime, ActiveSupport::TimeWithZone
+          value.strftime("%Y-%m-%d %H:%M:%S")
+        when true
+          "✓ Yes"
+        when false
+          "✗ No"
+        when nil
+          span(class: "text-gray-400 italic") { "empty" }
+        else
+          # Truncate very long values
+          str = value.to_s
+          if str.length > 100
+            truncate(str, length: 100)
+          else
+            str
+          end
+        end
+      end
+    end
+  end
+end

data/app/components/easy_admin/versions/diff_modal_component.rb

@@ -0,0 +1,314 @@
+module EasyAdmin
+  module Versions
+    class DiffModalComponent < BaseComponent
+      def initialize(version:, record:, resource_class:)
+        @version = version
+        @record = record
+        @resource_class = resource_class
+      end
+
+      def view_template
+        turbo_frame(id: "modal") do
+          # Modal backdrop
+          div(
+            id: "modal-backdrop",
+            class: "fixed inset-0 z-50 flex items-center justify-center p-4 bg-black bg-opacity-50 opacity-100 transition-opacity duration-300",
+            data: { controller: "modal", action: "click->modal#closeOnBackdrop" }
+          ) do
+            # Modal container
+            div(
+              class: "relative w-full max-w-4xl max-h-[90vh] bg-white rounded-lg shadow-xl overflow-hidden"
+            ) do
+              render_modal_header
+              render_modal_body
+              render_modal_footer
+            end
+          end
+        end
+      end
+
+      private
+
+      def render_modal_header
+        div(class: "px-6 py-4 border-b border-gray-200 bg-gray-50 flex items-center justify-between") do
+          div do
+            h2(class: "text-lg font-semibold text-gray-900") do
+              "Version Details ##{@version.id}"
+            end
+            p(class: "text-sm text-gray-600 mt-1") do
+              "#{@version.event.capitalize} • #{time_ago_in_words(@version.created_at)} ago"
+            end
+          end
+          
+          button(
+            class: "text-gray-400 hover:text-gray-600 transition-colors",
+            data: { action: "click->modal#close" }
+          ) do
+            unsafe_raw <<~SVG
+              <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/>
+              </svg>
+            SVG
+          end
+        end
+      end
+
+      def render_modal_body
+        div(class: "px-6 py-4 max-h-96 overflow-y-auto") do
+          if @version.object.blank?
+            div(class: "text-center py-8 text-gray-500") do
+              "No change data available for this version"
+            end
+            return
+          end
+
+          begin
+            old_attrs = parse_version_object(@version.object)
+            changes = extract_changes(@version, old_attrs)
+            
+            if changes.any?
+              div(class: "space-y-6") do
+                changes.each do |field, change|
+                  render_detailed_field_change(field, change)
+                end
+              end
+            else
+              div(class: "text-center py-8 text-gray-500") do
+                "No visible changes detected"
+              end
+            end
+          rescue => e
+            div(class: "text-red-600 bg-red-50 border border-red-200 rounded-lg p-4") do
+              "Error parsing version data: #{e.message}"
+            end
+          end
+        end
+      end
+
+      def render_modal_footer
+        div(class: "px-6 py-4 border-t border-gray-200 bg-gray-50 flex items-center justify-between") do
+          div(class: "text-sm text-gray-500") do
+            if @version.whodunnit
+              "Changed by: #{@version.whodunnit}"
+            else
+              "Changed by: System"
+            end
+          end
+          
+          div(class: "flex items-center space-x-3") do
+            button(
+              class: "px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50 transition-colors",
+              data: { action: "click->modal#close" }
+            ) do
+              "Close"
+            end
+            
+            button(
+              class: "px-4 py-2 text-sm font-medium text-white bg-blue-600 border border-transparent rounded-md hover:bg-blue-700 transition-colors",
+              data: { 
+                controller: "version-revert",
+                action: "click->version-revert#confirm",
+                version_revert_version_id_value: @version.id,
+                version_revert_resource_id_value: @record.id,
+                version_revert_resource_name_value: @resource_class.route_key
+              }
+            ) do
+              "Revert to This Version"
+            end
+          end
+        end
+      end
+
+      def render_detailed_field_change(field, change)
+        # Match the timeline field change styling
+        div(class: "bg-gray-50 rounded-xl p-4 border border-gray-100") do
+          # Field name - using same styling as timeline
+          div(class: "text-sm font-semibold text-gray-900 mb-3") do
+            span { field.humanize }
+          end
+          
+          # Change display - use same responsive layout as timeline
+          div(class: "flex flex-col sm:flex-row sm:items-center space-y-3 sm:space-y-0 sm:space-x-4") do
+            if change.has_key?(:old)
+              div(class: "flex-1") do
+                div(class: "text-xs font-medium text-gray-500 uppercase tracking-wide mb-1") { "From" }
+                div(class: "text-sm text-gray-900 bg-white px-3 py-2 rounded-lg border border-gray-200 shadow-sm") do
+                  format_detailed_value(change[:old])
+                end
+              end
+            end
+            
+            # Arrow pointing from old to new - same as timeline
+            if change.has_key?(:old) && change.has_key?(:new)
+              div(class: "flex-shrink-0 text-gray-400 flex justify-center sm:block") do
+                # Vertical arrow for mobile
+                unsafe_raw <<~SVG
+                  <svg class="h-4 w-4 sm:hidden" viewBox="0 0 20 20" fill="currentColor">
+                    <path fill-rule="evenodd" d="M10 3a.75.75 0 01.75.75v10.638l3.96-4.158a.75.75 0 111.08 1.04l-5.25 5.5a.75.75 0 01-1.08 0l-5.25-5.5a.75.75 0 111.08-1.04l3.96 4.158V3.75A.75.75 0 0110 3z" clip-rule="evenodd"/>
+                  </svg>
+                SVG
+                # Horizontal arrow for desktop
+                unsafe_raw <<~SVG
+                  <svg class="h-4 w-4 hidden sm:block" viewBox="0 0 20 20" fill="currentColor">
+                    <path fill-rule="evenodd" d="M3 10a.75.75 0 01.75-.75h10.638L10.23 5.29a.75.75 0 111.04-1.08l5.5 5.25a.75.75 0 010 1.08l-5.5 5.25a.75.75 0 11-1.04-1.08l4.158-3.96H3.75A.75.75 0 013 10z" clip-rule="evenodd"/>
+                  </svg>
+                SVG
+              end
+            end
+            
+            if change.has_key?(:new)
+              div(class: "flex-1") do
+                div(class: "text-xs font-medium text-gray-500 uppercase tracking-wide mb-1") { "To" }
+                div(class: "text-sm text-gray-900 bg-white px-3 py-2 rounded-lg border border-gray-200 shadow-sm") do
+                  format_detailed_value(change[:new])
+                end
+              end
+            end
+          end
+        end
+      end
+
+      def format_detailed_value(value)
+        case value
+        when Time, DateTime, ActiveSupport::TimeWithZone
+          value.strftime("%B %d, %Y at %I:%M %p")
+        when true
+          "Yes"
+        when false  
+          "No"
+        when nil
+          span(class: "text-gray-400 italic") { "empty" }
+        when String
+          # Try to parse as JSON for better formatting
+          if looks_like_json?(value)
+            format_json_value(value)
+          else
+            value
+          end
+        else
+          # Don't truncate in detailed view
+          value.to_s
+        end
+      end
+
+      private
+
+      def looks_like_json?(string)
+        return false if string.blank?
+        
+        # Check for regular JSON
+        regular_json = string.strip.start_with?('{', '[') || string == '0' || string == 'null' || string =~ /^\d+$/
+        
+        # Check for single-quoted JSON strings (like "{\"key\":\"value\"}")
+        quoted_json = string.strip.start_with?('"{') || string.strip.start_with?('"[')
+        
+        regular_json || quoted_json
+      end
+
+      def format_json_value(json_string)
+        return json_string if json_string.blank?
+
+        # Handle simple cases - including numeric strings that represent empty JSON
+        case json_string.strip
+        when '0', '1', '2', 'null', '""'
+          span(class: "text-gray-500 italic") { "empty" }
+        else
+          begin
+            # Try to handle quoted JSON strings
+            cleaned_string = json_string
+            if json_string.strip.start_with?('"{') || json_string.strip.start_with?('"[')
+              # Remove outer quotes and parse as JSON
+              cleaned_string = JSON.parse(json_string)
+            end
+            
+            parsed = JSON.parse(cleaned_string)
+            if parsed.is_a?(Hash) && parsed.empty?
+              span(class: "text-gray-500 italic") { "empty object" }
+            elsif parsed.is_a?(Array) && parsed.empty?
+              span(class: "text-gray-500 italic") { "empty array" }
+            else
+              # Format as pretty JSON
+              pre(class: "bg-gray-100 p-2 rounded text-sm font-mono whitespace-pre-wrap") do
+                JSON.pretty_generate(parsed)
+              end
+            end
+          rescue JSON::ParserError
+            # Not valid JSON, return as-is
+            json_string
+          end
+        end
+      end
+
+      # Reuse methods from TimelineComponent
+      def parse_version_object(object_yaml)
+        return {} if object_yaml.blank?
+        
+        YAML.safe_load(
+          object_yaml, 
+          permitted_classes: [Time, Date, DateTime, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone, Symbol],
+          aliases: true
+        )
+      rescue Psych::DisallowedClass, Psych::BadAlias
+        begin
+          YAML.unsafe_load(object_yaml)
+        rescue
+          extract_basic_attributes(object_yaml)
+        end
+      rescue => e
+        Rails.logger.warn "Failed to parse version object: #{e.message}"
+        {}
+      end
+      
+      def extract_basic_attributes(yaml_string)
+        attributes = {}
+        
+        yaml_string.scan(/^(\w+):\s*(.+)$/).each do |key, value|
+          next if value.include?('!ruby/object')
+          
+          cleaned_value = value.strip.gsub(/^["']|["']$/, '')
+          attributes[key] = cleaned_value unless cleaned_value.empty?
+        end
+        
+        attributes
+      rescue
+        {}
+      end
+
+      def extract_changes(version, old_attrs)
+        return {} unless old_attrs.is_a?(Hash)
+        
+        current_item = version.item
+        return {} unless current_item
+        
+        changes = {}
+        current_attrs = current_item.attributes
+        
+        (old_attrs.keys + current_attrs.keys).uniq.each do |key|
+          next if %w[id updated_at].include?(key.to_s)
+          
+          old_val = normalize_value_for_comparison(old_attrs[key])
+          new_val = normalize_value_for_comparison(current_attrs[key])
+          
+          if old_val != new_val
+            changes[key] = { old: old_attrs[key], new: current_attrs[key] }
+          end
+        end
+        
+        changes
+      end
+
+      def normalize_value_for_comparison(value)
+        case value
+        when true, "true", "t", "1", 1
+          true
+        when false, "false", "f", "0", 0
+          false  
+        when nil, ""
+          nil
+        else
+          value
+        end
+      end
+    end
+  end
+end