csspool 2.0.0 → 3.0.0

data/test/visitors/test_each.rb

@@ -0,0 +1,19 @@
+require 'helper'
+
+module CSSPool
+  module Visitors
+    class TestEach < CSSPool::TestCase
+      def test_iterate
+        doc = CSSPool.CSS <<-eocss
+          @charset "UTF-8";
+          @import url("foo.css") screen;
+          div#a, a.foo, a:hover, a[href][int="10"]{ background: red; }
+        eocss
+        list = []
+        doc.each { |node| list << node }
+        assert_equal 20, list.length
+        assert list.hash
+      end
+    end
+  end
+end

data/test/visitors/test_to_css.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'helper'
 
 module CSSPool
@@ -11,10 +12,23 @@ module CSSPool
         doc = CSSPool.CSS(doc.to_css)
         assert_equal 3, doc.rule_sets.first.declarations[0].expressions.length
 
-        assert_equal 'font: 14.0px / 30.0px Tahoma;',
+        assert_equal 'font: 14px / 30px Tahoma;',
           doc.rule_sets.first.declarations.first.to_css.strip
       end
 
+      # FIXME: this is a bug in libcroco
+      #def test_ident_followed_by_id
+      #  doc = CSSPool.CSS 'p#div { font: foo, #666; }'
+      #  assert_equal 'p#div', doc.rule_sets.first.selectors.first.to_css
+
+      #  p doc.rule_sets.first.selectors
+
+      #  doc = CSSPool.CSS 'p #div { font: foo, #666; }'
+
+      #  p doc.rule_sets.first.selectors
+      #  assert_equal 'p #div', doc.rule_sets.first.selectors.first.to_css
+      #end
+
       def test_hash_operator
         doc = CSSPool.CSS 'p { font: foo, #666; }'
         assert_equal 2, doc.rule_sets.first.declarations[0].expressions.length
@@ -136,6 +150,116 @@ module CSSPool
 
         assert_equal 1, doc.charsets.length
       end
+
+      def test_selector_attribute
+        input_output = {
+          "\"quotes\"" => "[title=\"\\\"quotes\\\"\"]",
+        }
+        input_output.each_pair do |input, output|
+          node = Selectors::Attribute.new 'title', input, Selectors::Attribute::EQUALS
+          assert_equal output, node.to_css
+        end
+
+        input_output = {
+          " space" => "[\\ space=\"value\"]",
+          "equal=" => "[equal\\==\"value\"]",
+          "new\nline" => "[new\\00000aline=\"value\"]"
+        }
+        input_output.each_pair do |input, output|
+          Selectors::Attribute.new input, 'value', Selectors::Attribute::EQUALS
+        end
+      end
+
+      def test_selector_psuedo
+        input_output = {
+          "pseudo" => ":pseudo",
+          "\"quotes\"" => ":\\000022quotes\\000022",
+          "paren(" => ":paren\\(",
+        }
+        input_output.each_pair do |input, output|
+          node = Selectors::PseudoClass.new input
+          assert_equal output, node.to_css
+        end
+
+        input_output = {
+          "" => ":psuedo()",
+          "ident" => ":psuedo(ident)",
+          " " => ":psuedo(\\ )",
+          "\"quote\"" => ":psuedo(\\000022quoted\\000022)"
+        }
+        input_output.each_pair do |input, output|
+          Selectors::Attribute.new input, 'value', Selectors::Attribute::EQUALS
+        end
+      end
+
+      def test_selector_other
+        input_output = {
+          "pseudo" => "pseudo",
+          "\"quotes\"" => "\\000022quotes\\000022",
+          "space " => "space\\ ",
+          "new\nline" => "new\\00000aline"
+        }
+        input_output.each_pair do |input, output|
+          node = Selectors::Type.new input
+          assert_equal "#{output}", node.to_css
+        end
+        input_output.each_pair do |input, output|
+          node = Selectors::Id.new input
+          assert_equal "##{output}", node.to_css
+        end
+        input_output.each_pair do |input, output|
+          node = Selectors::Class.new input
+          assert_equal ".#{output}", node.to_css
+        end
+      end
+
+      def test_property
+        input_output = {
+          "property" => "  property: value;",
+          "colon:" => "  colon\\:: value;",
+          "space " => "  space\\ : value;"
+        }
+        input_output.each_pair do |input, output|
+          node = CSS::Declaration.new input, [Terms::Ident.new("value")], false, nil
+          assert_equal output, node.to_css
+        end
+      end
+
+      def test_function_term
+        input_output = {
+          "attr" => "attr(\"string\", ident)",
+          "0" => "\\000030(\"string\", ident)",
+          "a function" => "a\\ function(\"string\", ident)",
+          "a(" => "a\\((\"string\", ident)",
+        }
+        input_output.each_pair do |input, output|
+          node = Terms::Function.new input, [Terms::String.new("string"), Terms::Ident.new("ident", ',')]
+          assert_equal output, node.to_css
+        end
+      end
+
+      def test_uri_term
+        input_output = {
+          "http://example.com" => "url(\"http://example.com\")",
+        }
+        input_output.each_pair do |input, output|
+          node = Terms::URI.new input
+          assert_equal output, node.to_css
+        end
+      end
+
+      def test_string_term
+        input_output = {
+          "basic" => "\"basic\"",
+          "\"quotes\"" => "\"\\\"quotes\\\"\"",
+          "…" => "\"…\"",
+          "\n\r\f" => "\"\\a \\\r\\\f\""
+        }
+        input_output.each_pair do |input, output|
+          node = Terms::String.new input
+          assert_equal output, node.to_css
+        end
+      end
     end
   end
 end

metadata

@@ -1,51 +1,75 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: csspool
-version: !ruby/object:Gem::Version 
-  version: 2.0.0
+version: !ruby/object:Gem::Version
+  version: 3.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Aaron Patterson
 - John Barnette
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-07-07 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ffi
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: &70169574084020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70169574084020
+- !ruby/object:Gem::Dependency
+  name: rexical
+  requirement: &70169574081520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70169574081520
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70169574065400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: *70169574065400
+- !ruby/object:Gem::Dependency
   name: hoe
+  requirement: &70169574053500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.2
-    version: 
-description: |-
-  CSSPool is a CSS parser.  CSSPool provides a SAC interface for parsing CSS as
-  well as a document oriented interface for parsing CSS.
-email: 
+  prerelease: false
+  version_requirements: *70169574053500
+description: ! 'CSSPool is a CSS parser.  CSSPool provides a SAC interface for parsing
+  CSS as
+
+  well as a document oriented interface for parsing CSS.'
+email:
 - aaronp@rubyforge.org
-- jabarnette@rubyforge.org
+- jbarnette@rubyforge.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
-files: 
+- CHANGELOG.rdoc
+- README.rdoc
+files:
 - .autotest
 - CHANGELOG.rdoc
 - Manifest.txt
@@ -60,20 +84,11 @@ files:
 - lib/csspool/css/document_handler.rb
 - lib/csspool/css/import_rule.rb
 - lib/csspool/css/media.rb
+- lib/csspool/css/parser.rb
+- lib/csspool/css/parser.y
 - lib/csspool/css/rule_set.rb
-- lib/csspool/lib_croco.rb
-- lib/csspool/lib_croco/cr_additional_sel.rb
-- lib/csspool/lib_croco/cr_attr_sel.rb
-- lib/csspool/lib_croco/cr_doc_handler.rb
-- lib/csspool/lib_croco/cr_num.rb
-- lib/csspool/lib_croco/cr_parser.rb
-- lib/csspool/lib_croco/cr_parsing_location.rb
-- lib/csspool/lib_croco/cr_pseudo.rb
-- lib/csspool/lib_croco/cr_rgb.rb
-- lib/csspool/lib_croco/cr_selector.rb
-- lib/csspool/lib_croco/cr_simple_sel.rb
-- lib/csspool/lib_croco/cr_term.rb
-- lib/csspool/lib_croco/glist.rb
+- lib/csspool/css/tokenizer.rb
+- lib/csspool/css/tokenizer.rex
 - lib/csspool/node.rb
 - lib/csspool/sac.rb
 - lib/csspool/sac/document.rb
@@ -96,13 +111,16 @@ files:
 - lib/csspool/terms/rgb.rb
 - lib/csspool/terms/string.rb
 - lib/csspool/terms/uri.rb
-- lib/csspool/visitable.rb
 - lib/csspool/visitors.rb
+- lib/csspool/visitors/children.rb
 - lib/csspool/visitors/comparable.rb
+- lib/csspool/visitors/iterator.rb
 - lib/csspool/visitors/to_css.rb
 - lib/csspool/visitors/visitor.rb
 - test/css/test_document.rb
 - test/css/test_import_rule.rb
+- test/css/test_parser.rb
+- test/css/test_tokenizer.rb
 - test/helper.rb
 - test/sac/test_parser.rb
 - test/sac/test_properties.rb
@@ -110,45 +128,49 @@ files:
 - test/test_collection.rb
 - test/test_parser.rb
 - test/test_selector.rb
+- test/visitors/test_children.rb
 - test/visitors/test_comparable.rb
+- test/visitors/test_each.rb
 - test/visitors/test_to_css.rb
-has_rdoc: true
+- .gemtest
 homepage: http://csspool.rubyforge.org
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+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: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: csspool
-rubygems_version: 1.3.4
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: CSSPool is a CSS parser
-test_files: 
+test_files:
 - test/css/test_document.rb
 - test/css/test_import_rule.rb
+- test/css/test_parser.rb
+- test/css/test_tokenizer.rb
 - test/sac/test_parser.rb
 - test/sac/test_properties.rb
 - test/sac/test_terms.rb
 - test/test_collection.rb
 - test/test_parser.rb
 - test/test_selector.rb
+- test/visitors/test_children.rb
 - test/visitors/test_comparable.rb
+- test/visitors/test_each.rb
 - test/visitors/test_to_css.rb

data/lib/csspool/lib_croco/cr_additional_sel.rb

@@ -1,46 +0,0 @@
-module CSSPool
-  module LibCroco
-    class CRAdditionalSel < FFI::Struct
-      layout(
-        :sel_type,    :int,
-        :content,     :pointer,
-        :next,        :pointer,
-        :prev,        :pointer,
-        :line,        :int,
-        :column,      :int,
-        :byte_offset, :int
-      )
-
-      def to_additional_selector
-        case self[:sel_type]
-        when 1      # CLASS_ADD_SELECTOR
-          CSSPool::Selectors::Class.new(
-            LibCroco.cr_string_peek_raw_str(self[:content]).read_string
-          )
-        when 1 << 1 # PSEUDO_CLASS_ADD_SELECTOR
-          pseudo = CRPseudo.new(self[:content])
-          CSSPool::Selectors::PseudoClass.new(
-            pseudo[:name].null? ? nil :
-              LibCroco.cr_string_peek_raw_str(pseudo[:name]).read_string,
-            pseudo[:extra].null? ? nil :
-              LibCroco.cr_string_peek_raw_str(pseudo[:extra]).read_string
-          )
-        when 1 << 3 # ID_ADD_SELECTOR
-          CSSPool::Selectors::Id.new(
-            LibCroco.cr_string_peek_raw_str(self[:content]).read_string
-          )
-        when 1 << 4 # ATTRIBUTE_ADD_SELECTOR
-          attr_sel = CRAttrSel.new(self[:content])
-          raise "FIXME: additional add selectors" unless attr_sel[:next].null?
-          CSSPool::Selectors::Attribute.new(
-            attr_sel[:name].null? ? nil :
-              LibCroco.cr_string_peek_raw_str(attr_sel[:name]).read_string,
-            attr_sel[:value].null? ? nil :
-              LibCroco.cr_string_peek_raw_str(attr_sel[:value]).read_string,
-            attr_sel[:match_way]
-          )
-        end
-      end
-    end
-  end
-end

data/lib/csspool/lib_croco/cr_attr_sel.rb

@@ -1,16 +0,0 @@
-module CSSPool
-  module LibCroco
-    class CRAttrSel < FFI::Struct
-      layout(
-        :name,        :pointer,
-        :value,       :pointer,
-        :match_way,   :int,
-        :next,        :pointer,
-        :prev,        :pointer,
-        :line,        :int,
-        :column,      :int,
-        :byte_offset, :int
-      )
-    end
-  end
-end

data/lib/csspool/lib_croco/cr_doc_handler.rb

@@ -1,24 +0,0 @@
-module CSSPool
-  module LibCroco
-    class CRDocHandler < FFI::Struct
-      layout(
-        :priv,                  :pointer,
-        :app_data,              :pointer,
-        :start_document,        :start_document,
-        :end_document,          :end_document,
-        :charset,               :charset,
-        :import_style,          :import_style,
-        :import_style_result,   :import_style_result,
-        :namespace_declaration, :namespace_declaration,
-        :comment,               :comment,
-        :start_selector,        :start_selector,
-        :end_selector,          :end_selector,
-        :property,              :property,
-        :start_font_face,       :start_font_face,
-        :end_font_face,         :end_font_face,
-        :start_media,           :start_media,
-        :end_media,             :end_media
-      )
-    end
-  end
-end

data/lib/csspool/lib_croco/cr_num.rb

@@ -1,13 +0,0 @@
-module CSSPool
-  module LibCroco
-    class CRNum < FFI::Struct
-      layout(
-        :type,  :int,
-        :value, :double,
-        :line,        :int,
-        :column,      :int,
-        :byte_offset, :int
-      )
-    end
-  end
-end

data/lib/csspool/lib_croco/cr_parser.rb

@@ -1,11 +0,0 @@
-module CSSPool
-  module LibCroco
-    class CRParser < FFI::Struct
-      layout(:priv, :pointer)
-
-      #def self.release pointer
-      #  CSSPool::LibCroco.cr_parser_destroy pointer
-      #end
-    end
-  end
-end

data/lib/csspool/lib_croco/cr_parsing_location.rb

@@ -1,17 +0,0 @@
-module CSSPool
-  module LibCroco
-    class CRParsingLocation < FFI::Struct
-      layout(
-        :line,        :uint,
-        :column,      :uint,
-        :byte_offset, :uint
-      )
-
-      def to_h
-        Hash[*[:line, :column, :byte_offset].map { |k|
-          [k, self[k]]
-        }.flatten]
-      end
-    end
-  end
-end

data/lib/csspool/lib_croco/cr_pseudo.rb

@@ -1,14 +0,0 @@
-module CSSPool
-  module LibCroco
-    class CRPseudo < FFI::Struct
-      layout(
-        :pseudo_type, :int,
-        :name,        :pointer,
-        :extra,       :pointer,
-        :line,        :int,
-        :column,      :int,
-        :byte_offset, :int
-      )
-    end
-  end
-end

data/lib/csspool/lib_croco/cr_rgb.rb

@@ -1,18 +0,0 @@
-module CSSPool
-  module LibCroco
-    class CRRgb < FFI::Struct
-      layout(
-        :name,          :string,
-        :red,           :long,
-        :green,         :long,
-        :blue,          :long,
-        :is_percentage, :int,
-        :inherit,       :int,
-        :is_transparent,:int,
-        :line,          :int,
-        :column,        :int,
-        :byte_offset,   :int
-      )
-    end
-  end
-end

data/lib/csspool/lib_croco/cr_selector.rb

@@ -1,34 +0,0 @@
-module CSSPool
-  module LibCroco
-    class CRSelector < FFI::Struct
-      layout(
-        :simple_sel,    :pointer,
-        :next,          :pointer,
-        :prev,          :pointer,
-        :line,          :int,
-        :column,        :int,
-        :byte_offset,   :int,
-        :ref_count,     :long
-      )
-
-      def to_selector
-        simple_selectors = []
-        pointer = self[:simple_sel]
-
-        until pointer.null?
-          LibCroco.cr_simple_sel_compute_specificity(pointer)
-          simple_selectors << CRSimpleSel.new(pointer)
-          pointer = simple_selectors.last[:next]
-        end
-
-        simple_selectors = simple_selectors.map { |sel| sel.to_simple_selector }
-
-        Selector.new simple_selectors, {
-          :line         => self[:line],
-          :column       => self[:column],
-          :byte_offset  => self[:byte_offset]
-        }
-      end
-    end
-  end
-end

data/lib/csspool/lib_croco/cr_simple_sel.rb

@@ -1,54 +0,0 @@
-module CSSPool
-  module LibCroco
-    class CRSimpleSel < FFI::Struct
-      layout(
-        :type_mask,       :int,
-        :case_sensitive,  :int,
-        :name,            :pointer,
-        :combinator,      :int,
-        :add_sel,         :pointer,
-        :specificity,     :ulong,
-        :next,            :pointer,
-        :prev,            :pointer,
-        :line,            :int,
-        :column,          :int,
-        :byte_offset,     :int
-      )
-
-      def to_simple_selector
-        klass = CSSPool::Selectors::Simple
-
-        case self[:type_mask]
-        when 1      # UNIVERSAL_SELECTOR
-          klass = CSSPool::Selectors::Universal
-        when 1 << 1 # TYPE_SELECTOR
-          klass = CSSPool::Selectors::Type
-        end
-
-        simple_sel = klass.new(
-          self[:name].null? ? nil :
-            LibCroco.cr_string_peek_raw_str(self[:name]).read_string,
-          self[:combinator]
-        )
-        simple_sel.parse_location = {
-          :line         => self[:line],
-          :column       => self[:column],
-          :byte_offset  => self[:byte_offset]
-        }
-
-        additional_selectors = []
-        pointer = self[:add_sel]
-        until pointer.null?
-          additional_selectors << CRAdditionalSel.new(pointer)
-          pointer = additional_selectors.last[:next]
-        end
-
-        simple_sel.additional_selectors = additional_selectors.map { |as|
-          as.to_additional_selector
-        }
-
-        simple_sel
-      end
-    end
-  end
-end