haml 3.2.0.alpha.10 → 3.2.0.alpha.13

data/CONTRIBUTING

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

data/REVISION

@@ -1 +0,0 @@
-630b8fe2033e698768a67a923960a14e1d02100f

data/VERSION

@@ -1 +0,0 @@
-3.2.0.alpha.10

data/VERSION_NAME

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

data/extra/update_watch.rb

@@ -1,13 +0,0 @@
-require 'rubygems'
-require 'sinatra'
-require 'json'
-set :port, 3123
-set :environment, :production
-enable :lock
-Dir.chdir(File.dirname(__FILE__) + "/..")
-
-post "/" do
-  puts "Recieved payload!"
-  puts "Rev: #{`git name-rev HEAD`.strip}"
-  system %{rake handle_update --trace REF=#{JSON.parse(params["payload"])["ref"].inspect}}
-end

data/lib/haml/root.rb

@@ -1,7 +0,0 @@
-module Haml
-  # The root directory of the Haml source tree.
-  # This may be overridden by the package manager
-  # if the lib directory is separated from the main source tree.
-  # @api public
-  ROOT_DIR = File.expand_path(File.join(__FILE__, "../../.."))
-end

data/lib/haml/shared.rb

@@ -1,78 +0,0 @@
-require 'strscan'
-
-module Haml
-  # This module contains functionality that's shared between Haml and Sass.
-  module Shared
-    extend self
-
-    # Scans through a string looking for the interoplation-opening `#{`
-    # and, when it's found, yields the scanner to the calling code
-    # so it can handle it properly.
-    #
-    # The scanner will have any backslashes immediately in front of the `#{`
-    # as the second capture group (`scan[2]`),
-    # and the text prior to that as the first (`scan[1]`).
-    #
-    # @yieldparam scan [StringScanner] The scanner scanning through the string
-    # @return [String] The text remaining in the scanner after all `#{`s have been processed
-    def handle_interpolation(str)
-      scan = StringScanner.new(str)
-      yield scan while scan.scan(/(.*?)(\\*)\#\{/)
-      scan.rest
-    end
-
-    # Moves a scanner through a balanced pair of characters.
-    # For example:
-    #
-    #     Foo (Bar (Baz bang) bop) (Bang (bop bip))
-    #     ^                       ^
-    #     from                    to
-    #
-    # @param scanner [StringScanner] The string scanner to move
-    # @param start [Character] The character opening the balanced pair.
-    #   A `Fixnum` in 1.8, a `String` in 1.9
-    # @param finish [Character] The character closing the balanced pair.
-    #   A `Fixnum` in 1.8, a `String` in 1.9
-    # @param count [Fixnum] The number of opening characters matched
-    #   before calling this method
-    # @return [(String, String)] The string matched within the balanced pair
-    #   and the rest of the string.
-    #   `["Foo (Bar (Baz bang) bop)", " (Bang (bop bip))"]` in the example above.
-    def balance(scanner, start, finish, count = 0)
-      str = ''
-      scanner = StringScanner.new(scanner) unless scanner.is_a? StringScanner
-      regexp = Regexp.new("(.*?)[\\#{start.chr}\\#{finish.chr}]", Regexp::MULTILINE)
-      while scanner.scan(regexp)
-        str << scanner.matched
-        count += 1 if scanner.matched[-1] == start
-        count -= 1 if scanner.matched[-1] == finish
-        return [str.strip, scanner.rest] if count == 0
-      end
-    end
-
-    # Formats a string for use in error messages about indentation.
-    #
-    # @param indentation [String] The string used for indentation
-    # @param was [Boolean] Whether or not to add `"was"` or `"were"`
-    #   (depending on how many characters were in `indentation`)
-    # @return [String] The name of the indentation (e.g. `"12 spaces"`, `"1 tab"`)
-    def human_indentation(indentation, was = false)
-      if !indentation.include?(?\t)
-        noun = 'space'
-      elsif !indentation.include?(?\s)
-        noun = 'tab'
-      else
-        return indentation.inspect + (was ? ' was' : '')
-      end
-
-      singular = indentation.length == 1
-      if was
-        was = singular ? ' was' : ' were'
-      else
-        was = ''
-      end
-
-      "#{indentation.length} #{noun}#{'s' unless singular}#{was}"
-    end
-  end
-end

data/lib/haml/template/patch.rb

@@ -1,58 +0,0 @@
-# This file makes Haml work with Rails
-# by monkeypatching the core template-compilation methods.
-# This is necessary for versions <= 2.0.1 because the template handler API
-# wasn't sufficiently powerful to deal with caching and so forth.
-
-# This module refers to the ActionView module that's part of Ruby on Rails.
-# Haml can be used as an alternate templating engine for it,
-# and includes several modifications to make it more Haml-friendly.
-# The documentation can be found
-# here[http://rubyonrails.org/api/classes/ActionView/Base.html].
-module ActionView
-  class Base
-    def delegate_template_exists_with_haml(template_path)
-      template_exists?(template_path, :haml) && [:haml]
-    end
-    alias_method :delegate_template_exists_without_haml, :delegate_template_exists?
-    alias_method :delegate_template_exists?, :delegate_template_exists_with_haml
-
-    def compile_template_with_haml(extension, template, file_name, local_assigns)
-      return compile_haml(template, file_name, local_assigns) if extension.to_s == "haml"
-      compile_template_without_haml(extension, template, file_name, local_assigns)
-    end
-    alias_method :compile_template_without_haml, :compile_template
-    alias_method :compile_template, :compile_template_with_haml
-
-    def compile_haml(template, file_name, local_assigns)
-      render_symbol = assign_method_name(:haml, template, file_name)
-      locals = local_assigns.keys
-
-      @@template_args[render_symbol] ||= {}
-      locals_keys = @@template_args[render_symbol].keys | locals
-      @@template_args[render_symbol] = Haml::Util.to_hash(locals_keys.map {|k| [k, true]})
-
-      options = Haml::Template.options.dup
-      options[:filename] = file_name || 'compiled-template'
-
-      begin
-        Haml::Engine.new(template, options).def_method(CompiledTemplates, render_symbol, *locals_keys)
-      rescue Exception => e
-        if logger
-          logger.debug "ERROR: compiling #{render_symbol} RAISED #{e}"
-          logger.debug "Backtrace: #{e.backtrace.join("\n")}"
-        end
-
-        base_path = if defined?(extract_base_path_from)
-                      # Rails 2.0.x
-                      extract_base_path_from(file_name) || view_paths.first
-                    else
-                      # Rails <=1.2.6
-                      @base_path
-                    end
-        raise ActionView::TemplateError.new(base_path, file_name || template, @assigns, template, e)
-      end
-
-      @@compile_time[render_symbol] = Time.now
-    end
-  end
-end

data/lib/sass.rb

@@ -1,8 +0,0 @@
-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

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

data/lib/sass/rails2_shim.rb

@@ -1,9 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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/test/benchmark.rb

@@ -1,91 +0,0 @@
-#!/usr/bin/env ruby
-
-times = (ARGV.first || 1000).to_i
-
-if times == 0 # Invalid parameter
-  puts <<END
-ruby #$0 [times=1000]
-  Benchmark Haml against various other templating languages.
-END
-  exit 1
-end
-
-require File.dirname(__FILE__) + '/../lib/haml'
-require File.dirname(__FILE__) + '/linked_rails'
-%w[rubygems erb erubis active_support action_controller
-   action_view action_pack haml/template rbench].each {|dep| require(dep)}
-
-def view
-  unless Haml::Util.has?(:instance_method, ActionView::Base, :finder)
-    return ActionView::Base.new(File.dirname(__FILE__), {})
-  end
-
-  # Rails >=2.1.0
-  base = ActionView::Base.new
-  base.finder.append_view_path(File.dirname(__FILE__))
-  base
-end
-
-def render(view, file)
-  view.render :file => file
-end
-
-RBench.run(times) do
-  column :haml, :title => "Haml"
-  column :haml_ugly, :title => "Haml :ugly"
-  column :erb, :title => "ERB"
-  column :erubis, :title => "Erubis"
-
-  template_name = 'standard'
-  directory = File.dirname(__FILE__) + '/haml'
-  haml_template    = File.read("#{directory}/templates/#{template_name}.haml")
-  erb_template     = File.read("#{directory}/erb/#{template_name}.erb")
-
-  report "Cached" do
-    obj = Object.new
-
-    Haml::Engine.new(haml_template).def_method(obj, :haml)
-    Haml::Engine.new(haml_template, :ugly => true).def_method(obj, :haml_ugly)
-    Erubis::Eruby.new(erb_template).def_method(obj, :erubis)
-    obj.instance_eval("def erb; #{ERB.new(erb_template, nil, '-').src}; end")
-
-    haml      { obj.haml }
-    haml_ugly { obj.haml_ugly }
-    erb       { obj.erb }
-    erubis    { obj.erubis }
-  end
-
-  report "ActionView" do
-    @base = view
-
-    @base.unmemoize_all
-    Haml::Template.options[:ugly] = false
-    # To cache the template
-    render @base, 'haml/templates/standard'
-    render @base, 'haml/erb/standard'
-
-    haml { render @base, 'haml/templates/standard' }
-    erb  { render @base, 'haml/erb/standard' }
-
-    Haml::Template.options[:ugly] = true
-    render @base, 'haml/templates/standard_ugly'
-    haml_ugly { render @base, 'haml/templates/standard_ugly' }
-  end
-
-  report "ActionView with deep partials" do
-    @base = view
-
-    @base.unmemoize_all
-    Haml::Template.options[:ugly] = false
-    # To cache the template
-    render @base, 'haml/templates/action_view'
-    render @base, 'haml/erb/action_view'
-
-    haml { render @base, 'haml/templates/action_view' }
-    erb  { render @base, 'haml/erb/action_view' }
-
-    Haml::Template.options[:ugly] = true
-    render @base, 'haml/templates/action_view_ugly'
-    haml_ugly { render @base, 'haml/templates/action_view_ugly' }
-  end
-end

data/test/gemfiles/Gemfile.rails-2.0.x

@@ -1,8 +0,0 @@
-source :gemcutter
-
-gem 'json'
-gem 'ruby_parser'
-gem 'hpricot'
-gem 'erubis'
-gem 'sass'
-gem 'rails', '>= 2.0.0', '< 2.1.0'

data/test/gemfiles/Gemfile.rails-2.0.x.lock

@@ -1,38 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (2.0.5)
-      actionpack (= 2.0.5)
-    actionpack (2.0.5)
-      activesupport (= 2.0.5)
-    activerecord (2.0.5)
-      activesupport (= 2.0.5)
-    activeresource (2.0.5)
-      activesupport (= 2.0.5)
-    activesupport (2.0.5)
-    erubis (2.7.0)
-    hpricot (0.8.4)
-    json (1.6.1)
-    rails (2.0.5)
-      actionmailer (= 2.0.5)
-      actionpack (= 2.0.5)
-      activerecord (= 2.0.5)
-      activeresource (= 2.0.5)
-      activesupport (= 2.0.5)
-      rake (>= 0.7.2)
-    rake (0.9.2)
-    ruby_parser (2.3.0)
-      sexp_processor (~> 3.0)
-    sass (3.1.7)
-    sexp_processor (3.0.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  erubis
-  hpricot
-  json
-  rails (>= 2.0.0, < 2.1.0)
-  ruby_parser
-  sass

data/test/gemfiles/Gemfile.rails-2.1.x

@@ -1,8 +0,0 @@
-source :gemcutter
-
-gem 'json'
-gem 'ruby_parser'
-gem 'hpricot'
-gem 'erubis'
-gem 'sass'
-gem 'rails', '>= 2.1.0', '< 2.2.0'

data/test/gemfiles/Gemfile.rails-2.1.x.lock

@@ -1,38 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (2.1.2)
-      actionpack (= 2.1.2)
-    actionpack (2.1.2)
-      activesupport (= 2.1.2)
-    activerecord (2.1.2)
-      activesupport (= 2.1.2)
-    activeresource (2.1.2)
-      activesupport (= 2.1.2)
-    activesupport (2.1.2)
-    erubis (2.7.0)
-    hpricot (0.8.4)
-    json (1.6.1)
-    rails (2.1.2)
-      actionmailer (= 2.1.2)
-      actionpack (= 2.1.2)
-      activerecord (= 2.1.2)
-      activeresource (= 2.1.2)
-      activesupport (= 2.1.2)
-      rake (>= 0.8.1)
-    rake (0.9.2)
-    ruby_parser (2.3.0)
-      sexp_processor (~> 3.0)
-    sass (3.1.7)
-    sexp_processor (3.0.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  erubis
-  hpricot
-  json
-  rails (>= 2.1.0, < 2.2.0)
-  ruby_parser
-  sass

data/test/gemfiles/Gemfile.rails-2.2.x

@@ -1,8 +0,0 @@
-source :gemcutter
-
-gem 'json'
-gem 'ruby_parser'
-gem 'hpricot'
-gem 'erubis'
-gem 'sass'
-gem 'rails', '>= 2.2.0', '< 2.3.0'

data/test/gemfiles/Gemfile.rails-2.2.x.lock

@@ -1,38 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (2.2.3)
-      actionpack (= 2.2.3)
-    actionpack (2.2.3)
-      activesupport (= 2.2.3)
-    activerecord (2.2.3)
-      activesupport (= 2.2.3)
-    activeresource (2.2.3)
-      activesupport (= 2.2.3)
-    activesupport (2.2.3)
-    erubis (2.7.0)
-    hpricot (0.8.4)
-    json (1.6.1)
-    rails (2.2.3)
-      actionmailer (= 2.2.3)
-      actionpack (= 2.2.3)
-      activerecord (= 2.2.3)
-      activeresource (= 2.2.3)
-      activesupport (= 2.2.3)
-      rake (>= 0.8.3)
-    rake (0.9.2)
-    ruby_parser (2.3.0)
-      sexp_processor (~> 3.0)
-    sass (3.1.7)
-    sexp_processor (3.0.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  erubis
-  hpricot
-  json
-  rails (>= 2.2.0, < 2.3.0)
-  ruby_parser
-  sass