haml-edge 2.1.16 → 2.1.17

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.16
1
+ 2.1.17
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.1.16
1
+ 2.1.17
data/lib/sass/files.rb CHANGED
@@ -1,4 +1,5 @@
1
1
  require 'digest/sha1'
2
+ require 'pathname'
2
3
 
3
4
  module Sass
4
5
  # This module contains various bits of functionality
@@ -88,9 +89,15 @@ module Sass
88
89
  end
89
90
 
90
91
  def find_full_path(filename, load_paths)
91
- segments = filename.split(File::SEPARATOR)
92
- segments.push "_#{segments.pop}"
93
- partial_name = segments.join(File::SEPARATOR)
92
+ partial_name = File.join(File.dirname(filename), "_#{File.basename(filename)}")
93
+
94
+ if Pathname.new(filename).absolute?
95
+ [partial_name, filename].each do |name|
96
+ return name if File.readable?(name)
97
+ end
98
+ return nil
99
+ end
100
+
94
101
  load_paths.each do |path|
95
102
  [partial_name, filename].each do |name|
96
103
  full_path = File.join(path, name)
@@ -7,7 +7,7 @@ module Sass
7
7
  end
8
8
 
9
9
  def to_s(*args)
10
- @to_s ||= super()
10
+ @to_s ||= (style == :compressed ? super().strip : super())
11
11
  rescue Sass::SyntaxError => e
12
12
  e.add_backtrace_entry(@filename)
13
13
  raise e
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.16
4
+ version: 2.1.17
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-27 00:00:00 -04:00
13
+ date: 2009-06-01 00:00:00 -04:00
14
14
  default_executable:
15
15
  dependencies: []
16
16