cloudhead-less 0.8.4 → 0.8.6

data/README.md

@@ -20,8 +20,8 @@ LESS allows you to write CSS the way (I think) it was meant to, that is: with *v
 ### And the CSS output it produces:
 	
 	.outline { border: 1px solid black }
-	.article > a { text-decoration: none }
-	.article > p { color: #110011 }
+	.article a { text-decoration: none }
+	.article p { color: #110011 }
 	.article { border: 1px solid black }
 	
 If you have CSS nightmares, just 

data/VERSION

@@ -1 +1 @@
-0.8.4
+0.8.7

data/bin/lessc

@@ -11,7 +11,8 @@ CSS = '.css'
 options = {
   :watch => false,
   :compress => false,
-  :debug => false
+  :debug => false,
+  :inheritance => :desc
 }
 
 # Get arguments
@@ -24,9 +25,14 @@ opts = OptionParser.new do |o|
     options[:watch] = true
   end
   
+  # Child-type inheritance
+  o.on("-c", "--child", "nesting uses child-type inheritance") do
+    options[:chain] = :child
+  end
+  
   # Compression needs a proper algorithm
   #
-  #  o.on("-c", "--compress", "compress css file") do
+  #  o.on("-x", "--compress", "compress css file") do
   #    options[:compress] = true
   #  end
   

data/less.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "0.8.4"
+  s.version = "0.8.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-05-25}
+  s.date = %q{2009-06-04}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{alexis@cloudhead.net}

data/lib/less.rb

@@ -4,9 +4,9 @@ require 'less/command'
 require 'less/engine'
 require 'less/tree'
 
-module Less
-  class MixedUnitsError < Exception 
-  end
+module Less    
+  MixedUnitsError = Class.new(Exception)
+  PathError = Class.new(Exception)
   
   def self.version
     File.read( File.join( File.dirname(__FILE__), '..', 'VERSION') )

data/lib/less/command.rb

@@ -21,6 +21,8 @@ module Less
     end
 
     def run!
+      compile(true) unless File.exist? @destination
+      
       if watch?
         log "Watching for changes in #@source ...Ctrl-C to abort.\n"
   
@@ -44,25 +46,27 @@ module Less
       end
     end
     
-    def compile
+    def compile new = false
       begin
         # Create a new Less object with the contents of a file
-        css = Less::Engine.new( File.read( @source ) ).to_css
+        css = Less::Engine.new( File.read( @source ) ).to_css @options[:inheritance]
         css = css.delete " \n" if compress?
         
         File.open( @destination, "w" ) do |file|
           file.write css
         end
-        puts " [Updated] #{@destination.split('/').last}" if watch?
+        puts "#{new ? '* [Created]' : ' [Updated]'} #{@destination.split('/').last}" if watch?
       rescue Errno::ENOENT => e
         abort "#{e}"
       rescue SyntaxError
         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"
+        err "errors were found in the .less file! \n#{error}\n"
+      rescue MixedUnitsError => e
+        err "`#{e}` you're  mixing units together! What do you expect?\n"
+      rescue PathError => e
+        err "`#{e}` was not found.\n"
       else
         true
       end
@@ -70,7 +74,11 @@ module Less
     
     # Just a logging function to avoid typing '}'
     def log s = ''
-      print '} ' + s.to_s
+      print '* ' + s.to_s
+    end
+    
+    def err s = ''
+      print "!! #{s}"
     end
   end
 end

data/lib/less/engine.rb

@@ -85,7 +85,7 @@ module Less
             next if operation.match /[a-z]/i
             evaluate.call operation
           else
-            raise MixedUnitsError
+            raise MixedUnitsError, value
           end
         end
       end
@@ -106,16 +106,16 @@ module Less
           end
 
           if var
-            node[ key ] = value.gsub REGEX[:path], var   # Substitute variable with value
+            node[ key ] = value.gsub REGEX[:path], var  # Substitute variable with value
           else
-            node.delete key                              # Discard the declaration if the variable wasn't found
+            node.delete key                             # Discard the declaration if the variable wasn't found
           end
         end    
       end
     end
     
-    def to_css
-      self.compile.to_css
+    def to_css chain
+      self.compile.to_css chain
     end
     
     def hashify
@@ -126,7 +126,7 @@ module Less
       #   less:     color: black;
       #   hashify: "color" => "black"
       #
-      hash = self.gsub(/\t/, ' ').                                                        # Tabs
+      hash = self.gsub(/\t+/, ' ').                                                       # Tabs
                   gsub(/\r\n/, "\n").                                                     # m$
                   gsub(/\/\/.*/, '').                                                     # Comments //
                   gsub(/\/\*.*?\*\//m, '').                                               # Comments /*

data/lib/less/tree.rb

@@ -24,7 +24,7 @@ module Less
         if what == :var && k == path.last
           branch[:variables][ k ]
         else
-          branch = branch[ k ]
+          branch = branch[ k ] or raise PathError, path.join(' > ')
         end
       end
     end
@@ -56,7 +56,7 @@ module Less
           self[ key ] = value.to_tree.                 # Make sure any change is saved to the main tree
                         traverse by, path, &blk        # Recurse, with the current node becoming `self`                       
           yield path, self[ key ] if by == :branch     # The node is a branch, yield it to the block
-          path.pop                                     # We're returning from a branch, pop the last element
+          path.pop                                     # We're returning from a branch, pop the last path element
         elsif by == :leaf and key.is_a? String
           yield key, value, path, self                 # The node is a leaf, yield it to the block
         else
@@ -69,12 +69,12 @@ module Less
     #
     # Convert the tree to css, using full paths
     #
-    def to_css css = []
+    def to_css chain = :desc, css = []
       self.traverse :branch do |path, node|
         properties = node.inject("") do |s, (k, v)|          
-          v.is_a?(String) ? (s + "#{k}: #{CGI.unescape(v)}; ") : s   # Add the property to the list
+          v.is_a?(String) ? (s + "#{k}: #{CGI.unescape(v)}; ") : s                # Add the property to the list
         end
-        css << path * ' > ' + " { " + properties + "}"               # Add the rule-set to the CSS
+        css << path * ( chain == :desc ? ' ' : ' > ') + " { " + properties + "}"  # Add the rule-set to the CSS
       end
       css.join "\n"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudhead-less
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
+  version: 0.8.6
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 -07:00
+date: 2009-06-04 00:00:00 -07:00
 default_executable: lessc
 dependencies: []