Permalink
Browse files

updated site to parse using 19 attributes

  • Loading branch information...
1 parent 96b1c57 commit feb8599f48bd27d35e23a76686ad70c2914e27f7 @twilson63 committed Sep 16, 2013
Showing with 73 additions and 11 deletions.
  1. +2 −2 Gemfile
  2. +11 −8 Gemfile.lock
  3. +56 −0 log/newrelic_agent.log
  4. +2 −1 server.rb
  5. +2 −0 views/sidebar.haml
View
@@ -4,11 +4,11 @@ gem 'thin'
gem 'sinatra'
gem 'hpricot'
gem 'haml', '~> 4.0.0'
-gem 'html2haml', '~> 1.0.0'
+gem 'html2haml', '~> 2.0.0.beta.1'
gem 'json'
gem 'builder'
gem 'erubis'
-gem 'ruby_parser'
+gem 'ruby_parser', '~> 3.2.2'
gem 'crack'
gem 'newrelic_rpm'
View
@@ -10,13 +10,16 @@ GEM
haml (4.0.0)
tilt
hpricot (0.8.6)
- html2haml (1.0.0)
+ html2haml (2.0.0.beta.1)
erubis (~> 2.7.0)
- haml (>= 4.0.0.rc.1)
- hpricot (~> 0.8.6)
- ruby_parser (~> 3.1.1)
+ haml (~> 4.0.0)
+ nokogiri (~> 1.6.0)
+ ruby_parser (~> 3.2.1)
json (1.7.6)
+ mini_portile (0.5.1)
newrelic_rpm (3.5.5.38)
+ nokogiri (1.6.0)
+ mini_portile (~> 0.5.0)
rack (1.5.2)
rack-protection (1.3.2)
rack
@@ -30,9 +33,9 @@ GEM
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.12.2)
- ruby_parser (3.1.1)
+ ruby_parser (3.2.2)
sexp_processor (~> 4.1)
- sexp_processor (4.1.4)
+ sexp_processor (4.3.0)
sinatra (1.3.4)
rack (~> 1.4)
rack-protection (~> 1.3)
@@ -52,11 +55,11 @@ DEPENDENCIES
erubis
haml (~> 4.0.0)
hpricot
- html2haml (~> 1.0.0)
+ html2haml (~> 2.0.0.beta.1)
json
newrelic_rpm
rack-test
rspec
- ruby_parser
+ ruby_parser (~> 3.2.2)
sinatra
thin
@@ -88,3 +88,59 @@
[02/14/13 10:52:05 -0500 air-4.local (87172)] INFO : Installing Net instrumentation
[02/14/13 10:52:05 -0500 air-4.local (87172)] INFO : Installing Sinatra instrumentation
[02/14/13 10:52:05 -0500 air-4.local (87172)] INFO : Finished instrumentation
+[09/16/13 08:47:39 -0400 thing-4.local (85554)] ERROR : Unable to read configuration file : can't convert nil into String
+[09/16/13 08:47:39 -0400 thing-4.local (85554)] INFO : Environment: development
+[09/16/13 08:47:39 -0400 thing-4.local (85554)] INFO : Dispatcher: thin
+[09/16/13 08:47:39 -0400 thing-4.local (85554)] INFO : Application: development
+[09/16/13 08:47:39 -0400 thing-4.local (85554)] WARN : No license key found in newrelic.yml config. This often means your newrelic.yml is missing a section for the running environment 'development'
+[09/16/13 08:47:40 -0400 thing-4.local (85554)] INFO : Installing Net instrumentation
+[09/16/13 08:47:40 -0400 thing-4.local (85554)] INFO : Installing Sinatra instrumentation
+[09/16/13 08:47:40 -0400 thing-4.local (85554)] INFO : Finished instrumentation
+[09/16/13 08:52:29 -0400 thing-4.local (85571)] ERROR : Unable to read configuration file : can't convert nil into String
+[09/16/13 08:52:29 -0400 thing-4.local (85571)] INFO : Environment: development
+[09/16/13 08:52:29 -0400 thing-4.local (85571)] INFO : Dispatcher: thin
+[09/16/13 08:52:29 -0400 thing-4.local (85571)] INFO : Application: development
+[09/16/13 08:52:29 -0400 thing-4.local (85571)] WARN : No license key found in newrelic.yml config. This often means your newrelic.yml is missing a section for the running environment 'development'
+[09/16/13 08:52:29 -0400 thing-4.local (85571)] INFO : Installing Net instrumentation
+[09/16/13 08:52:29 -0400 thing-4.local (85571)] INFO : Installing Sinatra instrumentation
+[09/16/13 08:52:29 -0400 thing-4.local (85571)] INFO : Finished instrumentation
+[09/16/13 08:54:29 -0400 thing-4.local (85576)] ERROR : Unable to read configuration file : can't convert nil into String
+[09/16/13 08:54:29 -0400 thing-4.local (85576)] INFO : Environment: development
+[09/16/13 08:54:29 -0400 thing-4.local (85576)] INFO : Dispatcher: thin
+[09/16/13 08:54:29 -0400 thing-4.local (85576)] INFO : Application: development
+[09/16/13 08:54:29 -0400 thing-4.local (85576)] WARN : No license key found in newrelic.yml config. This often means your newrelic.yml is missing a section for the running environment 'development'
+[09/16/13 08:54:29 -0400 thing-4.local (85576)] INFO : Installing Net instrumentation
+[09/16/13 08:54:29 -0400 thing-4.local (85576)] INFO : Installing Sinatra instrumentation
+[09/16/13 08:54:29 -0400 thing-4.local (85576)] INFO : Finished instrumentation
+[09/16/13 08:57:24 -0400 thing-4.local (85584)] ERROR : Unable to read configuration file : can't convert nil into String
+[09/16/13 08:57:24 -0400 thing-4.local (85584)] INFO : Environment: development
+[09/16/13 08:57:24 -0400 thing-4.local (85584)] INFO : Dispatcher: thin
+[09/16/13 08:57:24 -0400 thing-4.local (85584)] INFO : Application: development
+[09/16/13 08:57:24 -0400 thing-4.local (85584)] WARN : No license key found in newrelic.yml config. This often means your newrelic.yml is missing a section for the running environment 'development'
+[09/16/13 08:57:24 -0400 thing-4.local (85584)] INFO : Installing Net instrumentation
+[09/16/13 08:57:24 -0400 thing-4.local (85584)] INFO : Installing Sinatra instrumentation
+[09/16/13 08:57:24 -0400 thing-4.local (85584)] INFO : Finished instrumentation
+[09/16/13 09:00:21 -0400 thing-4.local (85591)] ERROR : Unable to read configuration file : can't convert nil into String
+[09/16/13 09:00:21 -0400 thing-4.local (85591)] INFO : Environment: development
+[09/16/13 09:00:21 -0400 thing-4.local (85591)] INFO : Dispatcher: thin
+[09/16/13 09:00:21 -0400 thing-4.local (85591)] INFO : Application: development
+[09/16/13 09:00:21 -0400 thing-4.local (85591)] WARN : No license key found in newrelic.yml config. This often means your newrelic.yml is missing a section for the running environment 'development'
+[09/16/13 09:00:21 -0400 thing-4.local (85591)] INFO : Installing Net instrumentation
+[09/16/13 09:00:21 -0400 thing-4.local (85591)] INFO : Installing Sinatra instrumentation
+[09/16/13 09:00:21 -0400 thing-4.local (85591)] INFO : Finished instrumentation
+[09/16/13 09:00:56 -0400 thing-4.local (85597)] ERROR : Unable to read configuration file : can't convert nil into String
+[09/16/13 09:00:56 -0400 thing-4.local (85597)] INFO : Environment: development
+[09/16/13 09:00:56 -0400 thing-4.local (85597)] INFO : Dispatcher: thin
+[09/16/13 09:00:56 -0400 thing-4.local (85597)] INFO : Application: development
+[09/16/13 09:00:56 -0400 thing-4.local (85597)] WARN : No license key found in newrelic.yml config. This often means your newrelic.yml is missing a section for the running environment 'development'
+[09/16/13 09:00:57 -0400 thing-4.local (85597)] INFO : Installing Net instrumentation
+[09/16/13 09:00:57 -0400 thing-4.local (85597)] INFO : Installing Sinatra instrumentation
+[09/16/13 09:00:57 -0400 thing-4.local (85597)] INFO : Finished instrumentation
+[09/16/13 09:01:14 -0400 thing-4.local (85600)] ERROR : Unable to read configuration file : can't convert nil into String
+[09/16/13 09:01:14 -0400 thing-4.local (85600)] INFO : Environment: development
+[09/16/13 09:01:14 -0400 thing-4.local (85600)] INFO : Dispatcher: thin
+[09/16/13 09:01:14 -0400 thing-4.local (85600)] INFO : Application: development
+[09/16/13 09:01:14 -0400 thing-4.local (85600)] WARN : No license key found in newrelic.yml config. This often means your newrelic.yml is missing a section for the running environment 'development'
+[09/16/13 09:01:14 -0400 thing-4.local (85600)] INFO : Installing Net instrumentation
+[09/16/13 09:01:14 -0400 thing-4.local (85600)] INFO : Installing Sinatra instrumentation
+[09/16/13 09:01:14 -0400 thing-4.local (85600)] INFO : Finished instrumentation
View
@@ -46,5 +46,6 @@
end
def convert(html)
- Haml::HTML.new(html, :erb => true, :xhtml => false).render
+ Html2haml::HTML.new(html, :erb => true, :xhtml => false,
+ :ruby19_style_attributes => true).render
end
View
@@ -2,6 +2,8 @@
%p
%span{:style => 'color:green;font-size:1.2em;'}
Updated to Html2Haml Gem #{Html2haml::VERSION} and Haml #{Haml::VERSION}
+ %p
+ ** Uses ruby19 attributes where it can.
#box
%p
%a{:href => 'http://js2cs.nodejitsu.com'} Convert Javascript to Coffeescript

0 comments on commit feb8599

Please sign in to comment.