strelka-newrelic 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTI4YWVjMjg1MTk4YTgzNmQyNDY2MGEzYmUwODk2YmRjMGY5NDgxYw==
+    MTljNGIxOWQxNDg4MDYxMWViN2UxNDQwYmFiMmQ5Yjc1Y2VlMGNmZg==
   data.tar.gz: !binary |-
-    ZTMwYTViNGEyNzZiMzczYTdlNTJjMjcyZTk5YWU0ZmQ2YWNjMzEyMA==
+    ODE5MWNmYjdkNTNhMTkxZjcyMzczYjhhZmM4ZDlmOWJjZTBkZjNhYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjJmYjIyMTcwZjAyMmNlOWIzY2VmYTcxOTM3ZWUzMTAzNGZjYTVlNmU1NTk4
-    NjMzYzM0MjkwNGY2OWE0MzRjYmQ1OTMyNTYwMGFkNjIwMGRjNzJhNGRjNDEy
-    NmJhYjFlMmViZTgxYjcxMzRkZmM2NjU3MmQ1MzQ5M2I5MWRhYjE=
+    N2EyNDM4YWY4MTY2MWE0YjcyNTNkNWNlYWMzOTllNWY3OWRhZjY2MWQ4YmJk
+    NzVhMTIyZjZiYTI1OGUwZmMyMjhjMDlhNDhhODk2NjhjOTVkYTgyZTk2ZTBh
+    YzVkMWUxNjhhYWJkMGVlODNiYTFlZWY2NWM3ZDBiNjBjZmZlOGU=
   data.tar.gz: !binary |-
-    MWMyYTcwMzRlM2EzNWRiZGEzMmE1ZGU5MjA1NzJkNGQ3M2EzNDFmOWIzMGMy
-    NzU4OGVkODczZWY0ODgzZDU2NGQ1YTIxMTA0OWVmOWM2NGY3YTA2YmUzMDc1
-    NDAyYzc2NDA2YmI3OGI0ODRhODIwMmRhOTg5ZDVkNGJjYWVlZjA=
+    Y2VkNjM3ZGVhYWFiZjlkN2NhNWI1YmM2NjlkYmY1ODc2NmI4YWU1MGFhMjgx
+    MzRkMmQyNjFjNWJkMTFjNGMxYmYxZDViOTJjY2Y1OTlkYzUzOThkNjJlOGIx
+    NTk0YTliZmFjMjM1NGZkNjBjZjFmMDJlOGYwOTk4ZmYyMjJhYTQ=

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.0.2 [2013-04-01] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+- Only try to add RUM header/footer when the response has notes.
+
+
 == v0.0.1 [2013-01-16] Michael Granger <ged@FaerieMUD.org>
 
 Initial release.

data/lib/strelka/app/newrelic.rb

@@ -35,15 +35,15 @@ module Strelka::App::NewRelic
 
 
 	# Library version constant
-	VERSION = '0.0.1'
+	VERSION = '0.0.2'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 16e6c9702fe8 $
+	REVISION = %q$Revision: 95dd2b5fc474 $
 
 
 
 	# Insert this plugin after routing in the app's stack
-	run_after :routing
+	run_after :routing, :templating
 
 	# Configurability API -- load newrelic configuration from the 'newrelic'
 	# section of the universal config. Since NewRelic's config is separate
@@ -87,6 +87,7 @@ module Strelka::App::NewRelic
 
 	### Mark and time the app.
 	def handle_request( request )
+		response = nil
 		self.log.debug "[:newrelic] Instrumenting with NewRelic."
 
 		txname = if !request.notes[:routing][:route].empty?
@@ -108,10 +109,12 @@ module Strelka::App::NewRelic
 			super
 		end
 
-		response.notes[:rum_header] = NewRelic::Agent.browser_timing_header
-		response.notes[:rum_footer] = NewRelic::Agent.browser_timing_footer
-
-		self.log.debug "  response notes: %p" % [ response.notes ]
+		self.log.debug "Response is: %p" % [ response ]
+		if response && response.respond_to?( :notes ) && response.notes
+			response.notes[:rum_header] = NewRelic::Agent.browser_timing_header
+			response.notes[:rum_footer] = NewRelic::Agent.browser_timing_footer
+			self.log.debug "  response notes: %p" % [ response.notes ]
+		end
 
 		return response
 	rescue => err

data/spec/strelka/app/newrelic_spec.rb

@@ -107,13 +107,10 @@ describe Strelka::App::NewRelic do
 					plugin :parameters
 					param :sku, :integer
 
-					plugin :routing
+					plugin :routing, :templating
 
 					get '/foo' do |request|
 						self.log.debug "Agent logger: %p" % [ NewRelic::Agent.logger ]
-						NewRelic::Agent.logger.debug "DEBUG"
-						NewRelic::Agent.logger.info "INFO"
-						NewRelic::Agent.browser_timing_header
 						res = request.response
 						res.status = HTTP::OK
 						return res
@@ -124,12 +121,11 @@ describe Strelka::App::NewRelic do
 						res.status = HTTP::OK
 						return res
 					end
-				end
-
-				# logdevice = Loggability[ NewRelic ]
-				# logger = NewRelic::Agent::AgentLogger.new(NewRelic::Agent.config, '', logdevice )
-				# NewRelic::Agent.logger = logger
 
+					get '/template' do |request|
+						return Inversion::Template.new( '' )
+					end
+				end
 			end
 
 			after( :each ) do
@@ -159,6 +155,12 @@ describe Strelka::App::NewRelic do
 				response.notes[:rum_footer].should =~ /NREUMQ/
 			end
 
+			it "only tries to add browser timing JS to the response if it's got notes" do
+				request = @request_factory.get( '/template' )
+				response = @app.new.start_newrelic_agent.handle( request )
+				response.status.should == HTTP::OK
+			end
+
 		end
 
 

data.tar.gz.sig

@@ -1 +1 @@
-���aQ>�{�+�jX���(�?��,��2���Y��h��k@�V�뾫��C ���	,(���
ڭ01�7u\Ô*���[C�����ɹ��˛6]V|��[)d��S���\���c*�<--�ﮄe�*�u� *��
+z�M0�H���*�҄�B��Gƍ*�����~�4� %�6��	��"�-�tm�+�poYu�ꚓG�T��O$�\�ll���Z�CI��l��1\Wn14�R����f�1��?�r���|P�T���'8� )�/YݍA�R浸m�]I�­C#Wv�Ɛ6
��ȉ+�y��M*/[�E���d9E����Q�ST�@�;���bq���(��#��+K�6[�ّ/�S�*Tn�(�S�ڱ�]���i���P����

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka-newrelic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michael Granger
@@ -37,7 +37,7 @@ cert_chain:
   YjMyZVFMago2bUtDd2pwZWd5dEUwb2lmWGZGOGs3NUE5MTA1Y0JuTmlNWk9l
   MXRYaXFZYy9leENnV3ZiZ2d1cnpET2NSa1p1Ci9ZU3VzYWlEWEhLVTJPM0Fr
   YzNodEE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strelka

metadata.gz.sig

@@ -1 +1,2 @@
-���;�pgHӀl��]�r�lCG�? '�[.��n��-/6;��%�2,{ak���.%�_�)aMwrL�f�뇋Ѭ��2m������g�������Q̡��W=��\��}ȃ)̍-�Go˦�����Uep=���:H`f��U|�eyJ}��2���I��E}uA�"x�!���\�.� ���|�A�:��[B��@Şi����[켶�}�c>4��HҾS�j�Z�(Ay��L�ۺ�>�@�4�QɓjF��ђU>
+Ƀ��4cc���#�y�-\��Ӊ���n��ه�C~Kb��t��jA+Um(��d�jgj�РA�Aϱ
0u慆�+�0m���O��BL���C%��?R�ˤ=��n��Ě[=~
+y