haml 3.1.0.alpha.14 → 3.1.0.alpha.17

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.14
+3.1.0.alpha.17

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.14
+3.1.0.alpha.17

data/lib/haml.rb

@@ -25,9 +25,10 @@ module Haml
   #   This isn't actually used;
   #   it's just passed in in case it needs to be used in the future
   def self.init_rails(binding)
-    # Rails 2.2+
+    # 2.2 <= Rails < 3
     if defined?(Rails) && Rails.respond_to?(:configuration) &&
-        Rails.configuration.respond_to?(:after_initialize)
+        Rails.configuration.respond_to?(:after_initialize) &&
+        !Haml::Util.ap_geq_3?
       Rails.configuration.after_initialize do
         next if defined?(Sass)
         autoload(:Sass, 'sass/rails2_shim')

data/lib/haml/exec.rb

@@ -344,231 +344,5 @@ END
         handle_load_error(err)
       end
     end
-<<<<<<< HEAD
-=======
-
-    # The `sass-convert` executable.
-    class SassConvert < Generic
-      # @param args [Array<String>] The command-line arguments
-      def initialize(args)
-        super
-        require 'sass'
-        @options[:for_tree] = {}
-        @options[:for_engine] = {:cache => false, :read_cache => true}
-      end
-
-      # Tells optparse how to parse the arguments.
-      #
-      # @param opts [OptionParser]
-      def set_opts(opts)
-        opts.banner = <<END
-Usage: sass-convert [options] [INPUT] [OUTPUT]
-
-Description:
-  Converts between CSS, Sass, and SCSS files.
-  E.g. converts from SCSS to Sass,
-  or converts from CSS to SCSS (adding appropriate nesting).
-
-Options:
-END
-
-        opts.on('-F', '--from FORMAT',
-          'The format to convert from. Can be css, scss, sass, less, or sass2.',
-          'sass2 is the same as sass, but updates more old syntax to new.',
-          'By default, this is inferred from the input filename.',
-          'If there is none, defaults to css.') do |name|
-          @options[:from] = name.downcase.to_sym
-          unless [:css, :scss, :sass, :less, :sass2].include?(@options[:from])
-            raise "Unknown format for sass-convert --from: #{name}"
-          end
-          try_less_note if @options[:from] == :less
-        end
-
-        opts.on('-T', '--to FORMAT',
-          'The format to convert to. Can be scss or sass.',
-          'By default, this is inferred from the output filename.',
-          'If there is none, defaults to sass.') do |name|
-          @options[:to] = name.downcase.to_sym
-          unless [:scss, :sass].include?(@options[:to])
-            raise "Unknown format for sass-convert --to: #{name}"
-          end
-        end
-
-        opts.on('-R', '--recursive',
-          'Convert all the files in a directory. Requires --from and --to.') do
-          @options[:recursive] = true
-        end
-
-        opts.on('-i', '--in-place',
-          'Convert a file to its own syntax.',
-          'This can be used to update some deprecated syntax.') do
-          @options[:in_place] = true
-        end
-
-        opts.on('--dasherize', 'Convert underscores to dashes') do
-          @options[:for_tree][:dasherize] = true
-        end
-
-        opts.on('--old', 'Output the old-style ":prop val" property syntax.',
-                         'Only meaningful when generating Sass.') do
-          @options[:for_tree][:old] = true
-        end
-
-        opts.on('-C', '--no-cache', "Don't cache to sassc files.") do
-          @options[:for_engine][:read_cache] = false
-        end
-
-        unless ::Haml::Util.ruby1_8?
-          opts.on('-E encoding', 'Specify the default encoding for Sass and CSS files.') do |encoding|
-            Encoding.default_external = encoding
-          end
-        end
-
-        super
-      end
-
-      # Processes the options set by the command-line arguments,
-      # and runs the CSS compiler appropriately.
-      def process_result
-        require 'sass'
-
-        if @options[:recursive]
-          process_directory
-          return
-        end
-
-        super
-        input = @options[:input]
-        raise "Error: '#{input.path}' is a directory (did you mean to use --recursive?)" if File.directory?(input)
-        output = @options[:output]
-        output = input if @options[:in_place]
-        process_file(input, output)
-      end
-
-      private
-
-      def process_directory
-        unless input = @options[:input] = @args.shift
-          raise "Error: directory required when using --recursive."
-        end
-
-        output = @options[:output] = @args.shift
-        raise "Error: --from required when using --recursive." unless @options[:from]
-        raise "Error: --to required when using --recursive." unless @options[:to]
-        raise "Error: '#{@options[:input]}' is not a directory" unless File.directory?(@options[:input])
-        if @options[:output] && File.exists?(@options[:output]) && !File.directory?(@options[:output])
-          raise "Error: '#{@options[:output]}' is not a directory"
-        end
-        @options[:output] ||= @options[:input]
-
-        from = @options[:from]
-        from = :sass if from == :sass2
-        if @options[:to] == @options[:from] && !@options[:in_place]
-          fmt = @options[:from]
-          raise "Error: converting from #{fmt} to #{fmt} without --in-place"
-        end
-
-        ext = @options[:from]
-        ext = :sass if ext == :sass2
-        Dir.glob("#{@options[:input]}/**/*.#{ext}") do |f|
-          output =
-            if @options[:in_place]
-              f
-            elsif @options[:output]
-              output_name = f.gsub(/\.(c|sa|sc|le)ss$/, ".#{@options[:to]}")
-              output_name[0...@options[:input].size] = @options[:output]
-              output_name
-            else
-              f.gsub(/\.(c|sa|sc|le)ss$/, ".#{@options[:to]}")
-            end
-
-          unless File.directory?(File.dirname(output))
-            puts_action :directory, :green, File.dirname(output)
-            FileUtils.mkdir_p(File.dirname(output))
-          end
-          puts_action :convert, :green, f
-          if File.exists?(output)
-            puts_action :overwrite, :yellow, output
-          else
-            puts_action :create, :green, output
-          end
-
-          input = open_file(f)
-          output = @options[:in_place] ? input : open_file(output, "w")
-          process_file(input, output)
-        end
-      end
-
-      def process_file(input, output)
-        if input.is_a?(File)
-          @options[:from] ||=
-            case input.path
-            when /\.scss$/; :scss
-            when /\.sass$/; :sass
-            when /\.less$/; :less
-            when /\.css$/; :css
-            end
-        elsif @options[:in_place]
-          raise "Error: the --in-place option requires a filename."
-        end
-
-        if output.is_a?(File)
-          @options[:to] ||=
-            case output.path
-            when /\.scss$/; :scss
-            when /\.sass$/; :sass
-            end
-        end
-
-        if @options[:from] == :sass2
-          @options[:from] = :sass
-          @options[:for_engine][:sass2] = true
-        end
-
-        @options[:from] ||= :css
-        @options[:to] ||= :sass
-        @options[:for_engine][:syntax] = @options[:from]
-
-        out =
-          ::Haml::Util.silence_haml_warnings do
-            if @options[:from] == :css
-              require 'sass/css'
-              ::Sass::CSS.new(input.read, @options[:for_tree]).render(@options[:to])
-            elsif @options[:from] == :less
-              require 'sass/less'
-              try_less_note
-              input = input.read if input.is_a?(IO) && !input.is_a?(File) # Less is dumb
-              Less::Engine.new(input).to_tree.to_sass_tree.send("to_#{@options[:to]}", @options[:for_tree])
-            else
-              if input.is_a?(File)
-                ::Sass::Engine.for_file(input.path, @options[:for_engine])
-              else
-                ::Sass::Engine.new(input.read, @options[:for_engine])
-              end.to_tree.send("to_#{@options[:to]}", @options[:for_tree])
-            end
-          end
-
-        output = File.open(input.path, 'w') if @options[:in_place]
-        output.write(out)
-      rescue ::Sass::SyntaxError => e
-        raise e if @options[:trace]
-        file = " of #{e.sass_filename}" if e.sass_filename
-        raise "Error on line #{e.sass_line}#{file}: #{e.message}\n  Use --trace for backtrace"
-      rescue LoadError => err
-        handle_load_error(err)
-      end
-
-      @@less_note_printed = false
-      def try_less_note
-        return if @@less_note_printed
-        @@less_note_printed = true
-        warn <<NOTE
-* NOTE: Sass and Less are different languages, and they work differently.
-* I'll do my best to translate, but some features -- especially mixins --
-* should be checked by hand.
-NOTE
-      end
-    end
->>>>>>> master
   end
 end

data/lib/sass.rb

@@ -0,0 +1,8 @@
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
+
+require 'haml'
+
+unless Haml::Util.try_sass
+  load Haml::Util.scope('vendor/sass/lib/sass.rb')
+end

data/lib/sass/plugin.rb

@@ -0,0 +1,8 @@
+dir = File.dirname(File.dirname(__FILE__))
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
+
+require 'haml'
+
+unless Haml::Util.try_sass
+  load Haml::Util.scope('vendor/sass/lib/sass/plugin.rb')
+end

data/lib/sass/rails2_shim.rb

@@ -0,0 +1,9 @@
+Haml::Util.try_sass
+Haml::Util.haml_warn(<<WARNING)
+Haml will no longer automatically load Sass in Haml 3.2.0.
+Please add config.gem 'sass' to your environment.rb.
+WARNING
+
+require 'sass'
+require 'sass/plugin'
+

data/lib/sass/rails3_shim.rb

@@ -0,0 +1,16 @@
+unless Haml::Util.try_sass
+  # Since Bundler sets up our gem environment,
+  # Sass will only be loadable from gem
+  # if gem "sass" has been set.
+  Haml::Util.haml_warn(<<WARNING)
+Haml will no longer automatically load Sass in Haml 3.2.0.
+Please add gem 'sass' to your Gemfile.
+WARNING
+end
+
+require 'sass/plugin/configuration'
+
+ActiveSupport.on_load(:before_initialize) do
+  require 'sass'
+  require 'sass/plugin'
+end

