deadweight 0.1.3 → 0.2.0

data/vendor/gems/{css_parser-1.0.0 → css_parser-1.1.5}/lib/css_parser/regexps.rb

@@ -16,7 +16,7 @@ module CssParser
   URI_RX = /url\(("([^"]*)"|'([^']*)'|([^)]*))\)/im
 
   # Initial parsing
-  RE_AT_IMPORT_RULE = /\@import[\s]+(url\()?["']+(.[^'"]*)["']\)?([\w\s\,]*);?/i
+  RE_AT_IMPORT_RULE = /\@import[\s]+(url\()?["''"]?(.[^'"\s"']*)["''"]?\)?([\w\s\,^\])]*)\)?;?/
   
   #--
   #RE_AT_MEDIA_RULE = Regexp.new('(\"(.[^\n\r\f\\"]*|\\\\' + RE_NL.to_s + '|' + RE_ESCAPE.to_s + ')*\")')

data/vendor/gems/{css_parser-1.0.0 → css_parser-1.1.5}/lib/css_parser/rule_set.rb

@@ -14,6 +14,7 @@ module CssParser
       @selectors = []
       @specificity = specificity
       @declarations = {}
+      @order = 0
       parse_selectors!(selectors) if selectors
       parse_declarations!(block)
     end
@@ -57,7 +58,9 @@ module CssParser
       is_important = !value.gsub!(CssParser::IMPORTANT_IN_PROPERTY_RX, '').nil?
       property = property.downcase.strip
       #puts "SAVING #{property}  #{value} #{is_important.inspect}"
-      @declarations[property] = {:value => value, :is_important => is_important}
+      @declarations[property] = {
+        :value => value, :is_important => is_important, :order => @order += 1
+      }
     end
     alias_method :[]=, :add_declaration!
 
@@ -81,9 +84,9 @@ module CssParser
 
     # Iterate through declarations.
     def each_declaration # :yields: property, value, is_important
-      @declarations.each do |property, data|
+      decs = @declarations.sort { |a,b| a[1][:order].nil? || b[1][:order].nil? ? 0 : a[1][:order] <=> b[1][:order] }
+      decs.each do |property, data|
         value = data[:value]
-        #value += ' !important' if data[:is_important]
         yield property.downcase.strip, value.strip, data[:is_important]
       end
     end
@@ -95,8 +98,10 @@ module CssParser
     def declarations_to_s(options = {})
      options = {:force_important => false}.merge(options)
      str = ''
-     importance = options[:force_important] ? ' !important' : ''
-     each_declaration { |prop, val| str += "#{prop}: #{val}#{importance}; " }
+     each_declaration do |prop, val, is_important|
+       importance = (options[:force_important] || is_important) ? ' !important' : ''
+       str += "#{prop}: #{val}#{importance}; "
+     end
      str.gsub(/^[\s]+|[\n\r\f\t]*|[\s]+$/mx, '').strip
     end
 
@@ -154,6 +159,7 @@ public
         
         value = @declarations[property][:value]
         is_important = @declarations[property][:is_important]
+        order = @declarations[property][:order]
         t, r, b, l = nil
 
         matches = value.scan(CssParser::BOX_MODEL_UNITS_RX)
@@ -175,10 +181,11 @@ public
             l = matches[3][0]
         end
 
-        @declarations["#{property}-top"] = {:value => t.to_s, :is_important => is_important}
-        @declarations["#{property}-right"] = {:value => r.to_s, :is_important => is_important}
-        @declarations["#{property}-bottom"] = {:value => b.to_s, :is_important => is_important}
-        @declarations["#{property}-left"] = {:value => l.to_s, :is_important => is_important}
+        values = { :is_important => is_important, :order => order }
+        @declarations["#{property}-top"]    = values.merge(:value => t.to_s)
+        @declarations["#{property}-right"]  = values.merge(:value => r.to_s)
+        @declarations["#{property}-bottom"] = values.merge(:value => b.to_s)
+        @declarations["#{property}-left"]   = values.merge(:value => l.to_s)
         @declarations.delete(property)
       end
     end
@@ -198,6 +205,7 @@ public
 
       value = @declarations['font'][:value]
       is_important = @declarations['font'][:is_important]
+      order = @declarations['font'][:order]
 
       in_fonts = false
 
@@ -232,7 +240,7 @@ public
         end
       end
 
-      font_props.each { |font_prop, font_val| @declarations[font_prop] = {:value => font_val, :is_important => is_important} }
+      font_props.each { |font_prop, font_val| @declarations[font_prop] = {:value => font_val, :is_important => is_important, :order => order} }
 
       @declarations.delete('font')
     end
@@ -247,6 +255,7 @@ public
 
       value = @declarations['background'][:value]
       is_important = @declarations['background'][:is_important]
+      order = @declarations['background'][:order]
 
       bg_props = {}
 
@@ -283,7 +292,7 @@ public
         end
       end
 
-      bg_props.each { |bg_prop, bg_val| @declarations[bg_prop] = {:value => bg_val, :is_important => is_important} }
+      bg_props.each { |bg_prop, bg_val| @declarations[bg_prop] = {:value => bg_val, :is_important => is_important, :order => order} }
 
       @declarations.delete('background')
     end
@@ -291,11 +300,13 @@ public
 
     # Looks for long format CSS background properties (e.g. <tt>background-color</tt>) and 
     # converts them into a shorthand CSS <tt>background</tt> property.
+    #
+    # Leaves properties declared !important alone.
     def create_background_shorthand! # :nodoc:
       new_value = ''
       ['background-color', 'background-image', 'background-repeat', 
        'background-position', 'background-attachment'].each do |property|
-        if @declarations.has_key?(property)
+        if @declarations.has_key?(property) and not @declarations[property][:is_important]
           new_value += @declarations[property][:value] + ' '
           @declarations.delete(property)
         end
@@ -380,4 +391,4 @@ public
 
     end
   end
-end
+end

data/vendor/gems/{css_parser-1.0.0 → css_parser-1.1.5}/test/test_css_parser_basic.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 # Test cases for reading and generating CSS shorthand properties
 class CssParserBasicTests < Test::Unit::TestCase
@@ -10,6 +10,7 @@ class CssParserBasicTests < Test::Unit::TestCase
       html, body, p { margin: 0px; }
       p { padding: 0px; }
       #content { font: 12px/normal sans-serif; }
+      .content { color: red; }
     EOT
   end
 
@@ -17,6 +18,8 @@ class CssParserBasicTests < Test::Unit::TestCase
     @cp.add_block!(@css)
     assert_equal 'margin: 0px;', @cp.find_by_selector('body').join(' ')
     assert_equal 'margin: 0px; padding: 0px;', @cp.find_by_selector('p').join(' ')
+    assert_equal 'font: 12px/normal sans-serif;', @cp.find_by_selector('#content').join(' ')
+    assert_equal 'color: red;', @cp.find_by_selector('.content').join(' ')
   end
 
   def test_adding_block

data/vendor/gems/css_parser-1.1.5/test/test_css_parser_loading.rb

@@ -0,0 +1,139 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+# Test cases for the CssParser's loading functions.
+class CssParserLoadingTests < Test::Unit::TestCase
+  include CssParser
+  include WEBrick
+
+  def setup
+    # from http://nullref.se/blog/2006/5/17/testing-with-webrick
+    @cp = Parser.new
+
+    @uri_base = 'http://localhost:12000'
+
+    @www_root = File.dirname(__FILE__) + '/fixtures/'
+
+    @server_thread = Thread.new do
+      s = WEBrick::HTTPServer.new(:Port => 12000, :DocumentRoot => @www_root, :Logger => Log.new(nil, BasicLog::FATAL), :AccessLog => [])
+      @port = s.config[:Port]
+      begin
+        s.start
+      ensure
+        s.shutdown
+      end
+    end
+
+    sleep 1 # ensure the server has time to load
+  end
+ 
+  def teardown
+    @server_thread.kill
+    @server_thread.join(5)
+    @server_thread = nil
+  end
+ 
+  def test_loading_a_local_file
+    file_name = File.dirname(__FILE__) + '/fixtures/simple.css'
+    @cp.load_file!(file_name)
+    assert_equal 'margin: 0px;', @cp.find_by_selector('p').join(' ')
+  end
+
+  def test_loading_a_local_file_with_scheme
+    file_name = 'file://' + File.expand_path(File.dirname(__FILE__)) + '/fixtures/simple.css'
+    @cp.load_uri!(file_name)
+    assert_equal 'margin: 0px;', @cp.find_by_selector('p').join(' ')
+  end
+
+  def test_loading_a_remote_file
+    @cp.load_uri!("#{@uri_base}/simple.css")
+    assert_equal 'margin: 0px;', @cp.find_by_selector('p').join(' ')
+  end
+
+  # http://github.com/alexdunae/css_parser/issues#issue/4
+  def test_loading_a_remote_file_over_ssl
+    # TODO: test SSL locally
+    @cp.load_uri!("https://www.expresspardons.com/inc/screen.css")
+    assert_match /margin\: 0\;/, @cp.find_by_selector('body').join(' ')
+  end
+
+
+  def test_following_at_import_rules_local
+    base_dir = File.dirname(__FILE__) + '/fixtures'
+    @cp.load_file!('import1.css', base_dir)
+
+    # from '/import1.css'
+    assert_equal 'color: lime;', @cp.find_by_selector('div').join(' ')
+
+    # from '/subdir/import2.css'
+    assert_equal 'text-decoration: none;', @cp.find_by_selector('a').join(' ')
+    
+    # from '/subdir/../simple.css'
+    assert_equal 'margin: 0px;', @cp.find_by_selector('p').join(' ')
+  end
+
+  def test_following_at_import_rules_remote
+    @cp.load_uri!("#{@uri_base}/import1.css")
+
+    # from '/import1.css'
+    assert_equal 'color: lime;', @cp.find_by_selector('div').join(' ')
+
+    # from '/subdir/import2.css'
+    assert_equal 'text-decoration: none;', @cp.find_by_selector('a').join(' ')
+    
+    # from '/subdir/../simple.css'
+    assert_equal 'margin: 0px;', @cp.find_by_selector('p').join(' ')
+  end
+
+  def test_following_at_import_rules_from_add_block
+    css_block = '@import "../simple.css";'
+ 
+    @cp.add_block!(css_block, :base_uri => "#{@uri_base}/subdir/")
+    
+    # from 'simple.css'
+    assert_equal 'margin: 0px;', @cp.find_by_selector('p').join(' ')
+  end
+
+  def test_importing_with_media_types
+    @cp.load_uri!("#{@uri_base}/import-with-media-types.css")
+    
+    # from simple.css with :screen media type
+    assert_equal 'margin: 0px;', @cp.find_by_selector('p', :screen).join(' ')
+    assert_equal '', @cp.find_by_selector('p', :tty).join(' ')
+  end
+
+  def test_throwing_circular_reference_exception
+    assert_raise CircularReferenceError do
+      @cp.load_uri!("#{@uri_base}/import-circular-reference.css")
+    end
+
+    cp_without_exceptions = Parser.new(:io_exceptions => false)
+
+    assert_nothing_raised CircularReferenceError do
+      cp_without_exceptions.load_uri!("#{@uri_base}/import-circular-reference.css")
+    end
+    
+  end
+
+  def test_toggling_circular_reference_exception
+    cp_without_exceptions = Parser.new(:io_exceptions => false)
+
+    assert_nothing_raised CircularReferenceError do
+      cp_without_exceptions.load_uri!("#{@uri_base}/import-circular-reference.css")
+    end
+  end
+
+  def test_toggling_not_found_exceptions
+    cp_with_exceptions = Parser.new(:io_exceptions => true)
+
+    assert_raise RemoteFileError do
+      cp_with_exceptions.load_uri!("#{@uri_base}/no-exist.xyz")
+    end
+
+    cp_without_exceptions = Parser.new(:io_exceptions => false)
+
+    assert_nothing_raised RemoteFileError do
+      cp_without_exceptions.load_uri!("#{@uri_base}/no-exist.xyz")
+    end
+  end
+
+end

data/vendor/gems/{css_parser-1.0.0 → css_parser-1.1.5}/test/test_css_parser_media_types.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 # Test cases for the handling of media types
 class CssParserMediaTypesTests < Test::Unit::TestCase
@@ -28,7 +28,7 @@ class CssParserMediaTypesTests < Test::Unit::TestCase
     assert_equal 'font-size: 13px; line-height: 1.2;', @cp.find_by_selector('body', :screen).join(' ')
   end
 
-  def atest_finding_by_multiple_media_types
+  def test_finding_by_multiple_media_types
     css = <<-EOT
       @media print {
         body { font-size: 10pt }
@@ -55,14 +55,49 @@ class CssParserMediaTypesTests < Test::Unit::TestCase
     assert_equal 'font-size: 10pt;', @cp.find_by_selector('body', :screen).join(' ')
     assert @cp.find_by_selector('body', :handheld).empty?
   end
+  
+  def test_adding_block_and_limiting_media_types1
+    css = <<-EOT
+      @import "import1.css", print
+    EOT
+    
+    base_dir = File.dirname(__FILE__)  + '/fixtures/'
+
+    @cp.add_block!(css, :only_media_types => :screen, :base_dir => base_dir)
+    assert @cp.find_by_selector('div').empty?
+
+  end
+  
+  def test_adding_block_and_limiting_media_types2
+    css = <<-EOT
+      @import "import1.css", print
+    EOT
+    
+    base_dir = File.dirname(__FILE__)  + '/fixtures/'
+
+    @cp.add_block!(css, :only_media_types => :print, :base_dir => base_dir)
+    assert_match 'color: lime', @cp.find_by_selector('div').join(' ')
+  end  
+
+  def test_adding_block_and_limiting_media_types
+    css = <<-EOT
+      @import "import1.css"
+    EOT
+    
+    base_dir = File.dirname(__FILE__)  + '/fixtures/'
+
+    @cp.add_block!(css, :only_media_types => :print, :base_dir => base_dir)
+    assert_match 'color: lime', @cp.find_by_selector('div').join(' ')
+  end  
+
 
-  def atest_adding_rule_set_with_media_type
+  def test_adding_rule_set_with_media_type
     @cp.add_rule!('body', 'color: black;', [:handheld,:tty])
     @cp.add_rule!('body', 'color: blue;', :screen)
     assert_equal 'color: black;', @cp.find_by_selector('body', :handheld).join(' ')
   end
 
-  def atest_selecting_with_all_meda_type
+  def test_selecting_with_all_meda_type
     @cp.add_rule!('body', 'color: black;', [:handheld,:tty])
     assert_equal 'color: black;', @cp.find_by_selector('body', :all).join(' ')
   end

data/vendor/gems/{css_parser-1.0.0 → css_parser-1.1.5}/test/test_css_parser_misc.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 # Test cases for the CssParser.
 class CssParserTests < Test::Unit::TestCase
@@ -83,7 +83,6 @@ class CssParserTests < Test::Unit::TestCase
   end
 
   def test_ignoring_malformed_declarations
-    flunk
     # dervived from http://www.w3.org/TR/CSS21/syndata.html#parsing-errors
     css = <<-EOT
       p { color:green }

data/vendor/gems/{css_parser-1.0.0 → css_parser-1.1.5}/test/test_css_parser_regexps.rb

@@ -1,5 +1,5 @@
 # coding: iso-8859-1
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 # Test cases for CSS regular expressions
 #

data/vendor/gems/css_parser-1.1.5/test/test_helper.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+require 'test/unit'
+require 'net/http'
+require 'open-uri'
+require 'WEBrick'
+require File.dirname(__FILE__) + '/../lib/css_parser'

data/vendor/gems/{css_parser-1.0.0 → css_parser-1.1.5}/test/test_merging.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class MergingTests < Test::Unit::TestCase
   include CssParser
@@ -85,4 +85,19 @@ class MergingTests < Test::Unit::TestCase
     merged = CssParser.merge(rs)
     assert_equal rs.object_id, merged.object_id
   end
+  
+  def test_merging_important
+    rs1 = RuleSet.new(nil, 'color: black !important;')
+    rs2 = RuleSet.new(nil, 'color: red;')
+    merged = CssParser.merge(rs1, rs2)
+    assert_equal 'black !important;', merged['color']    
+  end
+
+  def test_merging_shorthand_important
+    rs1 = RuleSet.new(nil, 'background: black none !important;')
+    rs2 = RuleSet.new(nil, 'background-color: red;')
+    merged = CssParser.merge(rs1, rs2)
+    assert_equal 'black !important;', merged['background-color']
+  end
+
 end

data/vendor/gems/{css_parser-1.0.0 → css_parser-1.1.5}/test/test_rule_set.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require "set"
 
 # Test cases for parsing CSS blocks
@@ -60,12 +60,27 @@ class RuleSetTests < Test::Unit::TestCase
     assert_equal(expected, actual)
   end
 
+  def test_each_declaration_respects_order
+    css_fragment = "margin: 0; padding: 20px; margin-bottom: 28px;"
+    rs           = RuleSet.new(nil, css_fragment)
+    expected     = %w(margin padding margin-bottom)
+    actual       = []
+    rs.each_declaration { |prop, val, imp| actual << prop }
+    assert_equal(expected, actual)
+  end
+
   def test_declarations_to_s
     declarations = 'color: #fff; font-weight: bold;'
     rs = RuleSet.new('#content p, a', declarations)
     assert_equal(declarations.split(' ').sort, rs.declarations_to_s.split(' ').sort)
   end
 
+  def test_important_declarations_to_s
+    declarations = 'color: #fff; font-weight: bold !important;'
+    rs = RuleSet.new('#content p, a', declarations)
+    assert_equal(declarations.split(' ').sort, rs.declarations_to_s.split(' ').sort)
+  end
+
   def test_overriding_specificity
     rs = RuleSet.new('#content p, a', 'color: white', 1000)
     rs.each_selector do |sel, decs, spec|