r2 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8550ffae3d9358c1257e8163f6a5d03d945d09f
-  data.tar.gz: 3a0e2808776280f8c3a87de5d1cf7baa5a18af8d
+  metadata.gz: d1fa57a5b8f4000ba8d6e91882b7eda70ef205b3
+  data.tar.gz: 34e72abffc40f8b95266805d6e5275bf830eaf1a
 SHA512:
-  metadata.gz: d1de570c1fc501a5e278d2757bba45aacce956ef3d39660e9e3f661de8bbf7812391729407363882d9a98bb386bbff37ec8de588f85e9b49592679d3175aac1c
-  data.tar.gz: 6c80710ffed22c49310fec1766d478e4df07c10af0a9bed75ec3a1ea1c02c18f3da29d311517355fcff44c374fab99c183ca9fc39c034a18300c922938f83f96
+  metadata.gz: 78b0b6a518f92747338fb1e0dbe32089ca82679ffca5dd7de2c867ae4691da8282926cb39fe08c6dc2f7ca16ec102f443935fba82561be3f22eb1110d7df7942
+  data.tar.gz: ac1f527bbb0a97dafb880e2d849f7a7e4f91137ab7af58997caef3ecd6995c545f556d7c5a7bef3a7311be96d0c2296e4770440943663836c5b0dbdda04446ed

data/.travis.yml

@@ -1,5 +1,5 @@
 
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.2
   - jruby-19mode # JRuby in 1.9 mode

data/README.md

@@ -23,6 +23,7 @@ Report bugs in the github project at http://github.com/mzsanford/r2rb
 
 ## Change Log
 
+ * v0.2.7 - Add an option to skip R2 processing on a CSS block (error report from [@mapmeld](https://github.com/mapmeld))
  * v0.2.6 - Handle multi-row selectors (fix from [@n0nick](https://github.com/n0nick))
  * v0.2.5 - Handle `background:` shorthand
  * v0.2.4 - Handle `url()` properties better

data/lib/r2.rb

@@ -10,6 +10,9 @@ require 'r2/shadow_flipper'
 
 module R2
 
+  # A string that indicates this block should be skipped
+  SKIP_TOKEN = 'SKIP_R2'
+
   # Short cut method for providing a one-time CSS change
   def self.r2(css)
     ::R2::Swapper.new.r2(css)
@@ -77,9 +80,13 @@ module R2
           # it is a selector with "{" or a closing "}", insert as it is. This is
           # things like ".foo {" and its matching "}"
           rule_str = rule
+        elsif rule.match(/#{SKIP_TOKEN}/)
+          # A body that is being skipped
+          rule_str = rule.sub(SKIP_TOKEN, '')
         else
           # It is a declaration body, like "padding-left:4px;margin-left:5px;"
           rule_str = ""
+
           # 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=...")
@@ -109,11 +116,12 @@ module R2
     def minimize(css)
       return '' unless css
 
-      css.gsub(/\/\*[\s\S]+?\*\//, '').   # comments
-         gsub(/[\n\r]+/, ' ').            # line breaks and carriage returns
-         gsub(/\s*([:;,\{\}])\s*/, '\1'). # space between selectors, declarations, properties and values
-         gsub(/\s+/, ' ').                # replace multiple spaces with single spaces
-         gsub(/(\A\s+|\s+\z)/, '')        # leading or trailing spaces
+      css.gsub(/\/\*\s*no-r2\s*\*\//, SKIP_TOKEN).   # special skip comment
+         gsub(/\/\*[\s\S]+?\*\//, '').               # comments
+         gsub(/[\n\r]+/, ' ').                       # line breaks and carriage returns
+         gsub(/\s*([:;,\{\}])\s*/, '\1').            # space between selectors, declarations, properties and values
+         gsub(/\s+/, ' ').                           # replace multiple spaces with single spaces
+         gsub(/(\A\s+|\s+\z)/, '')                   # leading or trailing spaces
     end
 
     # Given a single CSS declaration rule (e.g. <tt>padding-left: 4px</tt>) return the opposing rule (so, <tt>padding-right:4px;</tt> in this example)
@@ -241,7 +249,7 @@ module R2
       end
 
       # If first point is a unit-value
-      if match = points[0].match(/^(\d+[a-z]{2,3})/)
+      if match = points[0].match(/^(-?\d+[a-z]{2,3})/)
         val = ["right", match[1], points[1] || "center"].compact.join(' ')
       end
 

data/lib/r2/version.rb

@@ -1,3 +1,3 @@
 module R2
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/r2_spec.rb

@@ -107,6 +107,19 @@ describe R2::Swapper do
 
       expect(r2.r2(css)).to eq(expected)
     end
+
+    it "handles no-r2 comment" do
+      css = <<-EOS
+      .sprite.foo {
+        /* no-r2 */
+        background-position: 0px -50px;
+      }
+      EOS
+
+      expected = ".sprite.foo{ background-position:0px -50px;}"
+
+      expect(r2.r2(css)).to eq(expected)
+    end
   end
 
   describe "#declaration_swap" do
@@ -274,6 +287,7 @@ describe R2::Swapper do
       it "should convert a unit value" do
         expect(r2.background_position_swap('25px')).to eq('right 25px center')
       end
+
     end
 
     context "with a pair of values" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r2
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Matt Sanford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: r2
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: CSS flipper for right-to-left processing