r2 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a5183daf3e28928082401b7e9ab748e41080b7a
-  data.tar.gz: 7e223471bffd64f83bab5c4b6f9454d067759e8d
+  metadata.gz: 5001cd455fb9de572960b0f6ab968888198a5e88
+  data.tar.gz: 3508a64c9e2df1edf3a5656094860f3afd66242c
 SHA512:
-  metadata.gz: f4fbd3b2586d61ca723267911424da717054b69e072456da424c51a5bbf9070a430d926c404b53d464b07cc1511d5745bf821d7db5b3ef86243fd3498fcc2ed3
-  data.tar.gz: 7e3eff1221044f7b7e695044bf8c89b4d0ec8e587c7bc13a33811c7f5f8390085e19ee77737b6203da921b8a1222386e5be57d6c6eddd27f00b834854e47085f
+  metadata.gz: eaf0fa605bd6b6f03a9181997949618a2567a18bc170e0db71d250b2a7a658ea2e6b613a3d9c050d5da1248bce08f8bd520d36c9e04424e512f30ead4b818c0b
+  data.tar.gz: 2db705161e9d78c836c7e19ce1c9942ecb0e388b19821edc40bce355eee226c5ee4f2f9d8d006277de6f2e9688a21ac7e75875c94aea5c3a8132f51fa261b985

data/README.md

@@ -23,6 +23,9 @@ Report bugs in the github project at http://github.com/mzsanford/r2rb
 
 ## Change Log
 
+ * 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)
  * v0.2.1 – CSS3 `box-shadow` fix
    * [BUG] Correctly handle `box-shadow` declarations starting with `inset` (fix from [@wazeHQ](https://github.com/wazeHQ))
  * v0.2.0 – CSS3 additions

data/bin/r2

@@ -1,3 +1,11 @@
 #!/usr/bin/env ruby
 
 require "r2"
+
+if ARGV[0]
+  css = File.read(ARGV[0])
+else
+  css = $stdin.read
+end
+
+puts R2.r2(css)

data/lib/r2.rb

@@ -5,6 +5,9 @@
 # Author::    Matt Sanford  (mailto:matt@twitter.com)
 # Copyright:: Copyright (c) 2011 Twitter, Inc.
 # License::   Licensed under the Apache License, Version 2.0
+
+require 'r2/shadow_flipper'
+
 module R2
 
   # Short cut method for providing a one-time CSS change
@@ -148,19 +151,10 @@ module R2
     # Given the 2-6 variable declaration for box-shadow convert the direction. Conversion requires inverting the
     # horizontal measure only.
     def shadow_swap(val)
-      args = val.to_s.split(/\s+/)
-
-      #move 'inset' to the end
-      args.push(args.shift) if args && args[0] == "inset"
-
-      matched = args && args[0].match(/^([-+]?\d+)(\w*)$/)
-      if matched
-        return (["#{(-1 * matched[1].to_i)}#{matched[2]}"] + args[1..5]).compact.join(' ')
-      else
-        return val
-      end
+      ShadowFlipper::flip(val)
     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 /,
     # should be left alone.

data/lib/r2/shadow_flipper.rb

@@ -0,0 +1,33 @@
+module R2
+  module ShadowFlipper
+    def self.flip(val)
+      val = replace_commas_in_parentheses(val)
+      val = val.split(/\s*,\s*/).map { |shadow| single_shadow_swap(shadow) }.join(', ')
+      restore_commas(val)
+    end
+
+  private
+
+    def self.replace_commas_in_parentheses(string)
+      string.gsub(/\([^)]*\)/) { |parens| parens.gsub(',', '|||') }
+    end
+
+    def self.restore_commas(string)
+      string.gsub('|||', ',')
+    end
+
+    def self.single_shadow_swap(val)
+      args = val.to_s.split(/\s+/)
+
+      #move 'inset' to the end
+      args.push(args.shift) if args && args[0] == "inset"
+
+      matched = args && args[0].match(/^([-+]?\d+)(\w*)$/)
+      if matched
+        return (["#{(-1 * matched[1].to_i)}#{matched[2]}"] + args[1..5]).compact.join(' ')
+      else
+        return val
+      end
+    end
+  end
+end

data/lib/r2/version.rb

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

data/spec/r2_spec.rb

@@ -156,6 +156,14 @@ describe R2::Swapper do
       r2.shadow_swap("inset 1px 2px").should == "-1px 2px inset"
     end
 
+    it "should swap multiple values" do
+      r2.shadow_swap("inset 1px 2px, 1px 2px #000").should == "-1px 2px inset, -1px 2px #000"
+    end
+
+    it "should swap multiple values (with rgba)" do
+      r2.shadow_swap("inset 1px 2px rgba(0,0,0,0.2), 1px 2px #000").should == "-1px 2px rgba(0,0,0,0.2) inset, -1px 2px #000"
+    end
+
   end
 
   describe "#border_radius_swap" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r2
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Matt Sanford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -55,6 +55,7 @@ files:
 - Rakefile
 - bin/r2
 - lib/r2.rb
+- lib/r2/shadow_flipper.rb
 - lib/r2/version.rb
 - r2.gemspec
 - spec/r2_spec.rb