crass 1.0.3 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ef1bd09fd5e081df138061c200938cb6f197a62e
-  data.tar.gz: 71f860902672bf678340a722bf6c811d63eab276
+SHA256:
+  metadata.gz: def285e9f3d16e7222dce13f004b8ad8b936c76ecec909306cf15078f6ec8999
+  data.tar.gz: 6fbb08644b3ff290d66012bbfa9afa249ab565f9e67240e13d433715d1b535b7
 SHA512:
-  metadata.gz: 95fd718bb11a892f968cf9690ae5653b7285accecd5e7deb456e31ff0b66a9241b0aa4f3fa91fcdde887a119555380315babbbe4cf2ed9aef8228b25e3c41155
-  data.tar.gz: 2fb2f4e30b20d179ca512c524cfe70e80da3258457d2c2b4b046ac9106ad209b79377f75749463c20fc8b0a9e5863bea5dcca827deea0b974ba955c12e55b0f1
+  metadata.gz: 43daba64a022574e3ac4b439c5dca3cc329e2217e47df9eeaf79987748fa949feeaccb4745a212ebb9e91f01d4b5ec433947b57380efda233d078a9f1f1ea8ab
+  data.tar.gz: aa88544b1374fa5fb774970e5b714e6913c23e750a0e84767548e9c8076d25851f9f8861b38dfef0c9262a8c7785bce82436ad19c951ea4a9836fcee4a163199

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
   - ruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/HISTORY.md

@@ -1,6 +1,27 @@
 Crass Change History
 ====================
 
+1.0.6 (2020-01-12)
+------------------
+
+* Number values are now limited to a maximum of `Float::MAX` and a minimum of
+  negative `Float::MAX`. (#11)
+
+* Added project metadata to the gemspec. (#9 - @orien)
+
+
+1.0.5 (2019-10-15)
+------------------
+
+* Removed test files from the gem. (#8 - @t-richards)
+
+
+1.0.4 (2018-04-08)
+------------------
+
+* Fixed whitespace warnings. (#7 - @yahonda)
+
+
 1.0.3 (2017-11-13)
 ------------------
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2017 Ryan Grove (ryan@wonko.com)
+Copyright (c) 2020 Ryan Grove (ryan@wonko.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the ‘Software’), to deal in

data/README.md

@@ -190,25 +190,3 @@ tokenizing and parsing rules that Crass implements.
 [simon]:http://exyr.org/about/
 [spec]:http://www.w3.org/TR/css-syntax-3/
 [tab]:http://www.xanthir.com/contact/
-
-License
--------
-
-Copyright (c) 2017 Ryan Grove (ryan@wonko.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the ‘Software’), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -5,12 +5,13 @@ Bundler::GemHelper.install_tasks
 
 Rake::TestTask.new
 task :default => [:test]
+task :test => :set_rubyopts
+
+task :set_rubyopts do
+  ENV['RUBYOPT'] ||= ""
+  ENV['RUBYOPT'] += " -w"
 
-task :test => :set_frozen_string_literal_option
-task :set_frozen_string_literal_option do
   if RUBY_ENGINE == "ruby" && RUBY_VERSION >= "2.3"
-    warn "NOTE: Testing support for frozen string literals"
-    ENV['RUBYOPT'] ||= ""
     ENV['RUBYOPT'] += " --enable-frozen-string-literal --debug=frozen-string-literal"
   end
 end

data/crass.gemspec

@@ -11,13 +11,19 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/rgrove/crass/'
   s.license     = 'MIT'
 
+  s.metadata = {
+    'bug_tracker_uri'   => 'https://github.com/rgrove/crass/issues',
+    'changelog_uri'     => "https://github.com/rgrove/crass/blob/v#{s.version}/HISTORY.md",
+    'documentation_uri' => "https://www.rubydoc.info/gems/crass/#{s.version}",
+    'source_code_uri'   => "https://github.com/rgrove/crass/tree/v#{s.version}",
+  }
+
   s.platform = Gem::Platform::RUBY
   s.required_ruby_version = Gem::Requirement.new('>= 1.9.2')
 
   s.require_paths = ['lib']
 
-  s.files      = `git ls-files`.split($/)
-  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+  s.files = `git ls-files -z`.split("\x0").grep_v(%r{^test/})
 
   # Development dependencies.
   s.add_development_dependency 'minitest', '~> 5.0.8'

data/lib/crass/parser.rb

@@ -402,25 +402,25 @@ module Crass
         case token[:node]
           # Non-standard. Spec says to discard comments and whitespace, but we
           # keep them so we can serialize faithfully.
-          when :comment, :whitespace
-            rules << token
+        when :comment, :whitespace
+          rules << token
 
-          when :cdc, :cdo
-            unless flags[:top_level]
-              @tokens.reconsume
-              rule = consume_qualified_rule
-              rules << rule if rule
-            end
-
-          when :at_keyword
-            @tokens.reconsume
-            rule = consume_at_rule
-            rules << rule if rule
-
-          else
+        when :cdc, :cdo
+          unless flags[:top_level]
             @tokens.reconsume
             rule = consume_qualified_rule
             rules << rule if rule
+          end
+
+        when :at_keyword
+          @tokens.reconsume
+          rule = consume_at_rule
+          rules << rule if rule
+
+        else
+          @tokens.reconsume
+          rule = consume_qualified_rule
+          rules << rule if rule
         end
       end
 

data/lib/crass/tokenizer.rb

@@ -429,27 +429,36 @@ module Crass
     # 4.3.3. http://dev.w3.org/csswg/css-syntax/#consume-a-numeric-token
     def consume_numeric
       number = consume_number
+      repr = number[0]
+      value = number[1]
+      type = number[2]
+
+      if type == :integer
+        value = value.to_i
+      else
+        value = value.to_f
+      end
 
       if start_identifier?(@s.peek(3))
         create_token(:dimension,
-          :repr  => number[0],
-          :type  => number[2],
-          :unit  => consume_name,
-          :value => number[1])
+          :repr => repr,
+          :type => type,
+          :unit => consume_name,
+          :value => value)
 
       elsif @s.peek == '%'
         @s.consume
 
         create_token(:percentage,
-          :repr  => number[0],
-          :type  => number[2],
-          :value => number[1])
+          :repr => repr,
+          :type => type,
+          :value => value)
 
       else
         create_token(:number,
-          :repr  => number[0],
-          :type  => number[2],
-          :value => number[1])
+          :repr => repr,
+          :type => type,
+          :value => value)
       end
     end
 
@@ -537,38 +546,38 @@ module Crass
 
       until @s.eos?
         case char = @s.consume
-          when ')'
-            break
+        when ')'
+          break
 
-          when RE_WHITESPACE
-            @s.scan(RE_WHITESPACE)
+        when RE_WHITESPACE
+          @s.scan(RE_WHITESPACE)
 
-            if @s.eos? || @s.peek == ')'
-              @s.consume
-              break
-            else
-              return create_token(:bad_url, :value => value + consume_bad_url)
-            end
+          if @s.eos? || @s.peek == ')'
+            @s.consume
+            break
+          else
+            return create_token(:bad_url, :value => value + consume_bad_url)
+          end
+
+        when '"', "'", '(', RE_NON_PRINTABLE
+          # Parse error.
+          return create_token(:bad_url,
+            :error => true,
+            :value => value + consume_bad_url)
 
-          when '"', "'", '(', RE_NON_PRINTABLE
+        when '\\'
+          if valid_escape?
+            value << consume_escaped
+          else
             # Parse error.
             return create_token(:bad_url,
               :error => true,
-              :value => value + consume_bad_url)
-
-          when '\\'
-            if valid_escape?
-              value << consume_escaped
-            else
-              # Parse error.
-              return create_token(:bad_url,
-                :error => true,
-                :value => value + consume_bad_url
-              )
-            end
+              :value => value + consume_bad_url
+            )
+          end
 
-          else
-            value << char
+        else
+          value << char
         end
       end
 
@@ -588,9 +597,19 @@ module Crass
       t = matches[:exponent_sign] == '-' ? -1 : 1
       e = matches[:exponent].to_i
 
-      # I know this looks nutty, but it's exactly what's defined in the spec,
-      # and it works.
-      s * (i + f * 10**-d) * 10**(t * e)
+      # I know this formula looks nutty, but it's exactly what's defined in the
+      # spec, and it works.
+      value = s * (i + f * 10**-d) * 10**(t * e)
+
+      # Maximum and minimum values aren't defined in the spec, but are enforced
+      # here for sanity.
+      if value > Float::MAX
+        value = Float::MAX
+      elsif value < -Float::MAX
+        value = -Float::MAX
+      end
+
+      value
     end
 
     # Creates and returns a new token with the given _properties_.

data/lib/crass/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Crass
-  VERSION = '1.0.3'
+  VERSION = '1.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crass
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
 platform: ruby
 authors:
 - Ryan Grove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2020-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -60,40 +60,14 @@ files:
 - lib/crass/token-scanner.rb
 - lib/crass/tokenizer.rb
 - lib/crass/version.rb
-- test/css-parsing-tests/An+B.json
-- test/css-parsing-tests/LICENSE
-- test/css-parsing-tests/README.rst
-- test/css-parsing-tests/color3.json
-- test/css-parsing-tests/color3_hsl.json
-- test/css-parsing-tests/color3_keywords.json
-- test/css-parsing-tests/component_value_list.json
-- test/css-parsing-tests/declaration_list.json
-- test/css-parsing-tests/make_color3_hsl.py
-- test/css-parsing-tests/make_color3_keywords.py
-- test/css-parsing-tests/one_component_value.json
-- test/css-parsing-tests/one_declaration.json
-- test/css-parsing-tests/one_rule.json
-- test/css-parsing-tests/rule_list.json
-- test/css-parsing-tests/stylesheet.json
-- test/css-parsing-tests/stylesheet_bytes.json
-- test/shared/parse_rules.rb
-- test/support/common.rb
-- test/support/serialization/animate.css
-- test/support/serialization/bootstrap-theme.css
-- test/support/serialization/bootstrap.css
-- test/support/serialization/html5-boilerplate.css
-- test/support/serialization/misc.css
-- test/support/serialization/pure.css
-- test/test_crass.rb
-- test/test_css_parsing_tests.rb
-- test/test_parse_properties.rb
-- test/test_parse_rules.rb
-- test/test_parse_stylesheet.rb
-- test/test_serialization.rb
 homepage: https://github.com/rgrove/crass/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/rgrove/crass/issues
+  changelog_uri: https://github.com/rgrove/crass/blob/v1.0.6/HISTORY.md
+  documentation_uri: https://www.rubydoc.info/gems/crass/1.0.6
+  source_code_uri: https://github.com/rgrove/crass/tree/v1.0.6
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -109,40 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: CSS parser based on the CSS Syntax Level 3 spec.
-test_files:
-- test/css-parsing-tests/An+B.json
-- test/css-parsing-tests/LICENSE
-- test/css-parsing-tests/README.rst
-- test/css-parsing-tests/color3.json
-- test/css-parsing-tests/color3_hsl.json
-- test/css-parsing-tests/color3_keywords.json
-- test/css-parsing-tests/component_value_list.json
-- test/css-parsing-tests/declaration_list.json
-- test/css-parsing-tests/make_color3_hsl.py
-- test/css-parsing-tests/make_color3_keywords.py
-- test/css-parsing-tests/one_component_value.json
-- test/css-parsing-tests/one_declaration.json
-- test/css-parsing-tests/one_rule.json
-- test/css-parsing-tests/rule_list.json
-- test/css-parsing-tests/stylesheet.json
-- test/css-parsing-tests/stylesheet_bytes.json
-- test/shared/parse_rules.rb
-- test/support/common.rb
-- test/support/serialization/animate.css
-- test/support/serialization/bootstrap-theme.css
-- test/support/serialization/bootstrap.css
-- test/support/serialization/html5-boilerplate.css
-- test/support/serialization/misc.css
-- test/support/serialization/pure.css
-- test/test_crass.rb
-- test/test_css_parsing_tests.rb
-- test/test_parse_properties.rb
-- test/test_parse_rules.rb
-- test/test_parse_stylesheet.rb
-- test/test_serialization.rb
-has_rdoc: 
+test_files: []

data/test/css-parsing-tests/An+B.json

@@ -1,156 +0,0 @@
-[
-
-"", null,
-"  \n", null,
-
-"odd", [2, 1],
-"even", [2, 0],
-"ödd", null,
-"éven", null,
-" /**/\t OdD /**/\n", [2, 1],
-" /**/\t EveN /**/\n", [2, 0],
-
-
-"3", [0, 3],
-"+2 ", [0, 2],
-" -14 ", [0, -14],
-"+ 2 ", null,
-"- 14 ", null,
-"3.1", null,
-
-"3N", [3, 0],
-"+2N ", [2, 0],
-" -14n ", [-14, 0],
-"+ 2N ", null,
-"- 14N ", null,
-"3.1N", null,
-"3 n", null,
-
-"  N", [1, 0],
-" +n", [1, 0],
-" -n", [-1, 0],
-"+ n", null,
-"- n", null,
-
-
-"3N+1", [3, 1],
-"+2n+1 ", [2, 1],
-" -14n+1 ", [-14, 1],
-"+ 2N+1 ", null,
-"- 14n+1 ", null,
-"3.1n+1", null,
-"3 n+1", null,
-
-"  n+1", [1, 1],
-" +N+1", [1, 1],
-" -n+1", [-1, 1],
-"+ N+1", null,
-"- N+1", null,
-
-"3n-1", [3, -1],
-"+2N-1 ", [2, -1],
-" -14n-1 ", [-14, -1],
-"+ 2N-1 ", null,
-"- 14N-1 ", null,
-"3.1n-1", null,
-"3 n-1", null,
-"3n-1foo", null,
-
-"  n-1", [1, -1],
-" +n-1", [1, -1],
-" -n-1", [-1, -1],
-"+ n-1", null,
-"- n-1", null,
-" +n-1foo", null,
-" -n-1foo", null,
-
-
-"3N +1", [3, 1],
-"+2N +1 ", [2, 1],
-" -14n +1 ", [-14, 1],
-"+ 2N +1 ", null,
-"- 14n +1 ", null,
-"3.1N +1", null,
-"3 n +1", null,
-"3n foo", null,
-"3n + foo", null,
-
-"  n +1", [1, 1],
-" +N +1", [1, 1],
-" -n +1", [-1, 1],
-"+ n +1", null,
-"- N +1", null,
-
-"3N -1", [3, -1],
-"+2n -1 ", [2, -1],
-" -14n -1 ", [-14, -1],
-"+ 2n -1 ", null,
-"- 14N -1 ", null,
-"3.1N -1", null,
-"3 N -1", null,
-
-"  N -1", [1, -1],
-" +N -1", [1, -1],
-" -n -1", [-1, -1],
-"+ n -1", null,
-"- n -1", null,
-
-
-"3n+ 1", [3, 1],
-"+2n+ 1 ", [2, 1],
-" -14n+ 1 ", [-14, 1],
-"+ 2n+ 1 ", null,
-"- 14N+ 1 ", null,
-"3.1n+ 1", null,
-"3 N+ 1", null,
-
-"  N+ 1", [1, 1],
-" +N+ 1", [1, 1],
-" -N+ 1", [-1, 1],
-"+ n+ 1", null,
-"- N+ 1", null,
-
-"3n- 1", [3, -1],
-"+2N- 1 ", [2, -1],
-" -14N- 1 ", [-14, -1],
-"+ 2N- 1 ", null,
-"- 14n- 1 ", null,
-"3.1n- 1", null,
-"3 n- 1", null,
-
-"  N- 1", [1, -1],
-" +N- 1", [1, -1],
-" -n- 1", [-1, -1],
-"+ n- 1", null,
-"- N- 1", null,
-
-
-"3N + 1", [3, 1],
-"+2N + 1 ", [2, 1],
-" -14n + 1 ", [-14, 1],
-"+ 2n + 1 ", null,
-"- 14N + 1 ", null,
-"3.1n + 1", null,
-"3 N + 1", null,
-
-"  n + 1", [1, 1],
-" +n + 1", [1, 1],
-" -N + 1", [-1, 1],
-"+ N + 1", null,
-"- N + 1", null,
-
-"3N - 1", [3, -1],
-"+2n - 1 ", [2, -1],
-" -14n - 1 ", [-14, -1],
-"+ 2N - 1 ", null,
-"- 14N - 1 ", null,
-"3.1N - 1", null,
-"3 n - 1", null,
-
-"  N - 1", [1, -1],
-" +n - 1", [1, -1],
-" -n - 1", [-1, -1],
-"+ N - 1", null,
-"- N - 1", null
-
-]

data/test/css-parsing-tests/LICENSE

@@ -1,8 +0,0 @@
-Written in 2013 by Simon Sapin.
-
-To the extent possible under law, the author(s) have dedicated all copyright
-and related and neighboring rights to this work to the public domain worldwide.
-This work is distributed without any warranty.
-
-See the CC0 Public Domain Dedication:
-http://creativecommons.org/publicdomain/zero/1.0/