r2 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f8550ffae3d9358c1257e8163f6a5d03d945d09f
-  data.tar.gz: 3a0e2808776280f8c3a87de5d1cf7baa5a18af8d
+SHA256:
+  metadata.gz: 790a1c3403b43e80a07f3353d0f683483aff2f50367d95b0c55759202e02626c
+  data.tar.gz: af54fe9e6ee0d53be9b88683af39cae8f5ad40adb8c6a39a3e46f3356d3ce050
 SHA512:
-  metadata.gz: d1de570c1fc501a5e278d2757bba45aacce956ef3d39660e9e3f661de8bbf7812391729407363882d9a98bb386bbff37ec8de588f85e9b49592679d3175aac1c
-  data.tar.gz: 6c80710ffed22c49310fec1766d478e4df07c10af0a9bed75ec3a1ea1c02c18f3da29d311517355fcff44c374fab99c183ca9fc39c034a18300c922938f83f96
+  metadata.gz: 274cd78b0fd61476c37dcc87c474587ef60e57ad2cf2cdd3aeb803cf08c3abed8226b940ff563b5f98c87c7a55108264194f292663658f19bcfd7ec85a84b7d6
+  data.tar.gz: 6aa114c12414912ad7c1d4f26f93548e1c9eb85565e4b5f27599105c4c47e416b3138dbbce8df6dd14f152848ba9dea19dd92cb7dde5c0ee7f3f32d4eb8786a2

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/version.rb

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

data/lib/r2.rb

@@ -10,6 +10,12 @@ require 'r2/shadow_flipper'
 
 module R2
 
+  # A string that indicates this block should be skipped
+  SKIP_TOKEN = 'SKIP_R2'
+
+  # Important declarations are removed and then re-added after swapping
+  IMPORTANT_DECLARATION = '!important'
+
   # Short cut method for providing a one-time CSS change
   def self.r2(css)
     ::R2::Swapper.new.r2(css)
@@ -77,9 +83,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 +119,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)
@@ -157,14 +168,17 @@ module R2
     # Given a 4-argument CSS declaration value (like that of <tt>padding</tt> or <tt>margin</tt>) return the opposing
     # value. The opposing value swaps the left and right but not the top or bottom. Any unrecognized argument is returned
     # unmolested (for example, 2-argument values)
-    def quad_swap(val)
+    def quad_swap(css_value)
+      points_str, is_important = extract_important(css_value)
       # 1px 2px 3px 4px => 1px 4px 3px 2px
-      points = val.to_s.split(/\s+/)
+      points = points_str.to_s.split(/\s+/)
 
-      if points && points.length == 4
-        [points[0], points[3], points[2], points[1]].join(' ')
-      else
-        val
+      append_important(is_important) do
+        if points && points.length == 4
+          [points[0], points[3], points[2], points[1]].join(' ')
+        else
+          points_str
+        end
       end
     end
 
@@ -204,22 +218,25 @@ module R2
     # 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.
-    def border_radius_swap(val)
+    def border_radius_swap(css_value)
       # 1px 2px 3px 4px => 1px 4px 3px 2px
-      points = val.to_s.split(/\s+/)
-
-      if points && points.length > 1 && !val.to_s.include?('/')
-        case points.length
-        when 4
-          [points[1], points[0], points[3], points[2]].join(' ')
-        when 3
-          [points[1], points[0], points[1], points[2]].join(' ')
-        when 2
-          [points[1], points[0]].join(' ')
-        else val
+      points_str, is_important = extract_important(css_value)
+      points = points_str.to_s.split(/\s+/)
+
+      append_important(is_important) do
+        if points && points.length > 1 && !points_str.to_s.include?('/')
+          case points.length
+          when 4
+            [points[1], points[0], points[3], points[2]].join(' ')
+          when 3
+            [points[1], points[0], points[1], points[2]].join(' ')
+          when 2
+            [points[1], points[0]].join(' ')
+          else points_str
+          end
+        else
+          points_str
         end
-      else
-        val
       end
     end
 
@@ -241,12 +258,22 @@ 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
 
       val
     end
+
+    def extract_important(css)
+      is_important = css =~ /#{IMPORTANT_DECLARATION}/
+      return css.sub(/ #{IMPORTANT_DECLARATION}/, ''), is_important
+    end
+
+    def append_important(is_important, &block)
+      css_value = yield
+      css_value + (is_important ? " #{IMPORTANT_DECLARATION}" : '')
+    end
   end
 
 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
@@ -197,6 +210,11 @@ describe R2::Swapper do
     it "should skip a pair value" do
       expect(r2.quad_swap("1px 2px")).to eq("1px 2px")
     end
+
+    it "should handle !important" do
+      expect(r2.quad_swap("1px 2px 3px 4px !important")).to eq("1px 4px 3px 2px !important")
+      expect(r2.quad_swap("1px 2px !important")).to eq("1px 2px !important")
+    end
   end
 
   describe "#shadow_swap" do
@@ -236,6 +254,9 @@ describe R2::Swapper do
       expect(r2.shadow_swap("inset 1px 2px rgba(0,0,0,0.2), 1px 2px #000")).to eq("-1px 2px rgba(0,0,0,0.2) inset, -1px 2px #000")
     end
 
+    it "should handle !important correctly" do
+      expect(r2.shadow_swap("1px 2px !important")).to eq("-1px 2px !important")
+    end
   end
 
   describe "#border_radius_swap" do
@@ -250,6 +271,11 @@ describe R2::Swapper do
     it "should skip a pair value" do
       expect(r2.border_radius_swap("1px 2px")).to eq("2px 1px")
     end
+
+    it "should corectly handle !important" do
+      expect(r2.border_radius_swap("1px !important")).to eq("1px !important")
+      expect(r2.border_radius_swap("1px 2px !important")).to eq("2px 1px !important")
+    end
   end
 
   describe "#background_position_swap" do
@@ -274,6 +300,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.8
 platform: ruby
 authors:
 - Matt Sanford
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -88,7 +88,7 @@ files:
 homepage: https://github.com/mzsanford/R2rb
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,9 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: r2
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: CSS flipper for right-to-left processing
 test_files: