visionmedia-ass 0.0.2 → 0.0.3

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.0.3 / 2009-01-19
+
+* Minor performance improvements
+* Minor refactoring
 
 === 0.0.1 / 2009-01-12
 

data/ass.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ass}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-01-15}
+  s.date = %q{2009-01-19}
   s.default_executable = %q{ass}
   s.description = %q{'Amazing Style Sheets'}
   s.email = %q{tj@vision-media.ca}

data/examples/benchmarks.rb

@@ -1,7 +1,50 @@
 
 $:.unshift File.dirname(__FILE__) + '/../lib/'
+
 require 'ass'
-require 'benchmark'
+require 'rubygems'
+require 'sass'
+require 'rgauge'
+
+large_sass = <<-SASS
+=highlighted-background
+  background:
+    color: #fc0
+=header-text
+  font:
+    size: 20px
+
+=compound
+  +highlighted-background
+  +header-text
+  
+.page-title
+  +header-text
+  :padding 4px
+  :margin
+    :top 10px
+    
+#footer
+  :padding 0
+  :margin 15px 1px
+  :background red
+  
+  .copyright < somethng
+    :color green
+    
+    :hover
+      :background
+        :color red
+    
+body
+  :color #fff
+  
+  a
+    :font
+      :size 12px
+      :family "Arial"
+      :weight bold
+SASS
 
 large_ass = <<-ASS
 /* Inline comment
@@ -67,9 +110,8 @@ a
     
 ASS
 
-Benchmark.bm(15) do |x|
-  x.report("60 lines") { 
-    Ass::Parser.parse(large_ass)
-  }
+benchmark 'Parsing Speed', :times => 20 do
+  report('Large Ass')  { Ass::Parser.parse(large_ass) }
+  report('Large Sass') { Sass::Engine.new(large_sass).render }
 end
 

data/lib/ass/parser.rb

@@ -20,7 +20,7 @@ module Ass
     PROPERTY = /^ *#{HYPHENATED_WORD}/
     
     attr_accessor :ass, :constants, :css
-    alias :to_s :ass
+    alias :to_s :css
     
     def initialize ass = ''
       @ass, @css, @constants = ass, '', {}
@@ -32,64 +32,59 @@ module Ass
       last_selector = ''
       lines = @ass.split "\n"
       lines.each do |line|
-        if line.match COMMENT
+        
+        case line
+        when COMMENT
           @css << "/* #{$1.strip} */\n"
-        elsif line.match CONSTANT_WITH_VALUE
-          @constants[$1.to_sym] = $2
-        elsif not in_block and line.match MIXIN
-          in_mixin, in_block = $1, true
-        elsif in_block and line.match MIXIN
-          next if in_mixin
-          @css << mixins[$1]
-        elsif in_block and line.match BLANK
-          in_block = false
-          next if in_mixin
-          @css << CLOSING_BRACE
-        elsif line.match AT
-          @css << line << "\n"
-        elsif line.match BLANK or line.match ASS_COMMENT
-          # Do nothing
-        elsif not in_block and line.match SELECTOR 
-          in_block = true
-          if sub_selector?($1, last_selector)
+        when MIXIN
+          if in_block
             next if in_mixin
-            selector = join_selectors last_selector, $1.strip
-            @css << selector << OPEN_BRACE
+            @css << mixins[$1]
           else
-            in_mixin = false
-            selector = $1.strip
-            @css << selector << OPEN_BRACE
+            in_mixin, in_block = $1, true
           end
-          last_selector = selector
-        elsif line.match PROPERTY
-          if mixin = in_mixin
-            mixins[mixin] << format_property(line)
-          else
-            @css << format_property(line)
+        when CONSTANT_WITH_VALUE
+          @constants[$1.to_sym] = $2
+        when BLANK
+          if in_block
+            in_block = false
+            next if in_mixin
+            @css << CLOSING_BRACE
+          end
+        when AT
+          @css << line << "\n"
+        else
+          if not in_block and line.match SELECTOR 
+            in_block = true
+            if nested_selector?($1, last_selector)
+              next if in_mixin
+              selector = splice_selectors last_selector, $1.strip
+              @css << selector << OPEN_BRACE
+            else
+              in_mixin = false
+              selector = $1.strip
+              @css << selector << OPEN_BRACE
+            end
+            last_selector = selector
+          elsif line.match PROPERTY
+            if mixin = in_mixin
+              mixins[mixin] << format_property(line)
+            else
+              @css << format_property(line)
+            end
           end
         end
       end
       self
     end
     
-    def join_selectors selector_a, selector_b
-      if selector_b[0,1] == ':'
-        if selector_a.include? ','
-          selector_a.split(',').collect { |selector| selector << selector_b }.join(',')  
-        else
-          selector_a << selector_b
-        end
-      else
-        if selector_a.include? ','
-          selector_a.split(',').collect { |selector| selector << ' ' << selector_b }.join(',')  
-        else
-          selector_a << ' ' << selector_b
-        end
-      end
+    def splice_selectors selector_a, selector_b
+      selector_b[0,0] = ' ' unless selector_b[0,1] == ':'
+      selector_a.strip.gsub(/([^,]+),/, "\\1#{selector_b},") << selector_b
     end
     
-    def sub_selector? selector_a, selector_b
-      true if indents_in(selector_a) > indents_in(selector_b)
+    def nested_selector? selector_a, selector_b
+      indents_in(selector_a) > indents_in(selector_b)
     end
     
     def indents_in string
@@ -98,9 +93,9 @@ module Ass
     
     def format_property line
       line.gsub! PROPERTY, '  \1:'
-      line.gsub! CONSTANT do |constant|
-        constant_sym = constant.gsub(':', '').to_sym
-        @constants[constant_sym] || 'undefined_constant'
+      line.gsub! CONSTANT do |constant| 
+        constant[0,1] = ''
+        @constants[constant.to_sym] || 'undefined_constant'
       end
       line << ";\n"
     end

data/lib/ass/version.rb

@@ -1,7 +1,7 @@
 
 module Ass
   module VERSION #:nodoc:
-    MAJOR, MINOR, TINY = [0, 0, 2]
+    MAJOR, MINOR, TINY = [0, 0, 3]
     STRING = [MAJOR, MINOR, TINY].join '.'
   end
 end

data/spec/functional/parser_spec.rb

@@ -12,15 +12,15 @@ describe Ass::Parser do
   end
   
   it "should determine sub selectors" do
-    @parser.sub_selector?('  sub', 'primary').should be_true
-    @parser.sub_selector?('primary', 'primary').should be_nil
+    @parser.nested_selector?('  sub', 'primary').should be_true
+    @parser.nested_selector?('primary', 'primary').should be_false
   end
   
-  it "should join sub selectors" do
-    @parser.join_selectors('a', ':hover').should == 'a:hover'
-    @parser.join_selectors('h1', 'a').should == 'h1 a'
-    @parser.join_selectors('h1, h2, h3', ':hover').should == 'h1:hover, h2:hover, h3:hover'
-    @parser.join_selectors('h1, h2, h3', 'a').should == 'h1 a, h2 a, h3 a'
+  it "should splice sub selectors" do
+    @parser.splice_selectors('a', ':hover').should == 'a:hover'
+    @parser.splice_selectors('h1', 'a').should == 'h1 a'
+    @parser.splice_selectors('h1, h2, h3', ':hover').should == 'h1:hover, h2:hover, h3:hover'
+    @parser.splice_selectors('h1, h2, h3', 'a').should == 'h1 a, h2 a, h3 a'
   end
 
   it "should populate constants" do
@@ -35,6 +35,24 @@ describe Ass::Parser do
     @parser.constants[:tertiary_size].should == '9em'
   end
   
+  it "should populate output undefined constant" do
+    @parser.ass = <<-ASS.deindent
+      :color = #fff
+      
+      body
+        background :color
+        font :font_size
+        
+    ASS
+    @parser.parse!
+    @parser.css.should == <<-CSS.deindent
+      body {
+        background: #fff;
+        font: undefined_constant;
+      }
+    CSS
+  end
+  
   it "should translate ass document from file" do
     Ass::Parser.parse_file(File.dirname(__FILE__) + '/../fixtures/test.ass').should == <<-ASS.deindent
       body.some-class {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-ass
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-15 00:00:00 -08:00
+date: 2009-01-19 00:00:00 -08:00
 default_executable: ass
 dependencies: 
 - !ruby/object:Gem::Dependency