r2 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4f4e266f69646ea465956984aae4e9f23714888
-  data.tar.gz: 4bc745ee1417f388979ffd6b090b3b0ce7cf012b
+  metadata.gz: d5ab6e294013e8786fc50aae34d70baa7a62f10b
+  data.tar.gz: a8b49f9b4b9407050145114607f23c7d391c3a6a
 SHA512:
-  metadata.gz: 4b504c3c059252910fb1ab6dbcfbf41cf2c8383d181d28b861c133b99459ed7d2bff733fa51bddacc58b8583f0c27116fb5ebcdf3d6e62a9b06d25fc8509a61a
-  data.tar.gz: e2f4ecebe8b886e6478ad1e3b99cfecee536df7f587d676f26757e5264a5d822504c5e7153a6fda23352bfb7d7f7b2300fd5725d3784606027ac8175567811ee
+  metadata.gz: f3950af1429c22b800a0c94a297ee427b95c125dbc806f516c946f3f3c1855d3ff8a08f6adc01c7515f02e66f32e793243efe48ed558fb718ffaf65140efe086
+  data.tar.gz: b36f3c6a247163831b299922ba4114067b5052eaef920cd03f51c008fa9c94f6f76e7c60d3c9217573f1134a12c68463e1ba2d45390fb1b8b985c1dcf720585c

data/README.md

@@ -23,6 +23,7 @@ Report bugs in the github project at http://github.com/mzsanford/r2rb
 
 ## Change Log
 
+ * v0.2.5 - Handle `background:` shorthand
  * v0.2.4 - Handle `url()` properties better
    * [BUG] - Handle `url()` without embedded semi-colons and with trailing parameters
  * v0.2.3 - Handle `url()` properties better

data/lib/r2.rb

@@ -62,7 +62,8 @@ module R2
       '-moz-box-shadow' => lambda {|obj,val| obj.shadow_swap(val) },
       'direction'  => lambda {|obj,val| obj.direction_swap(val) },
       'clear' => lambda {|obj,val| obj.side_swap(val) },
-      'background-position' => lambda {|obj,val| obj.background_position_swap(val) }
+      'background-position' => lambda {|obj,val| obj.background_position_swap(val) },
+      'background' => lambda {|obj,val| obj.background_swap(val) },
     }
 
     # Given a String of CSS perform the full directionality change
@@ -173,6 +174,32 @@ module R2
       ShadowFlipper::flip(val)
     end
 
+    # Given the short-hand background: definition attempt to convert the direction.
+    def background_swap(val)
+      parts = val.split(/ /)
+
+      checked = []
+      skip = false
+      parts.each_index do |i|
+        p = parts[i]
+        n = parts[i+1]
+
+        if skip
+          skip = false
+          next
+        end
+
+        if p.match(/left|right|\d+%/)
+          checked << background_position_swap("#{p} #{n}")
+          skip = true
+        else
+          checked << side_swap(p)
+        end
+      end
+
+      checked.flatten.join(' ')
+    end
+
 
     # Border radius uses top-left, top-right, bottom-left, bottom-right, so all values need to be swapped. Additionally,
     # two and three value border-radius declarations need to be swapped as well. Vertical radius, specified with a /,

data/lib/r2/version.rb

@@ -1,3 +1,3 @@
 module R2
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/r2_spec.rb

@@ -55,6 +55,27 @@ describe R2::Swapper do
       flipped_css.should == expected_result
     end
 
+    # background: #000 url("spree/frontend/cart.png") no-repeat left center;
+    it "handles background with position declarations" do
+      css = <<-EOS
+        .bg1 {
+          background: #000 url("spree/frontend/cart.png") no-repeat left center;
+        }
+        .bg2 {
+          background: #000 url("spree/frontend/cart.png") no-repeat 1% 50%;
+        }
+      EOS
+
+      expected_result  = '.bg1{background:#000 url("spree/frontend/cart.png") no-repeat right center;}'
+      expected_result += '.bg2{background:#000 url("spree/frontend/cart.png") no-repeat 99% 50%;}';
+
+      flipped_css = r2.r2(css)
+
+      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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r2
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Matt Sanford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake