r2 0.0.3 → 0.1.0

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 *.gem
 .bundle
+Gemfile.lock

data/README.md

@@ -19,6 +19,10 @@ Report bugs in the github project at http://github.com/mzsanford/r2rb
 
 ## Change Log
 
+ * 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
  * v0.0.3 - Feature release
    * [FEATURE] Added -moz and -webkit border support
    * [FEATURE] Added box-shadow (+moz and webkit) support
@@ -40,4 +44,4 @@ Report bugs in the github project at http://github.com/mzsanford/r2rb
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
-     limitations under the License.
+     limitations under the License.

data/lib/r2/version.rb

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

data/lib/r2.rb

@@ -49,12 +49,17 @@ module R2
     VALUE_PROCS = {
       'padding'    => lambda {|obj,val| obj.quad_swap(val) },
       'margin'     => lambda {|obj,val| obj.quad_swap(val) },
+      'border-radius' => lambda {|obj,val| obj.border_radius_swap(val) },
+      '-moz-border-radius' => lambda {|obj,val| obj.border_radius_swap(val) },
+      '-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) },
-      'direction'  => lambda {|obj,val| obj.direction_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) }
     }
 
     # Given a String of CSS perform the full directionality change
@@ -69,7 +74,7 @@ module R2
 
         rule_str = selector + '{'
         declarations.split(/;(?!base64)/).each do |decl|
-          rule_str << declartion_swap(decl)
+          rule_str << declaration_swap(decl)
         end
         rule_str << "}"
         rule_str
@@ -89,7 +94,7 @@ module R2
     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)
-    def declartion_swap(decl)
+    def declaration_swap(decl)
       return '' unless decl
 
       matched = decl.match(/([^:]+):(.+)$/)
@@ -139,6 +144,52 @@ module R2
         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.
+    def border_radius_swap(val)
+      # 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
+        end
+      else
+        val
+      end
+    end
+
+    # Given a background-position such as <tt>left center</tt> or <tt>0% 50%</tt> return the opposing value e.g <tt>right center</tt> or <tt>100% 50%</tt>
+    def background_position_swap(val)
+
+      if val =~ /left/
+        val.gsub!('left', 'right')
+      elsif val =~ /right/
+        val.gsub!('right', 'left')
+      end
+
+      points = val.strip.split(/\s+/)
+
+      # If first point is a percentage-value
+      if match = points[0].match(/(\d+)%/)
+        inv = 100 - match[1].to_i # 30% => 70% (100 - x)
+        val = ["#{inv}%", points[1]].compact.join(' ')
+      end
+
+      # If first point is a unit-value
+      if match = points[0].match(/^(\d+[a-z]{2,3})/)
+        val = ["right", match[1], points[1] || "center"].compact.join(' ')
+      end
+
+      val
+    end
   end
 
 end

data/r2.gemspec

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

data/spec/r2_spec.rb

@@ -12,25 +12,25 @@ describe R2 do
     end
   end
 
-  context "declartion_swap" do
+  context "declaration_swap" do
     it "should handle nil" do
-      @r2.declartion_swap(nil).should == ''
+      @r2.declaration_swap(nil).should == ''
     end
 
     it "should handle invalid declarations" do
-      @r2.declartion_swap("not a decl").should == ''
+      @r2.declaration_swap("not a decl").should == ''
     end
 
     it "should swap a swappable parameter" do
-      @r2.declartion_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.declartion_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.declartion_swap("foo:bar").should == 'foo:bar;'
+      @r2.declaration_swap("foo:bar").should == 'foo:bar;'
     end
   end
 
@@ -97,4 +97,82 @@ describe R2 do
       @r2.quad_swap("1px 2px").should == "1px 2px"
     end
   end
-end
+
+  context "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"
+    end
+
+    it "should skip a triple value" do
+      @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"
+    end
+  end
+
+  context "background_position_swap" do
+
+    context "with a single value" do
+      it "should ignore a named-vertical" do
+        @r2.background_position_swap('top').should == 'top'
+      end
+
+      it "should swap a named-horizontal 'left'" do
+        @r2.background_position_swap('left').should == 'right'
+      end
+
+      it "should swap a named-horizontal 'right'" do
+        @r2.background_position_swap('right').should == 'left'
+      end
+
+      it "should invert a percentage" do
+        @r2.background_position_swap('25%').should == '75%'
+      end
+
+      it "should convert a unit value" do
+        @r2.background_position_swap('25px').should == 'right 25px center'
+      end
+    end
+
+    context "with a pair of values" do
+      # Note that a pair of keywords can be reordered while a combination of
+      # keyword and length or percentage cannot. So ‘center left’ is valid
+      # while ‘50% left’ is not.
+      # 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'
+      end
+
+      it "should swap named-horizontal and ignore unit-vertical" do
+        @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'
+      end
+
+      it "should swap named-horizontal and ignore percentage-vertical" do
+        @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%'
+      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'
+      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'
+      end
+    end
+  end
+end

metadata

@@ -1,34 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: r2
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Matt Sanford
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-23 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
+date: 2013-03-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: CSS flipper for right-to-left processing. A Ruby port of https://github.com/ded/r2
-email: 
+email:
 - matt@twitter.com
-executables: 
+executables:
 - r2
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -39,39 +45,29 @@ files:
 - lib/r2/version.rb
 - r2.gemspec
 - spec/r2_spec.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: r2
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: CSS flipper for right-to-left processing
-test_files: 
+test_files:
 - spec/r2_spec.rb