haml-edge 2.1.8 → 2.1.9

Sign up to get free protection for your applications and to get access to all the features.
data/EDGE_GEM_VERSION CHANGED
@@ -1 +1 @@
1
- 2.1.8
1
+ 2.1.9
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.1.8
1
+ 2.1.9
data/lib/haml.rb CHANGED
@@ -642,7 +642,7 @@ require 'haml/version'
642
642
  # ==== |
643
643
  #
644
644
  # The pipe character designates a multiline string.
645
- # It's placed at the end of a line
645
+ # It's placed at the end of a line (after some whitespace)
646
646
  # and means that all following lines that end with <tt>|</tt>
647
647
  # will be evaluated as though they were on the same line.
648
648
  # For example:
data/lib/sass/files.rb CHANGED
@@ -14,8 +14,7 @@ module Sass
14
14
  compiled_filename = sassc_filename(filename, options)
15
15
  sha = Digest::SHA1.hexdigest(text)
16
16
 
17
- if dump = try_to_read_sassc(filename, compiled_filename, sha)
18
- root = Marshal.load(dump)
17
+ if root = try_to_read_sassc(filename, compiled_filename, sha)
19
18
  root.options = options.merge(:filename => filename)
20
19
  return root
21
20
  end
@@ -67,8 +66,10 @@ module Sass
67
66
  File.open(compiled_filename) do |f|
68
67
  return unless f.readline("\n").strip == Sass::VERSION
69
68
  return unless f.readline("\n").strip == sha
70
- return f.read
69
+ return Marshal.load(f.read)
71
70
  end
71
+ rescue TypeError => e, ArgumentError => e
72
+ warn "Warning. Error encountered while reading cache #{compiled_filename}: #{e}"
72
73
  end
73
74
 
74
75
  def try_to_write_sassc(root, compiled_filename, sha, options)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: haml-edge
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.8
4
+ version: 2.1.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2009-05-13 00:00:00 -04:00
13
+ date: 2009-05-19 00:00:00 -04:00
14
14
  default_executable:
15
15
  dependencies: []
16
16