data/vendor/sass/CONTRIBUTING

@@ -0,0 +1,3 @@
+Contributions are welcomed. Please see the following sites for guidelines:
+
+  http://sass-lang.com/development.html#contributing

data/vendor/sass/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2006-2009 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/vendor/sass/README.md

@@ -0,0 +1,201 @@
+# Sass
+
+**Sass makes CSS fun again**. Sass is an extension of CSS3,
+adding nested rules, variables, mixins, selector inheritance, and more.
+It's translated to well-formatted, standard CSS
+using the command line tool or a web-framework plugin.
+
+Sass has two syntaxes. The new main syntax (as of Sass 3)
+is known as "SCSS" (for "Sassy CSS"),
+and is a superset of CSS3's syntax.
+This means that every valid CSS3 stylesheet is valid SCSS as well.
+SCSS files use the extension `.scss`.
+
+The second, older syntax is known as the indented syntax (or just "Sass").
+Inspired by Haml's terseness, it's intended for people
+who prefer conciseness over similarity to CSS.
+Instead of brackets and semicolons,
+it uses the indentation of lines to specify blocks.
+Although no longer the primary syntax,
+the indented syntax will continue to be supported.
+Files in the indented syntax use the extension `.sass`.
+
+## Using
+
+Sass can be used from the command line
+or as part of a web framework.
+The first step is to install the gem:
+
+    gem install sass
+
+After you convert some CSS to Sass, you can run
+
+    sass style.scss
+
+to compile it back to CSS.
+For more information on these commands, check out
+
+    sass --help
+
+To install Sass in Rails 2,
+just add `config.gem "sass"` to `config/environment.rb`.
+In Rails 3, add `gem "sass"` to your Gemfile instead.
+`.sass` or `.scss` files should be placed in `public/stylesheets/sass`,
+where they'll be automatically compiled
+to corresponding CSS files in `public/stylesheets` when needed
+(the Sass template directory is customizable...
+see [the Sass reference](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#template_location-option) for details).
+
+Sass can also be used with any Rack-enabled web framework.
+To do so, just add
+
+    require 'sass/plugin/rack'
+    use Sass::Plugin::Rack
+
+to `config.ru`.
+Then any Sass files in `public/stylesheets/sass`
+will be compiled CSS files in `public/stylesheets` on every request.
+
+To use Sass programatically,
+check out the [YARD documentation](http://sass-lang.com/docs/yardoc/).
+
+## Formatting
+
+Sass is an extension of CSS
+that adds power and elegance to the basic language.
+It allows you to use [variables][vars], [nested rules][nested],
+[mixins][mixins], [inline imports][imports],
+and more, all with a fully CSS-compatible syntax.
+Sass helps keep large stylesheets well-organized,
+and get small stylesheets up and running quickly,
+particularly with the help of
+[the Compass style library](http://compass-style.org).
+
+[vars]:    http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#variables_
+[nested]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#nested_rules_
+[mixins]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#mixins
+[imports]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#import
+
+Sass has two syntaxes.
+The one presented here, known as "SCSS" (for "Sassy CSS"),
+is fully CSS-compatible.
+The other (older) syntax, known as the indented syntax or just "Sass",
+is whitespace-sensitive and indentation-based.
+For more information, see the [reference documentation][syntax].
+
+[syntax]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#syntax
+
+To run the following examples and see the CSS they produce,
+put them in a file called `test.scss` and run `sass test.scss`.
+
+### Nesting
+
+Sass avoids repetition by nesting selectors within one another.
+The same thing works for properties.
+
+    table.hl {
+      margin: 2em 0;
+      td.ln { text-align: right; }
+    }
+
+    li {
+      font: {
+        family: serif;
+        weight: bold;
+        size: 1.2em;
+      }
+    }
+
+### Variables
+
+Use the same color all over the place?
+Need to do some math with height and width and text size?
+Sass supports variables, math operations, and many useful functions.
+
+    $blue: #3bbfce;
+    $margin: 16px;
+
+    .content_navigation {
+      border-color: $blue;
+      color: darken($blue, 10%);
+    }
+
+    .border {
+      padding: $margin / 2;
+      margin: $margin / 2;
+      border-color: $blue;
+    }
+
+### Mixins
+
+Even more powerful than variables,
+mixins allow you to re-use whole chunks of CSS,
+properties or selectors.
+You can even give them arguments. 
+
+    @mixin table-scaffolding {
+      th {
+        text-align: center;
+        font-weight: bold;
+      }
+      td, th { padding: 2px; }
+    }
+
+    @mixin left($dist) {
+      float: left;
+      margin-left: $dist;
+    }
+
+    #data {
+      @include left(10px);
+      @include table-scaffolding;
+    }
+
+A comprehensive list of features is available
+in the [Sass reference](http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html).
+
+## Executables
+
+The Sass gem includes several executables that are useful
+for dealing with Sass from the command line.
+
+### `sass`
+
+The `sass` executable transforms a source Sass file into CSS.
+See `sass --help` for further information and options.
+
+### `sass-convert`
+
+The `sass-convert` executable converts between CSS, Sass, and SCSS.
+When converting from CSS to Sass or SCSS,
+nesting is applied where appropriate.
+See `sass-convert --help` for further information and options.
+
+## Authors
+
+Sass was envisioned by [Hampton Catlin](http://hamptoncatlin.com) (hcatlin).
+However, Hampton doesn't even know his way around the code anymore and now
+occasionally consults on the language issues. Hampton lives in Jacksonville,
+Florida and is the lead mobile developer for Wikimedia.
+
+[Nathan Weizenbaum](http://nex-3.com) is the primary developer and architect of
+Sass. His hard work has kept the project alive by endlessly answering forum
+posts, fixing bugs, refactoring, finding speed improvements, writing
+documentation, implementing new features, and getting Hampton coffee (a fitting
+task for a boy-genius). Nathan lives in Seattle, Washington and while not being
+a student at the University of Washington or working at an internship, he
+consults for Unspace Interactive.
+
+[Chris Eppstein](http://acts-as-architect.blogspot.com) is a core contributor to
+Sass and the creator of Compass, the first Sass-based framework. Chris focuses
+on making Sass more powerful, easy to use, and on ways to speed its adoption
+through the web development community. Chris lives in San Jose, California with
+his wife and daughter. He is the Software Architect for
+[Caring.com](http://caring.com), a website devoted to the 34 Million caregivers
+whose parents are sick or elderly, that uses Haml and Sass.
+
+If you use this software, you must pay Hampton a compliment. And
+buy Nathan some jelly beans. Maybe pet a kitten. Yeah. Pet that kitty.
+
+Beyond that, the implementation is licensed under the MIT License.
+Okay, fine, I guess that means compliments aren't __required__.