cataract 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcb5043777c52ed2a3f4bcd96966dcbe00e0f7bcf5ac410398afc855d59407f5
-  data.tar.gz: 65fabbfff1bbc559a0998f5a412800987ed2921252cdd2d4a757c6b59041c66a
+  metadata.gz: a1c4727f2f1b3c3aafa117ca105ee0d55a6d6f33b0fed789533af10c24173918
+  data.tar.gz: 86c0e96b1a953fb817fa235517e00215b4b363baea7d1225c5fcb2b9643b29c9
 SHA512:
-  metadata.gz: cee4076685ff5a5e6ae8dbe441a9e7cefc8f1ad109fa7179373cb0bb39e4118b570ddfef68aeef573b002a683b3ca66148293f460b52a562472596d4d1e11842
-  data.tar.gz: de9ae8a5f1d684c797706b48e10e7372cda9ae280698e67ea3dac25be81331a901c9a181dd8ca04d2cb9ce46b2447fc0709501b0fd53c848bcc6981a4d286597
+  metadata.gz: 7282bde75fb5cd81ad2b7f2d7134a6fde2941a8f5320a4de2d463114d25bfc709e80f1639e9479cb69b7f22d685d203a7097fa0cf8c2e952041b733420991080
+  data.tar.gz: f8af1d50b389d64c36c5138f431b5b09f95ec3ca8f68b6c342ec280e7e1c84a8fca95ec6c95a81d97f9bced8d0f295acfbf2849ca47939e16cbf1b408544cdbe

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.2.1] - 2025-11-14
+
+- Fix serializer bug related to media queries
+
 ## [0.2.0] - 2025-11-14
 
 - Major: CSS `@import` resolution refactored from string-concatenation to parsed-object architecture with proper charset handling, media query combining,

data/ext/cataract/cataract.c

@@ -549,18 +549,34 @@ static void serialize_rule_with_children(VALUE result, VALUE rules_array, long r
 
     if (formatted) {
         // Formatted output with indentation
+        DEBUG_PRINTF("[SERIALIZE_RULE] Formatted mode, indent_level=%d, selector=%s\n", indent_level, RSTRING_PTR(selector));
         rb_str_append(result, selector);
         rb_str_cat2(result, " {\n");
 
+        // Build indent strings based on indent_level
+        // Declarations are inside the rule, so add 1 level (2 spaces per level)
+        // Closing brace matches the opening selector level
+        char decl_indent[MAX_INDENT_BUFFER];
+        char closing_indent[MAX_INDENT_BUFFER];
+        int decl_spaces = (indent_level + 1) * 2;
+        int closing_spaces = indent_level * 2;
+        memset(decl_indent, ' ', decl_spaces);
+        decl_indent[decl_spaces] = '\0';
+        memset(closing_indent, ' ', closing_spaces);
+        closing_indent[closing_spaces] = '\0';
+
         // Serialize own declarations with indentation (each on its own line)
         if (!NIL_P(declarations) && RARRAY_LEN(declarations) > 0) {
-            serialize_declarations_formatted(result, declarations, "  ");
+            DEBUG_PRINTF("[SERIALIZE_RULE] Serializing %ld declarations with indent='%s' (%d spaces)\n",
+                        RARRAY_LEN(declarations), decl_indent, decl_spaces);
+            serialize_declarations_formatted(result, declarations, decl_indent);
         }
 
         // Serialize nested children
         serialize_children_only(result, rules_array, rule_idx, rule_to_media, parent_to_children,
                               selector, declarations, formatted, indent_level + 1);
 
+        rb_str_cat2(result, closing_indent);
         rb_str_cat2(result, "}\n");
     } else {
         // Compact output
@@ -576,6 +592,9 @@ static void serialize_rule_with_children(VALUE result, VALUE rules_array, long r
 
         rb_str_cat2(result, " }\n");
     }
+
+    // Prevent compiler from optimizing away 'rule' before we're done with selector/declarations
+    RB_GC_GUARD(rule);
 }
 
 // New stylesheet serialization entry point - checks for nesting and delegates
@@ -626,6 +645,10 @@ static VALUE stylesheet_to_s_new(VALUE self, VALUE rules_array, VALUE media_inde
 
     DEBUG_PRINTF("[MAP] parent_to_children map: %s\n", RSTRING_PTR(rb_inspect(parent_to_children)));
 
+    // Track media block state for proper opening/closing
+    VALUE current_media = Qnil;
+    int in_media_block = 0;
+
     // Serialize only top-level rules (parent_rule_id == nil)
     // Children are serialized recursively
     DEBUG_PRINTF("[SERIALIZE] Starting serialization, total_rules=%ld\n", total_rules);
@@ -643,6 +666,34 @@ static VALUE stylesheet_to_s_new(VALUE self, VALUE rules_array, VALUE media_inde
             continue;
         }
 
+        // Get media for this rule
+        VALUE rule_id = rb_struct_aref(rule, INT2FIX(RULE_ID));
+        VALUE rule_media = rb_hash_aref(rule_to_media, rule_id);
+
+        // Handle media block transitions
+        if (NIL_P(rule_media)) {
+            // Not in media - close any open media block
+            if (in_media_block) {
+                rb_str_cat2(result, "}\n");
+                in_media_block = 0;
+                current_media = Qnil;
+            }
+        } else {
+            // In media - check if we need to open/change block
+            if (NIL_P(current_media) || !rb_equal(current_media, rule_media)) {
+                // Close previous media block if open
+                if (in_media_block) {
+                    rb_str_cat2(result, "}\n");
+                }
+                // Open new media block
+                current_media = rule_media;
+                rb_str_cat2(result, "@media ");
+                rb_str_append(result, rb_sym2str(rule_media));
+                rb_str_cat2(result, " {\n");
+                in_media_block = 1;
+            }
+        }
+
         // Check if this is an AtRule
         if (rb_obj_is_kind_of(rule, cAtRule)) {
             serialize_at_rule(result, rule);
@@ -657,6 +708,11 @@ static VALUE stylesheet_to_s_new(VALUE self, VALUE rules_array, VALUE media_inde
         );
     }
 
+    // Close final media block if still open
+    if (in_media_block) {
+        rb_str_cat2(result, "}\n");
+    }
+
     return result;
 }
 
@@ -779,6 +835,10 @@ static VALUE stylesheet_to_formatted_s_new(VALUE self, VALUE rules_array, VALUE
         }
     }
 
+    // Track media block state for proper opening/closing
+    VALUE current_media = Qnil;
+    int in_media_block = 0;
+
     // Serialize only top-level rules (parent_rule_id == nil)
     for (long i = 0; i < total_rules; i++) {
         VALUE rule = rb_ary_entry(rules_array, i);
@@ -789,20 +849,66 @@ static VALUE stylesheet_to_formatted_s_new(VALUE self, VALUE rules_array, VALUE
             continue;
         }
 
+        // Get media for this rule
+        VALUE rule_id = rb_struct_aref(rule, INT2FIX(RULE_ID));
+        VALUE rule_media = rb_hash_aref(rule_to_media, rule_id);
+
+        // Handle media block transitions
+        if (NIL_P(rule_media)) {
+            // Not in media - close any open media block
+            if (in_media_block) {
+                rb_str_cat2(result, "}\n");
+                in_media_block = 0;
+                current_media = Qnil;
+
+                // Add blank line after closing media block
+                rb_str_cat2(result, "\n");
+            }
+        } else {
+            // In media - check if we need to open/change block
+            if (NIL_P(current_media) || !rb_equal(current_media, rule_media)) {
+                // Close previous media block if open
+                if (in_media_block) {
+                    rb_str_cat2(result, "}\n");
+                } else if (RSTRING_LEN(result) > 0) {
+                    // Add blank line before new media block (except at start)
+                    rb_str_cat2(result, "\n");
+                }
+                // Open new media block
+                current_media = rule_media;
+                rb_str_cat2(result, "@media ");
+                rb_str_append(result, rb_sym2str(rule_media));
+                rb_str_cat2(result, " {\n");
+                in_media_block = 1;
+            }
+        }
+
         // Check if this is an AtRule
         if (rb_obj_is_kind_of(rule, cAtRule)) {
             serialize_at_rule(result, rule);
             continue;
         }
 
+        // Add indent if inside media block
+        if (in_media_block) {
+            DEBUG_PRINTF("[FORMATTED] Adding base indent for media block\n");
+            rb_str_cat2(result, "  ");
+        }
+
         // Serialize rule with nested children
+        DEBUG_PRINTF("[FORMATTED] Calling serialize_rule_with_children, in_media_block=%d\n", in_media_block);
         serialize_rule_with_children(
             result, rules_array, i, rule_to_media, parent_to_children,
             1,  // formatted (with indentation)
-            0   // indent_level (top-level)
+            in_media_block ? 1 : 0   // indent_level (1 if inside media block, 0 otherwise)
         );
     }
 
+    // Close final media block if still open
+    if (in_media_block) {
+        rb_str_cat2(result, "}\n");
+    }
+
     return result;
 }
 

data/ext/cataract/cataract.h

@@ -120,6 +120,10 @@ static inline VALUE strip_string(const char *str, long len) {
   #define MAX_PARSE_DEPTH 10  // Max recursion depth for nested @media/@supports blocks and CSS nesting
 #endif
 
+// Max buffer size for indent strings in serialization
+// (MAX_PARSE_DEPTH + 1) * 2 spaces + null terminator, rounded up for safety
+#define MAX_INDENT_BUFFER ((MAX_PARSE_DEPTH + 2) * 2 + 1)
+
 #ifndef MAX_PROPERTY_NAME_LENGTH
   #define MAX_PROPERTY_NAME_LENGTH 256  // Max length of CSS property name
 #endif

data/lib/cataract/pure/serializer.rb

@@ -355,6 +355,9 @@ module Cataract
           current_media = nil
         end
 
+        # Add blank line before base rule if we just closed a media block (ends with "}\n")
+        result << "\n" if result.length > 1 && result.getbyte(-1) == BYTE_NEWLINE && result.getbyte(-2) == BYTE_RBRACE
+
         serialize_rule_with_nesting_formatted(result, rule, rule_children, rule_to_media, '')
       else
         if current_media.nil? || current_media != rule_media

data/lib/cataract/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cataract
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cataract
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Cook