haml 3.0.25 → 3.1.0.alpha.2

data/.yardopts

@@ -2,7 +2,7 @@
 --markup          markdown
 --markup-provider maruku
 --default-return  ""
---title           "Haml/Sass Documentation"
+--title           "Haml Documentation"
 --query           'object.type != :classvariable'
 --query           'object.type != :constant || @api && @api.text == "public"'
 --hide-void-return

data/CONTRIBUTING

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

data/EDGE_GEM_VERSION

@@ -0,0 +1 @@
+3.1.0.alpha.2

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2009 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein
+Copyright (c) 2006-2009 Hampton Catlin and Nathan Weizenbaum
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,72 +1,40 @@
-# Haml and Sass
+# Haml
 
-Haml and Sass are templating engines
-for the two most common types of documents on the web:
-HTML and CSS, respectively.
-They are designed to make it both easier and more pleasant
-to code HTML and CSS documents,
+Haml is a templating engine for HTML.
+It's are designed to make it both easier and more pleasant
+to write HTML documents,
 by eliminating redundancy,
 reflecting the underlying structure that the document represents,
 and providing elegant, easily understandable, and powerful syntax.
 
 ## Using
 
-Haml and Sass can be used from the command line
+Haml can be used from the command line
 or as part of a Ruby web framework.
 The first step is to install the gem:
 
     gem install haml
 
-After you convert some HTML to Haml or some CSS to Sass,
-you can run
+After you convert some HTML to Haml, you can run
 
     haml document.haml
-    sass style.scss
 
 to compile them.
 For more information on these commands, check out
 
     haml --help
-    sass --help
 
-To install Haml and Sass in Rails 2,
+To install Haml in Rails 2,
 just add `config.gem "haml"` to `config/environment.rb`.
 In Rails 3, add `gem "haml"` to your Gemfile instead.
 and both Haml and Sass will be installed.
 Views with the `.html.haml` extension will automatically use Haml.
-Sass is a little more complicated;
-`.sass` 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).
 
-For Merb, `.html.haml` views will work without any further modification.
-To enable Sass, you also need to add a dependency.
-To do so, just add
-
-    dependency "merb-haml"
-
-to `config/dependencies.rb` (or `config/init.rb` in a flat/very flat Merb application).
-Then it'll work just like it does in Rails.
-
-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 Haml and Sass programatically,
+To use Haml programatically,
 check out the [YARD documentation](http://haml-lang.com/docs/yardoc/).
 
 ## Formatting
 
-### Haml
-
 The most basic element of Haml
 is a shorthand for creating HTML:
 
@@ -133,141 +101,16 @@ Haml provides far more tools than those presented here.
 Check out the [reference documentation](http://beta.haml-lang.com/docs/yardoc/file.HAML_REFERENCE.html)
 for full details.
 
-#### Indentation
+### Indentation
 
 Haml's indentation can be made up of one or more tabs or spaces.
 However, indentation must be consistent within a given document.
 Hard tabs and spaces can't be mixed,
 and the same number of tabs or spaces must be used throughout.
 
-### Sass
-
-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 Haml gem includes several executables that are useful
-for dealing with Haml and Sass from the command line.
-
-### `haml`
-
-The `haml` executable transforms a source Haml file into HTML.
-See `haml --help` for further information and options.
-
-### `sass`
-
-The `sass` executable transforms a source Sass file into CSS.
-See `sass --help` for further information and options.
-
-### `html2haml`
-
-The `html2haml` executable attempts to transform HTML,
-optionally with ERB markup, into Haml code.
-Since HTML is so variable, this transformation is not always perfect;
-it's a good idea to have a human check the output of this tool.
-See `html2haml --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
 
-Haml and Sass were created by [Hampton Catlin](http://hamptoncatlin.com)
+Haml was created by [Hampton Catlin](http://hamptoncatlin.com)
 (hcatlin) and he is the author of the original implementation. 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
@@ -281,14 +124,6 @@ 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.
 

data/Rakefile

@@ -42,7 +42,7 @@ END
 # Don't use Rake::GemPackageTast because we want prerequisites to run
 # before we load the gemspec.
 desc "Build all the packages."
-task :package => [:revision_file, :submodules, :permissions] do
+task :package => [:revision_file, :submodules] do
   load scope('haml.gemspec')
   Gem::Builder.new(HAML_GEMSPEC).build
   pkg = "#{HAML_GEMSPEC.name}-#{HAML_GEMSPEC.version}"
@@ -54,16 +54,6 @@ task :package => [:revision_file, :submodules, :permissions] do
   sh %{gzip pkg/#{pkg}.tar}
 end
 
-task :permissions do
-  sh %{chmod -R a+rx bin}
-  sh %{chmod -R a+r .}
-  require 'shellwords'
-  Dir.glob('test/**/*_test.rb') do |file|
-    next if file =~ %r{^test/haml/spec/}
-    sh %{chmod a+rx #{file}}
-  end
-end
-
 task :revision_file do
   require 'lib/haml'
 
@@ -95,7 +85,8 @@ task :release => [:check_release, :package] do
   sh %{gem push pkg/haml-#{version}.gem}
 end
 
-# Ensures that the version have been updated for a new release.
+
+# Ensures that the VERSION file has been updated for a new release.
 task :check_release do
   version = File.read(scope("VERSION")).strip
   raise "There have been changes since current version (#{version})" if changed_since?(version)
@@ -125,29 +116,10 @@ def changed_since?(rev, *files)
   return !$?.success?
 end
 
-# Returns whether or not the given Emacs mode file (haml or sass)
-# has changed since the given version.
-#
-# @param mode [String, Symbol] The name of the mode
-# @param version [String] The version number
-# @return [String, nil] The version number if the version has changed
-def mode_unchanged?(mode, version)
-  mode_version = File.read(scope("extra/#{mode}-mode.el")).scan(/^;; Version: (.*)$/).first.first
-  return false if mode_version == version
-  return mode_version unless changed_since?(mode_version, "extra/#{mode}-mode.el")
-  raise "#{mode}-mode.el version is #{version.inspect}, but it has changed as of #{version.inspect}"
-  return false
-end
-
 task :submodules do
   if File.exist?(File.dirname(__FILE__) + "/.git")
     sh %{git submodule sync}
     sh %{git submodule update --init}
-  elsif !File.exist?(File.dirname(__FILE__) + "/vendor/fssm/lib")
-    warn <<WARN
-WARNING: vendor/fssm doesn't exist, and this isn't a git repository so
-I can't get it automatically!
-WARN
   end
 end
 
@@ -159,25 +131,11 @@ task :release_edge do
     sh %{git reset --hard origin/edge-gem}
     sh %{git merge origin/master}
 
-    # Get the current master branch version
-    version = File.read(scope('VERSION')).strip.split('.')
-    pr = version[3]
-    version = version.map {|n| n.to_i}
-    unless pr || (version[1] % 2 == 1 && version[2] == 0)
-      raise "#{version.join('.')} is not a development version" 
+    unless edge_version = bump_edge_version
+      puts "master is already a prerelease version, no use building an edge gem"
+      next
     end
 
-    # Bump the edge gem version
-    edge_version = File.read(scope('EDGE_GEM_VERSION')).strip.split('.').map {|n| n.to_i}
-    if !pr && (edge_version[0..1] != version[0..1])
-      # A new master branch version was released, reset the edge gem version
-      edge_version[0..1] = version[0..1]
-      edge_version[2] = 0
-    else
-      # Just bump the teeny version
-      edge_version[2] += 1
-    end
-    edge_version = edge_version.join('.')
     File.open(scope('EDGE_GEM_VERSION'), 'w') {|f| f.puts(edge_version)}
     sh %{git commit -m "Bump edge gem version to #{edge_version}." EDGE_GEM_VERSION}
     sh %{git push origin edge-gem}
@@ -187,9 +145,39 @@ task :release_edge do
     sh %{rake package}
     sh %{git checkout VERSION}
 
-    sh %{rubyforge add_release haml haml-edge "Bleeding Edge (v#{edge_version})" pkg/haml-edge-#{edge_version}.gem}
-    sh %{gem push pkg/haml-edge-#{edge_version}.gem}
+    sh %{rubyforge add_release haml haml "Bleeding Edge (v#{edge_version})" pkg/haml-#{edge_version}.gem}
+    sh %{gem push pkg/haml-#{edge_version}.gem}
+  end
+end
+
+# Reads the master version and the edge gem version,
+# bump the latter, and return it.
+#
+# Returns nil if the current master version is already a non-alpha prerelease.
+def bump_edge_version
+  # Get the current master branch version
+  version = File.read(scope('VERSION')).strip.split('.')
+  version.map! {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
+  unless version.size == 5 # prerelease
+    raise "master version #{version.join('.')} is not a prerelease version" 
+  end
+
+  # Bump the edge gem version
+  edge_version = File.read(scope('EDGE_GEM_VERSION')).strip.split('.')
+  edge_version.map! {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
+
+  if version[3] != "alpha"
+    return
+  elsif edge_version[0..2] != version[0..2]
+    # A new master branch version was released, reset the edge gem version
+    edge_version[0..2] = version[0..2]
+    edge_version[4] = 1
+  else
+    # Just bump the teeny version
+    edge_version[4] += 1
   end
+
+  edge_version.join('.')
 end
 
 task :watch_for_update do
@@ -210,7 +198,7 @@ begin
 
   namespace :doc do
     task :sass do
-      require scope('lib/sass')
+      require 'sass'
       Dir[scope("yard/default/**/*.sass")].each do |sass|
         File.open(sass.gsub(/sass$/, 'css'), 'w') do |f|
           f.write(Sass::Engine.new(File.read(sass)).render)
@@ -237,9 +225,6 @@ OPTS
       list.exclude('lib/haml/railtie.rb')
       list.exclude('lib/haml/helpers/action_view_mods.rb')
       list.exclude('lib/haml/helpers/xss_mods.rb')
-      list.exclude('lib/sass/plugin/merb.rb')
-      list.exclude('lib/sass/plugin/rails.rb')
-      list.exclude('lib/sass/less.rb')
     end.to_a
     t.options << '--incremental' if Rake.application.top_level_tasks.include?('redoc')
     t.options += FileList.new(scope('yard/*.rb')).to_a.map {|f| ['-e', f]}.flatten
@@ -268,20 +253,19 @@ rescue LoadError
 end
 
 task :pages do
+  puts "#{'=' * 50} Running rake pages"
   ensure_git_cleanup do
-    puts "#{'=' * 50} Running rake pages PROJ=#{ENV["PROJ"].inspect}"
-    raise 'No ENV["PROJ"]!' unless proj = ENV["PROJ"]
-    sh %{git checkout #{proj}-pages}
-    sh %{git reset --hard origin/#{proj}-pages}
+    sh %{git checkout haml-pages}
+    sh %{git reset --hard origin/haml-pages}
 
-    Dir.chdir("/var/www/#{proj}-pages") do
+    Dir.chdir("/var/www/haml-pages") do
       sh %{git fetch origin}
 
       sh %{git checkout stable}
       sh %{git reset --hard origin/stable}
 
-      sh %{git checkout #{proj}-pages}
-      sh %{git reset --hard origin/#{proj}-pages}
+      sh %{git checkout haml-pages}
+      sh %{git reset --hard origin/haml-pages}
       sh %{rake build --trace}
       sh %{mkdir -p tmp}
       sh %{touch tmp/restart.txt}
@@ -311,31 +295,21 @@ begin
 
   desc <<END
 Run a profile of haml.
-  ENGINE=str sets the engine to be profiled. Defaults to Haml.
   TIMES=n sets the number of runs. Defaults to 1000.
-  FILE=str sets the file to profile.
-    Defaults to 'standard' for Haml and 'complex' for Sass.
+  FILE=str sets the file to profile. Defaults to 'standard'
   OUTPUT=str sets the ruby-prof output format.
     Can be Flat, CallInfo, or Graph. Defaults to Flat. Defaults to Flat.
 END
   task :profile do
-    engine = (ENV['ENGINE'] || 'haml').downcase
     times  = (ENV['TIMES'] || '1000').to_i
     file   = ENV['FILE']
 
-    if engine == 'sass'
-      require 'lib/sass'
+    require 'lib/haml'
 
-      file = File.read(scope("test/sass/templates/#{file || 'complex'}.sass"))
-      result = RubyProf.profile { times.times { Sass::Engine.new(file).render } }
-    else
-      require 'lib/haml'
-
-      file = File.read(scope("test/haml/templates/#{file || 'standard'}.haml"))
-      obj = Object.new
-      Haml::Engine.new(file).def_method(obj, :render)
-      result = RubyProf.profile { times.times { obj.render } }
-    end
+    file = File.read(scope("test/haml/templates/#{file || 'standard'}.haml"))
+    obj = Object.new
+    Haml::Engine.new(file).def_method(obj, :render)
+    result = RubyProf.profile { times.times { obj.render } }
 
     RubyProf.const_get("#{(ENV['OUTPUT'] || 'Flat').capitalize}Printer").new(result).print 
   end
@@ -404,7 +378,7 @@ end
 
 task :handle_update do
   email_on_error do
-    unless ENV["REF"] =~ %r{^refs/heads/(master|stable|(?:haml|sass)-pages)$}
+    unless ENV["REF"] =~ %r{^refs/heads/(master|stable|haml-pages)$}
       puts "#{'=' * 20} Ignoring rake handle_update REF=#{ENV["REF"].inspect}"
       next
     end
@@ -421,13 +395,11 @@ task :handle_update do
     sh %{git checkout master}
     sh %{git reset --hard origin/master}
 
-    if branch == "master"
+    case branch
+    when "master"
       sh %{rake release_edge --trace}
-    elsif branch == "stable"
-      sh %{rake pages --trace PROJ=haml}
-      sh %{rake pages --trace PROJ=sass}
-    elsif branch =~ /^(haml|sass)-pages$/
-      sh %{rake pages --trace PROJ=#{$1}}
+    when "stable", "haml-pages"
+      sh %{rake pages --trace}
     end
 
     puts 'Done running handle_update'