haml-edge 2.3.161 → 2.3.162

Sign up to get free protection for your applications and to get access to all the features.
Files changed (38) hide show
  1. data/EDGE_GEM_VERSION +1 -1
  2. data/VERSION +1 -1
  3. data/extra/haml-mode.el +10 -7
  4. metadata +2 -37
  5. data/test/haml/spec/README.md +0 -97
  6. data/test/haml/spec/lua_haml_spec.lua +0 -30
  7. data/test/haml/spec/ruby_haml_test.rb +0 -19
  8. data/test/haml/spec/tests.json +0 -534
  9. data/vendor/fssm/LICENSE +0 -20
  10. data/vendor/fssm/README.markdown +0 -55
  11. data/vendor/fssm/Rakefile +0 -59
  12. data/vendor/fssm/VERSION.yml +0 -5
  13. data/vendor/fssm/example.rb +0 -9
  14. data/vendor/fssm/fssm.gemspec +0 -77
  15. data/vendor/fssm/lib/fssm/backends/fsevents.rb +0 -36
  16. data/vendor/fssm/lib/fssm/backends/inotify.rb +0 -26
  17. data/vendor/fssm/lib/fssm/backends/polling.rb +0 -25
  18. data/vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb +0 -131
  19. data/vendor/fssm/lib/fssm/monitor.rb +0 -26
  20. data/vendor/fssm/lib/fssm/path.rb +0 -91
  21. data/vendor/fssm/lib/fssm/pathname.rb +0 -502
  22. data/vendor/fssm/lib/fssm/state/directory.rb +0 -57
  23. data/vendor/fssm/lib/fssm/state/file.rb +0 -24
  24. data/vendor/fssm/lib/fssm/support.rb +0 -63
  25. data/vendor/fssm/lib/fssm/tree.rb +0 -176
  26. data/vendor/fssm/lib/fssm.rb +0 -33
  27. data/vendor/fssm/profile/prof-cache.rb +0 -40
  28. data/vendor/fssm/profile/prof-fssm-pathname.html +0 -1231
  29. data/vendor/fssm/profile/prof-pathname.rb +0 -68
  30. data/vendor/fssm/profile/prof-plain-pathname.html +0 -988
  31. data/vendor/fssm/profile/prof.html +0 -2379
  32. data/vendor/fssm/spec/path_spec.rb +0 -75
  33. data/vendor/fssm/spec/root/duck/quack.txt +0 -0
  34. data/vendor/fssm/spec/root/file.css +0 -0
  35. data/vendor/fssm/spec/root/file.rb +0 -0
  36. data/vendor/fssm/spec/root/file.yml +0 -0
  37. data/vendor/fssm/spec/root/moo/cow.txt +0 -0
  38. data/vendor/fssm/spec/spec_helper.rb +0 -14
data/EDGE_GEM_VERSION CHANGED
@@ -1 +1 @@
1
- 2.3.161
1
+ 2.3.162
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.3.161
1
+ 2.3.162
data/extra/haml-mode.el CHANGED
@@ -30,6 +30,7 @@
30
30
  (require 'textile-mode nil t)
31
31
  (require 'markdown-mode nil t)
32
32
  (require 'javascript-mode "javascript" t)
33
+ (require 'js nil t)
33
34
 
34
35
 
35
36
  ;; User definable variables
@@ -172,13 +173,15 @@ This requires that `css-mode' is available.
172
173
  (defun haml-highlight-js-filter-block (limit)
173
174
  "If a :javascript filter is found within LIMIT, highlight it.
174
175
 
175
- This requires that Karl Landström's \"javascript.el\" be available."
176
- (if (boundp 'js-font-lock-keywords-3)
177
- (haml-fontify-filter-region "javascript"
178
- limit
179
- js-font-lock-keywords-3
180
- javascript-mode-syntax-table
181
- nil)))
176
+ This requires that Karl Landström's javascript mode be available, either as the
177
+ \"js.el\" bundled with Emacs 23, or as \"javascript.el\" found in ELPA and
178
+ elsewhere."
179
+ (let ((keywords (or (and (featurep 'js) js--font-lock-keywords-3)
180
+ (and (featurep 'javascript-mode) js-font-lock-keywords-3)))
181
+ (syntax-table (or (and (featurep 'js) js-mode-syntax-table)
182
+ (and (featurep 'javascript-mode) javascript-mode-syntax-table))))
183
+ (when keywords
184
+ (haml-fontify-filter-region "javascript" limit keywords syntax-table nil))))
182
185
 
183
186
  (defun haml-highlight-textile-filter-block (limit)
184
187
  "If a :textile filter is found within LIMIT, highlight it.
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.3.161
4
+ version: 2.3.162
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: 2010-02-15 00:00:00 -05:00
13
+ date: 2010-02-18 00:00:00 -05:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
@@ -111,36 +111,6 @@ files:
111
111
  - lib/sass/tree/variable_node.rb
112
112
  - lib/sass/tree/while_node.rb
113
113
  - lib/sass/callbacks.rb
114
- - vendor/fssm/LICENSE
115
- - vendor/fssm/README.markdown
116
- - vendor/fssm/Rakefile
117
- - vendor/fssm/VERSION.yml
118
- - vendor/fssm/example.rb
119
- - vendor/fssm/fssm.gemspec
120
- - vendor/fssm/lib/fssm.rb
121
- - vendor/fssm/lib/fssm/backends/fsevents.rb
122
- - vendor/fssm/lib/fssm/backends/inotify.rb
123
- - vendor/fssm/lib/fssm/backends/polling.rb
124
- - vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb
125
- - vendor/fssm/lib/fssm/monitor.rb
126
- - vendor/fssm/lib/fssm/path.rb
127
- - vendor/fssm/lib/fssm/pathname.rb
128
- - vendor/fssm/lib/fssm/state/directory.rb
129
- - vendor/fssm/lib/fssm/state/file.rb
130
- - vendor/fssm/lib/fssm/support.rb
131
- - vendor/fssm/lib/fssm/tree.rb
132
- - vendor/fssm/profile/prof-cache.rb
133
- - vendor/fssm/profile/prof-fssm-pathname.html
134
- - vendor/fssm/profile/prof-pathname.rb
135
- - vendor/fssm/profile/prof-plain-pathname.html
136
- - vendor/fssm/profile/prof.html
137
- - vendor/fssm/spec/path_spec.rb
138
- - vendor/fssm/spec/root/duck/quack.txt
139
- - vendor/fssm/spec/root/file.css
140
- - vendor/fssm/spec/root/file.rb
141
- - vendor/fssm/spec/root/file.yml
142
- - vendor/fssm/spec/root/moo/cow.txt
143
- - vendor/fssm/spec/spec_helper.rb
144
114
  - bin/css2sass
145
115
  - bin/haml
146
116
  - bin/html2haml
@@ -174,10 +144,6 @@ files:
174
144
  - test/haml/results/tag_parsing.xhtml
175
145
  - test/haml/results/very_basic.xhtml
176
146
  - test/haml/results/whitespace_handling.xhtml
177
- - test/haml/spec/README.md
178
- - test/haml/spec/lua_haml_spec.lua
179
- - test/haml/spec/ruby_haml_test.rb
180
- - test/haml/spec/tests.json
181
147
  - test/haml/util_test.rb
182
148
  - test/haml/template_test.rb
183
149
  - test/haml/templates/_av_partial_1.haml
@@ -326,7 +292,6 @@ test_files:
326
292
  - test/haml/engine_test.rb
327
293
  - test/haml/helper_test.rb
328
294
  - test/haml/html2haml_test.rb
329
- - test/haml/spec/ruby_haml_test.rb
330
295
  - test/haml/util_test.rb
331
296
  - test/haml/template_test.rb
332
297
  - test/haml/spec_test.rb
@@ -1,97 +0,0 @@
1
- # Haml Spec #
2
-
3
- Haml Spec provides a basic suite of tests for Haml interpreters.
4
-
5
- It is intented for developers who are creating or maintaining an implementation
6
- of the [Haml](http://haml-lang.com) markup language.
7
-
8
- At the moment, there are test runners for the [original Haml](http://github.com/nex3/haml)
9
- in Ruby, and for [Lua Haml](http://github.com/norman/lua-haml). Support for
10
- other versions of Haml will be added if their developers/maintainers
11
- are interested in using it.
12
-
13
- ## The Tests ##
14
-
15
- The tests are kept in JSON format for portability across languages. Each test
16
- is a JSON object with expected input, output, local variables and configuration
17
- parameters (see below). The test suite only provides tests for features which
18
- are portable, therefore no tests for script are provided, nor for external
19
- filters such as :markdown or :textile.
20
-
21
- The one major exception to this are the tests for interpolation, which you may
22
- need to modify with a regular expression to run under PHP or Perl, which
23
- require a symbol before variable names. These tests are included despite being
24
- less than 100% portable because interpolation is an important part of Haml and
25
- can be tricky to implement.
26
-
27
- ## Running the Tests ##
28
-
29
- ### Ruby ###
30
-
31
- In order to make it as easy as possible for non-Ruby programmers to run the
32
- Ruby Haml tests, the Ruby test runner uses test/unit, rather than something
33
- fancier like Rspec. To run them you probably only need to install `haml`, and
34
- possibly `ruby` if your platform doesn't come with it by default. If you're
35
- using Ruby 1.8.x, you'll also need to install `json`:
36
-
37
- sudo gem install haml
38
- # for Ruby 1.8.x; check using "ruby --version" if unsure
39
- sudo gem install json
40
-
41
- Then, running the Ruby test suite is easy:
42
-
43
- ruby ruby_haml_test.rb
44
-
45
- ### Lua ###
46
-
47
- The Lua test depends on [Telescope](http://telescope.luaforge.net/),
48
- [jason4lua](http://json.luaforge.net/), and
49
- [Lua Haml](http://github.com/norman/lua-haml). Install and
50
- run `tsc lua_haml_spec.lua`.
51
-
52
- ## Contributing ##
53
-
54
- ### Getting it ###
55
-
56
- You can access the [Git repository](http://github.com/norman/haml-spec) at:
57
-
58
- git://github.com/norman/haml-spec.git
59
-
60
- Patches are *very* welcome, as are test runners for your Haml implementation.
61
-
62
- As long as any test you add run against Ruby Haml and are not redundant, I'll
63
- be very happy to add them.
64
-
65
- ### Test JSON format ###
66
-
67
- "test name" : {
68
- "haml" : "haml input",
69
- "html" : "expected html output",
70
- "result" : "expected test result",
71
- "locals" : "local vars",
72
- "config" : "config params"
73
- }
74
-
75
- * test name: This should be a *very* brief description of what's being tested. It can
76
- be used by the test runners to name test methods, or to exclude certain tests from being
77
- run.
78
- * haml: The Haml code to be evaluated. Always required.
79
- * html: The HTML output that should be generated. Required unless "result" is "error".
80
- * result: Can be "pass" or "error". If it's absent, then "pass" is assumed. If it's "error",
81
- then the goal of the test is to make sure that malformed Haml code generates an error.
82
- * locals: An object containing local variables needed for the test.
83
- * config: An object containing configuration parameters used to run the test.
84
- The configuration parameters should be usable directly by Ruby's Haml with no
85
- modification. If your implementation uses config parameters with different
86
- names, you may need to process them to make them match your implementation.
87
- If your implementation has options that do not exist in Ruby's Haml, then you
88
- should add tests for this in your implementation's test rather than here.
89
-
90
- ## License ##
91
-
92
- This project is released under the [WTFPL](http://sam.zoy.org/wtfpl/) in order
93
- to be as usable as possible in any project, commercial or free.
94
-
95
- ## Author ##
96
-
97
- [Norman Clarke](mailto:norman@njclarke.com)
@@ -1,30 +0,0 @@
1
- require 'luarocks.require'
2
- require 'json'
3
- require 'telescope'
4
- require 'haml'
5
-
6
- local function get_tests(filename)
7
- local self = debug.getinfo(1).short_src
8
- if self:match("/") then return "./" .. self:gsub("[^/]*%.lua$", "/" .. filename)
9
- elseif self:match("\\") then return self:gsub("[^\\]*%.lua$", "\\" .. filename)
10
- else return filename
11
- end
12
- end
13
-
14
- local fh = assert(io.open(get_tests("tests.json")))
15
- local input = fh:read '*a'
16
- fh:close()
17
-
18
- local contexts = json.decode(input)
19
-
20
- describe("LuaHaml", function()
21
- for context, expectations in pairs(contexts) do
22
- describe("When handling " .. context, function()
23
- for name, exp in pairs(expectations) do
24
- it(string.format("should correctly render %s", name), function()
25
- assert_equal(haml.render(exp.haml, exp.config or {}, exp.locals or {}), exp.html)
26
- end)
27
- end
28
- end)
29
- end
30
- end)
@@ -1,19 +0,0 @@
1
- require "test/unit"
2
- require "json"
3
- require "haml"
4
-
5
- class HamlTest < Test::Unit::TestCase
6
- contexts = JSON.parse(File.read(File.dirname(__FILE__) + "/tests.json"))
7
- contexts.each do |context|
8
- context[1].each do |name, test|
9
- class_eval(<<-EOTEST)
10
- def test_#{name.gsub(/\s+|[^a-zA-Z0-9_]/, "_")}
11
- locals = Hash[*(#{test}["locals"] || {}).collect {|k, v| [k.to_sym, v] }.flatten]
12
- options = Hash[*(#{test}["config"] || {}).collect {|k, v| [k.to_sym, v.to_sym] }.flatten]
13
- engine = Haml::Engine.new(#{test}["haml"], options)
14
- assert_equal(engine.render(Object.new, locals).chomp, #{test}["html"])
15
- end
16
- EOTEST
17
- end
18
- end
19
- end