r2 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 11915f30f055af7962245e50b8bb3acd299d72e8
+  data.tar.gz: a536b287f02596d20774cce78c37e81a24eb32fd
+SHA512:
+  metadata.gz: 6915646f994723a8ea9755e19ea764d00afe85c6f50f8ec356c373778729b08ccf07c0cf3ef1b4342d161902e3bce3365c1e2639fad435d4b97f8d96ab125666
+  data.tar.gz: 36b1614dd763a3c4f5534858f549c97e2fd06a467089437dcf082dfbc1ec0a748bf6121826bbe30e1f382f5ede46b6e331d7630c33dc8a5df6a92bb932e4bcb8

data/.travis.yml

@@ -0,0 +1,9 @@
+
+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/Gemfile

@@ -2,3 +2,6 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in r2.gemspec
 gemspec
+
+gem 'guard-rspec'
+gem 'rb-fsevent', '~> 0.9'

data/Guardfile

@@ -0,0 +1,6 @@
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/README.md

@@ -13,13 +13,20 @@ You can use the handy static method for flipping any CSS string via:
     > R2.r2("/* Comment */\nbody { direction: rtl; }")
     #=> "body{direction:ltr;}"
 
+## Build Status
+
+[![Build Status](https://travis-ci.org/mzsanford/R2rb.png)](https://travis-ci.org/mzsanford/R2rb)
+
 ## Reporting bugs
 
 Report bugs in the github project at http://github.com/mzsanford/r2rb
 
 ## Change Log
 
- * v0.1.0 – @fractious[https://github.com/fractious] updates
+ * v0.2.0 – CSS3 additions
+   * [FEATURE] Support `@media` queries by ignoring them (fix from [@haimlankry](https://github.com/haimlankry))
+   * [FEATURE] Correctly flip `box-shadow` values (bug report from [@aviaron](https://github.com/aviaron))
+ * v0.1.0 – [@fractious](https://github.com/fractious) updates
    * [CLEANUP] Added rspec dev dependency
    * [CLEANUP] Fixed typo in internal method name
    * [FEATURE] Added support for background-position

data/Rakefile

@@ -1,14 +1,9 @@
 require 'bundler'
 require 'rake'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks
 
-task :default => [:test]
-
-desc "Run all examples"
-Spec::Rake::SpecTask.new('test') do |t|
-  t.spec_files = FileList['spec/*_spec.rb']
-end
-
+RSpec::Core::RakeTask.new(:spec)
 
+task :default => :spec

data/lib/r2.rb

@@ -54,9 +54,9 @@ module R2
       '-webkit-border-radius' => lambda {|obj,val| obj.border_radius_swap(val) },
       'text-align' => lambda {|obj,val| obj.side_swap(val) },
       'float'      => lambda {|obj,val| obj.side_swap(val) },
-      'box-shadow' => lambda {|obj,val| obj.quad_swap(val) },
-      '-webkit-box-shadow' => lambda {|obj,val| obj.quad_swap(val) },
-      '-moz-box-shadow' => lambda {|obj,val| obj.quad_swap(val) },
+      'box-shadow' => lambda {|obj,val| obj.shadow_swap(val) },
+      '-webkit-box-shadow' => lambda {|obj,val| obj.shadow_swap(val) },
+      '-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) }
@@ -66,20 +66,19 @@ module R2
     def r2(original_css)
       css = minimize(original_css)
 
-      result = css.gsub(/([^\{]+\{[^\}]+\})+?/) do |rule|
-        # break rule into selector|declaration parts
-        parts = rule.match(/([^\{]+)\{([^\}]+)/)
-        selector = parts[1]
-        declarations = parts[2]
-
-        rule_str = selector + '{'
-        declarations.split(/;(?!base64)/).each do |decl|
-          rule_str << declaration_swap(decl)
+      result = css.gsub(/([^\{\}]+[^\}]|[\}])+?/) do |rule|
+        if rule.match(/[\{\}]/)
+          #it is a selector with "{" or a closing "}", insert as it is
+          rule_str = rule
+        else
+          #It is a decleration
+          rule_str = ""
+          rule.split(/;(?!base64)/).each do |decl|
+            rule_str << declaration_swap(decl)
+          end
         end
-        rule_str << "}"
         rule_str
       end
-
       return result
     end
 
@@ -90,7 +89,8 @@ module R2
       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(/\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)
@@ -144,6 +144,20 @@ module R2
         val
       end
     end
+
+    # 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+/)
+
+      matched = args && args[0].match(/^([-+]?\d+)(\w*)$/)
+      if matched
+        return (["#{(-1 * matched[1].to_i)}#{matched[2]}"] + Array(args.values_at(1..5))).compact.join(' ')
+      else
+        return val
+      end
+    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/version.rb

@@ -1,3 +1,3 @@
 module R2
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/r2.gemspec

@@ -14,7 +14,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "r2"
 
-  s.add_development_dependency 'rspec', '~> 1.3.0'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', '~> 2.13.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/r2_spec.rb

@@ -2,137 +2,192 @@
 require 'r2'
 
 describe R2 do
-  before(:each) do
-    @r2 = R2::Swapper.new
+
+  describe ".r2" do
+    let(:r2)  { double("r2") }
+    let(:css) { "body { direction: rtl; }" }
+
+    it "provides a shortcut to .new#r2" do
+      R2::Swapper.should_receive(:new).and_return(r2)
+      r2.should_receive(:r2).with(css)
+      R2.r2(css)
+    end
   end
 
-  context ".r2 static call" do
+end
+
+describe R2::Swapper do
+  subject(:r2) { R2::Swapper.new }
+
+  describe "#r2" do
     it "processes CSS" do
-      R2.r2("/* comment */\nbody { direction: rtl; }\nimg { padding: 4px;}").should == "body{direction:ltr;}img{padding:4px;}"
+      r2.r2("/* comment */\nbody { direction: rtl; }\nimg { padding: 4px;}").should == "body{direction:ltr;}img{padding:4px;}"
+    end
+
+    it "handles media queries" do
+      css = <<-EOS
+        @media all and (max-width: 222px) {
+          p {
+            padding-left: 2px;
+          }
+        }
+      EOS
+
+      expected_result = "@media all and (max-width:222px){p{padding-right:2px;}}"
+
+      flipped_css = r2.r2(css)
+
+      flipped_css.should == expected_result
     end
   end
 
-  context "declaration_swap" do
+  describe "#declaration_swap" do
     it "should handle nil" do
-      @r2.declaration_swap(nil).should == ''
+      r2.declaration_swap(nil).should == ''
     end
 
     it "should handle invalid declarations" do
-      @r2.declaration_swap("not a decl").should == ''
+      r2.declaration_swap("not a decl").should == ''
     end
 
     it "should swap a swappable parameter" do
-      @r2.declaration_swap("padding-right:4px").should == 'padding-left:4px;'
+      r2.declaration_swap("padding-right:4px").should == 'padding-left:4px;'
     end
 
     it "should swap a swappable quad parameter" do
-      @r2.declaration_swap("padding:1px 2px 3px 4px").should == 'padding:1px 4px 3px 2px;'
+      r2.declaration_swap("padding:1px 2px 3px 4px").should == 'padding:1px 4px 3px 2px;'
     end
 
     it "should ignore other parameters" do
-      @r2.declaration_swap("foo:bar").should == 'foo:bar;'
+      r2.declaration_swap("foo:bar").should == 'foo:bar;'
     end
   end
 
-  context "minimize" do
+  describe "#minimize" do
     it "should handle nil" do
-      @r2.minimize(nil).should == ""
+      r2.minimize(nil).should == ""
     end
 
     it "should strip comments" do
-      @r2.minimize("/* comment */foo").should == "foo"
+      r2.minimize("/* comment */foo").should == "foo"
     end
 
     it "should remove newlines" do
-      @r2.minimize("foo\nbar").should == "foobar"
+      r2.minimize("foo\nbar").should == "foobar"
     end
 
     it "should remove carriage returns" do
-      @r2.minimize("foo\rbar").should == "foobar"
+      r2.minimize("foo\rbar").should == "foobar"
     end
 
     it "should collapse multiple spaces into one" do
-      @r2.minimize("foo       bar").should == "foo bar"
+      r2.minimize("foo       bar").should == "foo bar"
     end
   end
 
-  context "direction_swap" do
+  describe "#direction_swap" do
     it "should swap 'rtl' to 'ltr'" do
-      @r2.direction_swap('rtl').should == 'ltr'
+      r2.direction_swap('rtl').should == 'ltr'
     end
 
     it "should swap 'ltr' to 'rtl'" do
-      @r2.direction_swap('ltr').should == 'rtl'
+      r2.direction_swap('ltr').should == 'rtl'
     end
 
     it "should ignore values other than 'ltr' and 'rtl'" do
       [nil, '', 'foo'].each do |val|
-        @r2.direction_swap(val).should == val
+        r2.direction_swap(val).should == val
       end
     end
   end
 
-  context "side_swap" do
+  describe "#side_swap" do
     it "should swap 'right' to 'left'" do
-      @r2.side_swap('right').should == 'left'
+      r2.side_swap('right').should == 'left'
     end
 
     it "should swap 'left' to 'right'" do
-      @r2.side_swap('left').should == 'right'
+      r2.side_swap('left').should == 'right'
     end
 
     it "should ignore values other than 'left' and 'right'" do
       [nil, '', 'foo'].each do |val|
-        @r2.side_swap(val).should == val
+        r2.side_swap(val).should == val
       end
     end
   end
 
-  context "quad_swap" do
+  describe "#quad_swap" do
     it "should swap a valid quad value" do
-      @r2.quad_swap("1px 2px 3px 4px").should == "1px 4px 3px 2px"
+      r2.quad_swap("1px 2px 3px 4px").should == "1px 4px 3px 2px"
     end
 
     it "should skip a pair value" do
-      @r2.quad_swap("1px 2px").should == "1px 2px"
+      r2.quad_swap("1px 2px").should == "1px 2px"
     end
   end
 
-  context "border_radius_swap" do
+  describe "#shadow_swap" do
+    it "should swap a 2 arg value" do
+      r2.shadow_swap("1px 2px").should == "-1px 2px"
+    end
+
+    it "should swap a 2 arg value from rtl to ltr" do
+      r2.shadow_swap("-1px 2px").should == "1px 2px"
+    end
+
+    it "should swap a 3 arg value" do
+      r2.shadow_swap("1px 2px #000").should == "-1px 2px #000"
+    end
+
+    it "should swap a 4 arg value" do
+      r2.shadow_swap("1px 2px 3px 4px").should == "-1px 2px 3px 4px"
+    end
+
+    it "should swap a 5 arg value" do
+      r2.shadow_swap("1px 2px 3px 4px #000").should == "-1px 2px 3px 4px #000"
+    end
+
+    it "should swap a 6 arg value" do
+      r2.shadow_swap("1px 2px 3px 4px #000 inset").should == "-1px 2px 3px 4px #000 inset"
+    end
+  end
+
+  describe "#border_radius_swap" do
     it "should swap a valid quad value" do
-      @r2.border_radius_swap("1px 2px 3px 4px").should == "2px 1px 4px 3px"
+      r2.border_radius_swap("1px 2px 3px 4px").should == "2px 1px 4px 3px"
     end
 
     it "should skip a triple value" do
-      @r2.border_radius_swap("1px 2px 3px").should == "2px 1px 2px 3px"
+      r2.border_radius_swap("1px 2px 3px").should == "2px 1px 2px 3px"
     end
 
     it "should skip a pair value" do
-      @r2.border_radius_swap("1px 2px").should == "2px 1px"
+      r2.border_radius_swap("1px 2px").should == "2px 1px"
     end
   end
 
-  context "background_position_swap" do
+  describe "#background_position_swap" do
 
     context "with a single value" do
       it "should ignore a named-vertical" do
-        @r2.background_position_swap('top').should == 'top'
+        r2.background_position_swap('top').should == 'top'
       end
 
       it "should swap a named-horizontal 'left'" do
-        @r2.background_position_swap('left').should == 'right'
+        r2.background_position_swap('left').should == 'right'
       end
 
       it "should swap a named-horizontal 'right'" do
-        @r2.background_position_swap('right').should == 'left'
+        r2.background_position_swap('right').should == 'left'
       end
 
       it "should invert a percentage" do
-        @r2.background_position_swap('25%').should == '75%'
+        r2.background_position_swap('25%').should == '75%'
       end
 
       it "should convert a unit value" do
-        @r2.background_position_swap('25px').should == 'right 25px center'
+        r2.background_position_swap('25px').should == 'right 25px center'
       end
     end
 
@@ -143,36 +198,37 @@ describe R2 do
       # See: http://dev.w3.org/csswg/css3-background/#background-position
 
       it "should swap named-horizontal and ignore named-vertical" do
-        @r2.background_position_swap('right bottom').should == 'left bottom'
+        r2.background_position_swap('right bottom').should == 'left bottom'
       end
 
       it "should swap named-horizontal and ignore unit-vertical" do
-        @r2.background_position_swap('left 100px').should == 'right 100px'
+        r2.background_position_swap('left 100px').should == 'right 100px'
       end
 
       it "should convert unit-horizontal" do
-        @r2.background_position_swap('100px center').should == 'right 100px center'
+        r2.background_position_swap('100px center').should == 'right 100px center'
       end
 
       it "should swap named-horizontal and ignore percentage-vertical" do
-        @r2.background_position_swap('left 0%').should == 'right 0%'
+        r2.background_position_swap('left 0%').should == 'right 0%'
       end
 
       it "should invert first percentage-horizontal value in a pair" do
-        @r2.background_position_swap('25% 100%').should == '75% 100%'
+        r2.background_position_swap('25% 100%').should == '75% 100%'
       end
     end
 
     context "with a triplet of values" do
       it "should swap named-horizontal" do
-        @r2.background_position_swap('left 20px center').should == 'right 20px center'
+        r2.background_position_swap('left 20px center').should == 'right 20px center'
       end
     end
 
     context "with a quad of values" do
       it "should swap named-horizontal value" do
-        @r2.background_position_swap('bottom 10px left 20px').should == 'bottom 10px right 20px'
+        r2.background_position_swap('bottom 10px left 20px').should == 'bottom 10px right 20px'
       end
     end
   end
+
 end

metadata

@@ -1,32 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: r2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Sanford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.13.0
 description: CSS flipper for right-to-left processing. A Ruby port of https://github.com/ded/r2
 email:
 - matt@twitter.com
@@ -36,7 +47,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -47,27 +60,26 @@ files:
 - spec/r2_spec.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: r2
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CSS flipper for right-to-left processing
 test_files:
 - spec/r2_spec.rb