less 1.0.8 → 1.0.9

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/less.gemspec

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

data/lib/less/engine/less.tt

@@ -165,7 +165,7 @@ grammar Less
   # div / .class / #id / input[type="text"] / lang(fr)
   #
   rule element
-    (class_id / tag / ident) attribute* ('(' ident ')')? / attribute+ / '@media' / '@font-face'
+    (class_id / tag / ident) attribute* ('(' ident? attribute* ')')? / attribute+ / '@media' / '@font-face'
   end
   
   rule class_id
@@ -176,7 +176,7 @@ grammar Less
   # [type="text"]
   #
   rule attribute
-    '[' tag ([|~]? '=') (tag / string) ']' / '[' (tag / string) ']'
+    '[' tag ([|~*]? '=') (tag / string) ']' / '[' (tag / string) ']'
   end
   
   rule class
@@ -290,9 +290,9 @@ grammar Less
   # Color
   #
   rule color
-    '#' hex {
+    '#' rgb {
       def build env
-        env.identifiers.last << Node::Color.new(hex.text_value)
+        env.identifiers.last << Node::Color.new(*rgb.build)
       end
     } / fn:(('hsl'/'rgb') 'a'?) '(' arguments ')' {
       def build env
@@ -302,10 +302,25 @@ grammar Less
     }
   end
   
-  rule hex
-    [a-fA-F0-9] [a-fA-F0-9] [a-fA-F0-9]+
+  #
+  # 00ffdd / 0fd
+  #
+  rule rgb
+    r:(hex hex) g:(hex hex) b:(hex hex) {
+      def build
+        [r.text_value, g.text_value, b.text_value]
+      end
+    } / r:hex g:hex b:hex {
+      def build
+        [r.text_value, g.text_value, b.text_value].map {|c| c * 2 }
+      end
+    }
   end
   
+  rule hex
+    [a-fA-F0-9]
+  end
+      
   #
   # Functions and arguments
   #

data/lib/less/engine/nodes.rb

@@ -1,8 +1,8 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'engine/nodes/entity'
+require 'engine/nodes/function'
 require 'engine/nodes/element'
 require 'engine/nodes/property'
 require 'engine/nodes/literal'
-require 'engine/nodes/function'
 require 'engine/nodes/selector'

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

@@ -15,13 +15,7 @@ module Less
     # RGBA to Node::Color
     #
     def rgba *rgba
-      r, g, b, a = rgba.flatten
-      hex = [r, g, b].inject("") do |str, c|
-        c = c.to_i.to_s(16)
-        c = '0' + c if c.length < 2
-        str + c
-      end
-      Node::Color.new hex, a
+      Node::Color.new *rgba
     end
     
     #

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

@@ -11,56 +11,79 @@ module Less
     #
     # rgb(255, 0, 0) #f0f0f0
     #
-    class Color < DelegateClass(Fixnum)
+    class Color
       include Literal
-      attr_reader :color, :opacity
-      
-      def initialize color = nil, opacity = 1.0
-        @opacity = opacity
-        @color = if color.is_a? Array
-          rgba color
-        elsif color.is_a? ::String
-          color.delete! unit
-          if color.length == 3
-            color.split(//).map {|v| v + v }.join('').to_i 16
-          elsif color.length == 6
-            color.to_i 16
-          else
-            color
-          end
+      attr_reader :r, :g, :b, :a
+
+      def initialize(r, g, b, a = 1.0)
+        r, g, b = [r, g, b].map {|c| c.is_a?(::String) ? c.to_i(16) : c }
+        @r, @g, @b, @a = normalize(r), normalize(g), normalize(b), normalize(a, 1.0)
+      end
+      
+      def alpha(v)
+        self.class.new(r,g,b,v)
+      end
+      
+      def rgb
+        [r, g, b]
+      end
+      
+      def operate op, other
+        if other.is_a? Numeric
+          self.class.new *self.rgb.map {|c| c.send(op, other) }, @a
         else
-          color
+          self.class.new *self.rgb.zip(other.rgb).map {|a, b| a.send(op, b) }, @a
         end
-        super @color.to_i
       end
-    
-      def unit
-        '#'
+      
+      def + other
+        operate :+, other
       end
-    
-      def hex
-        v = [[to_i, 0].max, 256 ** 3].min
-        "%06x" % [v]
+
+      def - other
+        operate :-, other
       end
-    
-      def to_css
-        if opacity and opacity < 1.0
-          colors = hex.scan(/../).map {|v| v.to_i(16) }.join(", ")
-          "rgba(#{colors}, #{opacity})"
+      
+      def * other
+        operate :*, other
+      end
+      
+      def / other
+        operate :/, other
+      end
+      
+      def coerce other
+        return self, other
+      end
+
+      def to_s
+        if a < 1.0
+          "rgba(#{r.to_i}, #{g.to_i}, #{b.to_i}, #{a})"
         else
-          unit + hex
+          "#%02x%02x%02x" % [r,g,b]
         end
       end
-    
-      def to_ruby
-        color
+
+      def inspect
+        if a < 1.0
+          "rgba(#{r}, #{g}, #{b}, #{a})"
+        else
+          "rgb(#{r}, #{g}, #{b})"
+        end
       end
-    
-      def to_s
-        "#{unit}#{super}"
+
+      def to_css
+        to_s
       end
       
-      def inspect; to_s end
+      def to_ruby
+        "Color.new(#{r},#{g},#{b},#{a})"
+      end
+      
+    protected
+      def normalize(v, max = 255, min = 0)
+        [[min, v].max, max].min
+      end
     end
   
     #

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

@@ -94,7 +94,12 @@ module Less
         
           unless ruby.include? nil
             if entity
-              entity.class.new(eval(ruby.join), *(unit if entity.class == Node::Number))
+              result = eval(ruby.join)
+              if result.is_a? Entity
+                result
+              else
+                entity.class.new(*result, *(unit if entity.class == Node::Number))
+              end
             else
               first
             end

data/lib/less/engine/parser.rb

@@ -1660,10 +1660,6 @@ module Less
   end
 
   module Element0
-    def ident
-      elements[1]
-    end
-
   end
 
   module Element1
@@ -1721,17 +1717,35 @@ module Less
         end
         s9 << r10
         if r10
-          r11 = _nt_ident
+          r12 = _nt_ident
+          if r12
+            r11 = r12
+          else
+            r11 = instantiate_node(SyntaxNode,input, index...index)
+          end
           s9 << r11
           if r11
-            if has_terminal?(')', false, index)
-              r12 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
-            else
-              terminal_parse_failure(')')
-              r12 = nil
+            s13, i13 = [], index
+            loop do
+              r14 = _nt_attribute
+              if r14
+                s13 << r14
+              else
+                break
+              end
+            end
+            r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
+            s9 << r13
+            if r13
+              if has_terminal?(')', false, index)
+                r15 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure(')')
+                r15 = nil
+              end
+              s9 << r15
             end
-            s9 << r12
           end
         end
         if s9.last
@@ -1759,43 +1773,43 @@ module Less
     if r1
       r0 = r1
     else
-      s13, i13 = [], index
+      s16, i16 = [], index
       loop do
-        r14 = _nt_attribute
-        if r14
-          s13 << r14
+        r17 = _nt_attribute
+        if r17
+          s16 << r17
         else
           break
         end
       end
-      if s13.empty?
-        @index = i13
-        r13 = nil
+      if s16.empty?
+        @index = i16
+        r16 = nil
       else
-        r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
+        r16 = instantiate_node(SyntaxNode,input, i16...index, s16)
       end
-      if r13
-        r0 = r13
+      if r16
+        r0 = r16
       else
         if has_terminal?('@media', false, index)
-          r15 = instantiate_node(SyntaxNode,input, index...(index + 6))
+          r18 = instantiate_node(SyntaxNode,input, index...(index + 6))
           @index += 6
         else
           terminal_parse_failure('@media')
-          r15 = nil
+          r18 = nil
         end
-        if r15
-          r0 = r15
+        if r18
+          r0 = r18
         else
           if has_terminal?('@font-face', false, index)
-            r16 = instantiate_node(SyntaxNode,input, index...(index + 10))
+            r19 = instantiate_node(SyntaxNode,input, index...(index + 10))
             @index += 10
           else
             terminal_parse_failure('@font-face')
-            r16 = nil
+            r19 = nil
           end
-          if r16
-            r0 = r16
+          if r19
+            r0 = r19
           else
             @index = i0
             r0 = nil
@@ -1907,7 +1921,7 @@ module Less
       s1 << r3
       if r3
         i4, s4 = index, []
-        if has_terminal?('[|~]', true, index)
+        if has_terminal?('[|~*]', true, index)
           r6 = true
           @index += 1
         else
@@ -3211,14 +3225,14 @@ module Less
   end
 
   module Color0
-    def hex
+    def rgb
       elements[1]
     end
   end
 
   module Color1
     def build env
-      env.identifiers.last << Node::Color.new(hex.text_value)
+      env.identifiers.last << Node::Color.new(*rgb.build)
     end
   end
 
@@ -3262,7 +3276,7 @@ module Less
     end
     s1 << r2
     if r2
-      r3 = _nt_hex
+      r3 = _nt_rgb
       s1 << r3
     end
     if s1.last
@@ -3372,62 +3386,190 @@ module Less
     r0
   end
 
-  module Hex0
+  module Rgb0
+    def hex
+      elements[0]
+    end
+
+    def hex
+      elements[1]
+    end
   end
 
-  def _nt_hex
+  module Rgb1
+    def hex
+      elements[0]
+    end
+
+    def hex
+      elements[1]
+    end
+  end
+
+  module Rgb2
+    def hex
+      elements[0]
+    end
+
+    def hex
+      elements[1]
+    end
+  end
+
+  module Rgb3
+    def r
+      elements[0]
+    end
+
+    def g
+      elements[1]
+    end
+
+    def b
+      elements[2]
+    end
+  end
+
+  module Rgb4
+    def build
+      [r.text_value, g.text_value, b.text_value]
+    end
+  end
+
+  module Rgb5
+    def r
+      elements[0]
+    end
+
+    def g
+      elements[1]
+    end
+
+    def b
+      elements[2]
+    end
+  end
+
+  module Rgb6
+    def build
+      [r.text_value, g.text_value, b.text_value].map {|c| c * 2 }
+    end
+  end
+
+  def _nt_rgb
     start_index = index
-    if node_cache[:hex].has_key?(index)
-      cached = node_cache[:hex][index]
+    if node_cache[:rgb].has_key?(index)
+      cached = node_cache[:rgb][index]
       @index = cached.interval.end if cached
       return cached
     end
 
-    i0, s0 = index, []
-    if has_terminal?('[a-fA-F0-9]', true, index)
-      r1 = true
-      @index += 1
+    i0 = index
+    i1, s1 = index, []
+    i2, s2 = index, []
+    r3 = _nt_hex
+    s2 << r3
+    if r3
+      r4 = _nt_hex
+      s2 << r4
+    end
+    if s2.last
+      r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+      r2.extend(Rgb0)
     else
-      r1 = nil
+      @index = i2
+      r2 = nil
     end
-    s0 << r1
-    if r1
-      if has_terminal?('[a-fA-F0-9]', true, index)
-        r2 = true
-        @index += 1
+    s1 << r2
+    if r2
+      i5, s5 = index, []
+      r6 = _nt_hex
+      s5 << r6
+      if r6
+        r7 = _nt_hex
+        s5 << r7
+      end
+      if s5.last
+        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+        r5.extend(Rgb1)
       else
-        r2 = nil
+        @index = i5
+        r5 = nil
       end
-      s0 << r2
-      if r2
-        s3, i3 = [], index
-        loop do
-          if has_terminal?('[a-fA-F0-9]', true, index)
-            r4 = true
-            @index += 1
-          else
-            r4 = nil
-          end
-          if r4
-            s3 << r4
-          else
-            break
-          end
+      s1 << r5
+      if r5
+        i8, s8 = index, []
+        r9 = _nt_hex
+        s8 << r9
+        if r9
+          r10 = _nt_hex
+          s8 << r10
         end
-        if s3.empty?
-          @index = i3
-          r3 = nil
+        if s8.last
+          r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+          r8.extend(Rgb2)
         else
-          r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+          @index = i8
+          r8 = nil
         end
-        s0 << r3
+        s1 << r8
       end
     end
-    if s0.last
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Hex0)
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(Rgb3)
+      r1.extend(Rgb4)
+    else
+      @index = i1
+      r1 = nil
+    end
+    if r1
+      r0 = r1
+    else
+      i11, s11 = index, []
+      r12 = _nt_hex
+      s11 << r12
+      if r12
+        r13 = _nt_hex
+        s11 << r13
+        if r13
+          r14 = _nt_hex
+          s11 << r14
+        end
+      end
+      if s11.last
+        r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
+        r11.extend(Rgb5)
+        r11.extend(Rgb6)
+      else
+        @index = i11
+        r11 = nil
+      end
+      if r11
+        r0 = r11
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:rgb][start_index] = r0
+
+    r0
+  end
+
+  def _nt_hex
+    start_index = index
+    if node_cache[:hex].has_key?(index)
+      cached = node_cache[:hex][index]
+      @index = cached.interval.end if cached
+      return cached
+    end
+
+    if has_terminal?('[a-fA-F0-9]', true, index)
+      r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
+      @index += 1
     else
-      @index = i0
       r0 = nil
     end
 

data/spec/css/colors-1.0.css

@@ -4,3 +4,7 @@
 #blue #short { color: #0000ff; }
 #blue #long { color: #0000ff; }
 #blue #rgba { color: rgba(0, 0, 255, 0.1); }
+#overflow .a { color: #000000; }
+#overflow .b { color: #ffffff; }
+#overflow .c { color: #ffffff; }
+#overflow .d { color: #00ff00; }

data/spec/css/css-1.0.css

@@ -23,6 +23,7 @@ p + h1 { font-size: 2.2em; }
 input[type="text"] { font-weight: normal; }
 h2[title] { font-size: 100%; }
 [disabled] { color: transparent; }
+p:not([class*="lead"]) { color: black; }
 #shorthands {
   border: 1px solid #000000;
   font: 12px/16px Arial;

data/spec/engine_spec.rb

@@ -65,7 +65,7 @@ describe Less::Engine do
     it "should handle custom functions" do
       module Less::Functions
         def color arg
-          Less::Node::Color.new("#999999") if arg == "evil red"
+          Less::Node::Color.new("99", "99", "99") if arg == "evil red"
         end
         
         def increment a

data/spec/less/colors-1.0.less

@@ -2,11 +2,9 @@
   #short {
     color: #fea;
   }
-
   #long {
     color: #ffeeaa;
   }
-  
   #rgba {
     color: rgba(255, 238, 170, 0.1);
   }
@@ -16,12 +14,17 @@
   #short {
     color: #00f;
   }
-
   #long {
     color: #0000ff;
   }
-
   #rgba {
     color: rgba(0, 0, 255, 0.1);
   }
+}
+
+#overflow {
+  .a { color: #111111 - #444444; } // #000000
+  .b { color: #eee + #fff; } // #ffffff
+  .c { color: #aaa * 3; } // #ffffff
+  .d { color: #00ee00 + #009900; } // #00ff00
 }

data/spec/less/css-1.0.less

@@ -72,6 +72,10 @@ h2[title] {
   color: transparent;
 }
 
+p:not([class*="lead"]) {
+  color: black; 
+}
+
 #shorthands {
   border: 1px solid #000;
   font: 12px/16px Arial;

metadata

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