css_counter 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d29466a22fbcba30013eb4e93c7b52ac8ab2f7f9
-  data.tar.gz: 5e46547c7b27fc99ac7a9cc5c1cde88ca2e9195b
+  metadata.gz: 119ea80024e35b6ff01ecb565b6d436f02dc8610
+  data.tar.gz: 6a50e0996f2c2a40f29e5b1ebe81be0a7f5e1551
 SHA512:
-  metadata.gz: f737014b43feac1c75bb6d190a4f13f8052291c7c9bd7e90cd9fe9d37e32a5719a621641f5d26c216365fbac6ff328987c5508c3ef3c64cbea67fad9fa3a5478
-  data.tar.gz: 72f6f09383d8386b86277e8792cbb8d20241e5137526a073013e0209b8838808641b9a5fba9df99bbd5b82678c367e879b9c059744b11d6b67d08871015bba19
+  metadata.gz: 3b5b1315deccefbaafdd29a59b0c24a06101f0937d60dd353dc6c0589950c55d3b91ddb477153e6ec8c537a0322c65dcccd7598954ffc38e7632307222f21d79
+  data.tar.gz: 20c16c7adf29446bd751673bbb48cedb00cd8b731daab11e3736e415c6fbae757fe29b7ed8142d60a1eff752d5641d2e30f1590be8e541a48c0cee4625f4ba68

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.0.3 (14th February 2013)
+* improve counting of some CSS3 selectors
+
 v0.0.2 (14th February 2013)
 * added a rake task for checking the CSS selector count from rails
 

data/lib/css_counter.rb

@@ -15,25 +15,39 @@ class CssCounter
 
   def count_selectors_in_css_string(string)
     tree = Crass.parse(string)
-    selector_count = tree.select { |item|
-      item[:node] == :style_rule
-    }.map { |item|
-      item[:selector][:value].split(",")
-    }.flatten.size
-    media_queries = tree.select { |item|
-      item[:node] == :at_rule && item[:name] == "media"
+    tree.map { |item|
+      count_selectors_in_node(item)
+    }.inject(0) { |accum, i|
+      accum += i
     }
-    media_queries.each do |mq|
-      selector_count += count_selectors_in_mq(string, mq)
+  end
+
+  def count_selectors_in_node(item)
+    case item[:node]
+    when :style_rule then count_selectors_in_style_rule(item)
+    when :at_rule    then count_selectors_in_at_rule(item)
+    else
+      0
     end
-    selector_count
   end
 
-  def count_selectors_in_mq(css, mq)
-    startpos = mq[:block][:tokens][1][:pos]
-    endpos   = mq[:block][:tokens][-2][:pos]
-    local_css = css[startpos, endpos-startpos]
-    count_selectors_in_css_string(local_css)
+  def count_selectors_in_style_rule(item)
+    item[:selector][:value].split(",").size
+  end
+
+  def count_selectors_in_at_rule(item)
+    if item[:name] == "media"
+      startpos = item[:block][:tokens][1][:pos]
+      endpos   = item[:block][:tokens][-2][:pos]
+      local_css = @css[startpos, endpos-startpos]
+      count_selectors_in_css_string(local_css) + 1
+    elsif item[:name] == "font-face"
+      1
+    elsif item[:name] =~ /keyframes\Z/
+      item[:block][:value].select { |item| item[:node] == :percentage }.size
+    else
+      0
+    end
   end
 
 end

data/spec/css_counter_spec.rb

@@ -35,16 +35,37 @@ describe CssCounter do
       let!(:input) { File.read(File.dirname(__FILE__) + "/fixtures/mediaquery.css") }
       subject { CssCounter.new(input).selectors }
 
+      it { should == 3 }
+    end
+
+    context "with charset.css" do
+      let!(:input) { File.read(File.dirname(__FILE__) + "/fixtures/charset.css") }
+      subject { CssCounter.new(input).selectors }
+
+      it { should == 1 }
+    end
+
+    context "with font-face.css" do
+      let!(:input) { File.read(File.dirname(__FILE__) + "/fixtures/font-face.css") }
+      subject { CssCounter.new(input).selectors }
+
       it { should == 2 }
     end
 
-    context "with mediaquery.css" do
+    context "with keyframes.css" do
+      let!(:input) { File.read(File.dirname(__FILE__) + "/fixtures/keyframes.css") }
+      subject { CssCounter.new(input).selectors }
+
+      it { should == 9 }
+    end
+
+    context "with tc-application.css" do
       let!(:input) { File.read(File.dirname(__FILE__) + "/fixtures/tc-application.css") }
       subject { CssCounter.new(input).selectors }
 
       # TODO blesscss reports this file has 4467 selectors. Who is correct?
       #it { should == 4467 }
-      it { should == 4326 }
+      it { should == 4461 }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: css_counter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - James Healy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake