yass-css 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cfdea80822b1a34f32b6275cbf273f27fa5480d7351973871a0b66135ce07fa
-  data.tar.gz: c1e0b94b72410f8f9b5794be113f7c6f18842c8a73774c5807a9a1d25de32bee
+  metadata.gz: 964454f0c8bdcfd25f640bff134b466d111d77762345707e7c75c778a5edf224
+  data.tar.gz: be5c8bad69e40f961b554a65bd9faad47bde6c190bbb966ac3d2af8118981341
 SHA512:
-  metadata.gz: 1d8a76d695194c0d501608d2118274c34274a78ad0841c279591520435683597c989029b9dfa0487c8d4f31c3e734c74b2b271c933ddaff2570944b9fac96179
-  data.tar.gz: 85e27a49582a8be423ba87568797c0a832bdc68b410d695b840ab10a7e5ce7a028155356074f764818bffff05fc85ad9a4f2eea5086017024a1298c24397ffc1
+  metadata.gz: 90de862ea2b3691488983d8bfe765c40a10df87d3598b336385293e055599558b1fb6d344b90eb70270fcdfa8c6438fee44011e3b60be48ba32ad72350da2fe3
+  data.tar.gz: 1a466ea66b1012163c8da76c31b0c46b660ce1f51997af8324dd86c87ce3f1f66220f744fcdd61063a61d950766508f926a4bfbaa7900767ed6649a66f719bb9

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.4.0] - 2026-04-20
+
+- Support nested rules.
+
+## [0.3.0] - 2026-04-19
+
+- Upgrade to rb_sys v0.9.126.
+
 ## [0.2.0] - 2026-04-19
 
 - Fully support all style declarations.

data/Cargo.lock

@@ -1357,7 +1357,7 @@ checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
 [[package]]
 name = "yass"
