haml-edge 3.1.69 → 3.1.70

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.69
+3.1.70

data/VERSION

@@ -1 +1 @@
-3.1.69
+3.1.70

data/lib/haml/exec.rb

@@ -168,118 +168,33 @@ MESSAGE
       end
     end
 
-    # An abstrac class that encapsulates the code
-    # specific to the `haml` and `sass` executables.
-    class HamlSass < Generic
+    # The `sass` executable.
+    class Sass < Generic
       # @param args [Array<String>] The command-line arguments
       def initialize(args)
         super
-        @options[:for_engine] = {}
+        @options[:for_engine] = {
+          :load_paths => ['.'] + (ENV['SASSPATH'] || '').split(File::PATH_SEPARATOR)
+        }
       end
 
       protected
 
-      # Tells optparse how to parse the arguments
-      # available for the `haml` and `sass` executables.
-      #
-      # This is meant to be overridden by subclasses
-      # so they can add their own options.
+      # Tells optparse how to parse the arguments.
       #
       # @param opts [OptionParser]
       def set_opts(opts)
+        super
+
         opts.banner = <<END
-Usage: #{@name.downcase} [options] [INPUT] [OUTPUT]
+Usage: sass [options] [INPUT] [OUTPUT]
 
 Description:
-  Uses the #{@name} engine to parse the specified template
-  and outputs the result to the specified file.
+  Converts SCSS or Sass files to CSS.
 
 Options:
 END
 
-        opts.on('--rails RAILS_DIR', "Install Haml and Sass from the Gem to a Rails project") do |dir|
-          original_dir = dir
-
-          env = File.join(dir, "config", "environment.rb")
-          if File.exists?(File.join(dir, "Gemfile"))
-            puts("haml --rails isn't needed for Rails 3 or greater.",
-              "Add 'gem \"haml\"' to your Gemfile instead.", "",
-              "haml --rails will no longer work in the next version of #{@name}.", "")
-          elsif File.exists?(env) && File.open(env) {|env| env.grep(/config\.gem/)}
-            puts("haml --rails isn't needed for Rails 2.1 or greater.",
-              "Add 'config.gem \"haml\"' to config/environment.rb instead.", "",
-              "haml --rails will no longer work in the next version of #{@name}.", "")
-          end
-
-          dir = File.join(dir, 'vendor', 'plugins')
-
-          unless File.exists?(dir)
-            puts "Directory #{dir} doesn't exist"
-            exit 1
-          end
-
-          dir = File.join(dir, 'haml')
-
-          if File.exists?(dir)
-            print "Directory #{dir} already exists, overwrite [y/N]? "
-            exit 2 if gets !~ /y/i
-            FileUtils.rm_rf(dir)
-          end
-
-          begin
-            Dir.mkdir(dir)
-          rescue SystemCallError
-            puts "Cannot create #{dir}"
-            exit 1
-          end
-
-          File.open(File.join(dir, 'init.rb'), 'w') do |file|
-            file << File.read(File.dirname(__FILE__) + "/../../init.rb")
-          end
-
-          puts "Haml plugin added to #{original_dir}"
-          exit
-        end
-
-        opts.on('-c', '--check', "Just check syntax, don't evaluate.") do
-          require 'stringio'
-          @options[:check_syntax] = true
-          @options[:output] = StringIO.new
-        end
-
-        super
-      end
-
-      # Processes the options set by the command-line arguments.
-      # In particular, sets `@options[:for_engine][:filename]` to the input filename
-      # and requires the appropriate file.
-      #
-      # This is meant to be overridden by subclasses
-      # so they can run their respective programs.
-      def process_result
-        super
-        @options[:for_engine][:filename] = @options[:filename] if @options[:filename]
-        require File.dirname(__FILE__) + "/../#{@name.downcase}"
-      end
-    end
-
-    # The `sass` executable.
-    class Sass < HamlSass
-      # @param args [Array<String>] The command-line arguments
-      def initialize(args)
-        super
-        @name = "Sass"
-        @options[:for_engine][:load_paths] = ['.'] + (ENV['SASSPATH'] || '').split(File::PATH_SEPARATOR)
-      end
-
-      protected
-
-      # Tells optparse how to parse the arguments.
-      #
-      # @param opts [OptionParser]
-      def set_opts(opts)
-        super
-
         opts.on('--scss',
                 'Use the CSS-superset SCSS syntax.') do
           @options[:for_engine][:syntax] = :scss
@@ -298,6 +213,11 @@ END
                                    'Only meaningful for --watch and --update.') do
           @options[:stop_on_error] = true
         end
+        opts.on('-c', '--check', "Just check syntax, don't evaluate.") do
+          require 'stringio'
+          @options[:check_syntax] = true
+          @options[:output] = StringIO.new
+        end
         opts.on('-t', '--style NAME',
                 'Output style. Can be nested (default), compact, compressed, or expanded.') do |name|
           @options[:for_engine][:style] = name.to_sym
@@ -340,6 +260,8 @@ END
       # Processes the options set by the command-line arguments,
       # and runs the Sass compiler appropriately.
       def process_result
+        require 'sass'
+
         if !@options[:update] && !@options[:watch] &&
             @args.first && colon_path?(@args.first)
           if @args.size == 1
@@ -352,6 +274,7 @@ END
         return interactive if @options[:interactive]
         return watch_or_update if @options[:watch] || @options[:update]
         super
+        @options[:for_engine][:filename] = @options[:filename]
 
         begin
           input = @options[:input]
@@ -381,13 +304,11 @@ END
       private
 
       def interactive
-        require 'sass'
         require 'sass/repl'
         ::Sass::Repl.new(@options).run
       end
 
       def watch_or_update
-        require 'sass'
         require 'sass/plugin'
         ::Sass::Plugin.options.merge! @options[:for_engine]
         ::Sass::Plugin.options[:unix_newlines] = @options[:unix_newlines]
@@ -476,11 +397,11 @@ MSG
     end
 
     # The `haml` executable.
-    class Haml < HamlSass
+    class Haml < Generic
       # @param args [Array<String>] The command-line arguments
       def initialize(args)
         super
-        @name = "Haml"
+        @options[:for_engine] = {}
         @options[:requires] = []
         @options[:load_paths] = []
       end
@@ -491,6 +412,21 @@ MSG
       def set_opts(opts)
         super
 
+        opts.banner = <<END
+Usage: haml [options] [INPUT] [OUTPUT]
+
+Description:
+  Converts Haml files to HTML.
+
+Options:
+END
+
+        opts.on('-c', '--check', "Just check syntax, don't evaluate.") do
+          require 'stringio'
+          @options[:check_syntax] = true
+          @options[:output] = StringIO.new
+        end
+
         opts.on('-t', '--style NAME',
                 'Output style. Can be indented (default) or ugly.') do |name|
           @options[:for_engine][:ugly] = true if name.to_sym == :ugly
@@ -536,6 +472,7 @@ MSG
       # and runs the Haml compiler appropriately.
       def process_result
         super
+        @options[:for_engine][:filename] = @options[:filename]
         input = @options[:input]
         output = @options[:output]
 

data/lib/haml/util.rb

@@ -269,8 +269,8 @@ module Haml
     #
     # @return [String, nil]
     def rails_root
-      if defined?(Rails.root)
-        return Rails.root.to_s if Rails.root
+      if defined?(::Rails.root)
+        return ::Rails.root.to_s if ::Rails.root
         raise "ERROR: Rails.root is nil!"
       end
       return RAILS_ROOT.to_s if defined?(RAILS_ROOT)
@@ -283,7 +283,7 @@ module Haml
     #
     # @return [String, nil]
     def rails_env
-      return Rails.env.to_s if defined?(Rails.root)
+      return ::Rails.env.to_s if defined?(::Rails.env)
       return RAILS_ENV.to_s if defined?(RAILS_ENV)
       return nil
     end

data/lib/sass/scss/parser.rb

@@ -212,8 +212,18 @@ module Sass
       end
 
       def import_directive
-        @expected = "string or url()"
-        arg = tok(STRING) || (uri = tok!(URI))
+        values = []
+
+        loop do
+          values << expr!(:import_arg)
+          break if use_css_import? || !tok(/,\s*/)
+        end
+
+        return values
+      end
+
+      def import_arg
+        return unless arg = tok(STRING) || (uri = tok!(URI))
         path = @scanner[1] || @scanner[2] || @scanner[3]
         ss
 
@@ -318,7 +328,7 @@ module Sass
       def block_contents(node, context)
         block_given? ? yield : ss_comments(node)
         node << (child = block_child(context))
-        while tok(/;/) || (child && child.has_children)
+        while tok(/;/) || has_children?(child)
           block_given? ? yield : ss_comments(node)
           node << (child = block_child(context))
         end
@@ -330,6 +340,12 @@ module Sass
         variable || directive || declaration_or_ruleset
       end
 
+      def has_children?(child_or_array)
+        return false unless child_or_array
+        return child_or_array.last.has_children if child_or_array.is_a?(Array)
+        return child_or_array.has_children
+      end
+
       # This is a nasty hack, and the only place in the parser
       # that requires backtracking.
       # The reason is that we can't figure out if certain strings
@@ -747,6 +763,7 @@ MESSAGE
         :expr => "expression (e.g. 1px, bold)",
         :selector_comma_sequence => "selector",
         :simple_selector_sequence => "selector",
+        :import_arg => "file to import (string or url())",
       }
 
       TOK_NAMES = Haml::Util.to_hash(

data/lib/sass/tree/node.rb

@@ -84,14 +84,18 @@ module Sass
 
       # Appends a child to the node.
       #
-      # @param child [Tree::Node] The child node
+      # @param child [Tree::Node, Array<Tree::Node>] The child node or nodes
       # @raise [Sass::SyntaxError] if `child` is invalid
       # @see #invalid_child?
       def <<(child)
         return if child.nil?
-        check_child! child
-        self.has_children = true
-        @children << child
+        if child.is_a?(Array)
+          child.each {|c| self << c}
+        else
+          check_child! child
+          self.has_children = true
+          @children << child
+        end
       end
 
       # Raises an error if the given child node is invalid.

data/test/sass/results/scss_import.css

@@ -12,4 +12,20 @@ body { font: Arial; background: blue; }
 
 midrule { inthe: middle; }
 
+scss { imported: yes; }
+
+body { font: Arial; background: blue; }
+
+#page { width: 700px; height: 100; }
+#page #header { height: 300px; }
+#page #header h1 { font-size: 50px; color: blue; }
+
+#content.user.show #container.top #column.left { width: 100px; }
+#content.user.show #container.top #column.right { width: 600px; }
+#content.user.show #container.bottom { background: brown; }
+
+@import url(basic.css);
+@import url(../results/complex.css);
+#foo { background-color: #bbaaff; }
+
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/templates/scss_import.scss

@@ -2,7 +2,8 @@ $preconst: hello;
 
 @mixin premixin {pre-mixin: here}
 
-@import "importee.sass";
+@import "importee.sass", "scss_importee", "basic.sass", "basic.css", "../results/complex.css";
+@import "partial.sass";
 
 nonimported {
   myconst: $preconst;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 3.1.69
+  version: 3.1.70
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-22 00:00:00 -04:00
+date: 2010-08-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency