ionfish-stylish 0.1.2 → 0.1.3

data/History.txt

@@ -0,0 +1,32 @@
+=== Version 0.1.3 (TODO)
+
+Variables in the DSL
+* Selector and property variables
+* New descope example
+* Limited CSS3 background support
+* Cleaned up various things
+
+
+=== Version 0.1.2 (2009-04-12)
+
+Documentation release
+* Documented the stylesheet generation DSL
+* Updated example code in the README
+* Added an Image class to handle background images
+
+
+=== Version 0.1.1 (2009-04-12)
+
+More DSL features
+* Added the ability to append comments through the stylesheet generation DSL
+* Fixed some parsing and selector serialisation problems
+* Updated the main example file to work with the new DSL
+* Completed the documentation of the core classes
+
+
+=== Version 0.1.0 (2009-04-10)
+
+First major release
+* New selector scope tree, which serialises to a valid stylesheet
+* Stylesheet generation DSL based on the tree datastructure
+* HSL(A) colour space support, complementing the existing RGB support

data/README.md

@@ -23,6 +23,8 @@ Calling the stylesheet's `to_s` method would produce the following
     .content h2 {font-size:2em;}
     .content p {margin:0 0 1em 0;}
 
+A number of additional examples are available in the example/ directory.
+
 
 Compatibility
 -------------
@@ -36,11 +38,6 @@ Future considerations
 
 *   Add a Border class to complement Background.
 *   Add better support for CSS3 properties to Background.
-*   Add a native mapping construct to allow symbol lookup for alternate
-    stylesheets.
-*   Change stylesheet generation to a two-step process where the tree structure
-    is generated in the first step and symbols (for example, those employed by
-    a mapping construct) are evaluated the second.
 *   Fundamental objects like percentages need their own classes rather than
     being dealt with in an ad-hoc manner by higher-level objects.
 *   Add a parser so CSS can be read as well as written.

data/Rakefile

@@ -11,14 +11,16 @@ begin
     s.authors = ["Benedict Eastaugh"]
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install "
-    + "technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: sudo gem install " +
+       "technicalpickles-jeweler -s http://gems.github.com"
 end
 
 task :default => :test
 
 desc "Run the Stylish test suite"
 task :test do
+  require 'test/unit'
+  
   testdir = "test"
   Dir.foreach(testdir) do |f|
     path = "#{testdir}/#{f}"
@@ -28,7 +30,16 @@ task :test do
   end
 end
 
-desc "Run a Stylish example"
-task :example do
-  require 'example/tarski'
+namespace :example do
+  
+  desc "An extended generator DSL example."
+  task :tarski do
+    require 'example/tarski'
+  end
+  
+  desc "Extract base rules from a selector tree."
+  task :descope do
+    require 'example/descope'
+  end
 end
+

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 2
+:patch: 3
 :major: 0

data/lib/stylish/background.rb

@@ -0,0 +1,226 @@
+module Stylish
+  
+  # The Background class is a specialised kind of Declaration, geared towards
+  # dealing with the oddities of the background family of declarations, which
+  # can exist in both long- and shorthand forms.
+  #
+  # For example, these longhand background declarations
+  #
+  #     background-color:  #999;
+  #     background-image:  url('bg.png');
+  #     background-repeat: repeat-x;
+  #
+  # could be compressed into a single shorthand declaration
+  #
+  #     background: #999 url('bg.png') repeat-x;
+  #
+  # The Background class allows for easy conversion between these forms. It
+  # defaults to the longhand versions, allowing rules with stronger selector
+  # weighting to only override specific parts of other rules' background
+  # declarations.
+  class Background < Declaration
+    attr_reader :color,
+                :image,
+                :repeat,
+                :position,
+                :attachment,
+                :origin,
+                :break,
+                :compressed
+    
+    PROPERTIES = [
+      [:color,      "background-color"],
+      [:image,      "background-image"],
+      [:repeat,     "background-repeat"],
+      [:position,   "background-position"],
+      [:attachment, "background-attachment"],
+      [:origin,     "background-origin"],
+      [:break,      "background-break"],
+      [:compressed]]
+    
+    REPEAT_VALUES        = ["repeat-x", "repeat-y", "repeat",
+                            "space", "round", "no-repeat"]
+    ATTACHMENT_VALUES    = ["scroll", "fixed", "local"]
+    HORIZONTAL_POSITIONS = ["left", "center", "right"]
+    VERTICAL_POSITIONS   = ["top", "center", "bottom"]
+    ORIGIN_VALUES        = ["border-box", "padding-box", "content-box"]
+    BREAK_VALUES         = ["bounding-box", "each-box", "continuous"]
+    
+    # Create a new Background object with the specified properties.
+    def initialize(options)
+      accept_format(/^\s*%s\s*:\s*%s;\s*$/m, "%s:%s;")
+      self.value = options
+    end
+    
+    # Input validation for colours is handled by the Color class, which will
+    # raise an ArgumentError if the argument is an invalid colour value.
+    def color=(val)
+      @color = Color.new(val)
+    end
+    
+    # Set the background image(s). As of CSS3, elements may have multiple
+    # background images, so this method attempts to provide a backwards-
+    # compatible solution.
+    #
+    #     background = Background.new :image => "sky.png", :compressed => true
+    #     background.to_s # => "background:url('sky.png');"
+    #
+    #     background.image = ["ball.png", "grass.png"]
+    #     background.to_s # => "background:url('ball.png'), url('grass.png');"
+    #
+    def image=(paths)
+      paths  = [paths] if paths.is_a?(String)
+      @image = paths.inject([]) {|images, path| images << Image.new(path) }
+      
+      if @image.length < 2
+        @image = @image.first
+      else
+        def @image.to_s
+          join(", ")
+        end
+      end
+    end
+    
+    # Set the background repeat(s). As of CSS3, the background-repeat property
+    # may have multiple values, so this method provides a backwards-compatible
+    # solution.
+    #
+    #     repeating = Background.new :repeat => ["repeat-x", "repeat-y"]
+    #     repeating.to_s # => "background-repeat:repeat-x, repeat-y;"
+    #
+    def repeat=(repeats)
+      repeats = [repeats] if repeats.is_a? String
+      @repeat = repeats.find_all {|r| REPEAT_VALUES.include? r }
+      
+      if @repeat.length < 2
+        @repeat = @repeat.first
+      else
+        def @repeat.to_s
+          join(", ")
+        end
+      end
+    end
+    
+    # Only position keywords are currently handled, not percentages or lengths.
+    def position=(val)
+      xpos, ypos = val.split(/\s+/) << "center"
+      if HORIZONTAL_POSITIONS.include?(xpos) && VERTICAL_POSITIONS.include?(ypos)
+        @position = [xpos, ypos]
+      end
+    end
+    
+    # The background-attachment property takes a limited range of values, so
+    # only a value within that range will be accepted.
+    def attachment=(attachments)
+      attachments = [attachments] if attachments.is_a? String
+      @attachment = attachments.find_all {|a| ATTACHMENT_VALUES.include? a }
+      
+      if @attachment.length < 2
+        @attachment = @attachment.first
+      else
+        def @attachment.to_s
+          join(", ")
+        end
+      end
+    end
+    
+    # The background-origin property specifies the background positioning area.
+    # It is a CSS3 property which takes multiple values.
+    #
+    #     original = Background.new :origin => ["padding-box", "content-box"]
+    #     original.to_s # => background-origin:padding-box, content-box;
+    #
+    def origin=(origins)
+      origins = [origins] if origins.is_a? String
+      @origin = origins.find_all {|o| ORIGIN_VALUES.include? o }
+      
+      if @origin.length < 2
+        @origin = @origin.first
+      else
+        def @origin.to_s
+          join(", ")
+        end
+      end
+    end
+    
+    # The background-break property, defined in CSS3, specifies how the
+    # background positioning area is derived when an element is broken into
+    # multiple boxes.
+    #
+    #     broken = Background.new :break => "bounding-box"
+    #     broken.to_s # => "background-break:bounding-box;"
+    #
+    def break=(value)
+      @break = value if BREAK_VALUES.include? value
+    end
+    
+    # Set this to true to generate a shorthand declaration, e.g.
+    #
+    #     background:#ccc url('bg.png') no-repeat 0 0;
+    #
+    # As opposed to the longhand version:
+    #
+    #     background-color:#ccc; background-image:url('bg.png');
+    #     background-repeat:no-repeat; background-position:0 0;
+    #
+    def compressed=(val)
+      @compressed = val == true || nil
+    end
+    
+    # Override Declaration#name, since it's not compatible with the
+    # internals of this class.
+    def name
+      PROPERTIES.reject {|n, p| p.nil? }.map {|n, p|
+        value = self.send(n)
+        p.to_s unless value.nil?
+      }.compact
+    end
+    
+    # Override Declaration#name=, since it's not compatible with the
+    # internals of this class.
+    def name=(val)
+      raise NoMethodError, "name= is not defined for Background."
+    end
+    
+    # Override Declaration#value, since it's not compatible with the internals
+    # of this class.
+    def value(name_and_value = false)
+      PROPERTIES.reject {|n, p| p.nil? }.map {|n, p|
+        value = self.send(n)
+        next if value.nil?
+        name_and_value ? [p.to_s, value] : value
+      }.compact
+    end
+    
+    # Override Declaration#value=, since it's not compatible with the internals
+    # of this class.
+    def value=(options)
+      unless options.is_a? Hash
+        raise ArgumentError, "Argument must be a hash of background properties"
+      end
+      
+      PROPERTIES.each do |name, property|
+        self.send(:"#{name.to_s}=", options[name]) if options[name]
+      end
+    end
+    
+    # Generate a string representation of a Background instance.
+    #
+    # There are two kinds of representation, each of which have slightly
+    # different CSS semantics. If compressed is set to true, this method will
+    # produce a shorthand CSS declaration such as the following:
+    #
+    #     background: #fff url('bg.png') no-repeat 50% 0;
+    #
+    # Otherwise it will produce an unordered list of individual background
+    # declarations.
+    def to_s(symbols = {})
+      if @compressed
+        "background:#{self.value(true).map {|p, v| v }.compact.join(" ")};"
+      else
+        self.value(true).map {|p, v| sprintf(@format, p, v.to_s) }.join(" ")
+      end
+    end
+  end
+  
+end

data/lib/stylish/color.rb

@@ -1,6 +1,3 @@
-require 'mathn'
-require 'rational'
-
 module Stylish #:nodoc:
   
   # The Color class is intended to eventually implement the entirety of the
@@ -214,7 +211,7 @@ module Stylish #:nodoc:
     [:red, :green, :blue].each do |color|
       reader = color
       writer = :"#{color}="
-      color = :"@#{color.to_s}"
+      color  = :"@#{color.to_s}"
       
       unless self.respond_to?(reader)
         self.send(:define_method, reader) do
@@ -246,11 +243,11 @@ module Stylish #:nodoc:
     # Attribute writer for the color's value. Uses the ColorStringParser inner
     # class to parse string values, and contains other logic to handle arrays.
     def value=(value)
-      if value.is_a?(String) || value.is_a?(Symbol)
+      if value.is_a?(String)
         parser = ColorStringParser.new
         @type, @red, @green, @blue, @opacity = parser.parse(value)
         return unless @type.nil?
-      elsif value.is_a?(Array) && (3..4).include?(value.length)
+      else
         rgb = value[0..2].inject([]) do |rgb, v|
           if v.is_a?(Integer) || v.is_a?(Float)
             rgb << v
@@ -263,14 +260,12 @@ module Stylish #:nodoc:
           rgb
         end
         
-        if rgb.length == 3
-          if value.length == 3
-            @red, @green, @blue, @opacity = rgb << nil
-            @type = :rgb and return
-          elsif value.length == 4 and value[3].kind_of?(Numeric)
-            @red, @green, @blue, @opacity = rgb << value[3].to_f
-            @type = :rgba and return
-          end
+        if value.length < 4
+          @red, @green, @blue, @opacity = rgb << nil
+          @type = :rgb and return
+        else
+          @red, @green, @blue, @opacity = rgb << value[3].to_f
+          @type = :rgba and return
         end
       end
       
@@ -289,10 +284,7 @@ module Stylish #:nodoc:
     #   color.opacity # => 0.5
     #
     def opacity=(value)
-      return unless value.is_a?(Integer) || value.is_a?(Float)
-      return if value < 0 || value > 1
-      
-      @opacity = value
+      @opacity = value unless value < 0 || value > 1
     end
     
     # Returns a color keyword string if the RGB value of the color is equal to
@@ -381,7 +373,7 @@ module Stylish #:nodoc:
     #   color.type = :rgb
     #   color.to_s # => "rgb(0, 0, 0)"
     #
-    def to_s
+    def to_s(symbols = {})
       return "inherit" if @type == :inherit
       
       self.send(:"to_#{self.type.to_s}")
@@ -415,7 +407,9 @@ module Stylish #:nodoc:
         huer.call(red - green, 240)
       end
       
-      [hue].concat([saturation, lightness].map {|r| (r * 100).to_f.round.to_s + "%" })
+      [hue].concat([saturation, lightness].map {|r|
+        (r * 100).to_f.round.to_s + "%"
+      })
     end
     
     def hsla

data/lib/stylish/core.rb

@@ -73,8 +73,9 @@ module Stylish
     end
     
     # Serialise the rule to valid CSS code.
-    def to_s(scope = "")
-      sprintf(@format, selectors.join(scope), @declarations.join)
+    def to_s(symbols = {}, scope = "")
+      sprintf(@format, selectors.join(symbols, scope),
+        @declarations.to_s(symbols))
     end
   end
   
@@ -150,7 +151,7 @@ module Stylish
     # the serialisation API of those trees, and thus the #to_s method has a
     # scope argument, which is in practice discarded when the serialisation of
     # the comment occurs.
-    def to_s(scope = "")
+    def to_s(symbols = {}, scope = "")
       if @lines.empty? && @metadata.empty?
         sprintf("/**\n * %s\n */", @header)
       else
@@ -178,8 +179,8 @@ module Stylish
     
     # Selectors are immutable once created; the value of a given Selector must
     # be set when the object is created.
-    def initialize(str)
-      @selector = str.to_s
+    def initialize(selector)
+      @selector = selector
     end
     
     # Each Rule possesses one or more Selectors. Rules are often placed in
@@ -190,8 +191,9 @@ module Stylish
     #
     # The Selector class is also used internally by the Tree::SelectorScope
     # class, to store its scope value.
-    def to_s(scope = "")
-      (scope.empty? ? "" : scope + " ") + @selector.to_s
+    def to_s(symbols = {}, scope = "")
+      (scope.empty? ? "" : scope + " ") +
+        (@selector.is_a?(String) ? @selector.to_s : @selector.to_s(symbols))
     end
   end
   
@@ -211,15 +213,15 @@ module Stylish
     # The join method overrides the superclass' method in order to always use a
     # specific separator, and so that the scope that the selectors are being
     # used in can be passed through when Rules etc. are serialised.
-    def join(scope = "")
+    def join(symbols = {}, scope = "")
       self.inject("") do |ss, s|
-        (ss.empty? ? "" : ss + self.format) + s.to_s(scope)
+        (ss.empty? ? "" : ss + self.format) + s.to_s(symbols, scope)
       end
     end
     
     # The to_s method alternative way of calling the join method.
-    def to_s(scope = "")
-      self.join(scope)
+    def to_s(symbols = {}, scope = "")
+      self.join(symbols, scope)
     end
   end
   
@@ -262,12 +264,17 @@ module Stylish
     #
     # Since the formatting can be adjusted via the #format= accessor, the exact
     # spacing of the declaration can be controlled if desired.
-    def to_s
-      sprintf(@format, @property_name.to_s, @value.to_s)
+    def to_s(symbols = {})
+      if @value.is_a?(Generate::Variable) || @value.is_a?(Color)
+        value = @value.to_s(symbols)
+      else
+        value = @value.to_s
+      end
+      
+      sprintf(@format, @property_name.to_s, value)
     end
   end
   
-  
   # Declarations subclasses Array so that whenever #join is called, the
   # instance's format attribute will be used as the join string, rather than
   # the empty string.
@@ -292,151 +299,9 @@ module Stylish
     # format attribute. Assuming that its contents are indeed Declaration
     # objects, this will invoke their own #to_s method and generating correct
     # CSS code.
-    def to_s
-      self.join
-    end
-  end
-  
-  # The Background class is a specialised kind of Declaration, geared towards
-  # dealing with the oddities of the background family of declarations, which
-  # can exist in both long- and shorthand forms.
-  #
-  # For example, these longhand background declarations
-  #
-  #     background-color:  #999;
-  #     background-image:  url('bg.png');
-  #     background-repeat: repeat-x;
-  #
-  # could be compressed into a single shorthand declaration
-  #
-  #     background: #999 url('bg.png') repeat-x;
-  #
-  # The Background class allows for easy conversion between these forms. It
-  # defaults to the longhand versions, allowing rules with stronger selector
-  # weighting to only override specific parts of other rules' background
-  # declarations.
-  class Background < Declaration
-    attr_reader :color,
-                :image,
-                :repeat,
-                :position,
-                :attachment,
-                :compressed
-    
-    PROPERTIES = [
-      [:color,      "background-color"],
-      [:image,      "background-image"],
-      [:repeat,     "background-repeat"],
-      [:position,   "background-position"],
-      [:attachment, "background-attachment"],
-      [:compressed]]
-    
-    REPEAT_VALUES        = ["repeat", "repeat-x", "repeat-y", "no-repeat"]
-    ATTACHMENT_VALUES    = ["scroll", "fixed", "inherit"]
-    HORIZONTAL_POSITIONS = ["left", "center", "right"]
-    VERTICAL_POSITIONS   = ["top", "center", "bottom"]
-    
-    # Create a new Background object with the specified properties.
-    def initialize(options)
-      accept_format(/^\s*%s\s*:\s*%s;\s*$/m, "%s:%s;")
-      self.value = options
-    end
-    
-    # Input validation for colours is handled by the Color class, which will
-    # raise an ArgumentError if the argument is an invalid colour value.
-    def color=(val)
-      @color = Color.new(val)
-    end
-    
-    # Set the background image.
-    def image=(path)
-      @image = Image.new(path) if path.is_a?(String)
-    end
-    
-    # Set the background repeat.
-    def repeat=(val)
-      @repeat = val if REPEAT_VALUES.include?(val)
-    end
-    
-    # Only position keywords are currently handled, not percentages or lengths.
-    def position=(val)
-      xpos, ypos = val.split(/\s+/) << "center"
-      if HORIZONTAL_POSITIONS.include?(xpos) && VERTICAL_POSITIONS.include?(ypos)
-        @position = [xpos, ypos]
-      end
-    end
-    
-    # The background-attachment property takes a limited range of values, so
-    # only a value within that range will be accepted.
-    def attachment=(val)
-      @attachment = val if ATTACHMENT_VALUES.include?(val)
-    end
-    
-    # Set this to true to generate a shorthand declaration, e.g.
-    #
-    #     background:#ccc url('bg.png') no-repeat 0 0;
-    #
-    # As opposed to the longhand version:
-    #
-    #     background-color:#ccc; background-image:url('bg.png');
-    #     background-repeat:no-repeat; background-position:0 0;
-    #
-    def compressed=(val)
-      @compressed = val == true || nil
-    end
-    
-    # Override Declaration#name, since it's not compatible with the
-    # internals of this class.
-    def name
-      PROPERTIES.reject {|n, p| p.nil? }.map {|n, p|
-        value = self.send(n)
-        p.to_s unless value.nil?
-      }.compact
-    end
-    
-    # Override Declaration#name=, since it's not compatible with the
-    # internals of this class.
-    def name=(val)
-      raise NoMethodError, "name= is not defined for Background."
-    end
-    
-    # Override Declaration#value, since it's not compatible with the internals
-    # of this class.
-    def value(name_and_value = false)
-      PROPERTIES.reject {|n, p| p.nil? }.map {|n, p|
-        value = self.send(n)
-        next if value.nil?
-        name_and_value ? [p.to_s, value] : value
-      }.compact
-    end
-    
-    # Override Declaration#value=, since it's not compatible with the internals
-    # of this class.
-    def value=(options)
-      unless options.is_a? Hash
-        raise ArgumentError, "Argument must be a hash of background properties"
-      end
-      
-      PROPERTIES.each do |name, property|
-        self.send(:"#{name.to_s}=", options[name]) if options[name]
-      end
-    end
-    
-    # Generate a string representation of a Background instance.
-    #
-    # There are two kinds of representation, each of which have slightly
-    # different CSS semantics. If compressed is set to true, this method will
-    # produce a shorthand CSS declaration such as the following:
-    #
-    #     background: #fff url('bg.png') no-repeat 50% 0;
-    #
-    # Otherwise it will produce an unordered list of individual background
-    # declarations.
-    def to_s
-      if @compressed
-        "background:#{self.value(true).map {|p, v| v }.compact.join(" ")};"
-      else
-        self.value(true).map {|p, v| sprintf(@format, p, v.to_s) }.join(" ")
+    def to_s(symbols = {})
+      self.inject("") do |a, o|
+        a << (a.empty? ? "" : @format) << o.to_s(symbols)
       end
     end
   end

data/lib/stylish/generate.rb

@@ -55,10 +55,21 @@ module Stylish
         key        = key.to_s.sub("_", "-").to_sym
         
         if key == :background
-          declaration = Background.new(value)
+          if value.any? {|k,v| v.is_a? Symbol }
+            declaration = Variable.new(value, Background)
+          else
+            declaration = Background.new(value)
+          end
         elsif key == :color
-          declaration = Declaration.new("color", Color.new(value))
+          if value.is_a? Symbol
+            value = Variable.new(value, Color)
+          else
+            value = Color.new(value)
+          end
+          
+          declaration = Declaration.new("color", value)
         else
+          value = Variable.new(value) if value.is_a? Symbol
           declaration = Declaration.new(key, value)
         end
         
@@ -66,6 +77,52 @@ module Stylish
       end
     end
     
+    # Variables are elements of a selector tree that haven't been assigned
+    # values yet. When a tree that includes Variable objects is serialised, it
+    # must be passed a symbol table so that the variables may be given values.
+    class Variable
+      
+      # When Variable objects are initialised they may be given either a simple
+      # symbol, or a compound object (such as a hash) which contains symbols.
+      # When a compound object is given, a constructor must also be given.
+      #
+      #     varbg = Variable.new({:image => :button, :color => :bright})
+      #     varbg.to_s({:button => "button.png", :bright => "0f0"})
+      #
+      # Which would give the following:
+      #
+      #     background-image:url('button.png'); background-color:#0f0;
+      #
+      # Constructors can also be given for simple values, e.g. when creating a
+      # Color.
+      #
+      #     varc = Variable.new(:bright, Color)
+      #     varc.to_s({:bright => "f00"}) # => "#f00"
+      #
+      def initialize(name_or_hash, constructor = nil)
+        @name        = name_or_hash
+        @constructor = constructor
+      end
+      
+      # The symbol table is given as an argument to the root element of a
+      # selector tree when it is serialised, and passed down to each node as
+      # the tree is traversed. Nodes must then serialise themselves, and if
+      # they contain Variables they must pass them the symbol table so that
+      # they can be resolved to a given value.
+      def to_s(symbols)
+        if @constructor.nil?
+          symbols[@name]
+        elsif @name.is_a? Symbol
+          @constructor.new(symbols[@name]).to_s
+        else
+          @constructor.new(@name.to_a.inject({}) {|a, e|
+            a[e.first] = symbols[e.last]
+            a
+          }).to_s
+        end
+      end
+    end
+    
     # Often the selector associated with a call to the rule method would simply
     # be a single HTML element name. This has been factored out by adding
     # methods to the Description DSL class corresponding to all the HTML
@@ -161,7 +218,9 @@ module Stylish
         return unless declarations || block
         
         selectors = [selectors] unless selectors.is_a?(Array)
-        selectors.map! {|s| Selector.new(s) }
+        selectors.map! do |s|
+          Selector.new(s.is_a?(Symbol) ? Variable.new(s) : s)
+        end
         
         declarations = Generate.parse_declarations(declarations)
         

data/lib/stylish/stylesheet.rb

@@ -16,9 +16,9 @@ module Stylish
     end
     
     # Recursively serialise the tree to a stylesheet.
-    def to_s
+    def to_s(symbols = {})
       return "" if @nodes.empty?
-      @nodes.map {|node| node.to_s }.join(@format)
+      @nodes.map {|node| node.to_s(symbols) }.join(@format)
     end
   end
   

data/lib/stylish/tree.rb

@@ -84,10 +84,10 @@ module Stylish
       end
       
       # Recursively serialise the selector tree.
-      def to_s(scope = "")
+      def to_s(symbols = {}, scope = "")
         return "" if @nodes.empty?
         scope = scope.empty? ? @scope.to_s : scope + " " + @scope.to_s
-        @nodes.map {|node| node.to_s(scope) }.join(@format)
+        @nodes.map {|node| node.to_s(symbols, scope) }.join(@format)
       end
       
       # Return the node's child nodes.

data/lib/stylish.rb

@@ -1,11 +1,17 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'pathname'
+require 'mathn'
+require 'rational'
 
-require 'stylish/formattable'
-require 'stylish/tree'
-require 'stylish/core'
-require 'stylish/stylesheet'
-require 'stylish/image'
-require 'stylish/color'
-require 'stylish/generate'
+module Stylish
+  STYLISH_PATH = File.expand_path(File.dirname(__FILE__)) + '/stylish/'
+  
+  require STYLISH_PATH + 'formattable'
+  require STYLISH_PATH + 'tree'
+  require STYLISH_PATH + 'core'
+  require STYLISH_PATH + 'tree'
+  require STYLISH_PATH + 'stylesheet'
+  require STYLISH_PATH + 'image'
+  require STYLISH_PATH + 'background'
+  require STYLISH_PATH + 'color'
+  require STYLISH_PATH + 'generate'
+end

data/test/background_test.rb

@@ -1,6 +1,3 @@
-require 'test/unit'
-require './lib/stylish'
-
 class BackgroundTest < Test::Unit::TestCase
   
   def setup
@@ -24,10 +21,26 @@ class BackgroundTest < Test::Unit::TestCase
       Stylish::Background.new(:image => "background.jpg").image.path)
   end
   
+  def test_multiple_background_images
+    bg = Stylish::Background.new :image =>
+           ["flower.png", "ball.png", "grass.png"]
+    
+    assert_equal(3, bg.image.length)
+    assert_equal("background-image:" +
+      "url('flower.png'), url('ball.png'), url('grass.png');", bg.to_s)
+  end
+  
   def test_valid_background_repeats
     assert_equal('no-repeat', @composite.repeat)
   end
   
+  def test_multiple_background_repeats
+    bg = Stylish::Background.new :repeat => ["repeat-x", "repeat-y"]
+    
+    assert_equal(2, bg.repeat.length)
+    assert_equal("background-repeat:repeat-x, repeat-y;", bg.to_s)
+  end
+  
   def test_valid_background_positions
     assert_equal(2, @composite.position.length)
     assert_equal("left", @composite.position[0])
@@ -44,12 +57,32 @@ class BackgroundTest < Test::Unit::TestCase
       Stylish::Background.new(:attachment => "fixed").attachment)
   end
   
+  def test_multiple_attachments
+    glued = Stylish::Background.new :attachment => ["local", "fixed"]
+    
+    assert_equal(2, glued.attachment.length)
+    assert_equal("background-attachment:local, fixed;", glued.to_s)
+  end
+  
   def test_invalid_background_colors
     assert_raise ArgumentError do
       Stylish::Background.new(:color => "sky-blue")
     end
   end
   
+  def test_origins
+    original = Stylish::Background.new :origin => ["border-box", "padding-box"]
+    
+    assert_equal(2, original.origin.length)
+    assert_equal("background-origin:border-box, padding-box;", original.to_s)
+  end
+  
+  def test_breaks
+    broken = Stylish::Background.new :break => "bounding-box"
+    
+    assert_equal("background-break:bounding-box;", broken.to_s)
+  end
+  
   def test_invalid_image_values
     assert_nil(Stylish::Background.new(:image => []).image)
     assert_nil(Stylish::Background.new(:image => {}).image)

data/test/color_test.rb

@@ -1,11 +1,8 @@
-require 'test/unit'
-require './lib/stylish'
-
 class ColorTest < Test::Unit::TestCase
   
   def setup
-    @red = Stylish::Color.new(:red)
-    @green = Stylish::Color.new(:green)
+    @red = Stylish::Color.new("red")
+    @green = Stylish::Color.new("green")
     @blue = Stylish::Color.new("#0000FF")
     @white = Stylish::Color.new("#FFF")
     @yellow = Stylish::Color.new([255, 255, 0])
@@ -68,8 +65,6 @@ class ColorTest < Test::Unit::TestCase
   end
   
   def test_case_insensitivity_of_keywords
-    assert_equal([0, 128, 0, nil], Stylish::Color.new(:Green).value)
-    assert_equal([0, 128, 0, nil], Stylish::Color.new(:GrEeN).value)
     assert_equal([0, 128, 0, nil], Stylish::Color.new("Green").value)
     assert_equal([0, 128, 0, nil], Stylish::Color.new("GrEeN").value)
   end
@@ -117,7 +112,7 @@ class ColorTest < Test::Unit::TestCase
   
   def test_keyword_to_string
     assert_equal("green", @green.to_s)
-    assert_equal("yellow", Stylish::Color.new(:yellow).to_s)
+    assert_equal("yellow", Stylish::Color.new("yellow").to_s)
   end
   
   def test_rgb_to_string
@@ -148,8 +143,8 @@ class ColorTest < Test::Unit::TestCase
   end
   
   def test_inherit_and_transparent_to_hex
-    assert_nil(Stylish::Color.new(:inherit).to_hex)
-    assert_nil(Stylish::Color.new(:transparent).to_hex)
+    assert_nil(Stylish::Color.new("inherit").to_hex)
+    assert_nil(Stylish::Color.new("transparent").to_hex)
   end
   
   def test_hex_to_hex
@@ -160,8 +155,8 @@ class ColorTest < Test::Unit::TestCase
   end
   
   def test_keywords_to_hex
-    assert_equal("#808080", Stylish::Color.new(:gray).to_hex)
-    assert_equal("#800000", Stylish::Color.new(:maroon).to_hex)
+    assert_equal("#808080", Stylish::Color.new("gray").to_hex)
+    assert_equal("#800000", Stylish::Color.new("maroon").to_hex)
   end
   
   def test_rgb_to_hex
@@ -174,7 +169,7 @@ class ColorTest < Test::Unit::TestCase
     assert_equal("#fff", Stylish::Color.new([255, 255, 255]).to_hex)
     assert_equal("#fff", Stylish::Color.new("#ffffff").to_hex)
     assert_equal("#fb0", Stylish::Color.new("#ffbb00").to_hex)
-    assert_equal("#0ff", Stylish::Color.new(:aqua).to_hex)
+    assert_equal("#0ff", Stylish::Color.new("aqua").to_hex)
   end
   
   def test_rgb_to_hsl

data/test/comment_test.rb

@@ -1,6 +1,3 @@
-require 'test/unit'
-require './lib/stylish'
-
 class CommentTest < Test::Unit::TestCase
   
   def setup

data/test/declaration_test.rb

@@ -1,6 +1,3 @@
-require 'test/unit'
-require './lib/stylish'
-
 class DeclarationTest < Test::Unit::TestCase
   
   def setup

data/test/declarations_test.rb

@@ -1,12 +1,9 @@
-require 'test/unit'
-require './lib/stylish'
-
 class DeclarationsTest < Test::Unit::TestCase
   
   def setup
     @ds = Stylish::Declarations.new
     @ds << Stylish::Declaration.new("border-color", "red")
-    @ds << Stylish::Background.new(:color => :blue, :image => "test.png")
+    @ds << Stylish::Background.new(:color => "blue", :image => "test.png")
   end
   
   def test_join

data/test/formattable_test.rb

@@ -1,6 +1,3 @@
-require 'test/unit'
-require './lib/stylish'
-
 class FormattableTest < Test::Unit::TestCase
   
   def setup

data/test/generate_test.rb

@@ -1,6 +1,3 @@
-require 'test/unit'
-require './lib/stylish'
-
 class GenerateTest < Test::Unit::TestCase
   
   def test_simple_rules

data/test/image_test.rb

@@ -1,6 +1,3 @@
-require 'test/unit'
-require './lib/stylish'
-
 class ImageTest < Test::Unit::TestCase
   
   def setup

data/test/rule_test.rb

@@ -1,6 +1,3 @@
-require 'test/unit'
-require './lib/stylish'
-
 class RuleTest < Test::Unit::TestCase
   
   def setup

data/test/selector_test.rb

@@ -1,13 +1,10 @@
-require 'test/unit'
-require './lib/stylish'
-
 class SelectorTest < Test::Unit::TestCase
 
   def test_to_string
     s = Stylish::Selector.new(".test")
     assert_equal(".test", s.to_s)
     
-    s = Stylish::Selector.new(:div)
+    s = Stylish::Selector.new("div")
     assert_equal("div", s.to_s)
   end
 end

data/test/selectors_test.rb

@@ -1,6 +1,3 @@
-require 'test/unit'
-require './lib/stylish'
-
 class SelectorsTest < Test::Unit::TestCase
   
   def setup

data/test/stylesheet_test.rb

@@ -1,6 +1,3 @@
-require 'test/unit'
-require './lib/stylish'
-
 class StylesheetTest < Test::Unit::TestCase
   
   def setup

data/test/tree_test.rb

@@ -1,6 +1,3 @@
-require 'test/unit'
-require './lib/stylish'
-
 class TreeTest < Test::Unit::TestCase
   
   def setup

data/test/variable_test.rb

@@ -0,0 +1,46 @@
+class VariableTest < Test::Unit::TestCase
+  
+  def setup
+    @style = Stylish.generate do
+      div :font_weight => :weighty
+    end
+  end
+  
+  def test_variable_inclusion    
+    assert_instance_of(Stylish::Generate::Variable,
+      @style.rules.first.declarations.first.value)
+  end
+  
+  def test_variable_serialisation
+    assert_equal("div {font-weight:bold;}",
+      @style.to_s({:weighty => "bold"}))
+  end
+  
+  def test_selector_variables
+    style = Stylish.generate do
+      rule :some_selector, :line_height => 1.5
+    end
+    
+    assert_equal("body p {line-height:1.5;}",
+      style.to_s({:some_selector => "body p"}))
+  end
+  
+  def test_color_variables
+    style = Stylish.generate do
+      body :color => :bright_as_a_button
+    end
+    
+    assert_equal("body {color:#57b5cc;}",
+      style.to_s({:bright_as_a_button => "57b5cc"}))
+  end
+  
+  def test_background_variables
+    style = Stylish.generate do
+      body :background => {:color => :dark, :image => :buttonish}
+    end
+    
+    assert_equal(
+      "body {background-color:#000; background-image:url('button.png');}",
+      style.to_s({:dark => "000", :buttonish => "button.png"}))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ionfish-stylish
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Benedict Eastaugh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-13 00:00:00 -07:00
+date: 2009-04-24 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,10 +22,12 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- History.txt
 - README.md
 - Rakefile
 - VERSION.yml
 - lib/stylish.rb
+- lib/stylish/background.rb
 - lib/stylish/color.rb
 - lib/stylish/core.rb
 - lib/stylish/formattable.rb
@@ -46,6 +48,7 @@ files:
 - test/selectors_test.rb
 - test/stylesheet_test.rb
 - test/tree_test.rb
+- test/variable_test.rb
 has_rdoc: true
 homepage: http://github.com/ionfish/stylish
 post_install_message: 
@@ -86,3 +89,4 @@ test_files:
 - test/selectors_test.rb
 - test/stylesheet_test.rb
 - test/tree_test.rb
+- test/variable_test.rb