-version = "0.2.0"
+version = "0.4.0"
 dependencies = [
  "cssparser",
  "magnus",

data/README.md

@@ -1,5 +1,7 @@
 # Yass
 
+Yass: Yet Another Stylesheet System
+
 Yass is a Ruby wrapper around the [Stylo](https://github.com/servo/stylo) CSS engine, the parser behind the Firefox and Servo browsers developed by Mozilla.
 
 ## Rationale

data/RELEASING.md

@@ -0,0 +1,15 @@
+# Releasing Yass
+
+Follow these steps to release a new version of Yass:
+
+1. Bump the version in lib/yass/version.rb.
+2. Bump the version in ext/yass/Cargo.toml (should be the same version from step 1).
+3. Add a heading in CHANGELOG.md with the version number and today's date.
+4. Run `bundle install` and `bundle exec rake compile` to refresh the Bundler and Cargo lockfiles.
+5. Commit the results of these changes and push them to GitHub.
+6. Wait for CI to run. This might seem unimportant but weird things can go wrong with lockfiles, etc, so it's best to wait for a clean bill of health before continuing.
+7. Create a release in the GitHub UI [here](https://github.com/camertron/yass/releases/new).
+    1. Create a new tag for the release of the form vX.X.X, using the same version number you've been using this whole time.
+    2. Name the release the same thing, i.e. vX.X.X.
+    3. Copy the relevant section from CHANGELOG.md (including the header) and paste it into the release notes.
+8. This will kick off the GitHub action in .github/workflows/release.yml, build the native extension for all the supported ruby versions and platforms, and publish the various .gem files to rubygems.org.

data/Rakefile

@@ -7,8 +7,6 @@ RSpec::Core::RakeTask.new(:spec)
 
 require "rb_sys/extensiontask"
 
-# task build: :compile
-
 GEMSPEC = Gem::Specification.load("yass.gemspec")
 
 RbSys::ExtensionTask.new("yass", GEMSPEC) do |ext|

data/ext/yass/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "yass"
-version = "0.2.0"
+version = "0.4.0"
 edition = "2021"
 authors = ["Cameron Dutro <camertron@gmail.com>"]
 license = "MIT"

data/ext/yass/src/rules/init.rs

@@ -8,6 +8,7 @@ pub fn init(ruby: &Ruby, yass_module: &RModule) -> Result<(), Error> {
     let style_rule_class = yass_module.define_class("StyleRule", rule_class)?;
     style_rule_class.define_method("selectors", method!(YStyleRule::selectors, 0))?;
     style_rule_class.define_method("declarations", method!(YStyleRule::declarations, 0))?;
+    style_rule_class.define_method("rules", method!(YStyleRule::rules, 0))?;
     style_rule_class.define_method("source_location", method!(YStyleRule::source_location, 0))?;
 
     let media_rule_class = yass_module.define_class("MediaRule", rule_class)?;

data/ext/yass/src/rules/style_rule.rs

@@ -1,9 +1,9 @@
 use cssparser::SourceLocation;
 use magnus::{DataTypeFunctions, Error, IntoValue, RArray, Ruby, TypedData, Value, gc, typed_data};
 use selectors::parser::Selector;
-use style::{properties::PropertyDeclaration, selector_parser::SelectorImpl, servo_arc::Arc, shared_lock::{Locked, SharedRwLock}, stylesheets::StyleRule};
+use style::{properties::PropertyDeclaration, selector_parser::SelectorImpl, servo_arc::Arc, shared_lock::{Locked, SharedRwLock}, stylesheets::{CssRule, StyleRule}};
 
-use crate::{cached_value::CachedValue, cached_value_list::CachedValueList, declarations::declaration::YDeclaration, general::YSourceLocation, selectors::YSelector};
+use crate::{cached_value::CachedValue, cached_value_list::CachedValueList, declarations::declaration::YDeclaration, general::YSourceLocation, rules::rule::make_rule, selectors::YSelector};
 
 #[derive(TypedData)]
 #[magnus(class = "Yass::StyleRule", mark)]
@@ -12,14 +12,15 @@ pub struct YStyleRule {
     lock: SharedRwLock,
     selectors: CachedValueList<Selector<SelectorImpl>>,
     declarations: CachedValueList<PropertyDeclaration>,
-    source_location: CachedValue<SourceLocation>
+    source_location: CachedValue<SourceLocation>,
+    rules: CachedValueList<CssRule, SharedRwLock>,
 }
 
 impl YStyleRule {
     pub fn new(rule: Arc<Locked<StyleRule>>, lock: SharedRwLock) -> Self {
         YStyleRule {
             rule,
-            lock,
+            lock: lock.clone(),
 
             selectors: CachedValueList::empty(None, |selector, _ctx, ruby| {
                 YSelector::new(selector.clone()).into_value_with(ruby)
@@ -31,7 +32,11 @@ impl YStyleRule {
 
             source_location: CachedValue::empty(|source_location, ruby| {
                 YSourceLocation::new(source_location.line, source_location.column).into_value_with(ruby)
-            })
+            }),
+
+            rules: CachedValueList::empty(Some(lock.clone()), |rule, ctx, ruby| {
+                make_rule(rule, ctx.as_ref().unwrap(), ruby)
+            }),
         }
     }
 
@@ -62,6 +67,23 @@ impl YStyleRule {
         rb_self.declarations.to_a(ruby)
     }
 
+    pub fn rules(ruby: &Ruby, rb_self: typed_data::Obj<Self>) -> Result<RArray, Error> {
+        if rb_self.rules.is_empty() {
+            let guard = rb_self.lock.read();
+            let style_rule = rb_self.rule.read_with(&guard);
+
+            if let Some(locked_rules) = &style_rule.rules {
+                let rules = locked_rules.read_with(&guard);
+
+                for rule in &rules.0 {
+                    rb_self.rules.add(rule.clone(), ruby)?;
+                }
+            }
+        }
+
+        rb_self.rules.to_a(ruby)
+    }
+
     pub fn source_location(ruby: &Ruby, rb_self: typed_data::Obj<Self>) -> Value {
         if rb_self.source_location.is_empty() {
             let guard = rb_self.lock.read();
@@ -77,6 +99,7 @@ impl DataTypeFunctions for YStyleRule {
     fn mark(&self, marker: &gc::Marker) {
         self.selectors.mark(marker);
         self.declarations.mark(marker);
+        self.rules.mark(marker);
         self.source_location.mark(marker);
     }
 }

data/lib/yass/rules.rb

@@ -16,7 +16,7 @@ module Yass
   end
 
   class StyleRule
-    RUBY_METHODS = %i(declarations kind selectors source_location).freeze
+    RUBY_METHODS = %i(declarations kind rules selectors source_location).freeze
 
     include ::Yass::Node
 

data/lib/yass/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yass
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

data/lib/yass/visitor.rb

@@ -2328,6 +2328,7 @@ module Yass
     def visit_style_rule(node)
       visit_list(node.selectors)
       visit_list(node.declarations)
+      visit_list(node.rules)
       visit(node.source_location)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yass-css
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Cameron Dutro
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.124
+        version: 0.9.126
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.124
+        version: 0.9.126
 description: The Stylo CSS parser wrapped in a Ruby embrace.
 email:
 - camertron@gmail.com
@@ -37,6 +37,7 @@ files:
 - Cargo.toml
 - LICENSE.txt
 - README.md
+- RELEASING.md
 - Rakefile
 - codegen/ruby_module_tree.rb
 - codegen/rust_file_set.rb
@@ -480,7 +481,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.3.11
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.6
 specification_version: 4
 summary: A complete CSS parser for Ruby.
 test_files: []