less 1.1.9 → 1.1.10

data/VERSION

@@ -1 +1 @@
-1.1.9
+1.1.10

data/less.gemspec

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

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

@@ -8,41 +8,41 @@ module Less
     # TODO: Look into making @rules its own hash-like class
     # TODO: Look into whether selector should be child by default
     #
-    class Element < ::String
+    class Element
       include Enumerable
       include Entity
-  
-      attr_accessor :rules, :selector, :partial, :file, :set
-  
+
+      attr_accessor :rules, :selector, :file,
+                    :set,   :name
+
       def initialize name = "", selector = ''
-        super name   
-        
+        @name = name
         @set = []
         @rules = [] # Holds all the nodes under this element's hierarchy
         @selector = Selector[selector.strip].new  # descendant | child | adjacent
       end
-    
-      def class?;     self =~ /^\./ end
-      def id?;        self =~ /^#/  end
-      def universal?; self == '*'   end
-  
-      def tag? 
+
+      def class?;     name =~ /^\./ end
+      def id?;        name =~ /^#/  end
+      def universal?; name == '*'   end
+
+      def tag?
         not id? || class? || universal?
       end
-  
+
       # Top-most node?
       def root?
         parent.nil?
       end
-    
+
       def empty?
         @rules.empty?
       end
-  
+
       def leaf?
         elements.empty?
       end
-      
+
       # Group similar rulesets together
       # This is horrible, horrible code,
       # but it'll have to do until I find
@@ -51,24 +51,14 @@ module Less
         matched = false
         stack, result = elements.dup, []
         return self unless elements.size > 1
-        
+
         elements.each do
           e = stack.first
           result << e unless matched
-          
+
           matched = stack[1..-1].each do |ee|
-            if e.rules.size == ee.rules.size and 
-               e.elements.size == 0 and
-              !e.rules.zip(ee.rules).map {|a, b| 
-                a.to_css == b.to_css
-              }.include?(false)
-              
-              # Add to set unless it's a duplicate
-              if e == ee
-                # Do something with dups
-              else
-                self[e].set << ee
-              end
+            if e.equiv? ee and e.elements.size == 0
+              self[e].set << ee
               stack.shift
             else
               stack.shift
@@ -79,7 +69,7 @@ module Less
         @rules -= (elements - result)
         self
       end
-  
+
       #
       # Accessors for the different nodes in @rules
       #
@@ -87,26 +77,47 @@ module Less
       def properties;  @rules.select {|r| r.instance_of? Property } end
       def variables;   @rules.select {|r| r.instance_of? Variable } end
       def elements;    @rules.select {|r| r.instance_of? Element  } end
-  
+
       # Select a child element
       # TODO: Implement full selector syntax & merge with descend()
       def [] key
-        @rules.find {|i| i.to_s == key }
+        case key
+          when Entity
+            @rules.find {|i| i.eql? key }
+          when ::String
+            @rules.find {|i| i.to_s == key }
+          else raise ArgumentError
+        end
+      end
+
+      def == other
+        name == other.name
+      end
+
+      def eql? other
+        super and self.equiv? other
       end
-    
+
+      def equiv? other
+        rules.size == other.rules.size and
+        !rules.zip(other.rules).map do |a, b|
+          a.to_css == b.to_css
+        end.include?(false)
+      end
+
       # Same as above, except with a specific selector
       # TODO: clean this up or implement it differently
       def descend selector, element
         if selector.is_a? Child
-          s = self[element].selector
-          self[element] if s.is_a? Child or s.is_a? Descendant
+          s = self[element.name].selector
+          self[element.name] if s.is_a? Child or s.is_a? Descendant
         elsif selector.is_a? Descendant
-          self[element]
+          self[element.name]
         else
-          self[element] if self[element].selector.class == selector.class
+          self[element.name] if self[element.name].selector.class == selector.class
         end
       end
-  
+
       #
       # Add an arbitrary node to this element
       #
