css2less 0.0.1 → 0.0.2

data/ChangeLog.rdoc

@@ -1,3 +1,9 @@
+=== 0.0.2 / 2013-02-03
+
+* implement a new test to check if css @font-face rules are correctly handled
+* fix: correctly handle css @import rules ( #10 )
+* fix: correctly handle css child selectors ( #12 )
+
 === 0.0.1 / 2013-02-02
 
 * Reformat the source code using Ruby conventions.

data/lib/css2less.rb

@@ -71,11 +71,23 @@ module Css2Less
     def generate_tree
       @css.split("\n").map { |l| l.strip }.join.gsub(/\/\*+[^\*]*\*+\//, '').split(/[\{\}]/).each_slice(2) do |style|
         rules = style[0].strip
+        # handle child selector case - step1
+        if rules.include?('>')
+          rules = rules.gsub(/\s*>\s*/, ' &>')
+        end
+        if rules.include?("@import")
+          import_rule = rules.match(/@import.*;/)[0]
+          rules = rules.gsub(/@import.*;/, '')
+          add_rule(@tree, [], import_rule)
+        end
         # leave multiple rules alone
         if rules.include?(',')
           add_rule(@tree, [rules], style[1])
         else
-          add_rule(@tree, rules.split(/\s+/), style[1])
+          rules_split = rules.split(/\s+/)
+          # handle child selector case - step2
+          rules_split.map! {|rule| rule.gsub('&>', '& > ')}
+          add_rule(@tree, rules_split, style[1])
         end
       end
     end
@@ -85,13 +97,17 @@ module Css2Less
       tree = @tree
       end
       tree.each do |element, children|
-        @less = @less + ' ' * indent + element + " {\n"
-        style = children.delete(:style)
-        if style
-          @less = @less + style.split(';').map { |s| s.strip }.reject { |s| s.empty? }.map { |s| ' ' * (indent+4) + s + ";" }.join("\n") + "\n"
+        if element == :style
+          @less = @less + children.split(';').map { |s| s.strip }.reject { |s| s.empty? }.map { |s| s + ";" }.join("\n") + "\n"
+        else
+          @less = @less + ' ' * indent + element + " {\n"
+          style = children.delete(:style)
+          if style
+            @less = @less + style.split(';').map { |s| s.strip }.reject { |s| s.empty? }.map { |s| ' ' * (indent+4) + s + ";" }.join("\n") + "\n"
+          end
+          render_less(children, indent + 4)
+          @less = @less + ' ' * indent + "}\n"
         end
-        render_less(children, indent + 4)
-        @less = @less + ' ' * indent + "}\n"
       end
     end
 

data/lib/css2less/version.rb

@@ -1,3 +1,3 @@
 module Css2Less
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/css2less_spec.rb

@@ -6,3 +6,127 @@ describe Css2Less do
     subject.const_get('VERSION').should_not be_empty
   end
 end
+
+describe Css2Less::Converter do
+  it "should convert basic css structure into less structure" do
+    css = <<EOF
+#hello {
+    color: blue;
+}
+
+#hello #buddy {
+    background: red;
+}
+EOF
+    less = <<EOF
+#hello {
+    color: blue;
+    #buddy {
+        background: red;
+    }
+}
+EOF
+    converter = Css2Less::Converter.new(css)
+    converter.process_less
+    converter.get_less.should eq(less)
+  end
+
+  it "should correctly handle css child selectors" do
+    css = <<EOF
+body .navbar .nav > li > a {
+  color: #333;
+  font-weight: bold;
+}
+EOF
+    less = <<EOF
+body {
+    .navbar {
+        .nav {
+            & > li {
+                & > a {
+                    color: #333;
+                    font-weight: bold;
+                }
+            }
+        }
+    }
+}
+EOF
+    converter = Css2Less::Converter.new(css)
+    converter.process_less
+    converter.get_less.should eq(less)
+  end
+
+  it "should correctly handle css @import rules" do
+    css = <<EOF
+@import "style1.css";
+@import "style2.css";
+
+@import "style3.css";
+
+#hello {
+    color: blue;
+}
+
+@import "style4.css";
+
+#hello #buddy {
+    background: red;
+}
+@import "style5.css";
+EOF
+    less = <<EOF
+@import "style1.css";
+@import "style2.css";
+@import "style3.css";
+@import "style4.css";
+@import "style5.css";
+#hello {
+    color: blue;
+    #buddy {
+        background: red;
+    }
+}
+EOF
+    converter = Css2Less::Converter.new(css)
+    converter.process_less
+    converter.get_less.should eq(less)
+  end
+  
+  it "should correctly handle @font-face rules" do
+    css = <<EOF
+@font-face {
+  font-family: 'MyWebFont';
+  src: url('webfont.eot'); /* IE9 Compat Modes */
+  src: url('webfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('webfont.woff') format('woff'), /* Modern Browsers */
+       url('webfont.ttf')  format('truetype'), /* Safari, Android, iOS */
+       url('webfont.svg#svgFontName') format('svg'); /* Legacy iOS */
+}
+
+#hello {
+    color: blue;
+}
+
+#hello #buddy {
+    background: red;
+}
+EOF
+    less = <<EOF
+@font-face {
+    font-family: 'MyWebFont';
+    src: url('webfont.eot');
+    src: url('webfont.eot?#iefix') format('embedded-opentype'), url('webfont.woff') format('woff'), url('webfont.ttf')  format('truetype'), url('webfont.svg#svgFontName') format('svg');
+}
+#hello {
+    color: blue;
+    #buddy {
+        background: red;
+    }
+}
+EOF
+    converter = Css2Less::Converter.new(css)
+    converter.process_less
+    converter.get_less.should eq(less)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css2less
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc