staticmatic 0.10.7 → 0.10.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/VERSION.yml CHANGED
@@ -1,4 +1,4 @@
1
1
  ---
2
2
  :major: 0
3
3
  :minor: 10
4
- :patch: 7
4
+ :patch: 8
@@ -159,7 +159,13 @@ module StaticMatic
159
159
  output << yield
160
160
  output << "</#{name}>"
161
161
  else
162
- output << "/>"
162
+ format = @staticmatic.configuration.haml_options[:format]
163
+
164
+ if format.nil? || format == :xhtml
165
+ output << "/>"
166
+ else
167
+ output << ">"
168
+ end
163
169
  end
164
170
  output
165
171
  end
@@ -16,7 +16,7 @@ module StaticMatic::RenderMixin
16
16
  begin
17
17
  # clear all scope variables except @staticmatic
18
18
  @scope.instance_variables.each do |var|
19
- @scope.instance_variable_set(var, nil) unless var == ('@staticmatic' || :@staticmatic)
19
+ @scope.instance_variable_set(var, nil) unless var == '@staticmatic' || :@staticmatic
20
20
  end
21
21
  html = generate_html_from_template_source(File.read(full_file_path))
22
22
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: staticmatic
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.7
4
+ version: 0.10.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stephen Bartholomew
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-11-23 00:00:00 +00:00
12
+ date: 2010-03-20 00:00:00 +00:00
13
13
  default_executable: staticmatic
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -81,10 +81,7 @@ files:
81
81
  - spec/rescue_spec.rb
82
82
  - spec/sandbox/test_site/configuration.rb
83
83
  - spec/sandbox/test_site/site/index
84
- - spec/sandbox/test_site/site/index.html
85
84
  - spec/sandbox/test_site/site/layout_test
86
- - spec/sandbox/test_site/site/page_with_error
87
- - spec/sandbox/test_site/site/page_with_partial_error
88
85
  - spec/sandbox/test_site/site/stylesheets/application.css
89
86
  - spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html
90
87
  - spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html.html
@@ -1,10 +0,0 @@
1
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2
- <html>
3
- <head>
4
- <title>StaticMatic</title>
5
- <link rel="stylesheet" href="stylesheets/application.css" media="all"/>
6
- </head>
7
- <body>
8
- <h1>StaticMatic!</h1>
9
- </body>
10
- </html>
@@ -1,4 +0,0 @@
1
- <h1>NoMethodError</h1>
2
- <p>undefined method `bang!' for #<Object:0x1973d98></p>
3
- <h2>Stack Trace</h2>
4
- (haml):3:in `render'<br/>/usr/local/lib/ruby/gems/1.8/gems/haml-2.0.4/lib/haml/engine.rb:149:in `render'<br/>/usr/local/lib/ruby/gems/1.8/gems/haml-2.0.4/lib/haml/engine.rb:149:in `instance_eval'<br/>/usr/local/lib/ruby/gems/1.8/gems/haml-2.0.4/lib/haml/engine.rb:149:in `render'<br/>./bin/../lib/staticmatic/handlers/haml.rb:8:in `compile'<br/>./bin/../lib/staticmatic/template.rb:17:in `template_for'<br/>./bin/../lib/staticmatic/mixins/render.rb:4:in `render'<br/>./bin/../lib/staticmatic/mixins/build.rb:8:in `build'<br/>./bin/../lib/staticmatic/mixins/build.rb:4:in `each'<br/>./bin/../lib/staticmatic/mixins/build.rb:4:in `build'<br/>./bin/../lib/staticmatic/base.rb:58:in `send'<br/>./bin/../lib/staticmatic/base.rb:58:in `run'<br/>bin/staticmatic:23
@@ -1,4 +0,0 @@
1
- <h1>NoMethodError</h1>
2
- <p>undefined method `generate_partial' for nil:NilClass</p>
3
- <h2>Stack Trace</h2>
4
- ./bin/../lib/staticmatic/helpers.rb:178:in `partial'<br/>(haml):3:in `render'<br/>/usr/local/lib/ruby/gems/1.8/gems/haml-2.0.4/lib/haml/engine.rb:149:in `render'<br/>/usr/local/lib/ruby/gems/1.8/gems/haml-2.0.4/lib/haml/engine.rb:149:in `instance_eval'<br/>/usr/local/lib/ruby/gems/1.8/gems/haml-2.0.4/lib/haml/engine.rb:149:in `render'<br/>./bin/../lib/staticmatic/handlers/haml.rb:8:in `compile'<br/>./bin/../lib/staticmatic/template.rb:17:in `template_for'<br/>./bin/../lib/staticmatic/mixins/render.rb:4:in `render'<br/>./bin/../lib/staticmatic/mixins/build.rb:8:in `build'<br/>./bin/../lib/staticmatic/mixins/build.rb:4:in `each'<br/>./bin/../lib/staticmatic/mixins/build.rb:4:in `build'<br/>./bin/../lib/staticmatic/base.rb:58:in `send'<br/>./bin/../lib/staticmatic/base.rb:58:in `run'<br/>bin/staticmatic:23