r2 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5001cd455fb9de572960b0f6ab968888198a5e88
-  data.tar.gz: 3508a64c9e2df1edf3a5656094860f3afd66242c
+  metadata.gz: 993216b45cc4bad2255bc31184ca50bbd73dc8bf
+  data.tar.gz: 8f13aebd5b0081c7f08e796654a67c54cb6ecb14
 SHA512:
-  metadata.gz: eaf0fa605bd6b6f03a9181997949618a2567a18bc170e0db71d250b2a7a658ea2e6b613a3d9c050d5da1248bce08f8bd520d36c9e04424e512f30ead4b818c0b
-  data.tar.gz: 2db705161e9d78c836c7e19ce1c9942ecb0e388b19821edc40bce355eee226c5ee4f2f9d8d006277de6f2e9688a21ac7e75875c94aea5c3a8132f51fa261b985
+  metadata.gz: 553d29ee6461fb312f7e93cfee40a8707eefd96db4744041a4073e8d50be25781aea42c332313246c66ec1b23696ddf545965c9959ff88eb53d84a15b919ccaf
+  data.tar.gz: 0638da0e1140f27b7b330575d038603007c15f865309b538d5543b8572e6bb610e2f747c7248fc058645c5c45e17255b4b6914920fb8a498733604911a39b643

data/.travis.yml

@@ -2,8 +2,4 @@
 language: ruby
 rvm:
   - 1.9.3
-  - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
-  - 1.8.7

data/README.md

@@ -23,6 +23,9 @@ Report bugs in the github project at http://github.com/mzsanford/r2rb
 
 ## Change Log
 
+ * v0.2.3 - Handle `url()` properties better
+   * [BUG] - Handle `url()` with embedded semi-colons (like escaped SVG)
+   * [CHANGE] - Remove Travis tests for Ruby 1.8 because Travis adds a `celluloid` dependency that does not work before Ruby 1.9.3
  * v0.2.2 – CSS3 `box-shadow` fix continues
    * [BUG] Correctly handle `box-shadow` declarations that define multiple shadows (fix from [@wazeHQ](https://github.com/wazeHQ))
    * [FEATURE] Make the `r2` command line tool convert CSS provided via `stdin` or a file (previously it was a no-op)

data/lib/r2.rb

@@ -70,14 +70,32 @@ module R2
       css = minimize(original_css)
 
       result = css.gsub(/([^\{\}]+[^\}]|[\}])+?/) do |rule|
+        # +rule+ can represent a selector (".foo {"), the closing "}" for a selector, or the complete
+        # body of a a selector
         if rule.match(/[\{\}]/)
-          #it is a selector with "{" or a closing "}", insert as it is
+          # it is a selector with "{" or a closing "}", insert as it is. This is
+          # things like ".foo {" and its matching "}"
           rule_str = rule
         else
-          #It is a decleration
+          # It is a declaration body, like "padding-left:4px;margin-left:5px;"
           rule_str = ""
-          rule.split(/;(?!base64)/).each do |decl|
-            rule_str << declaration_swap(decl)
+          # Split up the individual rules in the body and process each swap. To handle the
+          # possible ";" in the url() definitions, like
+          # url("data;base64") and url("data:image/svg+xml;charset=...")
+          # a state machine is constructed.
+          url_rule = nil
+          rule.split(/;/).each do |part|
+            if part.match(/url\(/)
+              url_rule = part
+            elsif url_rule != nil
+              url_rule << ";" + part
+              if part.match(/\)$/)
+                rule_str << declaration_swap(url_rule)
+                url_rule = nil
+              end
+            else
+              rule_str << declaration_swap(part)
+            end
           end
         end
         rule_str

data/lib/r2/version.rb

@@ -1,3 +1,3 @@
 module R2
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/r2.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Matt Sanford"]
   s.email       = ["matt@twitter.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/mzsanford/R2rb"
   s.summary     = %q{CSS flipper for right-to-left processing}
   s.description = %q{CSS flipper for right-to-left processing. A Ruby port of https://github.com/ded/r2}
 

data/spec/r2_spec.rb

@@ -39,6 +39,23 @@ describe R2::Swapper do
 
       flipped_css.should == expected_result
     end
+
+    it "handles SVG background-image declarations" do
+      escaped_xml = "%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M9%2C5v3l5-4L9%2C0v3c0%2C0-5%2C0-5%2C7C6%2C5%2C9%2C5%2C9%2C5z%20M11%2C12H2V5h1l2-2H0v11h13V7l-2%2C2V12z%22%2F%3E%3C%2Fsvg%3E"
+      css = <<-EOS
+        .ui-icon-action:after {
+          display: block;
+          background-image: url("data:image/svg+xml;charset=ISO-8859-1,#{escaped_xml}");
+          text-align: left;
+        }
+      EOS
+
+      expected_result = ".ui-icon-action:after{display:block;background-image:url(\"data:image/svg+xml;charset=ISO-8859-1,#{escaped_xml}\");text-align:right;}"
+
+      flipped_css = r2.r2(css)
+
+      flipped_css.should == expected_result
+    end
   end
 
   describe "#declaration_swap" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r2
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Matt Sanford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,7 +59,7 @@ files:
 - lib/r2/version.rb
 - r2.gemspec
 - spec/r2_spec.rb
-homepage: ''
+homepage: https://github.com/mzsanford/R2rb
 licenses: []
 metadata: {}
 post_install_message: