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

data/vendor/sass/Rakefile

@@ -0,0 +1,363 @@
+# ----- Utility Functions -----
+
+def scope(path)
+  File.join(File.dirname(__FILE__), path)
+end
+
+# ----- Default: Testing ------
+
+task :default => :test
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'lib'
+  test_files = FileList[scope('test/**/*_test.rb')]
+  test_files.exclude(scope('test/rails/*'))
+  test_files.exclude(scope('test/plugins/*'))
+  t.test_files = test_files
+  t.verbose = true
+end
+
+# ----- Packaging -----
+
+# 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
+  load scope('sass.gemspec')
+  Gem::Builder.new(SASS_GEMSPEC).build
+  pkg = "#{SASS_GEMSPEC.name}-#{SASS_GEMSPEC.version}"
+  mkdir_p "pkg"
+  verbose(true) {mv "#{pkg}.gem", "pkg/#{pkg}.gem"}
+
+  sh %{rm -f pkg/#{pkg}.tar.gz}
+  verbose(false) {SASS_GEMSPEC.files.each {|f| sh %{tar rf pkg/#{pkg}.tar #{f}}}}
+  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/sass'
+
+  release = Rake.application.top_level_tasks.include?('release') || File.exist?(scope('EDGE_GEM_VERSION'))
+  if Sass.version[:rev] && !release
+    File.open(scope('REVISION'), 'w') { |f| f.puts Sass.version[:rev] }
+  elsif release
+    File.open(scope('REVISION'), 'w') { |f| f.puts "(release)" }
+  else
+    File.open(scope('REVISION'), 'w') { |f| f.puts "(unknown)" }
+  end
+end
+
+# We also need to get rid of this file after packaging.
+at_exit { File.delete(scope('REVISION')) rescue nil }
+
+desc "Install Sass as a gem. Use SUDO=1 to install with sudo."
+task :install => [:package] do
+  gem  = RUBY_PLATFORM =~ /java/  ? 'jgem' : 'gem' 
+  sh %{#{'sudo ' if ENV["SUDO"]}#{gem} install --no-ri pkg/sass-#{File.read(scope('VERSION')).strip}}
+end
+
+desc "Release a new Sass package to Rubyforge."
+task :release => [:check_release, :package] do
+  name = File.read(scope("VERSION_NAME")).strip
+  version = File.read(scope("VERSION")).strip
+  sh %{rubyforge add_release sass sass "#{name} (v#{version})" pkg/sass-#{version}.gem}
+  sh %{rubyforge add_file    sass sass "#{name} (v#{version})" pkg/sass-#{version}.tar.gz}
+  sh %{gem push pkg/sass-#{version}.gem}
+end
+
+# 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)
+  raise "VERSION_NAME must not be 'Bleeding Edge'" if File.read(scope("VERSION_NAME")) == "Bleeding Edge"
+end
+
+# Reads a password from the command line.
+#
+# @param name [String] The prompt to use to read the password
+def read_password(prompt)
+  require 'readline'
+  system "stty -echo"
+  Readline.readline("#{prompt}: ").strip
+ensure
+  system "stty echo"
+  puts
+end
+
+# Returns whether or not the repository, or specific files,
+# has/have changed since a given revision.
+#
+# @param rev [String] The revision to check against
+# @param files [Array<String>] The files to check.
+#   If this is empty, checks the entire repository
+def changed_since?(rev, *files)
+  IO.popen("git diff --exit-code #{rev} #{files.join(' ')}") {}
+  return !$?.success?
+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
+
+task :release_edge do
+  ensure_git_cleanup do
+    puts "#{'=' * 50} Running rake release_edge"
+
+    sh %{git checkout edge-gem}
+    sh %{git reset --hard origin/edge-gem}
+    sh %{git merge origin/master}
+
+    unless edge_version = bump_edge_version
+      puts "master is already a prerelease version, no use building an edge gem"
+      next
+    end
+
+    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}
+
+    # Package the edge gem with the proper version
+    File.open(scope('VERSION'), 'w') {|f| f.puts(edge_version)}
+    sh %{rake package}
+    sh %{git checkout VERSION}
+
+    sh %{rubyforge add_release sass sass "Bleeding Edge (v#{edge_version})" pkg/sass-#{edge_version}.gem}
+    sh %{gem push pkg/sass-#{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
+  sh %{ruby extra/update_watch.rb}
+end
+
+# ----- Documentation -----
+
+task :rdoc do
+  puts '=' * 100, <<END, '=' * 100
+Sass uses the YARD documentation system (http://github.com/lsegal/yard).
+Install the yard gem and then run "rake doc".
+END
+end
+
+begin
+  require 'yard'
+
+  namespace :doc do
+    task :sass do
+      require scope('lib/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)
+        end
+      end
+    end
+
+    desc "List all undocumented methods and classes."
+    task :undocumented do
+      opts = ENV["YARD_OPTS"] || ""
+      ENV["YARD_OPTS"] = opts.dup + <<OPTS
+ --list --query "
+  object.docstring.blank? &&
+  !(object.type == :method && object.is_alias?)"
+OPTS
+      Rake::Task['yard'].execute
+    end
+  end
+
+  YARD::Rake::YardocTask.new do |t|
+    t.files = FileList.new(scope('lib/**/*.rb')) do |list|
+      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
+    files = FileList.new(scope('doc-src/*')).to_a.sort_by {|s| s.size} + %w[MIT-LICENSE VERSION]
+    t.options << '--files' << files.join(',')
+    t.options << '--template-path' << scope('yard')
+    t.options << '--title' << ENV["YARD_TITLE"] if ENV["YARD_TITLE"]
+
+    t.before = lambda do
+      if ENV["YARD_OPTS"]
+        require 'shellwords'
+        t.options.concat(Shellwords.shellwords(ENV["YARD_OPTS"]))
+      end
+    end
+  end
+  Rake::Task['yard'].prerequisites.insert(0, 'doc:sass')
+  Rake::Task['yard'].instance_variable_set('@comment', nil)
+
+  desc "Generate Documentation"
+  task :doc => :yard
+  task :redoc => :yard
+rescue LoadError
+  desc "Generate Documentation"
+  task :doc => :rdoc
+  task :yard => :rdoc
+end
+
+task :pages do
+  ensure_git_cleanup do
+    puts "#{'=' * 50} Running rake pages"
+    sh %{git checkout sass-pages}
+    sh %{git reset --hard origin/sass-pages}
+
+    Dir.chdir("/var/www/sass-pages") do
+      sh %{git fetch origin}
+
+      sh %{git checkout stable}
+      sh %{git reset --hard origin/stable}
+
+      sh %{git checkout sass-pages}
+      sh %{git reset --hard origin/sass-pages}
+      sh %{rake build --trace}
+      sh %{mkdir -p tmp}
+      sh %{touch tmp/restart.txt}
+    end
+  end
+end
+
+# ----- Coverage -----
+
+begin
+  require 'rcov/rcovtask'
+
+  Rcov::RcovTask.new do |t|
+    t.test_files = FileList[scope('test/**/*_test.rb')]
+    t.rcov_opts << '-x' << '"^\/"'
+    if ENV['NON_NATIVE']
+      t.rcov_opts << "--no-rcovrt"
+    end
+    t.verbose = true
+  end
+rescue LoadError; end
+
+# ----- Profiling -----
+
+begin
+  require 'ruby-prof'
+
+  desc <<END
+Run a profile of sass.
+  TIMES=n sets the number of runs. Defaults to 1000.
+  FILE=str sets the file to profile. Defaults to 'complex'.
+  OUTPUT=str sets the ruby-prof output format.
+    Can be Flat, CallInfo, or Graph. Defaults to Flat. Defaults to Flat.
+END
+  task :profile do
+    times  = (ENV['TIMES'] || '1000').to_i
+    file   = ENV['FILE']
+
+    require 'lib/sass'
+
+    file = File.read(scope("test/sass/templates/#{file || 'complex'}.sass"))
+    result = RubyProf.profile { times.times { Sass::Engine.new(file).render } }
+
+    RubyProf.const_get("#{(ENV['OUTPUT'] || 'Flat').capitalize}Printer").new(result).print 
+  end
+rescue LoadError; end
+
+# ----- Handling Updates -----
+
+def email_on_error
+  yield
+rescue Exception => e
+  IO.popen("sendmail nex342@gmail.com", "w") do |sm|
+    sm << "From: nex3@nex-3.com\n" <<
+      "To: nex342@gmail.com\n" <<
+      "Subject: Exception when running rake #{Rake.application.top_level_tasks.join(', ')}\n" <<
+      e.message << "\n\n" <<
+      e.backtrace.join("\n")
+  end
+ensure
+  raise e if e
+end
+
+def ensure_git_cleanup
+  email_on_error {yield}
+ensure
+  sh %{git reset --hard HEAD}
+  sh %{git clean -xdf}
+  sh %{git checkout master}
+end
+
+task :handle_update do
+  email_on_error do
+    unless ENV["REF"] =~ %r{^refs/heads/(master|stable|sass-pages)$}
+      puts "#{'=' * 20} Ignoring rake handle_update REF=#{ENV["REF"].inspect}"
+      next
+    end
+    branch = $1
+
+    puts
+    puts
+    puts '=' * 150
+    puts "Running rake handle_update REF=#{ENV["REF"].inspect}"
+
+    sh %{git fetch origin}
+    sh %{git checkout stable}
+    sh %{git reset --hard origin/stable}
+    sh %{git checkout master}
+    sh %{git reset --hard origin/master}
+
+    case branch
+    when "master"
+      sh %{rake release_edge --trace}
+    when "stable", "sass-pages"
+      sh %{rake pages --trace}
+    end
+
+    puts 'Done running handle_update'
+    puts '=' * 150
+  end
+end

data/vendor/sass/TODO

@@ -0,0 +1,39 @@
+# -*- mode: org -*-
+#+STARTUP: nofold
+
+* Documentation
+  Redo tutorial?
+  Syntax highlighting?
+
+* Code
+  Keep track of error offsets everywhere
+    Use this to show error location in messages
+    Just clean up SassScript syntax errors in general
+    Lexer errors in particular are icky
+    See in particular error changes made in c07b5c8
+** Sass
+   Benchmark the effects of storing the raw template in sassc
+     If it's expensive, overload RootNode dumping/loading to dup and set @template to nil
+     Then fall back on reading from actual file
+   Make Rack middleware the default for Rails and Merb versions that support it
+   CSS superset
+   Classes are mixins
+     Can refer to specific property values? Syntax?
+   Pull in Compass watcher stuff
+   Internationalization
+     Particularly word constituents in Regexps
+   Optimization
+     http://csstidy.sourceforge.net/
+     http://developer.yahoo.com/yui/compressor/
+     Also comma-folding identical rules where possible
+     Multiple levels
+       0: No optimization
+       1: Nothing that changes doc structure
+         No comma-folding
+       2: Anything that keeps functionality identical to O2 (default)
+       3: Assume order of rules doesn't matter
+       Comma-fold even if there are intervening rules that might interfere
+   CSS3
+     Add (optional) support for http://www.w3.org/TR/css3-values/#calc
+       Cross-unit arithmetic should compile into this
+       Should we use "mod" in Sass for consistency?

data/vendor/sass/VERSION

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

data/vendor/sass/VERSION_NAME

@@ -0,0 +1 @@
+Bleeding Edge

data/vendor/sass/bin/css2sass

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../lib/sass'
+require 'sass/exec'
+
+warn <<END
+DEPRECATION WARNING:
+The css2sass tool is deprecated and will be removed in Sass 3.2.
+Use the sass-convert tool instead.
+END
+
+opts = Sass::Exec::SassConvert.new(%w[--from css --to sass] + ARGV)
+opts.parse!

data/vendor/sass/bin/sass

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# The command line Sass parser.
+
+require File.dirname(__FILE__) + '/../lib/sass'
+require 'sass/exec'
+
+opts = Sass::Exec::Sass.new(ARGV)
+opts.parse!

data/vendor/sass/bin/sass-convert

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../lib/sass'
+require 'sass/exec'
+
+opts = Sass::Exec::SassConvert.new(ARGV)
+opts.parse!

data/vendor/sass/doc-src/FAQ.md

@@ -0,0 +1,35 @@
+# Frequently Asked Questions
+
+* Table of contents
+{:toc}
+
+## Can I use a variable from my controller in my Sass file?
+{#q-ruby-code}
+
+No. Sass files aren't views.
+They're compiled once into static CSS files,
+then left along until they're changed and need to be compiled again.
+Not only don't you want to be running a full request cycle
+every time someone requests a stylesheet,
+but it's not a great idea to put much logic in there anyway
+due to how browsers handle them.
+
+If you really need some sort of dynamic CSS,
+you can define your own {Sass::Script::Functions Sass functions} using Ruby
+that can access the database or other configuration.
+*Be aware when doing this that Sass files are by default only compiled once
+and then served statically.*
+
+If you really, really need to compile Sass on each request,
+first make sure you have adequate caching set up.
+Then you can use {Sass::Engine} to render the code,
+using the {file:SASS_REFERENCE.md#custom-option `:custom` option}
+to pass in data that {Sass::Script::Functions::EvaluationContext#options can be accessed}
+from your Sass functions.
+
+# You still haven't answered my question!
+
+Sorry! Try looking at the [Sass](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html) reference,
+If you can't find an answer there,
+feel free to ask in `#sass` on irc.freenode.net
+or send an email to the [mailing list](http://groups.google.com/group/sass-lang).