haml-edge 2.3.35 → 2.3.36

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.35
+2.3.36

data/Rakefile

@@ -22,6 +22,7 @@ Rake::TestTask.new do |t|
   t.libs << 'lib'
   test_files = FileList['test/**/*_test.rb']
   test_files.exclude('test/rails/*')
+  test_files.exclude('test/haml/spec/*')
   t.test_files = test_files
   t.verbose = true
 end

data/VERSION

@@ -1 +1 @@
-2.3.35
+2.3.36

data/test/haml/spec_test.rb

@@ -9,24 +9,36 @@ end
 class SpecTest < Test::Unit::TestCase
   spec_file = File.dirname(__FILE__) + '/spec/tests.json'
   if !File.exists?(spec_file)
-    warn <<MSG
+    error = <<MSG.rstrip
 Couldn't load haml-spec, skipping some tests.
 To use haml-spec, run `git submodule update --init`
 MSG
   elsif !defined?(JSON)
-    warn "Couldn't load json, skipping some tests."
+    error = "Couldn't load json, skipping some tests."
+  end
+
+  if error
+    define_method(:test_fake_couldnt_load_spec) {warn("\n" + error)}
   else
     JSON.parse(File.read(spec_file)).each do |name, tests|
-      define_method("test_spec: #{name}") do
-        tests.each do |haml, html|
-          result = Haml::Engine.new(haml, :locals => [:var]).render(
-            Object.new,
-            :var => "value",
-            :first => "a",
-            :last => "z")
-          assert_equal(html, result.rstrip)
+      tests.each do |subname, test|
+        define_method("test_spec: #{name} (#{subname})") do
+          options = convert_hash(test["config"])
+          options[:format] = options[:format].to_sym if options[:format]
+          engine = Haml::Engine.new(test["haml"], options)
+
+          result = engine.render(Object.new, convert_hash(test["locals"]))
+
+          assert_equal(test["html"], result.rstrip)
         end
       end
     end
   end
+
+  private
+
+  def convert_hash(hash)
+    return {} unless hash
+    Haml::Util.map_keys(hash) {|k| k.to_sym}
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.35
+  version: 2.3.36
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-18 00:00:00 -04:00
+date: 2009-09-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency