Permalink
Browse files

removed xhtml parsing dependency

  • Loading branch information...
1 parent dc5ac9c commit 21364a0982ec0b68be3c23c1f293ab74e7e6ce33 @twilson63 committed Feb 10, 2013
Showing with 48 additions and 28 deletions.
  1. +2 −0 CHANGELOG
  2. +1 −1 Gemfile
  3. +28 −26 Gemfile.lock
  4. +16 −0 log/newrelic_agent.log
  5. +1 −1 server.rb
View
@@ -1,3 +1,5 @@
# 3/26/2011
fixed issue with failing rake test and added json support
also added a little better styling.
+# 2/10/2013
+Removed xhtml parsing restriction - #17
View
@@ -3,7 +3,7 @@ source :gemcutter
gem 'thin'
gem 'sinatra'
gem 'hpricot'
-gem 'html2haml'
+gem 'html2haml', "~> 1.0.0.beta.2"
gem 'json'
gem 'builder'
gem 'erubis'
View
@@ -1,41 +1,43 @@
GEM
remote: http://rubygems.org/
specs:
- builder (3.1.3)
- crack (0.3.1)
+ builder (3.1.4)
+ crack (0.3.2)
daemons (1.1.9)
diff-lcs (1.1.3)
erubis (2.7.0)
eventmachine (1.0.0)
- haml (3.2.0.rc.1)
+ haml (3.2.0.rc.4)
tilt
hpricot (0.8.6)
- html2haml (1.0.0.beta.1)
- haml (>= 3.2.0.beta.1)
- hpricot
- json (1.7.5)
- newrelic_rpm (3.4.2.1)
- rack (1.4.1)
- rack-protection (1.2.0)
+ html2haml (1.0.0.beta.3)
+ erubis (~> 2.7.0)
+ haml (>= 3.2.0.rc.3)
+ hpricot (~> 0.8.6)
+ ruby_parser (~> 3.1.1)
+ json (1.7.6)
+ newrelic_rpm (3.5.5.38)
+ rack (1.5.2)
+ rack-protection (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.3)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.2)
+ rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.3)
- ruby_parser (2.3.1)
- sexp_processor (~> 3.0)
- sexp_processor (3.2.0)
- sinatra (1.3.3)
- rack (~> 1.3, >= 1.3.6)
- rack-protection (~> 1.2)
+ rspec-mocks (2.12.2)
+ ruby_parser (3.1.1)
+ sexp_processor (~> 4.1)
+ sexp_processor (4.1.4)
+ sinatra (1.3.4)
+ rack (~> 1.4)
+ rack-protection (~> 1.3)
tilt (~> 1.3, >= 1.3.3)
- thin (1.4.1)
+ thin (1.5.0)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
@@ -49,7 +51,7 @@ DEPENDENCIES
crack
erubis
hpricot
- html2haml
+ html2haml (~> 1.0.0.beta.2)
json
newrelic_rpm
rack-test
@@ -64,3 +64,19 @@
[09/22/12 07:57:33 -0400 air-2.local (36556)] ERROR : No license key found. Please edit your newrelic.yml file and insert your license key.
[09/22/12 07:57:33 -0400 air-2.local (36556)] INFO : New Relic Ruby Agent 3.4.2 Initialized: pid = 36556
[09/22/12 07:57:33 -0400 air-2.local (36556)] INFO : Agent Log at /Users/twilson63/code/html2haml/log/newrelic_agent.log
+[02/10/13 10:54:25 -0500 air-4.local (37576)] ERROR : Unable to read configuration file : can't convert nil into String
+[02/10/13 10:54:25 -0500 air-4.local (37576)] INFO : Environment: development
+[02/10/13 10:54:25 -0500 air-4.local (37576)] INFO : Dispatcher: thin
+[02/10/13 10:54:25 -0500 air-4.local (37576)] INFO : Application: development
+[02/10/13 10:54:25 -0500 air-4.local (37576)] WARN : No license key found in newrelic.yml config. This often means your newrelic.yml is missing a section for the running environment 'development'
+[02/10/13 10:54:25 -0500 air-4.local (37576)] INFO : Installing Net instrumentation
+[02/10/13 10:54:25 -0500 air-4.local (37576)] INFO : Installing Sinatra instrumentation
+[02/10/13 10:54:25 -0500 air-4.local (37576)] INFO : Finished instrumentation
+[02/10/13 10:56:41 -0500 air-4.local (37586)] ERROR : Unable to read configuration file : can't convert nil into String
+[02/10/13 10:56:41 -0500 air-4.local (37586)] INFO : Environment: development
+[02/10/13 10:56:41 -0500 air-4.local (37586)] INFO : Dispatcher: thin
+[02/10/13 10:56:41 -0500 air-4.local (37586)] INFO : Application: development
+[02/10/13 10:56:41 -0500 air-4.local (37586)] WARN : No license key found in newrelic.yml config. This often means your newrelic.yml is missing a section for the running environment 'development'
+[02/10/13 10:56:41 -0500 air-4.local (37586)] INFO : Installing Net instrumentation
+[02/10/13 10:56:41 -0500 air-4.local (37586)] INFO : Installing Sinatra instrumentation
+[02/10/13 10:56:41 -0500 air-4.local (37586)] INFO : Finished instrumentation
View
@@ -46,5 +46,5 @@
end
def convert(html)
- Haml::HTML.new(html, :erb => true, :xhtml => true).render
+ Haml::HTML.new(html, :erb => true, :xhtml => false).render
end

0 comments on commit 21364a0

Please sign in to comment.