less 0.8.3 → 0.8.4

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

data/bin/lessc

@@ -10,7 +10,8 @@ CSS = '.css'
 # Argument defaults
 options = {
   :watch => false,
-  :compress => false
+  :compress => false,
+  :debug => false
 }
 
 # Get arguments
@@ -36,6 +37,10 @@ opts = OptionParser.new do |o|
     puts opts
     exit
   end
+  
+  o.on_tail("-d", "--debug", "show full error messages") do
+    options[:debug] = true
+  end
 
   # Version
   o.on_tail("-v", "--version", "show version") do

data/less.gemspec

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

data/lib/less/command.rb

@@ -7,6 +7,7 @@ module Less
     
     def watch?()    @options[:watch]    end
     def compress?() @options[:compress] end
+    def debug?()    @options[:debug]    end
     
     # little function which allows us to 
     # Ctrl-C exit inside the passed block
@@ -56,7 +57,9 @@ module Less
       rescue Errno::ENOENT => e
         abort "#{e}"
       rescue SyntaxError
-        error = $!.message.split("\n")[1..-1].collect {|e| e.gsub(/\(eval\)\:\d+\:\s/, '') } * "\n"
+        error = debug?? $! : $!.message.split("\n")[1..-1].collect {|e| 
+          e.gsub(/\(eval\)\:(\d+)\:\s/, 'line \1: ') 
+        } * "\n"
         log " !! errors were found in the .less file! \n#{error}\n"
       rescue MixedUnitsError
         log "!! You're  mixing units together! what do you expect?\n"

data/lib/less/engine.rb

@@ -126,13 +126,15 @@ module Less
       #   less:     color: black;
       #   hashify: "color" => "black"
       #
-      hash = self.gsub(/\/\/.*/, '').                                                     # Comments //
+      hash = self.gsub(/\t/, ' ').                                                        # Tabs
+                  gsub(/\r\n/, "\n").                                                     # m$
+                  gsub(/\/\/.*/, '').                                                     # Comments //
                   gsub(/\/\*.*?\*\//m, '').                                               # Comments /*
                   gsub(/"/, "'").                                                         # " => '
                   gsub(/("|')(.+?)(\1)/) { $1 + CGI.escape( $2 ) + $1 }.                  # Escape string values
-                  gsub(/(#{REGEX[:property]}):[ \t]*(.+?);/, '"\\1" => "\\2",').          # Declarations
+                  gsub(/(#{REGEX[:property]}):\s*(.+?)\s*(;|(?=\}))/,'"\1"=>"\2",').      # Rules
                   gsub(/\}/, "},").                                                       # Closing }
-                  gsub(/([ \t]*)(#{REGEX[:selector]}+?)[ \t\n]*\{/m, '\\1"\\2" => {').    # Selectors
+                  gsub(/( *)(#{REGEX[:selector]}+?)[ \n]*(?=\{)/m, '\1"\2"=>').           # Selectors
                   gsub(/([.#][->\w .#]+);/, '"\\1" => :mixin,')                           # Mixins
       eval "{" + hash + "}"                                                               # Return {hash}
     end

data/spec/spec.less

@@ -94,9 +94,17 @@ ul li:first-child, ul li:last-child {
 .p:first-letter { 
     color: red; 
 }
+:focus {
+    outline: 0;
+    content: "*}#f~ ";
+}
 q:lang(no) { 
     quotes: "~" "~"; 
 }
+blockquote:before {
+  color: red;
+}
+
 /*input[type="text"] { 
     background-color: blue; 
 }*/
@@ -108,4 +116,7 @@ q:lang(no) {
 
 // Spacing
 .space    
-{    color:  purple ;font-color:yellow;   }  
+{    color:  purple ;font-color:yellow;   }
+
+// No semi-column
+.no-semi-column { color: orange }

metadata

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