less 1.2.12 → 1.2.13

data/VERSION

@@ -1 +1 @@
-1.2.12
+1.2.13

data/less.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.2.12"
+  s.version = "1.2.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-11-18}
+  s.date = %q{2009-11-19}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{self@cloudhead.net}

data/lib/less/engine/grammar/less.tt

@@ -2,9 +2,9 @@ module Less
   grammar StyleSheet
     include Common
     include Entity
-    
+
     rule primary
-      (import / declaration / mixin / ruleset / comment)* {
+      (import / declaration / ruleset / mixin / comment)* {
         def build env = Less::Element.new
           elements.map do |e|
             e.build env if e.respond_to? :build
@@ -30,7 +30,7 @@ module Less
           end
         end
         # Mixin Declaration
-      } / '.' name:[-a-zA-Z0-9_]+ ws parameters ws "{" ws primary ws "}" ws {
+      } / ws '.' name:[-a-zA-Z0-9_]+ ws parameters ws "{" ws primary ws "}" ws {
         def build env
           env << Node::Mixin::Def.new(name.text_value, parameters.build(env))
           primary.build env.last
@@ -64,7 +64,7 @@ module Less
             e.send(method, env) if e.respond_to? method
           end.compact
         end
-    
+
         def all
           [selector] + tail.elements.map {|e| e.selector }
         end
@@ -82,7 +82,7 @@ module Less
             node.last
           end
         end
-    
+
         def mixin env
           sel.elements.map do |e|
             Node::Element.new(e.element.text_value, e.select.text_value)
@@ -90,7 +90,7 @@ module Less
         end
       }
     end
-    
+
     rule parameters
       '(' s ')' {
         def build env
@@ -102,7 +102,7 @@ module Less
             e.build(env)
           end
         end
-        
+
         def all
           [parameter] + tail.elements.map {|e| e.parameter }
         end
@@ -116,7 +116,7 @@ module Less
         end
       }
     end
-    
+
     rule import
       ws "@import" S url:(string / url) medias? s ';' ws {
         def build env
@@ -294,7 +294,7 @@ module Less
         end
       }
     end
-    
+
     #
     # Functions and arguments
     #
@@ -313,7 +313,7 @@ module Less
             e.build if e.respond_to? :build
           end.compact
         end
-  
+
         def all
           [expressions] + tail.elements.map {|e| e.expressions }
         end
@@ -324,4 +324,4 @@ module Less
       }
     end
   end
-end
+end

data/lib/less/engine/nodes/element.rb

@@ -13,7 +13,7 @@ module Less
       include Entity
 
       attr_accessor :rules, :selector, :file,
-                    :set,   :imported, :name     
+                    :set,   :imported, :name
 
       def initialize name = "", selector = ''
         @name = name
@@ -48,10 +48,11 @@ module Less
       # but it'll have to do until I find
       # a proper way to do it.
       def group
-        matched = false
-        stack, result = elements.dup, []
+        elements = self.elements.reject {|e| e.is_a?(Mixin::Def) }
         return self unless elements.size > 1
 
+        stack, result, matched = elements.dup, [], false
+
         elements.each do
           e = stack.first
           result << e unless matched
@@ -119,13 +120,13 @@ module Less
           self[element.name] if self[element.name].selector.class == selector.class
         end
       end
-      
+
       def mix arr = []
         @rules += arr.map do |r|
           r.copy.tap {|i| i.parent = self }
         end
       end
-      
+
       #
       # Add an arbitrary node to this element
       #
@@ -148,13 +149,15 @@ module Less
       def to_css path = [], env = nil
         path << @selector.to_css << name unless root?
 
-#        puts "to_css env: #{env ? env.variables : "nil"}"
-
-        content = (properties + mixins).map do |i|
+#       puts "to_css env: #{env ? env.variables : "nil"}"
+        content = @rules.select do |r|
+          r.is_a?(Mixin::Call) || r.instance_of?(Property)
+        end.map do |i|
           ' ' * 2 + i.to_css(env)
         end.compact.reject(&:empty?) * "\n"
 
         content = content.include?("\n") ? "\n#{content}\n" : " #{content.strip} "
+
         ruleset = if is_a?(Mixin::Def)
           content.strip
         else
@@ -163,12 +166,12 @@ module Less
             *@set.map(&:name)].uniq * ', '} {#{content}}\n" : ""
         end
 
-        css = ruleset + elements.
-              reject {|e| e.is_a? Mixin::Def }.map do |i|
+        ruleset + elements.reject {|e| e.is_a?(Mixin::Def) }.map do |i|
           i.to_css(path, env)
         end.reject(&:empty?).join
-        2.times {path.pop}
-        css
+
+      ensure
+        2.times { path.pop }
       end
 
       #
@@ -273,4 +276,4 @@ module Less
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: less
 version: !ruby/object:Gem::Version 
-  version: 1.2.12
+  version: 1.2.13
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 -05:00
+date: 2009-11-19 00:00:00 -05:00
 default_executable: lessc
 dependencies: 
 - !ruby/object:Gem::Dependency