roadie 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e46e63eac0d8ed2687129918a809ae20203b1e3
-  data.tar.gz: 5e6e1a556dbc197c61b5d209f85c123ae1075e1c
+  metadata.gz: cd4e9bce46c7a228c3bf830fa355cece328f7f20
+  data.tar.gz: 702ae383ac06b11cec36e355d396bc099862fd37
 SHA512:
-  metadata.gz: 3dd556c62999f098e98863d52292b7bb80752695ba68fe9d2309c791334f5ae950b47717482a7f1a18fd00284f84c5eae404f7747d26287ee8a34891bd1c7759
-  data.tar.gz: 1bbd2fbc9ef860af00a4b1da17507e341679ee555e11447749103958383d5713fed349cd73b68e928103309283dea9342c35a49a69d7d1dfc4b549c1e3fe1d14
+  metadata.gz: 5b4d2d872d94aacd77c4625b37e8459b1bef7bc931f8487207d52c22529ec9a16160d53f5c3822abc39edd694f42f41a58bcb114e33eb351931dfa8c178f61c9
+  data.tar.gz: 55001582e4b9f3e673ca2418fae5e0a18cbac73bb9ed5b9bbda849f3df8c717e2f33069b90275a876eb91949058e40c16acdd35f7cbd5de753ba3c3377ef5df8

data/.travis.yml

@@ -2,7 +2,8 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.1
+  - 2.2
   - jruby
   - rbx
 

data/Changelog.md

@@ -1,11 +1,19 @@
 ### dev
 
-[full changelog](https://github.com/Mange/roadie/compare/v3.0.1...master)
+[full changelog](https://github.com/Mange/roadie/compare/v3.0.2...master)
 
 * Nothing yet.
 
 ### 3.0.1
 
+[full changelog](https://github.com/Mange/roadie/compare/v3.0.1...v3.0.2)
+
+* Bug fixes:
+  * Some `data:` URLs could cause exceptions. (#97)
+  * Correctly parse properties with semicolons in their values - [Aidan Feldman (afeld)](https://github.com/afeld) (#100)
+
+### 3.0.1
+
 [full changelog](https://github.com/Mange/roadie/compare/v3.0.0...v3.0.1)
 
 * Enhancements:

data/README.md

@@ -235,7 +235,8 @@ Tested with [Travis CI](http://travis-ci.org) using:
 
 * MRI 1.9.3
 * MRI 2.0.0
-* MRI 2.1.2
+* MRI 2.1.3
+* MRI 2.2.0
 * JRuby (latest)
 * Rubinius >= 2.1 (experimental)
 

data/lib/roadie/errors.rb

@@ -6,11 +6,6 @@ module Roadie
   # it as a bug.
   class Error < RuntimeError; end
 
-  # Raised when a declaration which cannot be parsed is encountered.
-  #
-  # A declaration is something like "font-size: 12pt;".
-  class UnparseableDeclaration < Error; end
-
   # Raised when Roadie encounters an invalid URL which cannot be parsed by
   # Ruby's +URI+ class.
   #

data/lib/roadie/style_property.rb

@@ -14,17 +14,6 @@ module Roadie
     # @todo Rename #property to #name
     attr_reader :property
 
-    # Parse a property string.
-    #
-    # @example
-    #   property = Roadie::StyleProperty.parse("color: green")
-    #   property.property # => "color"
-    #   property.value # => "green"
-    #   property.important? # => false
-    def self.parse(declaration, specificity)
-      allocate.send :read_declaration!, declaration, specificity
-    end
-
     def initialize(property, value, important, specificity)
       @property = property
       @value = value
@@ -54,34 +43,7 @@ module Roadie
       "#{to_s} (#{specificity})"
     end
 
-    protected
-    def read_declaration!(declaration, specificity)
-      if (matches = DECLARATION_MATCHER.match(declaration))
-        initialize matches[:property], matches[:value].strip, !!matches[:important], specificity
-        self
-      else
-        raise UnparseableDeclaration, "Cannot parse declaration #{declaration.inspect}"
-      end
-    end
-
     private
-    DECLARATION_MATCHER = %r{
-      \A\s*
-      (?:
-        # !important declaration
-        (?<property>[^:]+):\s?
-        (?<value>.*?)
-        (?<important>\s!important)
-        ;?
-      |
-        # normal declaration
-        (?<property>[^:]+):\s?
-        (?<value>[^;]+)
-        ;?
-      )
-      \s*\Z
-    }x.freeze
-
     def value_with_important
       if important
         "#{value} !important"

data/lib/roadie/stylesheet.rb

@@ -39,17 +39,27 @@ module Roadie
 
     def parse_blocks(css)
       blocks = []
-      setup_parser(css).each_selector do |selector_string, declarations, specificity|
-        blocks << create_style_block(selector_string, declarations, specificity)
+      parser = setup_parser(css)
+
+      parser.each_rule_set do |rule_set, media_types|
+        rule_set.selectors.each do |selector_string|
+          blocks << create_style_block(selector_string, rule_set)
+        end
       end
+
       blocks
     end
 
-    def create_style_block(selector_string, declarations, specificity)
-      StyleBlock.new(
-        Selector.new(selector_string, specificity),
-        parse_declarations(declarations, specificity)
-      )
+    def create_style_block(selector_string, rule_set)
+      specificity = CssParser.calculate_specificity(selector_string)
+      selector = Selector.new(selector_string, specificity)
+      properties = []
+
+      rule_set.each_declaration do |prop, val, important|
+        properties << StyleProperty.new(prop, val, important, specificity)
+      end
+
+      StyleBlock.new(selector, properties)
     end
 
     def setup_parser(css)
@@ -57,9 +67,5 @@ module Roadie
       parser.add_block! css
       parser
     end
-
-    def parse_declarations(declarations, specificity)
-      declarations.split(';').map { |declaration| StyleProperty.parse(declaration, specificity) }
-    end
   end
 end

data/lib/roadie/url_generator.rb

@@ -107,7 +107,9 @@ module Roadie
     def path_is_absolute?(path)
       # Ruby's URI is pretty unforgiving, but roadie aims to be. Don't involve
       # URI for URLs that's easy to determine to be absolute.
-      path =~ %r{^(\w+:)?//} || !parse_path(path).relative?
+      # URLs starting with a scheme (http:, data:) are absolute, as is URLs
+      # start start with double slashes (//css/app.css).
+      path =~ %r{^(\w+:|//)} || !parse_path(path).relative?
     end
 
     def parse_path(path)

data/lib/roadie/version.rb

@@ -1,3 +1,3 @@
 module Roadie
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

data/spec/lib/roadie/style_property_spec.rb

@@ -45,38 +45,5 @@ module Roadie
         end
       end
     end
-
-    describe "parsing" do
-      def parsing(declaration, specificity)
-        property = StyleProperty.parse(declaration, specificity)
-        [property.property, property.value, property.important?, property.specificity]
-      end
-
-      it "understands simple declarations" do
-        expect(parsing("color: green", 1)).to eq(["color", "green", false, 1])
-        expect(parsing(" color:green; ", 1)).to eq(["color", "green", false, 1])
-        expect(parsing("color: green  ", 1)).to eq(["color", "green", false, 1])
-        expect(parsing("color: green  ; ", 1)).to eq(["color", "green", false, 1])
-      end
-
-      it "understands more complex values" do
-        expect(parsing("padding:0 1px 5rem 9%;", 89)).to eq(["padding", "0 1px 5rem 9%", false, 89])
-      end
-
-      it "understands more complex names" do
-        expect(parsing("font-size: 50%", 10)).to eq(["font-size", "50%", false, 10])
-      end
-
-      it "correctly reads !important declarations" do
-        expect(parsing("color: green !important", 1)).to eq(["color", "green", true, 1])
-        expect(parsing("color: green !important;", 1)).to eq(["color", "green", true, 1])
-      end
-
-      it "raises an error on unparseable declarations" do
-        expect {
-          parsing("I want a red apple!", 1)
-        }.to raise_error(Roadie::UnparseableDeclaration, /red apple/)
-      end
-    end
   end
 end

data/spec/lib/roadie/stylesheet_spec.rb

@@ -37,5 +37,19 @@ module Roadie
       stylesheet = Stylesheet.new("example.css", "body { color: green;}a{ color: red; font-size: small }")
       expect(stylesheet.to_s).to eq("body{color:green}\na{color:red;font-size:small}")
     end
+
+    it "understands data URIs" do
+      # http://css-tricks.com/data-uris/
+      stylesheet = Stylesheet.new("foo.css", <<-CSS)
+      h1 {
+        background-image: url(data:image/gif;base64,R0lGODl)
+      }
+      CSS
+
+      expect(stylesheet).to have(1).blocks
+      expect(stylesheet.blocks.map(&:to_s)).to eq([
+        "h1{background-image:url(data:image/gif;base64,R0lGODl)}"
+      ])
+    end
   end
 end

data/spec/lib/roadie/url_generator_spec.rb

@@ -82,7 +82,14 @@ module Roadie
       end
 
       it "does not touch data: URIs" do
-        expect(url("data:deadbeef", host: "example.com")).to eq("data:deadbeef")
+        # We've had failures with longer data URIs, but I have not been able to
+        # pinpoint where the problem is. I suspect a specific version of Ruby.
+        # This test might not actually catch the real issues since I couldn't
+        # get it red for the reported cases.
+        # It was solved by being more relaxed when determining if a URI is
+        # absolute or not.
+        data_uri = "data:image/png;dead/beef+/=="
+        expect(url(data_uri, host: "example.com")).to eq(data_uri)
       end
 
       it "does not touch absolute URLs without schemes" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadie
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Magnus Bergmark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri