haml 3.1.0.alpha.23 → 3.1.0.alpha.26

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of haml might be problematic. Click here for more details.

@@ -1 +1 @@
1
- 3.1.0.alpha.23
1
+ 3.1.0.alpha.26
data/VERSION CHANGED
@@ -1 +1 @@
1
- 3.1.0.alpha.23
1
+ 3.1.0.alpha.26
@@ -155,7 +155,7 @@ module Haml
155
155
  end
156
156
 
157
157
  def handle_load_error(err)
158
- dep = err.message.scan(/^no such file to load -- (.*)/)[0]
158
+ dep = err.message[/^no such file to load -- (.*)/, 1]
159
159
  raise err if @options[:trace] || dep.nil? || dep.empty?
160
160
  $stderr.puts <<MESSAGE
161
161
  Required dependency #{dep} not found!
@@ -3,6 +3,8 @@ $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
3
3
 
4
4
  require 'haml'
5
5
 
6
- unless Haml::Util.try_sass
6
+ if Haml::Util.try_sass
7
+ load Sass::Util.scope('lib/sass/plugin.rb')
8
+ else
7
9
  load Haml::Util.scope('vendor/sass/lib/sass/plugin.rb')
8
10
  end
@@ -49,6 +49,10 @@ to declare the names of the arguments they take.
49
49
  This flag hasn't been necessary since Rails 2.0.
50
50
  Existing Rails 2.0 installations will continue to work.
51
51
 
52
+ ## 3.0.23 (Unreleased)
53
+
54
+ * Fix the error message for unloadable modules when running the executables under Ruby 1.9.2.
55
+
52
56
  ## 3.0.22
53
57
 
54
58
  [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.22).
@@ -154,7 +154,7 @@ module Sass
154
154
  end
155
155
 
156
156
  def handle_load_error(err)
157
- dep = err.message.scan(/^no such file to load -- (.*)/)[0]
157
+ dep = err.message[/^no such file to load -- (.*)/, 1]
158
158
  raise err if @options[:trace] || dep.nil? || dep.empty?
159
159
  $stderr.puts <<MESSAGE
160
160
  Required dependency #{dep} not found!
@@ -192,7 +192,7 @@ WARNING
192
192
  class Call
193
193
  def to_sass_tree
194
194
  return if hide_in_sass
195
- Sass::Tree::MixinNode.new(@mixin.name.gsub(/^\./, ''), @params.map {|v| v.to_sass_tree})
195
+ Sass::Tree::MixinNode.new(@mixin.name.gsub(/^\./, ''), @params.map {|v| v.to_sass_tree}, {})
196
196
  end
197
197
  end
198
198
 
@@ -325,7 +325,7 @@ WARNING
325
325
 
326
326
  class Function
327
327
  def to_sass_tree
328
- Sass::Script::Funcall.new(self, @args.map {|a| a.to_sass_tree})
328
+ Sass::Script::Funcall.new(self, @args.map {|a| a.to_sass_tree}, {})
329
329
  end
330
330
  end
331
331
 
@@ -631,9 +631,9 @@ MSG
631
631
  #
632
632
  # @param obj {Object}
633
633
  # @return {String}
634
- def inspect(obj)
634
+ def inspect_obj(obj)
635
635
  return obj.inspect unless version_geq(::RUBY_VERSION, "1.9.2")
636
- return ':' + inspect(obj.to_s) if obj.is_a?(Symbol)
636
+ return ':' + inspect_obj(obj.to_s) if obj.is_a?(Symbol)
637
637
  return obj.inspect unless obj.is_a?(String)
638
638
  '"' + obj.gsub(/[\x00-\x7F]+/) {|s| s.inspect[1...-1]} + '"'
639
639
  end
@@ -1,4 +1,6 @@
1
- require 'sass/util'
1
+ # This is necessary for loading Sass when Haml is required in Rails 3.
2
+ # Once the split is complete, we can remove it.
3
+ require File.dirname(__FILE__) + '/../sass'
2
4
 
3
5
  module Sass
4
6
  # Handles Sass version-reporting.
File without changes
@@ -14,7 +14,7 @@ module Sass::Script::Functions
14
14
  declare :only_var_args, [], :var_args => true
15
15
 
16
16
  def only_kw_args(kwargs)
17
- Sass::Script::String.new("only-kw-args(" + kwargs.keys.sort.join(", ") + ")")
17
+ Sass::Script::String.new("only-kw-args(" + kwargs.keys.map {|a| a.to_s}.sort.join(", ") + ")")
18
18
  end
19
19
  declare :only_kw_args, [], :var_kwargs => true
20
20
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: haml
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0.alpha.23
4
+ version: 3.1.0.alpha.26
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Weizenbaum
@@ -364,7 +364,6 @@ files:
364
364
  - VERSION
365
365
  - VERSION_NAME
366
366
  - EDGE_GEM_VERSION
367
- - REVISION
368
367
  has_rdoc: false
369
368
  homepage: http://haml-lang.com/
370
369
  licenses: []
data/REVISION DELETED
@@ -1 +0,0 @@
1
- (release)