beautiful-css 0.0.1 → 0.0.3

data/lib/beautiful-css/engine.rb

@@ -1,4 +1,4 @@
-require "beautiful-css/rule"
+require "beautiful-css/rule_parser"
 require "sass"
 
 module BeautifulCss
@@ -18,35 +18,56 @@ module BeautifulCss
 
     def render
       return nil if @input.nil?
+      rules = build_rules
+      cleaned = remove_unset rules
+      groups = build_groups(cleaned)
+      return format( groups )
+    end
+
+
+    private
 
+    def build_rules
       text = scss_to_css @input
       text = text.gsub( /[\n\r\t]/m, " " )
       text = text.gsub( / +/m, " " )
       text = text.gsub( /\/\*[^*]*\*\//m, " " )
       rules = text.split('}')
+      rules = rules.map{|r| RuleParser.new(r).to_rules }.flatten
+    end
 
-      rules = rules.map{|r| Rule.new(r) }
-
+    def remove_unset rules
       hash = {}
-
-      ##BUILD
       rules.each do |r|
-        r.props.each do |p|
-          hash[p] = [] if !( hash.has_key? p)
-          r.selectors.each { |s| hash[p].push s }
+        hash[r.prop] = {} if !( hash.has_key? r.prop)
+        hash[r.prop][r.selector] = r.value
+      end
+      hash
+    end
+
+    def build_groups rules
+      groups = {}
+      rules.keys.each do |prop|
+        rules[prop].keys.each do |selector|
+          val = rules[prop][selector]
+          prop_val = "{ #{prop}:#{val} }"
+          groups[prop_val] = [] if !( rules.has_key? prop_val)
+          groups[prop_val] << selector
         end
       end
+      groups
+    end
 
-      ##PRINT
-      output = ""
-      hash.keys.sort.each do |key|
+    def format groups
+      output = ''
+      groups.keys.sort.each do |key|
         output += "\n"
-        output += hash[key].join(",\n") + "\n"
+        output += groups[key].uniq.join(",\n") + "\n"
         output += key + "\n"
       end
-
       output.gsub( /: +/, ':' )
     end
 
+
   end
 end

data/lib/beautiful-css/rule.rb

@@ -1,26 +1,14 @@
-
 module BeautifulCss
-
   class Rule
-    def initialize(str)
-      @body = str
-    end
 
-    def selectors
-      @body.match(/[^{]*/).to_s.split(/,/).map{|s| s.strip}.select{|s| !s.empty? }
-    end
+    attr_accessor :selector, :prop, :value
 
-    def props
-      begin
-      p = @body.match(/\{([^}]*)/)[1].split(';').select{|s| !s.strip.empty? }
-      p.map{|s| "{ " + s.strip + " }"}
-      rescue
-        []
-      end
+    def initialize(selector, prop, value)
+      @selector, @prop, @value = selector.strip, prop.strip, value.strip
     end
 
-    def body
-      @body
+    def to_s
+      @selector + "\n" + "{ #{prop}:#{value} }"
     end
 
   end

data/lib/beautiful-css/rule_parser.rb

@@ -0,0 +1,38 @@
+require "beautiful-css/rule"
+
+module BeautifulCss
+  class RuleParser
+
+    def initialize(str)
+      @body = str
+    end
+
+    def selectors
+      @body.match(/[^{]*/).to_s.split(/,/).map{|s| s.strip}.select{|s| !s.empty? }
+    end
+
+    def props
+      begin
+      p = @body.match(/\{([^}]*)/)[1].split(';').select{|s| !s.strip.empty? }
+      p.map{|s| s.strip.split(':') }
+      rescue
+        []
+      end
+    end
+
+    def to_rules
+      selectors.map do |selector|
+        props.map do |prop|
+          BeautifulCss::Rule.new(selector, prop[0], prop[1])
+        end
+      end.flatten
+    end
+
+    def body
+      @body
+    end
+
+
+  end
+
+end

data/lib/beautiful-css/version.rb

@@ -1,3 +1,3 @@
 module BeautifulCss
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/spec/convertions_spec.rb

@@ -20,18 +20,26 @@ D
 
 
 
-  it 'two styles' do
+  it 'should work with three styles' do
     dirty = <<DIRTY
 a
 {
   color:red;
   background-color:blue;
 }
+
+.classy
+{
+  color:green;
+}
 DIRTY
     clean = <<CLEAN
 a
 { background-color:blue }
 
+.classy
+{ color:green }
+
 a
 { color:red }
 CLEAN
@@ -81,6 +89,36 @@ CLEAN
 
 
 
+  it 'should remove dups' do
+    dirty = <<DIRTY
+a { color:red }
+a { color:red }
+DIRTY
+    clean = <<CLEAN
+a
+{ color:red }
+CLEAN
+    assert_renders dirty, clean
+  end
+
+
+
+
+  it 'should removed unset values' do
+    dirty = <<DIRTY
+a { color:green }
+a { color:red }
+DIRTY
+    clean = <<CLEAN
+a
+{ color:red }
+CLEAN
+    assert_renders dirty, clean
+  end
+
+
+
+
 
 
   def assert_renders(dirty,clean)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beautiful-css
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies: []
 description: A tool to help cleanup css
 email:
@@ -28,6 +28,7 @@ files:
 - lib/beautiful-css/engine.rb
 - lib/beautiful-css/exec.rb
 - lib/beautiful-css/rule.rb
+- lib/beautiful-css/rule_parser.rb
 - lib/beautiful-css/version.rb
 - spec/beautiful_css_spec.rb
 - spec/convertions_spec.rb