ionfish-stylish 0.1.4 → 0.1.5

data/History.txt

@@ -1,3 +1,11 @@
+=== Version 0.1.5 (2009-05-03)
+
+Improved background support
+* Length, Position and Percentage classes
+* accept_format now a class method
+* Improved API and internals for multiple background properties
+
+
 === Version 0.1.4 (2009-04-25)
 
 Bug fixes

data/README.md

@@ -23,7 +23,7 @@ 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.
+A number of additional examples are available in the `example/` directory.
 
 
 Compatibility
@@ -37,9 +37,6 @@ Future considerations
 ---------------------
 
 *   Add a Border class to complement Background.
-*   Add better support for CSS3 properties to Background.
-*   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.
 
 
@@ -59,9 +56,7 @@ Stylish treats CSS as object code--but it treats it nicely.
 Licence
 -------
 
-Copyright (c) 2008-2009, Benedict Eastaugh
-
-All rights reserved.
+Copyright (c) 2008-2009, Benedict Eastaugh. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 4
+:patch: 5
 :major: 0

data/lib/stylish/color.rb

@@ -22,14 +22,15 @@ module Stylish #:nodoc:
     # RGB integer; a hexadecimal representation of an RGB color; a rgb()
     # representation of an RGB color; and an rgba() representation of an RGBA
     # color.
+    pct = Percentage::PCTSTR
     OPACITY    = /([0-1]|0\.\d+)/
     RGB_INT    = /(\d{1,2}|[1-2][0-5]{2})/
     HSL_INT    = /(\d{1,2}|[1-2]\d{2}|3([0-5]\d|60))/
     HEX_COLOR  = /^#?([\da-fA-F]{3}){1,2}$/
-    RGB_COLOR  = /rgb\(\s*((#{RGB_INT}|#{PCT}),\s*){2}(#{RGB_INT}|#{PCT})\s*\)/
-    RGBA_COLOR = /rgba\(\s*((#{RGB_INT}|#{PCT}),\s*){3}#{OPACITY}\s*\)/
-    HSL_COLOR  = /hsl\(\s*((#{HSL_INT}|#{PCT}),\s*){2}(#{HSL_INT}|#{PCT})\s*\)/
-    HSLA_COLOR = /hsla\(\s*((#{HSL_INT}|#{PCT}),\s*){3}(#{OPACITY})\s*\)/
+    RGB_COLOR  = /rgb\(\s*((#{RGB_INT}|#{pct}),\s*){2}(#{RGB_INT}|#{pct})\s*\)/
+    RGBA_COLOR = /rgba\(\s*((#{RGB_INT}|#{pct}),\s*){3}#{OPACITY}\s*\)/
+    HSL_COLOR  = /hsl\(\s*((#{HSL_INT}|#{pct}),\s*){2}(#{HSL_INT}|#{pct})\s*\)/
+    HSLA_COLOR = /hsla\(\s*((#{HSL_INT}|#{pct}),\s*){3}(#{OPACITY})\s*\)/
     
     # Colors can be of several types: keywords, hexadecimal strings, RGB and
     # RGBA formats. The type of the color is set on initialisation, so that
@@ -253,7 +254,7 @@ module Stylish #:nodoc:
             rgb << v
           elsif v =~ /^#{RGB_INT}$/
             rgb << v.to_i
-          elsif v =~ PERCENTAGE
+          elsif Percentage.match? v
             rgb << (v.chop.to_f * 256 / 100).round
           end
           
@@ -503,7 +504,7 @@ module Stylish #:nodoc:
         map do |value|
           if value =~ /^#{RGB_INT}$/
             value.to_i
-          elsif value =~ PERCENTAGE
+          elsif Percentage.match? value
             (value.chop.to_f * 255 / 100).round
           else
             value.to_f

data/lib/stylish/core.rb

@@ -1,9 +1,5 @@
 module Stylish
   
-  # Regular expressions matching a percentage, and matching only a percentage.
-  PCT        = /-?(0\.)?\d+%/
-  PERCENTAGE = /^#{PCT}$/
-  
   # A list of all valid HTML5 elements. Used primarily in the stylesheet
   # generation DSL as method names.
   HTML_ELEMENTS = [:html, :head, :title, :base, :link, :meta, :style, :script,
@@ -21,6 +17,28 @@ module Stylish
                    :command, :bb, :menu, :legend, :div, :h1, :h2, :h3, :h4,
                    :h5, :h6]
   
+  class Stylesheet < Tree::SelectorScope
+    accept_format(/\s*/m, "\n")
+    
+    # Stylesheets are pure aggregate objects; they can contain child nodes,
+    # but have no data of their own. Their initializer therefore accepts no
+    # arguments.
+    def initialize
+      @nodes = []
+    end
+    
+    # Stylesheets are the roots of selector trees.
+    def root?
+      true
+    end
+    
+    # Recursively serialise the tree to a stylesheet.
+    def to_s(symbols = {})
+      return "" if @nodes.empty?
+      @nodes.map {|node| node.to_s(symbols) }.join(self.class.format)
+    end
+  end
+  
   # Rule objects represent CSS rules, and serialise to them. They possess one
   # or more selectors, and zero or more declarations. In addition to their
   # importance as the major building-blocks of stylesheets, they act as the
@@ -45,6 +63,7 @@ module Stylish
     include Formattable, Tree::Leaf
     
     attr_reader :selectors, :declarations
+    accept_format(/^\s*%s\s*\{\s*%s\s*\}\s*$/m, "%s {%s}")
     
     # Every Rule must have at least one selector, but may have any number of
     # declarations. Empty rules are often used in stylesheets to indicate
@@ -61,8 +80,6 @@ module Stylish
     # This makes Rule objects a very flexible foundation for the higher-level
     # data structures and APIs in Stylish.
     def initialize(selectors, declarations)
-      accept_format(/^\s*%s\s*\{\s*%s\s*\}\s*$/m, "%s {%s}")
-      
       @selectors = selectors.inject(Selectors.new) do |ss, s|
         ss << s
       end
@@ -74,7 +91,7 @@ module Stylish
     
     # Serialise the rule to valid CSS code.
     def to_s(symbols = {}, scope = "")
-      sprintf(@format, selectors.join(symbols, scope),
+      sprintf(self.class.format, selectors.join(symbols, scope),
         @declarations.to_s(symbols))
     end
   end
@@ -201,20 +218,14 @@ module Stylish
   class Selectors < Array
     include Formattable
     
-    # Since a group of Selectors is just a specialised kind of array, all that
-    # is done in its initialiser, regardless of arguments, is to set the
-    # default serialisation format.
-    def initialize(*args)
-      accept_format(/^\s*,\s*$/m, ", ")
-      super
-    end
+    accept_format(/^\s*,\s*$/m, ", ")
     
     # 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(symbols = {}, scope = "")
       self.inject("") do |ss, s|
-        (ss.empty? ? "" : ss + self.format) + s.to_s(symbols, scope)
+        (ss.empty? ? "" : ss + self.class.format) + s.to_s(symbols, scope)
       end
     end
     
@@ -232,10 +243,10 @@ module Stylish
     include Formattable
     
     attr_accessor :value
+    accept_format(/^\s*%s\s*:\s*%s;\s*$/m, "%s:%s;")
     
     # Each Declaration has a property name and a value.
     def initialize(name, value)
-      accept_format(/^\s*%s\s*:\s*%s;\s*$/m, "%s:%s;")
       self.value = value
       self.name  = name
     end
@@ -270,7 +281,7 @@ module Stylish
         value = @value.to_s
       end
       
-      sprintf(@format, @property_name.to_s, value)
+      sprintf(self.class.format, @property_name.to_s, value)
     end
   end
   
@@ -280,18 +291,12 @@ module Stylish
   class Declarations < Array
     include Formattable
     
-    # The allowed format is any string consisting only of whitespace
-    # characters, including newline. The default format string is a single
-    # space, which is probably the most common choice in hand-written CSS.
-    def initialize(*args)
-      accept_format(/^\s*$/m, " ")
-      super
-    end
+    accept_format(/^\s*$/m, " ")
     
     # The format attribute is always used as the separator when joining the
     # elements of a Declarations object.
     def join
-      super(@format)
+      super(self.class.format)
     end
     
     # Returns a string by converting each element to a string, separated by the
@@ -300,9 +305,21 @@ module Stylish
     # CSS code.
     def to_s(symbols = {})
       self.inject("") do |a, o|
-        a << (a.empty? ? "" : @format) << o.to_s(symbols)
+        a << (a.empty? ? "" : self.class.format) << o.to_s(symbols)
       end
     end
   end
   
+  # PropertyBundle objects are simple wrappers around property values with
+  # multiple values.
+  class PropertyBundle < Array
+    include Formattable
+    
+    accept_format(/^\s*,\s*$/m, ", ")
+    
+    def to_s
+      self.join(self.class.format)
+    end
+  end
+  
 end

data/lib/stylish/{background.rb → extended.rb}

@@ -1,5 +1,34 @@
 module Stylish
   
+  # Instances of the Image class are used to represent paths to images,
+  # generally background images.
+  class Image
+    include Formattable
+    
+    attr_accessor :path
+    accept_format(/^url\(\s*('|")?%s\1\s*\)$/, "url('%s')")
+    
+    # Image instances are serialised to URI values. The path to the image file
+    # can be surrounded by either single quotes, double quotes or neither;
+    # single quotes are the default in Stylish.
+    def initialize(path)
+      @path = path
+    end
+    
+    # Serialising Image objects to a string produces the URI values seen in
+    # background-image declarations, e.g.
+    #
+    #     image = Image.new("test.png")
+    #     image.to_s # => "url('test.png')"
+    #
+    #     background = Stylish::Background.new(:image => "test.png")
+    #     background.to_s # => "background-image:url('test.png');"
+    #
+    def to_s
+      sprintf(self.class.format, path.to_s)
+    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.
@@ -19,15 +48,6 @@ module Stylish
   # 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"],
@@ -41,105 +61,134 @@ module Stylish
     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"]
     
+    PROPERTIES.each do |name, value|
+      attr_reader name
+    end
+    
     # 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.
+    #
+    #     coloured = Background.new :color => "545454"
+    #     coloured.to_s # => "background-color:#545454;"
+    #
     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.
+    # Set the background image.
     #
     #     background = Background.new :image => "sky.png", :compressed => true
     #     background.to_s # => "background:url('sky.png');"
     #
-    #     background.image = ["ball.png", "grass.png"]
+    def image=(path)
+      @image = Image.new(path)
+    end
+    
+    # As of CSS3, elements may have multiple background images.
+    #
+    #     background.images = ["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
+    def images=(paths)
+      @image = paths.inject(PropertyBundle.new) do |is, i|
+        is << Image.new(i)
       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.
+    # Set the background repeat.
+    #
+    #     nonrepeating = Background.new :repeat => "no-repeat"
+    #     nonrepeating.to_s # => "background-repeat:no-repeat;"
+    #
+    def repeat=(repeat)
+      @repeat = repeat if REPEAT_VALUES.include? repeat
+    end
+    
+    # As of CSS3, the background-repeat property may have multiple values.
     #
-    #     repeating = Background.new :repeat => ["repeat-x", "repeat-y"]
+    #     repeating = Background.new :repeats => ["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
+    def repeats=(repeats)
+      @repeat = repeats.inject(PropertyBundle.new) do |rs, r|
+        rs << r if REPEAT_VALUES.include? r
+        rs
       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]
+    # Positions have an x and a y value, and are handled by a specialised
+    # Position class. They should be passed an array of two values, e.g.
+    #
+    #     positioned = Background.new :position => ["100%", 0]
+    #     positioned.to_s # => "background-position:100% 0;"
+    #
+    # See the documentation for the Position class for further details on
+    # permitted position types.
+    def position=(position)
+      @position = Position.new(position[0], position[1])
+    end
+    
+    # As of CSS3, elements may have multiple background images, and
+    # consequently they will need to be separately positioned as well.
+    #
+    #     p = Background.new :positions => [["left", "top"], ["right", "top"]]
+    #     p.to_s # => "background-position:left top, right top;"
+    #
+    def positions=(positions)
+      @position = positions.inject(PropertyBundle.new) do |ps, p|
+        ps << Position.new(p[0], p[1])
       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
+    #
+    #     attached = Background.new :attachment => "fixed"
+    #     attached.to_s # => "background-attachment:fixed;"
+    #
+    def attachment=(attachment)
+      @attachment = attachment if ATTACHMENT_VALUES.include? attachment
+    end
+    
+    # As of CSS3 elements may have multiple background-attachment values.
+    #
+    #     atts = Background.new :attachments => ["fixed", "scroll"]
+    #     atts.to_s # => "background-attachment:fixed, scroll;"
+    #
+    def attachments=(attachments)
+      @attachment = attachments.inject(PropertyBundle.new) do |as, a|
+        as << a if ATTACHMENT_VALUES.include? a
+        as
       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;
+    #     original = Background.new :origin => "content-box"
+    #     original.to_s # => background-origin: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
+    def origin=(origin)
+      @origin = origin if ORIGIN_VALUES.include? origin
+    end
+    
+    # The background-origin property is a CSS3 property and can take multiple
+    # values.
+    #
+    #     origs = Background.new :origin => ["padding-box", "content-box"]
+    #     origs.to_s # => background-origin:padding-box, content-box;
+    #
+    def origins=(origins)
+      @origin = origins.inject(PropertyBundle.new) do |os, o|
+        os << o if ORIGIN_VALUES.include? o
+        os
       end
     end
     
@@ -164,11 +213,11 @@ module Stylish
     #     background-repeat:no-repeat; background-position:0 0;
     #
     def compressed=(val)
-      @compressed = val == true || nil
+      @compressed = val == true
     end
     
-    # Override Declaration#name, since it's not compatible with the
-    # internals of this class.
+    # 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)
@@ -176,8 +225,8 @@ module Stylish
       }.compact
     end
     
-    # Override Declaration#name=, since it's not compatible with the
-    # internals of this class.
+    # 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
@@ -199,8 +248,10 @@ module Stylish
         raise ArgumentError, "Argument must be a hash of background properties"
       end
       
-      PROPERTIES.each do |name, property|
+      PROPERTIES.each do |name, value|
+        plural = (name.to_s + "s").to_sym
         self.send(:"#{name.to_s}=", options[name]) if options[name]
+        self.send(:"#{name.to_s}s=", options[plural]) if options[plural]
       end
     end
     
@@ -218,7 +269,9 @@ module Stylish
       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(" ")
+        self.value(true).map {|p, v|
+          sprintf(self.class.format, p, v.to_s)
+        }.join(" ")
       end
     end
   end

data/lib/stylish/formattable.rb

@@ -1,9 +1,9 @@
 module Stylish
   
   # The Formattable mixin gives an API for changing the output format of any of
-  # Stylish's core objects, as long as the new output format matches the regex
-  # provided in the object's initialize method. This is because in order to
-  # serialise a valid CSS document, strings must be joined in the correct way.
+  # Stylish's core classes, as long as the new output format matches the regex
+  # provided when the class was declared. This is because in order to generate
+  # valid CSS, strings must be joined in the correct way.
   #
   # For example, a rule's selectors must be comma-separated and its
   # declarations must be wrapped in curly braces, while each declaration
@@ -11,56 +11,47 @@ module Stylish
   # terminating with a semicolon.
   #
   # In order to employ the Formattable mixin, it must be included into a class
-  # and the #accept_format method must be called in the class's #initialize
-  # method, setting the allowed format and the default format.
+  # and the accept_format method must be called with the allowed format (as a
+  # regular expression) and the default format (a string).
   #
   #   class Stylesheet
   #     include Formattable
-  #
-  #     def initialize
-  #       accept_format(/\s*/m, "\n")
-  #     end
+  #     accept_format(/\s*/m, "\n")
   #   end
   #
-  # If one then creates a new Stylesheet object, one can modify the way it's
-  # formatted when serialised to CSS code.
-  #
-  #   stylesheet = Stylesheet.new
-  #   stylesheet.format # => "\n"
-  #   stylesheet.format = "\n\n"
-  #   stylesheet.format # => "\n\n"
-  #
   module Formattable
-    attr_reader :format
     
-    # Attribute writer that sets the object's format attribute. The argument
-    # must match the regular expression passed to #accept_format in the
-    # object's initialize method.
-    def format=(format)
-      if format_validates?(format)
-        @format = format
-      else
-        raise ArgumentError, "Not an allowed format."
-      end
+    def self.included(base)
+      base.extend(FormattableMethods)
     end
     
-    private
-    
-    # Because this is a private method, it . Ruby's object system and
-    # metaprogramming facilities means that these restrictions are evaded
-    # without much difficulty; making this method private indicates intent
-    # rather than providing a serious barrier to inadvisable behaviour.
-    #
-    # Within Stylish, #accept_format is used only in the initialize method of
-    # the various core classes which may be serialised to CSS code.
-    def accept_format(pattern, default)
-      @format_pattern = pattern if pattern.is_a? Regexp
-      self.format = default
-    end
-    
-    # Checks whether a particular string matches the pattern acceptable formats
-    def format_validates?(format)
-      format =~ @format_pattern
+    module FormattableMethods
+      attr_reader :format
+      
+      def format=(format)
+        if format_validates?(format)
+          @format = format
+        else
+          raise ArgumentError, "Not an allowed format."
+        end
+      end
+      
+      def accept_format(pattern, default)
+        @format_pattern = pattern if pattern.is_a? Regexp
+        self.format = default
+      end
+      
+      def format_validates?(format_string)
+        format_string =~ @format_pattern
+      end
+      
+      def inherited(subclass)
+        ["format", "format_pattern"].each do |attribute|
+          instance_var = "@#{attribute}"
+          subclass.instance_variable_set(instance_var,
+            instance_variable_get(instance_var))
+        end
+      end
     end
   end
   

data/lib/stylish/generate.rb

@@ -55,13 +55,13 @@ module Stylish
         key        = key.to_s.sub("_", "-").to_sym
         
         if key == :background
-          if value.any? {|k,v| v.is_a? Symbol }
+          if includes_symbols? value
             declaration = Variable.new(value, Background)
           else
             declaration = Background.new(value)
           end
         elsif key == :color
-          if value.is_a? Symbol
+          if includes_symbols? value
             value = Variable.new(value, Color)
           else
             value = Color.new(value)
@@ -69,7 +69,7 @@ module Stylish
           
           declaration = Declaration.new("color", value)
         else
-          value = Variable.new(value) if value.is_a? Symbol
+          value = Variable.new(value) if includes_symbols? value
           declaration = Declaration.new(key, value)
         end
         
@@ -77,6 +77,18 @@ module Stylish
       end
     end
     
+    def self.includes_symbols?(value)
+      return true if value.is_a? Symbol
+      
+      if value.is_a? Array
+        return value.any? {|v| includes_symbols?(v) }
+      elsif value.is_a? Hash
+        return value.values.any? {|v| includes_symbols?(v) }
+      end
+      
+      false
+    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.
@@ -109,16 +121,36 @@ module Stylish
       # 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, scope = "")
-        if @constructor.nil?
-          symbols[@name]
-        elsif @name.is_a? Symbol
-          @constructor.new(symbols[@name]).to_s(symbols, scope)
+      def to_s(symbol_table, scope = "")
+        evald = eval(nil, symbol_table)
+        
+        unless @constructor.nil?
+          @constructor.new(evald).to_s(symbol_table, scope)
+        else
+          evald
+        end
+      end
+      
+      # Recursively replace symbols with values. This allows for symbol lookup
+      # within more complex nested structures of arrays and hashes, created by
+      # e.g. background declarations.
+      def eval(name_or_hash, symbol_table)
+        replaceable = name_or_hash || @name
+        
+        if replaceable.is_a? Symbol
+          symbol_table[replaceable]
+        elsif replaceable.is_a?(Hash) || replaceable.is_a?(Array)
+          replaceable.to_a.inject(replaceable.class.new) do |acc, el|
+            if acc.is_a? Hash
+              acc[el[0]] = eval(el[1], symbol_table)
+            else
+              acc << eval(el, symbol_table)
+            end
+            
+            acc
+          end
         else
-          @constructor.new(@name.to_a.inject({}) {|a, e|
-            a[e.first] = symbols[e.last]
-            a
-          }).to_s(symbols, scope)
+          replaceable
         end
       end
     end

data/lib/stylish/numeric.rb

@@ -0,0 +1,94 @@
+module Stylish
+  
+  class Percentage
+    PCTSTR = /-?(0\.)?\d+%/
+    
+    def initialize(value)
+      value = value[0..-2]
+      
+      if value =~ /^\d+$/
+        @number = value.to_i
+      else
+        @number = value.to_f
+      end
+    end
+    
+    def to_s(symbols = {}, scope = "")
+      @number.to_s + "%"
+    end
+    
+    def self.match?(value)
+      value =~ /^#{PCTSTR}$/
+    end
+  end
+  
+  class Length
+    UNITS = [
+      # Relative length units
+      "em", "ex", "px",
+      # Absolute length units
+      "in", "cm", "mm", "pt", "pc"]
+    
+    attr_reader :unit, :value
+    
+    def initialize(value)
+      self.unit  = value.match(/(#{UNITS * "|"})$/)[0]
+      self.value = value[0..-3]
+    end
+    
+    def value=(value)
+      if value.is_a? Numeric
+        @value = value
+      elsif value =~ /^\d+$/
+        @value = value.to_i
+      elsif value =~ /^\d+\.\d+$/
+        @value = value.to_f
+      end
+    end
+    
+    def unit=(unit)
+      @unit = unit if UNITS.include? unit
+    end
+    
+    def to_s(symbols = {}, scope = "")
+      self.value.to_s + self.unit
+    end
+  end
+  
+  class Position
+    HORIZONTAL = ["left", "center", "right"]
+    VERTICAL   = ["top", "center", "bottom"]
+    
+    attr_reader :x, :y
+    
+    def initialize(xpos, ypos)
+      self.x = xpos || "center"
+      self.y = ypos || "center"
+    end
+    
+    def x=(xpos)
+      if HORIZONTAL.include?(xpos) || xpos.to_i == 0
+        @x = xpos
+      elsif Percentage.match? xpos
+        @x = Percentage.new(xpos)
+      else
+        @x = Length.new(xpos)
+      end
+    end
+    
+    def y=(ypos)
+      if VERTICAL.include?(ypos) || ypos.to_i == 0
+        @y = ypos
+      elsif Percentage.match? ypos
+        @y = Percentage.new(ypos)
+      else
+        @y = Length.new(ypos)
+      end
+    end
+    
+    def to_s(symbols = {}, scope = "")
+      @x.to_s + " " + @y.to_s
+    end
+  end
+  
+end

data/lib/stylish/tree.rb

@@ -41,14 +41,13 @@ module Stylish
       include Formattable, Node
       
       attr_reader :nodes
+      accept_format(/\s*/m, "\n")
       
       def initialize(selector)
-        accept_format(/\s*/m, "\n")
-        
         @nodes = []
         @scope = selector
       end
-            
+      
       # Return the child node at the given index.
       def [](index)
         @nodes[index]
@@ -89,7 +88,7 @@ module Stylish
         
         @nodes.map {|node|
           node.to_s(symbols, @scope.to_s(symbols, scope))
-        }.join(@format)
+        }.join(self.class.format)
       end
       
       # Return the node's child nodes.

data/lib/stylish.rb

@@ -8,10 +8,8 @@ module 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 + 'numeric'
+  require STYLISH_PATH + 'extended'
   require STYLISH_PATH + 'color'
   require STYLISH_PATH + 'generate'
 end

data/test/background_test.rb

@@ -3,7 +3,7 @@ class BackgroundTest < Test::Unit::TestCase
   def setup
     @composite = Stylish::Background.new(:color => "#CCC",
       :image => "images/test.png", :repeat => "no-repeat",
-      :position => "left", :attachment => "scroll")
+      :position => ["left", "top"], :attachment => "scroll")
   end
   
   def test_valid_background_colors
@@ -22,7 +22,7 @@ class BackgroundTest < Test::Unit::TestCase
   end
   
   def test_multiple_background_images
-    bg = Stylish::Background.new :image =>
+    bg = Stylish::Background.new :images =>
            ["flower.png", "ball.png", "grass.png"]
     
     assert_equal(3, bg.image.length)
@@ -35,20 +35,27 @@ class BackgroundTest < Test::Unit::TestCase
   end
   
   def test_multiple_background_repeats
-    bg = Stylish::Background.new :repeat => ["repeat-x", "repeat-y"]
+    bg = Stylish::Background.new :repeats => ["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])
-    assert_equal("center", @composite.position[1])
+    assert_equal("left", @composite.position.x)
+    assert_equal("top", @composite.position.y)
   end
   
-  def test_valid_compression
+  def test_position_serialisation
+    positioned = Stylish::Background.new({:position => ["100%", 0]})
+    assert_equal("background-position:100% 0;", positioned.to_s)
+  end
+  
+  def test_compression
     assert(Stylish::Background.new(:compressed => true))
+    assert_equal(false, Stylish::Background.new(:compressed => "true").compressed)
+    assert_equal(false, Stylish::Background.new(:compressed => "false").compressed)
+    assert_nil(Stylish::Background.new(:compressed => nil).compressed)
   end
   
   def test_valid_background_attachments
@@ -58,7 +65,7 @@ class BackgroundTest < Test::Unit::TestCase
   end
   
   def test_multiple_attachments
-    glued = Stylish::Background.new :attachment => ["local", "fixed"]
+    glued = Stylish::Background.new :attachments => ["local", "fixed"]
     
     assert_equal(2, glued.attachment.length)
     assert_equal("background-attachment:local, fixed;", glued.to_s)
@@ -71,7 +78,7 @@ class BackgroundTest < Test::Unit::TestCase
   end
   
   def test_origins
-    original = Stylish::Background.new :origin => ["border-box", "padding-box"]
+    original = Stylish::Background.new :origins => ["border-box", "padding-box"]
     
     assert_equal(2, original.origin.length)
     assert_equal("background-origin:border-box, padding-box;", original.to_s)
@@ -83,31 +90,15 @@ class BackgroundTest < Test::Unit::TestCase
     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)
-  end
-  
   def test_invalid_background_repeats
     assert_nil(Stylish::Background.new(:repeat => 'maxim-gun').repeat)
   end
   
-  def test_invalid_background_positions
-    assert_nil(Stylish::Background.new(:position => "green ideas").position)
-    assert_nil(Stylish::Background.new(:position => "top").position)
-  end
-  
   def test_invalid_background_attachments
     assert_nil(Stylish::Background.new(:attachment => "static").attachment)
     assert_nil(Stylish::Background.new(:attachment => "unhooked").attachment)
   end
   
-  def test_invalid_compression
-    assert_nil(Stylish::Background.new(:compressed => "true").compressed)
-    assert_nil(Stylish::Background.new(:compressed => "false").compressed)
-    assert_nil(Stylish::Background.new(:compressed => nil).compressed)
-  end
-  
   def test_declaration_property
     assert_equal(["background-color", "background-repeat"],
       Stylish::Background.new(:color => "red", :repeat => "no-repeat").name)

data/test/formattable_test.rb

@@ -1,40 +1,21 @@
 class FormattableTest < Test::Unit::TestCase
   
-  def setup
-    @selectors = Stylish::Selectors.new
-    @declaration = Stylish::Declaration.new("background-color", "#000")
-    @background = Stylish::Background.new("color" => "red")
-  end
-  
   def test_reading_default_formats  
-    assert_equal(", ", @selectors.format)
-    assert_equal("%s:%s;", @declaration.format)
-    assert_equal("%s:%s;", @declaration.format)
+    assert_equal(", ", Stylish::Selectors.format)
+    assert_equal("%s:%s;", Stylish::Declaration.format)
+    assert_equal("%s:%s;", Stylish::Background.format)
   end
   
   def test_setting_allowed_formats
     assert_nothing_raised do
-      @selectors.format = ",\n"
+      Stylish::Selectors.format = ",\n"
+      Stylish::Selectors.format = ", "
     end
   end
   
   def test_setting_disallowed_formats
     assert_raise ArgumentError do
-      @selectors.format = "//"
-    end
-  end
-  
-  class ConfusedAboutFormatting
-    include Stylish::Formattable
-  
-    def initialize
-      accept_format(/^\s*$/, "///")
-    end
-  end
-  
-  def test_class_definition_with_disallowed_format
-    assert_raise ArgumentError do
-      ConfusedAboutFormatting.new
+      Stylish::Selectors.format = "//"
     end
   end
 end

data/test/generate_test.rb

@@ -77,4 +77,21 @@ class GenerateTest < Test::Unit::TestCase
     assert_equal("A glorious comment!", style.comments[0].header)
     assert_equal("An additional note.", style.comments[1].lines[0])
   end
+  
+  def test_complex_background
+    style = Stylish.generate do
+      div :background => {
+        :images => ["tl.png", "tr.png", "br.png", "bl.png"],
+        :positions => [
+          ["left", "top"],
+          ["right", "top"],
+          ["right", "bottom"],
+          ["left", :pos]]}
+    end
+    
+    assert_equal("div {background-image:url('tl.png'), url('tr.png'), " +
+     "url('br.png'), url('bl.png'); " +
+     "background-position:left top, right top, right bottom, left bottom;}",
+     style.to_s({:pos => "bottom"}))
+  end
 end

data/test/length_test.rb

@@ -0,0 +1,20 @@
+class LengthTest < Test::Unit::TestCase
+  
+  def test_different_units
+    assert_equal("px", Stylish::Length.new("10px").unit)
+  end
+  
+  def test_serialisation
+    length = Stylish::Length.new("5em")
+    assert_equal("5em", length.to_s)
+  end
+  
+  def test_accessors
+    length = Stylish::Length.new("30mm")
+    length.unit  = "px"
+    length.value = 50
+    
+    assert_equal("px", length.unit)
+    assert_equal(50, length.value)
+  end
+end

data/test/position_test.rb

@@ -0,0 +1,22 @@
+class PositionTest < Test::Unit::TestCase
+  
+  def setup
+    @pos = Stylish::Position.new(0, 0)
+  end
+  
+  def test_percentage_positions
+    percentage = Stylish::Position.new("5%", "10%")
+    assert_equal("5%", percentage.x.to_s)
+    assert_equal("10%", percentage.y.to_s)
+  end
+  
+  def test_keyword_positions
+    keyed = Stylish::Position.new("left", "top")
+    assert_equal("left", keyed.x)
+    assert_equal("top", keyed.y)
+  end
+  
+  def test_serialisation
+    assert_equal("0 0", @pos.to_s)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ionfish-stylish
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Benedict Eastaugh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-25 00:00:00 -07:00
+date: 2009-05-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -27,13 +27,12 @@ files:
 - Rakefile
 - VERSION.yml
 - lib/stylish.rb
-- lib/stylish/background.rb
 - lib/stylish/color.rb
 - lib/stylish/core.rb
+- lib/stylish/extended.rb
 - lib/stylish/formattable.rb
 - lib/stylish/generate.rb
-- lib/stylish/image.rb
-- lib/stylish/stylesheet.rb
+- lib/stylish/numeric.rb
 - lib/stylish/tree.rb
 - test/background_test.rb
 - test/color_test.rb
@@ -43,6 +42,8 @@ files:
 - test/formattable_test.rb
 - test/generate_test.rb
 - test/image_test.rb
+- test/length_test.rb
+- test/position_test.rb
 - test/rule_test.rb
 - test/selector_test.rb
 - test/selectors_test.rb
@@ -84,6 +85,8 @@ test_files:
 - test/formattable_test.rb
 - test/generate_test.rb
 - test/image_test.rb
+- test/length_test.rb
+- test/position_test.rb
 - test/rule_test.rb
 - test/selector_test.rb
 - test/selectors_test.rb

data/lib/stylish/image.rb

@@ -1,32 +0,0 @@
-module Stylish
-  
-  # Instances of the Image class are used to represent paths to images,
-  # generally background images.
-  class Image
-    include Formattable
-    
-    attr_accessor :path
-    
-    # Image instances are serialised to URI values. The path to the image file
-    # can be surrounded by either single quotes, double quotes or neither;
-    # single quotes are the default in Stylish.
-    def initialize(path)
-      accept_format(/^url\(\s*('|")?%s\1\s*\)$/, "url('%s')")
-      @path = path
-    end
-    
-    # Serialising Image objects to a string produces the URI values seen in
-    # background-image declarations, e.g.
-    #
-    #     image = Image.new("test.png")
-    #     image.to_s # => "url('test.png')"
-    #
-    #     background = Stylish::Background.new(:image => "test.png")
-    #     background.to_s # => "background-image:url('test.png');"
-    #
-    def to_s
-      sprintf(@format, path.to_s)
-    end
-  end
-  
-end

data/lib/stylish/stylesheet.rb

@@ -1,25 +0,0 @@
-module Stylish
-  
-  class Stylesheet < Tree::SelectorScope
-    
-    # Stylesheets are pure aggregate objects; they can contain child nodes,
-    # but have no data of their own. Their initializer therefore accepts no
-    # arguments.
-    def initialize
-      accept_format(/\s*/m, "\n")
-      @nodes = []
-    end
-    
-    # Stylesheets are the roots of selector trees.
-    def root?
-      true
-    end
-    
-    # Recursively serialise the tree to a stylesheet.
-    def to_s(symbols = {})
-      return "" if @nodes.empty?
-      @nodes.map {|node| node.to_s(symbols) }.join(@format)
-    end
-  end
-  
-end