haml 3.1.0.alpha.33 → 3.1.0.alpha.36

data/vendor/sass/test/test_helper.rb

@@ -61,4 +61,12 @@ class Test::Unit::TestCase
   else
     flunk "Expected exception #{klass}, none raised"
   end
+
+  def assert_raise_line(line)
+    yield
+  rescue Sass::SyntaxError => e
+    assert_equal(line, e.sass_line)
+  else
+    flunk "Expected exception on line #{line}, none raised"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.33
+  version: 3.1.0.alpha.36
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -05:00
+date: 2010-11-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,27 +46,27 @@ files:
 - rails/init.rb
 - lib/haml.rb
 - lib/haml/buffer.rb
+- lib/haml/compiler.rb
 - lib/haml/engine.rb
-- lib/haml/exec.rb
 - lib/haml/error.rb
+- lib/haml/exec.rb
 - lib/haml/filters.rb
 - lib/haml/helpers.rb
-- lib/haml/html.rb
 - lib/haml/helpers/action_view_extensions.rb
 - lib/haml/helpers/action_view_mods.rb
 - lib/haml/helpers/xss_mods.rb
-- lib/haml/util.rb
+- lib/haml/html.rb
 - lib/haml/html/erb.rb
+- lib/haml/parser.rb
 - lib/haml/railtie.rb
-- lib/haml/template.rb
 - lib/haml/root.rb
 - lib/haml/shared.rb
-- lib/haml/compiler.rb
+- lib/haml/template.rb
 - lib/haml/template/options.rb
 - lib/haml/template/patch.rb
 - lib/haml/template/plugin.rb
+- lib/haml/util.rb
 - lib/haml/version.rb
-- lib/haml/parser.rb
 - lib/sass.rb
 - lib/sass/plugin.rb
 - lib/sass/rails2_shim.rb
@@ -162,7 +162,12 @@ files:
 - vendor/sass/extra/update_watch.rb
 - vendor/sass/init.rb
 - vendor/sass/lib/sass.rb
-- vendor/sass/lib/sass/cache_store.rb
+- vendor/sass/lib/sass/cache_stores.rb
+- vendor/sass/lib/sass/cache_stores/active_support.rb
+- vendor/sass/lib/sass/cache_stores/base.rb
+- vendor/sass/lib/sass/cache_stores/filesystem.rb
+- vendor/sass/lib/sass/cache_stores/memory.rb
+- vendor/sass/lib/sass/cache_stores/null.rb
 - vendor/sass/lib/sass/callbacks.rb
 - vendor/sass/lib/sass/css.rb
 - vendor/sass/lib/sass/engine.rb
@@ -172,6 +177,7 @@ files:
 - vendor/sass/lib/sass/importers.rb
 - vendor/sass/lib/sass/importers/base.rb
 - vendor/sass/lib/sass/importers/filesystem.rb
+- vendor/sass/lib/sass/importers/rails.rb
 - vendor/sass/lib/sass/less.rb
 - vendor/sass/lib/sass/plugin.rb
 - vendor/sass/lib/sass/plugin/compiler.rb
@@ -193,6 +199,7 @@ files:
 - vendor/sass/lib/sass/script/functions.rb
 - vendor/sass/lib/sass/script/interpolation.rb
 - vendor/sass/lib/sass/script/lexer.rb
+- vendor/sass/lib/sass/script/list.rb
 - vendor/sass/lib/sass/script/literal.rb
 - vendor/sass/lib/sass/script/node.rb
 - vendor/sass/lib/sass/script/number.rb
@@ -217,13 +224,16 @@ files:
 - vendor/sass/lib/sass/selector/simple.rb
 - vendor/sass/lib/sass/selector/simple_sequence.rb
 - vendor/sass/lib/sass/shared.rb
+- vendor/sass/lib/sass/tree/charset_node.rb
 - vendor/sass/lib/sass/tree/comment_node.rb
 - vendor/sass/lib/sass/tree/debug_node.rb
 - vendor/sass/lib/sass/tree/directive_node.rb
+- vendor/sass/lib/sass/tree/each_node.rb
 - vendor/sass/lib/sass/tree/extend_node.rb
 - vendor/sass/lib/sass/tree/for_node.rb
 - vendor/sass/lib/sass/tree/if_node.rb
 - vendor/sass/lib/sass/tree/import_node.rb
+- vendor/sass/lib/sass/tree/media_node.rb
 - vendor/sass/lib/sass/tree/mixin_def_node.rb
 - vendor/sass/lib/sass/tree/mixin_node.rb
 - vendor/sass/lib/sass/tree/node.rb
@@ -263,6 +273,9 @@ files:
 - vendor/sass/test/sass/results/compressed.css
 - vendor/sass/test/sass/results/expanded.css
 - vendor/sass/test/sass/results/import.css
+- vendor/sass/test/sass/results/import_charset.css
+- vendor/sass/test/sass/results/import_charset_1_8.css
+- vendor/sass/test/sass/results/import_charset_ibm866.css
 - vendor/sass/test/sass/results/line_numbers.css
 - vendor/sass/test/sass/results/mixins.css
 - vendor/sass/test/sass/results/multiline.css
@@ -283,6 +296,8 @@ files:
 - vendor/sass/test/sass/scss/rx_test.rb
 - vendor/sass/test/sass/scss/scss_test.rb
 - vendor/sass/test/sass/scss/test_helper.rb
+- vendor/sass/test/sass/templates/_imported_charset_ibm866.sass
+- vendor/sass/test/sass/templates/_imported_charset_utf8.sass
 - vendor/sass/test/sass/templates/_partial.sass
 - vendor/sass/test/sass/templates/alt.sass
 - vendor/sass/test/sass/templates/basic.sass
@@ -295,6 +310,9 @@ files:
 - vendor/sass/test/sass/templates/compressed.sass
 - vendor/sass/test/sass/templates/expanded.sass
 - vendor/sass/test/sass/templates/import.sass
+- vendor/sass/test/sass/templates/import_charset.sass
+- vendor/sass/test/sass/templates/import_charset_1_8.sass
+- vendor/sass/test/sass/templates/import_charset_ibm866.sass
 - vendor/sass/test/sass/templates/importee.less
 - vendor/sass/test/sass/templates/importee.sass
 - vendor/sass/test/sass/templates/line_numbers.sass
@@ -365,7 +383,6 @@ files:
 - VERSION
 - VERSION_NAME
 - EDGE_GEM_VERSION
-- REVISION
 has_rdoc: false
 homepage: http://haml-lang.com/
 licenses: []

data/REVISION

@@ -1 +0,0 @@
-(release)

data/vendor/sass/lib/sass/cache_store.rb

