cataract 0.2.2 → 0.2.4

data/lib/cataract/pure.rb

@@ -26,12 +26,14 @@ module Cataract
 end
 
 require_relative 'version'
+require_relative 'constants'
 
 # Load struct definitions and supporting files
 # (These are also loaded by lib/cataract.rb, but we need them here for direct require)
 require_relative 'declaration'
 require_relative 'rule'
 require_relative 'at_rule'
+require_relative 'media_query'
 require_relative 'import_statement'
 require_relative 'stylesheet_scope'
 require_relative 'stylesheet'
@@ -61,7 +63,6 @@ end
 require_relative 'pure/byte_constants'
 require_relative 'pure/helpers'
 require_relative 'pure/specificity'
-require_relative 'pure/imports'
 require_relative 'pure/serializer'
 require_relative 'pure/parser'
 require_relative 'pure/flatten'
@@ -99,10 +100,8 @@ module Cataract
 
   # NOTE: Copied from cataract.rb
   # Need to untangle this eventually
-  def self.parse_css(css, imports: false)
-    css = ImportResolver.resolve(css, imports) if imports
-
-    Stylesheet.parse(css)
+  def self.parse_css(css, **options)
+    Stylesheet.parse(css, **options)
   end
 
   # Flatten stylesheet rules according to CSS cascade rules
@@ -139,8 +138,8 @@ module Cataract
   # @param decl [Declaration] Declaration to expand
   # @return [Array<Declaration>] Array of expanded longhand declarations
   # @api private
-  def self._expand_shorthand(decl)
-    Flatten._expand_shorthand(decl)
+  def self.expand_shorthand(decl)
+    Flatten.expand_shorthand(decl)
   end
 
   # Add stub method to Stylesheet for pure Ruby implementation

data/lib/cataract/rule.rb

@@ -25,6 +25,7 @@ module Cataract
   # @attr [Integer, nil] parent_rule_id Parent rule ID for nested rules
   # @attr [Integer, nil] nesting_style 0=implicit, 1=explicit, nil=not nested
   # @attr [Integer, nil] selector_list_id ID linking rules from same selector list (e.g., "h1, h2")
+  # @attr [Integer, nil] media_query_id ID of the MediaQuery this rule belongs to (nil if not in media query)
   Rule = Struct.new(
     :id,
     :selector,
@@ -32,7 +33,8 @@ module Cataract
     :specificity,
     :parent_rule_id,
     :nesting_style,
-    :selector_list_id
+    :selector_list_id,
+    :media_query_id
   )
 
   class Rule
@@ -46,6 +48,7 @@ module Cataract
     # @param parent_rule_id [Integer, nil] Parent rule ID for nested rules
     # @param nesting_style [Integer, nil] Nesting style (0=implicit, 1=explicit, nil=not nested)
     # @param selector_list_id [Integer, nil] Selector list ID for grouping
+    # @param media_query_id [Integer, nil] MediaQuery ID for rules in media queries
     # @return [Rule] New rule instance
     #
     # @example Create a rule with keyword arguments
@@ -56,10 +59,11 @@ module Cataract
     #     specificity: 10,
     #     parent_rule_id: nil,
     #     nesting_style: nil,
-    #     selector_list_id: nil
+    #     selector_list_id: nil,
+    #     media_query_id: nil
     #   )
-    def self.make(id:, selector:, declarations:, specificity: nil, parent_rule_id: nil, nesting_style: nil, selector_list_id: nil)
-      new(id, selector, declarations, specificity, parent_rule_id, nesting_style, selector_list_id)
+    def self.make(id:, selector:, declarations:, specificity: nil, parent_rule_id: nil, nesting_style: nil, selector_list_id: nil, media_query_id: nil)
+      new(id, selector, declarations, specificity, parent_rule_id, nesting_style, selector_list_id, media_query_id)
     end
 
     # Silence warning about method redefinition. We redefine below to lazily calculate
@@ -211,7 +215,7 @@ module Cataract
     # rubocop:disable Naming/MemoizedInstanceVariableName
     def expanded_declarations
       @_expanded_declarations ||= begin
-        expanded = declarations.flat_map { |decl| Cataract._expand_shorthand(decl) }
+        expanded = declarations.flat_map { |decl| Cataract.expand_shorthand(decl) }
         expanded.sort_by! { |d| [d.property, d.value, d.important ? 1 : 0] }
         expanded
       end