@@ -118,33 +129,34 @@ module Less
           raise ArgumentError, "argument can't be a #{obj.class}"
         end
       end
-    
+
       def last;  elements.last  end
       def first; elements.first end
-      def to_s; root?? '*' : super end
-      
+      def to_s; root?? '*' : name end
+
       #
       # Entry point for the css conversion
       #
       def to_css path = []
-        path << @selector.to_css << self unless root?
+        path << @selector.to_css << name unless root?
 
         content = properties.map do |i|
           ' ' * 2 + i.to_css
         end.compact.reject(&:empty?) * "\n"
-        
-        content = content.include?("\n") ? 
+
+        content = content.include?("\n") ?
           "\n#{content}\n" : " #{content.strip} "
-        ruleset = !content.strip.empty?? 
-          "#{[path.reject(&:empty?).join.strip, *@set] * ', '} {#{content}}\n" : ""
-      
+        ruleset = !content.strip.empty??
+          "#{[path.reject(&:empty?).join.strip,
+          *@set.map(&:name)].uniq * ', '} {#{content}}\n" : ""
+
         css = ruleset + elements.map do |i|
           i.to_css(path)
-        end.reject(&:empty?).join        
+        end.reject(&:empty?).join
         path.pop; path.pop
         css
       end
-  
+
       #
       # Find the nearest variable in the hierarchy or raise a NameError
       #
@@ -156,26 +168,26 @@ module Less
           raise VariableNameError, ident unless result
         end
       end
-    
+
       #
       # Traverse the whole tree, returning each leaf (recursive)
       #
       def each path = [], &blk
-        elements.each do |element|                            
-          path << element                         
-          yield element, path if element.leaf?                
-          element.each path, &blk                                        
-          path.pop                    
+        elements.each do |element|
+          path << element
+          yield element, path if element.leaf?
+          element.each path, &blk
+          path.pop
         end
         self
       end
-  
+
       def inspect depth = 0
         indent = lambda {|i| '.  ' * i }
         put    = lambda {|ary| ary.map {|i| indent[ depth + 1 ] + i.inspect } * "\n"}
 
         (root?? "\n" : "") + [
-          indent[ depth ] + (self == '' ? '*' : self.to_s),
+          indent[ depth ] + self.to_s,
           put[ properties ],
           put[ variables ],
           elements.map {|i| i.inspect( depth + 1 ) } * "\n"

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

@@ -32,6 +32,14 @@ module Less
       def inspect
         self + (empty?? "" : ": `#{value.map {|i| i.to_s } * ' | '}`")
       end
+      
+      def == other
+        self.to_s == other.to_s
+      end
+      
+      def eql? other
+        self == other and value.eql? other.value
+      end
  
       def to_s
         super

data/spec/css/selectors.css

@@ -6,3 +6,8 @@ h3 a:hover { color: red; }
 h3 p:hover { color: red; }
 #all, #the, #same { color: blue; }
 ul, li, div, q, blockquote, textarea { margin: 0; }
+td {
+  margin: 0;
+  padding: 0;
+}
+td, input { line-height: 1em; }

data/spec/css/whitespace.css

@@ -1,9 +1,4 @@
 .whitespace, .white, .space, .mania, .no-semi-column { color: white; }
-.whitespace { color: white; }
-.whitespace { color: white; }
-.whitespace { color: white; }
-.whitespace { color: white; }
-.no-semi-column { color: white; }
 .no-semi-column {
   color: white;
   white-space: pre;

data/spec/less/selectors.less

@@ -13,3 +13,12 @@ h1, h2, h3 {
 ul, li, div, q, blockquote, textarea {
   margin: 0;
 }
+
+td {
+  margin: 0;
+  padding: 0;
+}
+
+td, input {
+  line-height: 1em;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: less
 version: !ruby/object:Gem::Version 
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-30 00:00:00 -04:00
+date: 2009-07-31 00:00:00 -04:00
 default_executable: lessc
 dependencies: []