cloudhead-less 0.8.8 → 0.8.9

data/VERSION

@@ -1 +1 @@
-0.8.8
+0.8.10

data/less.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "0.8.8"
+  s.version = "0.8.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]

data/lib/less/engine.rb

@@ -4,7 +4,7 @@ module Less
     COMPOUND = {'font' => true, 'background' => false, 'border' => false }
     REGEX = {
       :path     => /([#.][->#.\w ]+)?( ?> ?)?/,              # #header > .title
-      :selector => /[-\w #.,>*:\(\)]/,                       # .cow .milk > a
+      :selector => /[-\w #.,*>:\(\)]/,                       # .cow .milk > a
       :variable => /@([-\w]+)/,                              # @milk-white
       :property => /@[-\w]+|[-a-z]+/,                        # font-size
       :color    => /#([a-zA-Z0-9]{3,6})\b/,                  # #f0f0f0
@@ -39,7 +39,7 @@ module Less
         end
         node.delete key if matched # Delete the property if it's LESS-specific
       end
-      
+
       #
       # Evaluate mixins
       #
@@ -69,8 +69,8 @@ module Less
       # Units are: 1px, 1em, 1%, #111
       @tree = @tree.traverse :leaf do |key, value, path, node|
         node[ key ] = value.gsub /(#{REGEX[:operand]}(\s?)[-+\/*](\4))+(#{REGEX[:operand]})/ do |operation|
-          # Disallow operations certain compound declarations
-          if COMPOUND[key]
+          # Disallow operations on certain compound declarations
+          if COMPOUND[ key ]
             next value
           else
             raise CompoundOperationError, "#{key}: #{value}"
@@ -138,17 +138,17 @@ module Less
       #   less:     color: black;
       #   hashify: "color" => "black"
       #
-      hash = self.gsub(/\t+/, ' ').                                                       # Tabs
-                  gsub(/\r\n/, "\n").                                                     # m$
-                  gsub(/\/\/.*/, '').                                                     # Comments //
+      hash = self.gsub(/\r\n/, "\n").                                                     # m$
+                  gsub(/\/\/.*\n/, '').                                                   # Comments //
                   gsub(/\/\*.*?\*\//m, '').                                               # Comments /*
-                  gsub(/"/, "'").                                                         # " => '
-                  gsub(/("|')(.+?)(\1)/) { $1 + CGI.escape( $2 ) + $1 }.                  # Escape string values
-                  gsub(/(#{REGEX[:property]}):\s*(.+?)\s*(;|(?=\}))/,'"\1"=>"\2",').      # Rules
+                  gsub(/\s+/, ' ').                                                       # Replace \t\n
+                  gsub(/"/, "'").                                                         # " to '
+                  gsub(/("|')(.*?)(\1)/) { $1 + CGI.escape( $2 ) + $1 }.                  # Escape string values
+                  gsub(/(#{REGEX[:property]}): *([^\{\}]+?) *(;|(?=\}))/,'"\1"=>"\2",').  # Rules
                   gsub(/\}/, "},").                                                       # Closing }
-                  gsub(/( *)(#{REGEX[:selector]}+?)[ \n]*(?=\{)/m, '\1"\2"=>').           # Selectors
+                  gsub(/([, ]*)(#{REGEX[:selector]}+?)[ \n]*(?=\{)/, '\1"\2"=>').         # Selectors
                   gsub(/([.#][->\w .#]+);/, '"\\1" => :mixin,')                           # Mixins
-      eval "{" + hash + "}"                                                               # Return {hash}
+      eval "{#{ hash }}"                                                                  # Return {hash}
     end
   end
 end

data/spec/spec.css

@@ -12,14 +12,18 @@
 .root:hover a { display: block; }
 body { font-size: 10px; font-family: 'Lucida Grande', 'Helvetica', Verdana, sans-serif; margin: -5px 0 5px 10px; border: solid 1px #000; text-shadow: #333 -1px 1px 2px; -moz-border-radius: 3px; color: #ccc; background-color: #aaa; border-color: #888; }
 .operations > div { width: 80px; }
-.operations { width: 110px; border-width: 16px; font-size: 66; line-height: 7px; color: #eeeeee; colorb: #333333; colorc: #777777; }
+.operations { font: 12px/16px; width: 110px; border-width: 16px; font-size: 66; line-height: 7px; color: #eeeeee; colorb: #333333; colorc: #777777; }
 td, tr, table { border-width: 4px; }
+blockquote:before, blockquote:after, q:before, q:after { content: ''; }
+a:link, a:hover { color: brown; }
 ul li:first-child { border-top: none; }
 ul li:first-child, ul li:last-child { background-color: #333; }
 .p:first-letter { color: red; }
 :focus { outline: 0; content: '*}#f~ '; }
 q:lang(no) { quotes: '~' '~'; }
 blockquote:before { color: red; }
+div { color: purple; }
+.duplicate { width: 11px; color: blue; }
 .transparent_box { background-color: #FFF; filter: alpha(opacity=60); opacity: 0.6; }
 .space { color: purple; font-color: yellow; }
 .no-semi-column { color: orange; }

data/spec/spec.less

@@ -92,6 +92,14 @@ td, tr, table {
 }
 
 // More complex CSS selectors
+blockquote:before, blockquote:after, q:before, q:after { content: ""; }
+a:link, 
+a:hover {
+  color:brown;
+}
+div > a, a span {
+  color: grey;
+}
 ul li:first-child {
     border-top: none;
 }
@@ -112,6 +120,22 @@ blockquote:before {
   color: red;
 }
 
+// Duplicates
+div {
+  width: 9px;
+}
+div { 
+  color: purple;
+}
+.duplicate {
+  width: 9px;
+  height: 11px;
+}
+.duplicate {
+  width: 11px;
+  color: blue;
+}
+
 /*input[type="text"] { 
     background-color: blue; 
 }*/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudhead-less
 version: !ruby/object:Gem::Version 
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors: 
 - cloudhead