csspool 0.2.2 → 0.2.3

data/CHANGELOG.txt

@@ -1,3 +1,7 @@
+== 0.2.3
+
+* Fixed a bug where nil selectors on conditional selectors were being visited.
+
 == 0.2.2
 
 * I suck.

data/Rakefile

@@ -7,7 +7,7 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
 GENERATED_PARSER = "lib/css/sac/generated_parser.rb"
 GENERATED_PROPERTY_PARSER = "lib/css/sac/generated_property_parser.rb"
 
-Hoe.new('csspool', '0.2.2') do |p|
+Hoe.new('csspool', "0.2.3") do |p|
   p.rubyforge_name  = 'csspool'
   p.author          = 'Aaron Patterson'
   p.email           = 'aaronp@rubyforge.org'

data/lib/css/sac/parser.rb

@@ -14,7 +14,7 @@ module CSS
   module SAC
     class Parser < CSS::SAC::GeneratedParser
       # The version of CSSPool you're using
-      VERSION = '0.2.2'
+      VERSION = '0.2.3'
 
       TOKENIZER = Tokenizer.new
       

data/lib/css/sac/visitable.rb

@@ -69,7 +69,9 @@ module CSS
 
       def visit_ConditionalSelector(o)
         return false unless visit_SimpleSelector(o) # *sigh*
-        o.selector.accept(self) && o.condition.accept(self)
+        [o.selector, o.condition].compact.all? { |x|
+          x.accept(self)
+        }
       end
 
       def visit_AttributeCondition(o)

data/test/test_conditional_selector.rb

@@ -35,6 +35,9 @@ class ConditionalSelectorTest < SelectorTestCase
 
     assert sel =~ node
 
+    sel = ConditionalSelector.new(nil, attribute)
+    assert(sel =~ node)
+
     node.attributes = { 'class' => 'bar' }
     assert(!(sel =~ node))
   end

metadata

@@ -1,33 +1,36 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: csspool
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2007-12-04 00:00:00 -08:00
-summary: Parses CSS
-require_paths: 
-- lib
-email: aaronp@rubyforge.org
-homepage: http://csspool.rubyforge.org/
-rubyforge_project: csspool
-description: CSSpool (pronounced "cesspool") is a validating SAC parser for CSS.  The parser calls methods on a document handler depending on what it has found. CSSPool currently only supports CSS 2.1.  CSSPool will not yield invalid properties or selectors.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
-platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
+  version: 0.2.3
+platform: ""
 authors: 
 - Aaron Patterson
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2007-12-05 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.0
+    version: 
+description: CSSpool (pronounced "cesspool") is a validating SAC parser for CSS.  The parser calls methods on a document handler depending on what it has found. CSSPool currently only supports CSS 2.1.  CSSPool will not yield invalid properties or selectors.
+email: aaronp@rubyforge.org
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- CHANGELOG.txt
+- Manifest.txt
+- README.txt
 files: 
 - CHANGELOG.txt
 - Manifest.txt
@@ -107,28 +110,32 @@ files:
 - test/test_token.rb
 - test/test_tokenizer.rb
 - test/test_xpath.rb
-test_files: 
-- test/test_all.rb
+has_rdoc: true
+homepage: http://csspool.rubyforge.org/
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- CHANGELOG.txt
-- Manifest.txt
-- README.txt
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
-    version: 
+rubyforge_project: csspool
+rubygems_version: 0.9.5
+signing_key: 
+specification_version: 2
+summary: Parses CSS
+test_files: 
+- test/test_all.rb