csspress 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.4 2008-05-20
+
+* Major re-factoring. This has made the classes lighter. Testing has also been improved.
+
 == 0.0.3 2008-05-18
 
 * Fixed -h flag bug

data/Manifest.txt

@@ -11,6 +11,7 @@ lib/csspress.rb
 lib/csspress/declaration.rb
 lib/csspress/rule.rb
 lib/csspress/style_sheet.rb
+lib/csspress/style_sheet_parser.rb
 lib/csspress/template_builder.rb
 lib/csspress/version.rb
 lib/templates/default.csst
@@ -20,8 +21,13 @@ script/generate
 script/txt2html
 setup.rb
 spec/csspress_spec.rb
+spec/declaration_spec.rb
+spec/rule_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+spec/style_sheet_spec.rb
+spec/style_sheet_parser_spec.rb
+spec/template_builder_spec.rb
 tasks/custom.rake
 tasks/deployment.rake
 tasks/environment.rake

data/PostInstall.txt

@@ -1,5 +1,5 @@
 
-For more information on csspress, see http://csspress.rubyforge.org
+For more information on csspress, see http://www.csspress.net
 
 
 To get cracking straight away:

data/README.txt

@@ -1,13 +1,13 @@
-= csspress
+= CSSpress
 
 Project Page:
-- http://csspress.rubyforge.org
+- http://www.csspress.net
 RubyForge Page:
 - http://rubyforge.org/projects/csspress/
 
 == DESCRIPTION:
 
-Press out only the juice worth serving from you CSS files (and optimize it a little while your at it).
+Press out only the juice worth serving from your CSS files (and optimize it a little while your at it).
 
 When you are building a website, a well formatted and clearly commented CSS file can make it really easy
 for developers to see what is going on and build beautiful pages. All of this extra stuff however needs to be downloaded by a end user who is never going to read it, but has to wait for it.

data/bin/css

@@ -29,11 +29,9 @@
 # == Options
 # -h, --help          Displays help message
 # -s, --stats         Output compression information
-# -v, --version       Display the version, then exit
-#
-# == Author
-# David Madden
+# -v, --version       Display the version
 #
+
 require 'optparse'    # for parsing cmd line options
 require 'rdoc/usage'  # for outputing rdoc to terminal
 require 'ostruct'     # useful in cmd line option usage
@@ -139,32 +137,26 @@ class App #:nodoc: all
     # and output that file to pressed_filename.css
     # 
     def process_command
-      begin
-        file_in =  @arguments[0]
-        # Get the dir
-        path = File.dirname(file_in)
-        # Get the file name
-        name = File.basename(file_in)
-        
-        # Create name for tar file
-        file_out = "csspress-" << name.dup
-        
-        # Do the compression stuff
-        ss = StyleSheet.new
-        ss.load( file_in )
-        tb = TemplateBuilder.new( ss )
-        
-        # Change working dir to files dir
-        Dir.chdir(path)
-        
-        out = File.new( file_out, "w" )
-        out.write(tb.publish)
-        out.close
-      rescue Declaration::PropertyError => e
-        puts e
-      rescue IOError => e
-        puts e
-      end
+      file_in =  @arguments[0]
+      # Get the dir
+      path = File.dirname(file_in)
+      # Get the file name
+      name = File.basename(file_in)
+      
+      # Create name for tar file
+      file_out = path <<"/csspress-" << name
+      
+      # Do the compression stuff
+      ssp = StyleSheetParser.new( file_in )
+      ss = ssp.style_sheet
+      tb = TemplateBuilder.new( ss )
+      
+      # Change working dir to files dir
+      #Dir.chdir(path)
+      
+      out = File.new( file_out, "w" )
+      out.write(tb.publish)
+      out.close
       output_stats(file_in, file_out) if @options.stats
       #process_standard_input # [Optional]
     end

data/lib/csspress.rb

@@ -13,6 +13,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 require "csspress/declaration"
 require "csspress/rule"
 require "csspress/style_sheet"
+require "csspress/style_sheet_parser"
 require "csspress/template_builder"
 require "csspress/version"
 

data/lib/csspress/declaration.rb

@@ -11,24 +11,18 @@
 # It is composed of a property and a value. The property must be
 # valid.
 # 
-# Declaration takes a string and populates itself.
 # 
 # Example:
-#   d = declaration.new ( "border-color : blue" )
+#   d = declaration.new ( "border-color", "blue" )
 #   puts d.property #=> "border-color"
 #   puts d.value    #=> "blue"
 #
 class Declaration
   
-  # Declaration property
-  attr_reader :property
-  # Declaration value
-  attr_reader :value
+  attr_reader :property, :value
   
-  # internal error for invalid property types
-  # 
-  class PropertyError < StandardError
-    # do nothing - just creating a specific error
+  class PropertyError < StandardError #:nodoc:
+    # do nothing - just creating an error for internal use
   end
   
   # Properties for CSS1 to CSS3
@@ -64,81 +58,14 @@ class Declaration
     white-space white-space-collapse widows width word-break word-spacing word-wrap z-index
   )
   
-  ## Create a new Declaration from a string
-  # (The string should be valid CSS!)
-  #
-  def initialize(text)
-    dp = DeclarationParser.new(text)
-    @property = dp.property
-    @value = dp.value
+  def initialize(property, value)
+    raise PropertyError unless VALID_PROPERTIES.include?(property)
+    @property = property
+    @value = value
   end
   
-  # Print out the rule neatly
-  #
   def to_s
-   "#{@property}:#{@value}"
+    "#{@property}:#{@value}"
   end
   
-  private 
-  
-  # This class parses the text entered and makes the
-  # property and value available to the Declaration that
-  # initialised it.
-  #
-  class DeclarationParser #:nodoc:
-    attr_reader :property, :value
-    
-    def initialize(raw_data)
-      @raw_data = raw_data
-      @property = ""
-      @value = ""
-      parse
-    end
-    
-    private
-    
-    # Call methods to parse @raw_data and
-    # extract the property and name.
-    # 
-    # Raise an error if the property found
-    # is invalid.
-    # 
-    def parse
-      @property = get_property
-      raise PropertyError, "Invalid property type found: #{@property}" unless VALID_PROPERTIES.include? @property
-      @value = get_value
-    end
-    
-    # Get the property from @raw_data
-    #---
-    # The property is the part of @raw_data
-    # before the ':' character.
-    #+++
-    # 
-    def get_property
-      @raw_data.slice(0, @raw_data.index(":")).strip
-    end
-    
-    # Get the value from @raw_data
-    #---
-    # The value is the part of @raw_data
-    # after the ':' character.
-    #+++
-    # 
-    def get_value
-      @raw_data.slice(@raw_data.index(":")+1..@raw_data.size-1).strip
-    end
-  end
-end
-
-
-
-if __FILE__ == $0
-  begin
-    d = Declaration.new("backgrond-color: sdfds")
-    puts d.property
-    puts d.value
-  rescue PropertyError => e
-    puts e.message
-  end
 end

data/lib/csspress/rule.rb

@@ -12,112 +12,55 @@
 #   body { margin : 0; padding : 0 }
 # 
 # The components of a rule are:
-#   name { declarations }
+#   name { declaration block }
 # 
 # All declarations of Rule can be accessed using the
 # .each_declaration(){} method where each declaration
-# is passed to the block as a Declaration object.
+# is passed to the block.
 # 
 # Example:
-#   r = Rule.new ( "foo { margin: 0; padding: 0 }" )
+#   r = Rule.new ( "my rule" )
+#   r.add(Declaration.new("margin", "1px"))
 #   r.each_declaration do |dec|
 #     puts dec
 #   end
 #   puts r.name
-# 
+#
 class Rule
   
-  # name of the Rule
   attr_reader :name
-  # declarations contained within Rule
-  attr_reader :declarations
   
-  # Create a new Rule from a string
-  # (The string should be a valid CSS rule!)
+  # Create a new Rule with name
+  # 
+  def initialize(name)
+    @name = name
+    @declaration_block = []
+  end
+  
+  # add a Declaration to the rule's declaration block
   # 
-  def initialize( string )
-    rp = RuleParser.new( string )
-    @name = rp.name
-    @declarations = rp.declarations
+  def add(declaration)
+    raise ArgumentError unless declaration.instance_of?(Declaration)
+    @declaration_block << declaration
   end
   
-  # Yeild all declarations for self
+  # iterate through the declarations in the declaration block and pass
+  # each one to the block
   # 
   def each_declaration
-    @declarations.each do |declaration|
+    @declaration_block.each do |declaration|
       yield declaration
     end
   end
   
-  # Print out the rule neatly
+  # Return all declarations for the rule in an array
   # 
-  def to_s
-    "#{@name}{#{@declarations.join(";")}}"
+  def declaration_block
+    @declaration_block.dup
   end
   
-  private
-  
-  # This class parses the text entered and makes the
-  # name and declarations available to the Rule that
-  # initialised it.
-  # 
-  class RuleParser #:nodoc:
-    
-    attr_reader :name, :declarations
-    
-    # Create a new RuleParser and parse raw_data
-    # 
-    def initialize( raw_data )
-      @raw_data = raw_data
-      @name = ""
-      @declarations = []
-      parse
-    end
-    
-    private
-    
-    # Calls the methods needed to retrieve the
-    # information from @raw_data
-    # 
-    def parse
-      @name = get_rule_name
-      @declarations = get_declarations
-    end
-    
-    # Get the name of the rule from @raw_data
-    #---
-    # Simply a case of cutting the front off the
-    # @raw data string up to the first '{' and
-    # remove any white space
-    # +++
-    # 
-    def get_rule_name
-      @raw_data.slice(0, @raw_data.index("{")).strip
-    end
-    
-    # Get an array of declartaions for the Rule.
-    #---
-    # Get the part of @raw_data between '{'..'}'
-    # This is all of the declaration text.
-    # Declarations are delimeted by ';' so
-    # the string is split on the semi-colon and
-    # a new Declaration object is created for each
-    # one.
-    #+++
-    # 
-    def get_declarations
-      tmp = []
-      raw = @raw_data.slice(@raw_data.index("{")+1..@raw_data.index("}")-1).strip
-      raw.split(";").each do |line|
-        tmp << Declaration.new(line.strip)
-      end
-      tmp
-    end
+  def to_s
+    "#{@name}{#{@declaration_block.join(";")}}"
   end
-end
-
-if __FILE__ == $0
-  r = Rule.new("this is a test { background-color: sdfds; color:adlkasdj}")
-  puts r.name
-  puts r.declarations
+  
 end

data/lib/csspress/style_sheet.rb

@@ -1,6 +1,6 @@
 #!/usr/local/bin/ruby -w
 
-# style_sheet.rb
+# style_sheet_parser.rb
 #
 # Created by David Madden on 2008-05-14.
 # Copyright 2008 David Madden. All rights reserved.
@@ -12,232 +12,48 @@
 # contains can be accessed using the .each_rule(){} method which yields
 # each Rule to the block.
 # 
-# StyleSheet can also accept a CSS file as a paramiter to .new or using the
-# .load() method. This file is then converted into Rule objects and they are
-# added to StyleSheet. A compressed version of StyleSheet can be output using
-# a TemplateBuilder object and passing it StyleSheet as a parameter.
-# 
 # Example:
-#   ss = StyleSheet.new ( "foo.css" )
+#   ss = StyleSheet.new
+#   ss.add( Rule.new("A Rule") )
 #   tb = TemplateBuilder.new ( ss )
 #   puts tb.publish # output compressed version of ss
-# 
+#
 class StyleSheet
   
-  # rule objects
-  #---
-  # TODO: remove this and only allow access through each_rule.
-  # +++
-  attr_reader :rules
-  
-  # Creates a new StyleSheet object. Can also accept a file name
-  # and parse the contents to initalize the StyleSheet with the file's
-  # contents.
-  # 
-  def initialize(file=nil)
+  def initialize
+    # Store style rules in order
     @rules = []
-    load file unless file.nil?
-  end
-  
-  # Yeild each style rule in self
-  #
-  def each_rule
-    @rules.each do |rule|
-      yield rule
-    end
   end
   
-  # Output a compressed version of self
-  # 
-  #def compress
-  #  out = ""
-  #  self.each_style do |rule|
-  #    out << rule.compress
-  #  end
-  #  out
-  #end
-  
-  # Load a CSS file into self
-  # 
-  def load(file)
-    ssp = StyleSheetParser.new(file)
-    ssp.each { |rule| add(rule) }
-  end
-  
-  # Add a rule to self
-  # 
+  # Add rule to StyleSheet
+  # Raises ArgumentError rule is not a Rule
   def add(rule)
-    @rules << Rule.new(rule)
-    self
+    raise ArgumentError unless rule.instance_of?(Rule) 
+    @rules << rule
+    @self
   end
   
-  # Output self as String
-  # 
-  def to_s
-    out = ""
-    self.each_rule do |rule|
-      out << "#{rule}\n"
-    end
-    out
-  end
-  
-  # Number of Rules in Self
-  #
+  # The number of rules in self
   def size
     @rules.size
   end
   
-  # Alias of size
-  # 
-  def length
-    size
+  # Iterate through all rules in self and yield them
+  # to a block
+  def each_rule
+    @rules.each {|r| yield r }
   end
   
-  private
+  # Return an array of all rules in self
+  def rules
+    @rules.dup
+  end
   
-  # This class is responsible for processing a CSS file
-  # and allows iteration over the rules contained within
-  # the file to add to a StyleSheet object.
-  #--
-  # Due to the flexible nature of CSS syntax most of the
-  # work performed by the parser is envolved in normalizing
-  # the text into an array of style rules with the
-  # comments striped out.
-  # 
-  # This parser uses patern matching and string manupulation
-  # rather than analysing the file byte, by byte. This may or
-  # may not be proved to be a good thing.
-  # 
-  # At present all '@import' statements with in the CSS file are
-  # ignored!
-  # 
-  # A file is processed as follows:
-  # 1. The file is read into an array (@raw_data)
-  # 2. White space is removed from the beginnig and end of each field in the @raw_data
-  # 3. Comments are sepatated into there own array fields as they could be mixed into style code
-  # 4. All fields with comments and empty fields are removed from @raw_data
-  # 5. All style rules are put in their own array field
-  # 6. Each field has any white space removed
-  # Data clean!
-  # 
-  # Only the file in gerneral is parsed. Parsing of Rules and Declarations
-  # is handled by them internaly.
-  #++
-  # 
-  class StyleSheetParser #:nodoc:
-    attr_reader :lines
-    
-    # Creates new StyleSheetParser to parse the file 
-    # file_name
-    # 
-    def initialize( file_name )
-      @file = file_name
-      @raw_data = []
-      parse
-    end
-    
-    # Yield each rule in the parsed file
-    # 
-    def each
-      @raw_data.each do |rule|
-        yield rule
-      end
-    end
-    
-    private
-    
-    # Controls the processing of the data by calling
-    # a number of private functions.
-    # 
-    # The order of the method calls is important and
-    # the successful removal of comments depends
-    # upon it!
-    # 
-    def parse
-      get_lines
-      remove_white_space
-      separate_comments
-      delete_comments_and_blank_lines
-      separate_rules
-      remove_white_space
-    end
-    
-    # Read in all lines of @file to @raw_data.
-    # Will raise an error if there is any problem with
-    # accessing the file.
-    # 
-    def get_lines
-      begin
-        f = File.open( @file, 'r' )
-        @raw_data = f.readlines
-      rescue
-        raise IOError, "Could not process file: #{@file}"
-      ensure
-        f.close unless f.nil?
-      end
-    end
-    
-    # This removes white space from the beginning
-    # and end of every field in the @raw_data array,
-    # as well as removing runs of space characters.
-    # 
-    def remove_white_space
-      @raw_data.each do |line|
-        line.strip!           # remove white space from line beginnig and end
-        line.squeeze!( " " )  # remove runs of spaces 
-      end
-    end
-    
-    # Put a linebreak before and after every comment
-    # in @raw_data
-    # 
-    def separate_comments
-      tmp = @raw_data.join(" ")     # convert to string
-      tmp.gsub!( '/*', "\n/*" )     # add new line before comment
-      tmp.gsub!( '*/', "*/\n" )     # add new line after comment
-      @raw_data = tmp.split( "\n" ) # convert to array
-    end
-    
-    # Remove comments and blank lines from @raw_data.
-    # 
-    # This method currently also removes import stetments.
-    # TODO: move import handleing to separate method.
-    # 
-    def delete_comments_and_blank_lines
-      tmp = []
-      @raw_data.each do |line|
-        line.strip!               # remove any white space
-        next if line.length < 1   # ignore blank line
-        next if line =~ /\/\*/    # ignore comments
-        next if line =~ /import/  # ignore imports specially
-        tmp << line
-      end
-      @raw_data = tmp
+  def to_s
+    out = ""
+    @rules.each do |rule|
+      out << rule.to_s
     end
-    
-    # Add a new line character after every style rule
-    # in @raw_data
-    # 
-    def separate_rules
-      tmp = @raw_data.join( " " )   # convert to string
-      tmp.gsub!( '}', "}\n" )       # add a new line after every style rule
-      @raw_data = tmp.split( "\n" ) # convert to array
-    end 
-  end
-end
-
-
-if __FILE__ == $0
-  begin
-    ss = StyleSheet.new( "../test_data/style.css" )
-    #ss.load( "../test_data/style.css" )
-    tb = TemplateBuilder.new(ss)
-    puts tb.publish
-  rescue Declaration::PropertyError => e
-    puts e
-  rescue IOError => e
-    puts e
-  rescue Error => e
-    puts e
+    out
   end
 end

data/lib/csspress/style_sheet_parser.rb

@@ -0,0 +1,287 @@
+#!/usr/local/bin/ruby -w
+
+# style_sheet.rb
+#
+# Created by David Madden on 2008-05-14.
+# Copyright 2008 David Madden. All rights reserved.
+#
+# This is Free Software.  See LICENSE for details.
+
+# This class is responsible for processing a CSS file.
+# It creates a StyleSheet object from the content of the file.
+# The StyleSheet can be obtained using the style_sheet() method.
+# 
+# Example:
+#   ssp = StyleSheetParser("foo.css")
+#   stylesheet = ssp.style_sheet
+#   puts stylesheet
+# 
+#--
+# Due to the flexible nature of CSS syntax most of the
+# work performed by the parser is envolved in normalizing
+# the text into an array of style rules with the
+# comments striped out.
+# 
+# This parser uses patern matching and string manupulation
+# rather than analysing the file byte, by byte. This may or
+# may not be proved to be a good thing.
+# 
+# At present all '@import' statements with in the CSS file are
+# ignored!
+# 
+# A file is processed as follows:
+# 1. The file is read into an array (@raw_data)
+# 2. White space is removed from the beginnig and end of each field in the @raw_data
+# 3. Comments are sepatated into there own array fields as they could be mixed into style code
+# 4. All fields with comments and empty fields are removed from @raw_data
+# 5. All style rules are put in their own array field
+# 6. Each field has any white space removed
+# 7. A style sheet object is populated with the parsed rules
+# Data clean!
+# 
+# Only the file in gerneral is parsed. Parsing of Rules and Declarations
+# is handled by internaly by nested classes. StyleSheet parser breaks a 
+# file down into indevidule rules. It then uses a RuleParse object to parse
+# each of these rules. The rule parser then breaks up the rule into a name and
+# declaration block. It the uses a Declaration Parser on each declaration.
+#++
+# 
+class StyleSheetParser
+
+  # Creates new StyleSheetParser to parse the file 
+  # file
+  # 
+  def initialize( file )
+    @file = file
+    @raw_data = []
+    @style_sheet = nil
+    parse
+  end
+  
+  # Get parsed style sheet
+  #
+  def style_sheet
+    @style_sheet.dup
+  end
+
+  private
+  
+  # Yield each rule in the parsed file
+  # 
+  def each
+    @raw_data.each do |rule|
+      yield rule
+    end
+  end
+  
+  # Controls the processing of the data by calling
+  # a number of private functions.
+  # 
+  # The order of the method calls is important and
+  # the successful removal of comments depends
+  # upon it!
+  # 
+  def parse
+    get_lines
+    remove_white_space
+    separate_comments
+    delete_comments_and_blank_lines
+    separate_rules
+    remove_white_space
+    populate_style_sheet
+  end
+
+  # Read in all lines of @file to @raw_data.
+  # Will raise an error if there is any problem with
+  # accessing the file.
+  # 
+  def get_lines
+    begin
+      f = File.open( @file, 'r' )
+      @raw_data = f.readlines
+    rescue
+      raise IOError, "Could not process file: #{@file}"
+    ensure
+      f.close unless f.nil?
+    end
+  end
+
+  # This removes white space from the beginning
+  # and end of every field in the @raw_data array,
+  # as well as removing runs of space characters.
+  # 
+  def remove_white_space
+    @raw_data.each do |line|
+      line.strip!           # remove white space from line beginnig and end
+      line.squeeze!( " " )  # remove runs of spaces 
+    end
+  end
+
+  # Put a linebreak before and after every comment
+  # in @raw_data
+  # 
+  def separate_comments
+    tmp = @raw_data.join(" ")     # convert to string
+    tmp.gsub!( '/*', "\n/*" )     # add new line before comment
+    tmp.gsub!( '*/', "*/\n" )     # add new line after comment
+    @raw_data = tmp.split( "\n" ) # convert to array
+  end
+
+  # Remove comments and blank lines from @raw_data.
+  # 
+  # This method currently also removes import stetments.
+  # TODO: move import handleing to separate method.
+  # 
+  def delete_comments_and_blank_lines
+    tmp = []
+    @raw_data.each do |line|
+      line.strip!               # remove any white space
+      next if line.length < 1   # ignore blank line
+      next if line =~ /\/\*/    # ignore comments
+      next if line =~ /import/  # ignore imports specially
+      tmp << line
+    end
+    @raw_data = tmp
+  end
+
+  # Add a new line character after every style rule
+  # in @raw_data
+  # 
+  def separate_rules
+    tmp = @raw_data.join( " " )   # convert to string
+    tmp.gsub!( '}', "}\n" )       # add a new line after every style rule
+    @raw_data = tmp.split( "\n" ) # convert to array
+  end
+  
+  def populate_style_sheet
+    tmp = StyleSheet.new
+    each do |rule|
+      begin
+        rp = RuleParser.new(rule)
+        tmp.add(rp.rule)
+      rescue PropertyError
+        puts "An invalid property was detected: #{rule}"
+      end
+    end
+    @style_sheet = tmp
+  end
+  
+  
+  # This class parses the text entered and makes the
+  # name and declarations available to the Rule that
+  # initialised it.
+  # 
+  class RuleParser #:nodoc:
+    attr_reader :rule
+
+    # Create a new RuleParser and parse raw_data
+    # 
+    def initialize( raw_data )
+      @rule = nil
+      @raw_data = raw_data
+      @name = ""
+      @declarations = []
+      parse
+    end
+
+    private
+
+    # Calls the methods needed to retrieve the
+    # information from @raw_data
+    # 
+    def parse
+      @name = get_rule_name
+      @declarations = get_declarations
+      @rule = Rule.new(@name)
+      @declarations.each {|dec| @rule.add(dec)}
+    end
+
+    # Get the name of the rule from @raw_data
+    #---
+    # Simply a case of cutting the front off the
+    # @raw data string up to the first '{' and
+    # remove any white space
+    # +++
+    # 
+    def get_rule_name
+      @raw_data.slice(0, @raw_data.index("{")).strip
+    end
+
+    # Get an array of declartaions for the Rule.
+    #---
+    # Get the part of @raw_data between '{'..'}'
+    # This is all of the declaration text.
+    # Declarations are delimeted by ';' so
+    # the string is split on the semi-colon and
+    # a new Declaration object is created for each
+    # one.
+    #+++
+    # 
+    def get_declarations
+      tmp = []
+      raw = @raw_data.slice(@raw_data.index("{")+1..@raw_data.index("}")-1).strip
+      raw.split(";").each do |line|
+        dp = DeclarationParser.new(line.strip)
+        tmp << dp.declaration
+      end
+      tmp
+    end
+  end
+  
+  # This class parses the text entered and makes the
+  # property and value available to the Declaration that
+  # initialised it.
+  #
+  class DeclarationParser #:nodoc:
+    attr_reader :declaration
+
+    def initialize(raw_data)
+      @declaration = nil
+      @raw_data = raw_data
+      @property = ""
+      @value = ""
+      parse
+    end
+
+    private
+
+    # Call methods to parse @raw_data and
+    # extract the property and name.
+    # 
+    # Raise an error if the property found
+    # is invalid.
+    # 
+    def parse
+      @property = get_property
+      @value = get_value
+      @declaration = Declaration.new(@property, @value)
+    end
+
+    # Get the property from @raw_data
+    #---
+    # The property is the part of @raw_data
+    # before the ':' character.
+    #+++
+    # 
+    def get_property
+      @raw_data.slice(0, @raw_data.index(":")).strip
+    end
+
+    # Get the value from @raw_data
+    #---
+    # The value is the part of @raw_data
+    # after the ':' character.
+    #+++
+    # 
+    def get_value
+      @raw_data.slice(@raw_data.index(":")+1..@raw_data.size-1).strip
+    end
+  end
+end
+
+
+
+if __FILE__ == $0
+  ssp = StyleSheetParser.new("../../test/style.css")
+  puts ssp.style_sheet
+end

data/lib/csspress/template_builder.rb

@@ -29,15 +29,16 @@ require 'erb'
 class TemplateBuilder
   
   # Style sheet to publish
-  attr_reader :style_sheet
+  attr_reader :style_sheet, :template
   TEMPLATE_DIR = "/../templates/"
-  DEFAULT = "default.csst"
+  DEFAULT = "/../templates/default.csst"
   # Create a new TemplateBuilder for style_sheet using
   # template.
   # 
   def initialize( style_sheet, template=DEFAULT )
+    raise ArgumentError unless style_sheet.instance_of?(StyleSheet)
     @style_sheet = style_sheet
-    @template = File.dirname(__FILE__) + TEMPLATE_DIR + template
+    @template =  template
   end
   
   
@@ -47,7 +48,7 @@ class TemplateBuilder
   # 
   def publish
     begin
-      template = File.read(@template)
+      template = File.read(File.dirname(__FILE__) + @template)
       engin = ERB.new(template)
       t = engin.result(binding())
       # Chomp the trailing newline
@@ -56,18 +57,4 @@ class TemplateBuilder
       raise IOError, "Could not use requested template file: #{@template}"
     end
   end
-end
-
-
-if __FILE__ == $0
-  
-  require "style_sheet"
-  
-  ss = StyleSheet.new
-  ss.load( "../test_data/style.css" )
-  tb = TemplateBuilder.new(ss, "../templates/style_sheet.cssplate")
-#  out = File.new("../test_data/compressed_style.css", "w")
-#  out.write(tb.publish)
-#  out.close
-  puts tb.publish
 end

data/lib/csspress/version.rb

@@ -13,7 +13,7 @@ module Csspress #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/csspress_spec.rb

@@ -1,5 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe "Requres" do
-  
+describe Csspress do
+  it "should have a version" do
+    Csspress::VERSION::STRING.should_not be_nil
+  end
 end

data/spec/declaration_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe Declaration do
+  
+  before(:each) do
+    @dec = Declaration.new("margin", "0")
+  end
+  
+  # is everything connected?
+  it "should exist" do
+    @dec.should_not be_nil
+    @dec.should be_an_instance_of(Declaration)
+  end
+
+  it "should have a property and be readable" do
+    @dec.property.should_not be_nil
+    @dec.property.should == "margin"
+  end
+  
+  it "should have a value and be readable" do
+    @dec.value.should_not be_nil
+    @dec.value.should == "0"
+  end
+  
+  it "should raise a property error if property is not valid" do
+    lambda { dec = Declaration.new("foo", "10") }.should raise_error(Declaration::PropertyError)
+  end  
+end
+

data/spec/rule_spec.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+ 
+describe Rule do
+  
+  before(:each) do
+    @rule = Rule.new("Test Rule")
+    @decs = [Declaration.new("border", "1px"),Declaration.new("margin", "1px"),Declaration.new("width","2px")]
+  end
+  
+  # is everything connected?
+  it "should exist" do
+    @rule.should_not be_nil
+    @rule.should be_an_instance_of(Rule)
+  end
+
+  it "should have a name" do
+    @rule.name.should_not be_nil
+    @rule.name.should == "Test Rule"
+  end
+  
+  it "should allow declarations to be added" do
+    @rule.add(Declaration.new("height","2px"))
+  end
+  
+  it "should only allow declarations to be added" do
+    lambda { @rule.add("foo") }.should raise_error(ArgumentError)
+  end
+  
+  it "should allow iteration of the declarations" do
+    @decs.each {|dec| @rule.add(dec)}
+    output = []
+    @rule.each_declaration {|dec| output << dec}
+    @decs.should == output
+  end
+  
+  it "should preserve the order of declarations" do
+     @decs.each {|dec| @rule.add(dec) }
+     out = @rule.declaration_block
+     @decs.each_with_index do |dec, index| 
+       dec.should == out[index]
+     end
+   end
+  
+  it "should retun declaration block as an array of declarations" do
+    @decs.each {|dec| @rule.add(dec) }
+    @decs.should eql(@rule.declaration_block)
+  end
+  
+end
+

data/spec/style_sheet_parser_spec.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe StyleSheetParser do
+
+  it "should accept a file" do
+    ssp = StyleSheetParser.new("test/style.css")
+  end
+  
+  it "should produce a style sheet" do
+    ssp = StyleSheetParser.new("test/style.css")
+    ss = ssp.style_sheet
+    ss.should be_instance_of(StyleSheet)
+  end
+end

data/spec/style_sheet_spec.rb

@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe StyleSheet do
+  
+  before(:each) do
+    @style_sheet = StyleSheet.new
+    @rules = [Rule.new("Test1"), Rule.new("Test2"), Rule.new("Test3")]
+    @rule = Rule.new("test")
+  end
+  
+  # is everything connected?
+  it "should exist" do
+    @style_sheet.should_not be_nil
+    @style_sheet.should be_an_instance_of(StyleSheet)
+  end
+  
+  it "should be empty when created" do
+    @style_sheet.size.should == 0
+  end
+
+  it "should know how many rules it contains" do
+    total = 5
+    1.upto(total) do |i|
+      @style_sheet.add(@rule)
+    end
+    @style_sheet.size.should == total
+  end
+  
+  it "should accept rule objects" do
+    @style_sheet.add(@rule)
+  end
+  
+  it "should only allow rules to be added" do
+    lambda { @style_sheet.add("foo") }.should raise_error(ArgumentError)
+  end
+  
+  it "should yield all rules to a block" do
+    @rules.each {|rule| @style_sheet.add(rule) }
+    output = []
+    @style_sheet.each_rule {|rule| output << rule }
+    output.should == @rules
+  end
+  
+  it "should return all rules as an array" do
+    @rules.each {|rule| @style_sheet.add(rule) }
+    @rules.should eql(@style_sheet.rules)
+  end
+  
+  it "should preserve the order rules are added in" do 
+    @rules.each {|rule| @style_sheet.add(rule) }
+    out = @style_sheet.rules
+    @rules.each_with_index do |rule, index| 
+      rule.should ==  out[index]
+    end
+  end
+end
+

data/spec/template_builder_spec.rb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe TemplateBuilder do
+  
+  before(:each) do
+    @ss = StyleSheet.new
+    r = Rule.new("foo")
+    r.add(Declaration.new("margin", "0px"))
+    @ss.add(r)
+  end
+  it "should accept a StyleSheet" do
+    TemplateBuilder.new(StyleSheet.new)
+  end
+  it "should raise an argument error if it is not a stylesheet" do
+    lambda { TemplateBuilder.new("foo") }.should raise_error(ArgumentError)
+  end
+  it "should generate a string" do
+    tb = TemplateBuilder.new(@ss)
+    str = tb.publish
+    str.should be_an_instance_of(String)
+  end
+  
+  it "should have a default template" do
+    TemplateBuilder::DEFAULT.should_not be_nil
+    TemplateBuilder::DEFAULT.should be_an_instance_of(String)
+  end
+  
+  it "should accept a custom template to build" do
+    tb = TemplateBuilder.new(@ss, "A/test/file")
+    tb.template.should == "A/test/file"
+  end
+  
+  it "should raise a IOError if the template file it not valid" do
+    lambda { tb = TemplateBuilder.new(@ss, "A/test/file"); tb.publish }.should raise_error(IOError)
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: csspress
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - David Madden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-18 00:00:00 +01:00
+date: 2008-05-20 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -41,6 +41,7 @@ files:
 - lib/csspress/declaration.rb
 - lib/csspress/rule.rb
 - lib/csspress/style_sheet.rb
+- lib/csspress/style_sheet_parser.rb
 - lib/csspress/template_builder.rb
 - lib/csspress/version.rb
 - lib/templates/default.csst
@@ -50,8 +51,13 @@ files:
 - script/txt2html
 - setup.rb
 - spec/csspress_spec.rb
+- spec/declaration_spec.rb
+- spec/rule_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/style_sheet_spec.rb
+- spec/style_sheet_parser_spec.rb
+- spec/template_builder_spec.rb
 - tasks/custom.rake
 - tasks/deployment.rake
 - tasks/environment.rake
@@ -65,7 +71,7 @@ has_rdoc: true
 homepage: http://csspress.rubyforge.org
 post_install_message: |+
   
-  For more information on csspress, see http://csspress.rubyforge.org
+  For more information on csspress, see http://www.csspress.net
   
   
   To get cracking straight away: