csspool 4.0.3 → 4.0.4

data/lib/csspool/css/parser.y

@@ -20,6 +20,7 @@ token VARIABLE_NAME
 token CALC_SYM
 token FONTFACE_SYM
 token UNICODE_RANGE
+token RATIO
 
 rule
   document
@@ -552,6 +553,7 @@ rule
     ;
   term
     : ident
+    | ratio
     | numeric
     | string
     | uri
@@ -650,6 +652,11 @@ rule
         result = Terms::Number.new numeric(val.first), nil, unit
       }
     ;
+  ratio
+    : RATIO {
+        result = Terms::Ratio.new(val[0], val[1])
+      }
+    ;
   unary_operator
     : MINUS { result = :minus }
     | PLUS  { result = :plus }

data/lib/csspool/css/tokenizer.rb

@@ -208,6 +208,9 @@ class Tokenizer < Parser
       when (text = @ss.scan(/[\s]*([0-9]*\.[0-9]+|[0-9]+)%[\s]*/i))
          action { [:PERCENTAGE, st(text)] }
 
+      when (text = @ss.scan(/[\s]*[1-9][0-9]*[\s]*\/[\s]*[1-9][0-9]*[\s]*/i))
+         action { [:RATIO, st(text)] }
+
       when (text = @ss.scan(/[\s]*([0-9]*\.[0-9]+|[0-9]+)[\s]*/i))
          action { [:NUMBER, st(text)] }
 
@@ -278,6 +281,9 @@ class Tokenizer < Parser
       when (text = @ss.scan(/[\s]*([0-9]*\.[0-9]+|[0-9]+)%[\s]*/i))
          action { [:PERCENTAGE, st(text)] }
 
+      when (text = @ss.scan(/[\s]*[1-9][0-9]*[\s]*\/[\s]*[1-9][0-9]*[\s]*/i))
+         action { [:RATIO, st(text)] }
+
       when (text = @ss.scan(/[\s]*([0-9]*\.[0-9]+|[0-9]+)[\s]*/i))
          action { [:NUMBER, st(text)] }
 

data/lib/csspool/css/tokenizer.rex

@@ -7,8 +7,11 @@ macro
   w         [\s]*
   nonascii  [^\0-\177]
   num       ([0-9]*\.[0-9]+|[0-9]+)
+  positiveint [1-9][0-9]*
   length    {num}(px|cm|mm|in|pt|pc|mozmm|em|ex|ch|rem|vh|vw|vmin|vmax)
   percentage {num}%
+  # http://dev.w3.org/csswg/mediaqueries-3/#values
+  ratio     {positiveint}{w}\/{w}{positiveint}
   unicode   \\[0-9A-Fa-f]{1,6}(\r\n|[\s])?
   nth       ([\+\-]?[0-9]*n({w}[\+\-]{w}[0-9]+)?|[\+\-]?[0-9]+|odd|even)
   vendorprefix \-[A-Za-z]+\-
@@ -44,6 +47,7 @@ rule
 :LOGICQUERY {w}{num}(ms|s){w} { [:TIME, st(text)] }
 :LOGICQUERY {w}{num}[k]?hz{w} { [:FREQ, st(text)] }
 :LOGICQUERY {w}{percentage}{w} { [:PERCENTAGE, st(text)] }
+:LOGICQUERY {w}{ratio}{w}    { [:RATIO, st(text)] }
 :LOGICQUERY {w}{num}{w}      { [:NUMBER, st(text)] }
 :LOGICQUERY {ident}          { [:IDENT, st(text)] }
 :LOGICQUERY {w},{w}          { [:COMMA, st(',')] }
@@ -120,6 +124,7 @@ rule
             {w}{num}[k]?hz{w} { [:FREQ, st(text)] }
 
             {w}{percentage}{w} { [:PERCENTAGE, st(text)] }
+            {w}{ratio}{w}    { [:RATIO, st(text)] }
             {w}{num}{w}      { [:NUMBER, st(text)] }
             {w}\/\/{w}       { [:DOUBLESLASH, st(text)] }
             {w}\/{w}         { [:SLASH, st('/')] }

data/lib/csspool/terms.rb

@@ -6,4 +6,5 @@ require 'csspool/terms/uri'
 require 'csspool/terms/rgb'
 require 'csspool/terms/hash'
 require 'csspool/terms/math'
+require 'csspool/terms/ratio'
 require 'csspool/terms/resolution'

data/test/css/test_media_rule.rb

@@ -87,6 +87,20 @@ module CSSPool
         eocss
       end
 
+      def test_ratio
+        CSSPool.CSS <<-eocss
+          @media all and (min-aspect-ratio: 4/3) {
+          }
+        eocss
+      end
+
+      def test_ratio_with_spaces
+        CSSPool.CSS <<-eocss
+          @media all and (min-aspect-ratio: 4 / 3) {
+          }
+        eocss
+      end
+
     end
   end
 end

data/test/helper.rb

@@ -1,8 +1,8 @@
-require "test/unit"
+require "minitest/unit"
 require "csspool"
 
 module CSSPool
-  class TestCase < Test::Unit::TestCase
+  class TestCase < Minitest::Test
     unless RUBY_VERSION >= '1.9'
       undef :default_test
     end

data/test/visitors/test_comparable.rb

@@ -26,7 +26,7 @@ module CSSPool
 
       def test_not_equal
         doc1 = CSSPool.CSS 'div { border: foo(1, 2); }'
-        assert_not_equal nil, doc1
+        assert nil != doc1
       end
 
       def test_hash_range

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: csspool
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Aaron Patterson
 - John Barnette
+- Jason Barnabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -17,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
@@ -95,32 +96,45 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-description: |-
-  CSSPool is a CSS parser.  CSSPool provides a SAC interface for parsing CSS as
-  well as a document oriented interface for parsing CSS.
+        version: '3.13'
+description: ''
 email:
 - aaronp@rubyforge.org
 - jbarnette@rubyforge.org
+- jason.barnabe@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.rdoc
 - Manifest.txt
-- README.rdoc
+- README.md
 files:
 - ".autotest"
 - ".gemtest"
@@ -128,7 +142,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - Manifest.txt
-- README.rdoc
+- README.md
 - Rakefile
 - lib/csspool.rb
 - lib/csspool/collection.rb
@@ -192,11 +206,9 @@ files:
 - test/css/test_keyframes_rule.rb
 - test/css/test_media_rule.rb
 - test/css/test_namespace_rule.rb
-- test/css/test_node_position.rb
 - test/css/test_parser.rb
 - test/css/test_supports_rule.rb
 - test/css/test_tokenizer.rb
-- test/css/test_variables.rb
 - test/files/test.css
 - test/helper.rb
 - test/sac/test_parser.rb
@@ -211,14 +223,14 @@ files:
 - test/visitors/test_comparable.rb
 - test/visitors/test_each.rb
 - test/visitors/test_to_css.rb
-homepage: http://csspool.rubyforge.org
+homepage: https://github.com/sparklemotion/csspool/
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
 - "--main"
-- README.rdoc
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -232,33 +244,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: csspool
-rubygems_version: 2.4.2
+rubyforge_project: 
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: CSSPool is a CSS parser
-test_files:
-- test/test_selector.rb
-- test/test_collection.rb
-- test/test_term.rb
-- test/test_parser.rb
-- test/sac/test_properties.rb
-- test/sac/test_parser.rb
-- test/sac/test_terms.rb
-- test/test_declaration.rb
-- test/css/test_import_rule.rb
-- test/css/test_document.rb
-- test/css/test_parser.rb
-- test/css/test_font_face.rb
-- test/css/test_variables.rb
-- test/css/test_media_rule.rb
-- test/css/test_namespace_rule.rb
-- test/css/test_keyframes_rule.rb
-- test/css/test_document_query.rb
-- test/css/test_supports_rule.rb
-- test/css/test_tokenizer.rb
-- test/css/test_node_position.rb
-- test/visitors/test_comparable.rb
-- test/visitors/test_each.rb
-- test/visitors/test_children.rb
-- test/visitors/test_to_css.rb
+summary: ''
+test_files: []

data/test/css/test_node_position.rb

@@ -1,81 +0,0 @@
-require 'helper'
-
-module CSSPool
-  module CSS
-    class TestNodePosition < CSSPool::TestCase
-
-      def test_no_whitespace
-        child_content = '* { color: blue !important }'
-        css = "@document url(\"http://www.example.com\") {#{child_content}}"
-        doc = CSSPool.CSS css
-        assert_equal 1, doc.document_queries.size
-        dq = doc.document_queries.first
-        assert !dq.outer_start_pos.nil?
-        assert !dq.inner_start_pos.nil?
-        assert !dq.inner_end_pos.nil?
-        assert !dq.outer_end_pos.nil?
-        assert_equal css, css[dq.outer_start_pos..dq.outer_end_pos-1]
-        assert_equal child_content, css[dq.inner_start_pos..dq.inner_end_pos-1]
-      end
-
-      def test_whitespace
-        child_content = '  
-            * { color: blue !important } 
-        '
-        css = "
-          @document url(\"http://www.example.com\") {#{child_content}}
-        "
-        doc = CSSPool.CSS css
-        assert_equal 1, doc.document_queries.size
-        dq = doc.document_queries.first
-        assert !dq.outer_start_pos.nil?
-        assert !dq.inner_start_pos.nil?
-        assert !dq.inner_end_pos.nil?
-        assert !dq.outer_end_pos.nil?
-        # the whitespace on the "outside" should not be included
-        assert_equal css.strip, css[dq.outer_start_pos..dq.outer_end_pos-1]
-        # the whitespace on the "inside" should be retained
-        assert_equal child_content, css[dq.inner_start_pos..dq.inner_end_pos-1]
-      end
-
-      def test_comments
-        child_content = '  /* comment two */ 
-          * { color: blue !important } 
-          /* comment three */
-        '
-        css = "  /* comment one */
-          @document url(\"http://www.example.com\") {#{child_content}}
-        /* comment four */
-        "
-        doc = CSSPool.CSS css
-        assert_equal 1, doc.document_queries.size
-        dq = doc.document_queries.first
-        assert !dq.outer_start_pos.nil?
-        assert !dq.inner_start_pos.nil?
-        assert !dq.inner_end_pos.nil?
-        assert !dq.outer_end_pos.nil?
-        # the comments and whitespace to the "outside" should not be retained
-        assert_equal css.sub('/* comment one */', '').sub('/* comment four */', '').strip, css[dq.outer_start_pos..dq.outer_end_pos-1]
-        # the comments and whitespace on the "inside" should be retained
-        assert_equal child_content, css[dq.inner_start_pos..dq.inner_end_pos-1]
-      end
-
-      # this only works in ruby 2+
-      def test_multibyte_characters
-        child_content = '/* â */ * { color: blue !important }'
-        css = "@document url(\"http://www.example.com\") {#{child_content}}"
-        doc = CSSPool.CSS css
-        assert_equal 1, doc.document_queries.size
-        dq = doc.document_queries.first
-        assert !dq.outer_start_pos.nil?
-        assert !dq.inner_start_pos.nil?
-        assert !dq.inner_end_pos.nil?
-        assert !dq.outer_end_pos.nil?
-        assert_equal css, css[dq.outer_start_pos..dq.outer_end_pos-1]
-        assert_equal child_content, css[dq.inner_start_pos..dq.inner_end_pos-1]
-      end
-
-    end
-  end
-end
-

data/test/css/test_variables.rb

@@ -1,33 +0,0 @@
-require 'helper'
-
-# CSS variables - http://dev.w3.org/csswg/css-variables/
-module CSSPool
-  module CSS
-    class TestVariables < CSSPool::TestCase
-
-      # just checking that there's no parse error
-      def test_basic
-        doc = CSSPool.CSS <<-eocss
-          :root {
-            --main-bg-color: brown;
-          }
-          .one {
-            background-color: var(--main-bg-color);
-          }
-        eocss
-      end
-
-      def test_var_in_calc
-        doc = CSSPool.CSS <<-eocss
-          :root {
-            --right-margin: 10px;
-          }
-          .one {
-            width: calc(100% + var(--right-margin));
-          }
-        eocss
-      end
-
-    end
-  end
-end