@@ -1,208 +0,0 @@
-require 'stringio'
-
-module Sass
-  # An abstract base class for backends for the Sass cache.
-  # Any key-value store can act as such a backend;
-  # it just needs to implement the
-  # \{#_store} and \{#_retrieve} methods.
-  #
-  # To use a cache store with Sass,
-  # use the {file:SASS_REFERENCE.md#cache_store-option `:cache_store` option}.
-  class CacheStore
-    # Store cached contents for later retrieval
-    # Must be implemented by all CacheStore subclasses
-    #
-    # Note: cache contents contain binary data.
-    #
-    # @param key [String] The key to store the contents under
-    # @param version [String] The current sass version.
-    #                Cached contents must not be retrieved across different versions of sass.
-    # @param sha [String] The sha of the sass source.
-    #                Cached contents must not be retrieved if the sha has changed.
-    # @param contents [String] The contents to store.
-    def _store(key, version, sha, contents)
-      raise "#{self.class} must implement #_store."
-    end
-
-    # Retrieved cached contents.
-    # Must be implemented by all subclasses.
-    # 
-    # Note: if the key exists but the sha or version have changed,
-    # then the key may be deleted by the cache store, if it wants to do so.
-    #
-    # @param key [String] The key to retrieve
-    # @param version [String] The current sass version.
-    #                Cached contents must not be retrieved across different versions of sass.
-    # @param sha [String] The sha of the sass source.
-    #                Cached contents must not be retrieved if the sha has changed.
-    # @return [String] The contents that were previously stored.
-    # @return [NilClass] when the cache key is not found or the version or sha have changed.
-    def _retrieve(key, version, sha)
-      raise "#{self.class} must implement #_retrieve."
-    end
-
-    # Store a {Sass::Tree::RootNode}.
-    #
-    # @param key [String] The key to store it under.
-    # @param sha [String] The checksum for the contents that are being stored.
-    # @param obj [Object] The object to cache.
-    def store(key, sha, root)
-      _store(key, Sass::VERSION, sha, Sass::Util.dump(root))
-    end
-
-    # Retrieve a {Sass::Tree::RootNode}.
-    #
-    # @param key [String] The key the root element was stored under.
-    # @param sha [String] The checksum of the root element's content.
-    # @return [Object] The cached object.
-    def retrieve(key, sha)
-      contents = _retrieve(key, Sass::VERSION, sha)
-      Sass::Util.load(contents) if contents
-    rescue EOFError, TypeError, ArgumentError => e
-      raise
-      Sass::Util.sass_warn "Warning. Error encountered while reading cache #{path_to(key)}: #{e}"
-    end
-
-    # Return the key for the sass file.
-    #
-    # The `(sass_dirname, sass_basename)` pair
-    # should uniquely identify the Sass document,
-    # but otherwise there are no restrictions on their content.
-    #
-    # @param sass_dirname [String]
-    #   The fully-expanded location of the Sass file.
-    #   This corresponds to the directory name on a filesystem.
-    # @param sass_basename [String] The name of the Sass file that is being referenced.
-    #   This corresponds to the basename on a filesystem.
-    def key(sass_dirname, sass_basename)
-      dir = Digest::SHA1.hexdigest(sass_dirname)
-      filename = "#{sass_basename}c"
-      "#{dir}/#{filename}"
-    end
-  end
-
-  # A backend for the Sass cache using the filesystem.
-  class FileCacheStore < CacheStore
-    # The directory where the cached files will be stored.
-    #
-    # @return [String]
-    attr_accessor :cache_location
-
-    # Create a new FileCacheStore.
-    #
-    # @param cache_location [String] see \{#cache\_location}
-    def initialize(cache_location)
-      @cache_location = cache_location
-    end
-
-    # @see {CacheStore#\_retrieve\_}
-    def _retrieve(key, version, sha)
-      return unless File.readable?(path_to(key))
-      contents = nil
-      File.open(path_to(key), "rb") do |f|
-        if f.readline("\n").strip == version && f.readline("\n").strip == sha
-          return f.read
-        end
-      end
-      File.unlink path_to(key)
-      nil
-    rescue EOFError, TypeError, ArgumentError => e
-      Sass::Util.sass_warn "Warning. Error encountered while reading cache #{path_to(key)}: #{e}"
-    end
-
-    # @see {CacheStore#\_store\_}
-    def _store(key, version, sha, contents)
-      return unless File.writable?(File.dirname(@cache_location))
-      return if File.exists?(@cache_location) && !File.writable?(@cache_location)
-      compiled_filename = path_to(key)
-      return if File.exists?(File.dirname(compiled_filename)) && !File.writable?(File.dirname(compiled_filename))
-      return if File.exists?(compiled_filename) && !File.writable?(compiled_filename)
-      FileUtils.mkdir_p(File.dirname(compiled_filename))
-      File.open(compiled_filename, "wb") do |f|
-        f.puts(version)
-        f.puts(sha)
-        f.write(contents)
-      end
-    end
-
-    private
-
-    # Returns the path to a file for the given key.
-    #
-    # @param key [String]
-    # @return [String] The path to the cache file.
-    def path_to(key)
-      File.join(cache_location, key)
-    end
-  end
-
-  # A backend for the Sass cache using in-process memory.
-  class InMemoryCacheStore < CacheStore
-    # Since the {InMemoryCacheStore} is stored in the Sass tree's options hash,
-    # when the options get serialized as part of serializing the tree,
-    # you get crazy exponential growth in the size of the cached objects
-    # unless you don't dump the cache.
-    #
-    # @private
-    def _dump(depth)
-      ""
-    end
-
-    # If we deserialize this class, just make a new empty one.
-    #
-    # @private
-    def self._load(repr)
-      InMemoryCacheStore.new
-    end
-
-    # Create a new, empty cache store.
-    def initialize
-      @contents = {}
-    end
-
-    # @see CacheStore#_retrieve
-    def _retrieve(key, version, sha)
-      if @contents.has_key?(key)
-        return unless @contents[key][:version] == version
-        return unless @contents[key][:sha] == sha
-        return @contents[key][:contents]
-      end
-    end
-    
-    # @see CacheStore#_store
-    def _store(key, version, sha, contents)
-      @contents[key] = {
-        :version => version,
-        :sha => sha,
-        :contents => contents
-      }
-    end
-    
-    # Destructively clear the cache.
-    def reset!
-      @contents = {}
-    end
-  end
-
-  # Doesn't store anything, but records what things it should have stored.
-  # This doesn't currently have any use except for testing and debugging.
-  #
-  # @private
-  class NullCacheStore < CacheStore
-    def initialize
-      @keys = {}
-    end
-
-    def _retrieve(key, version, sha)
-      nil
-    end
-    
-    def _store(key, version, sha, contents)
-      @keys[key] = true
-    end
-    
-    def was_set?(key)
-      @keys[key]
-    end
-  end
-end