newrelic_rpm 3.1.1 → 3.1.2.beta1

data/test/new_relic/transaction_sample_test.rb

@@ -6,7 +6,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
 
   def setup
     @connection_stub = Mocha::Mockery.instance.named_mock('connection')
-    @connection_stub.stubs(:execute).returns('QUERY RESULT')
+    @connection_stub.stubs(:execute).returns([['QUERY RESULT']])
 
     NewRelic::TransactionSample.stubs(:get_connection).returns @connection_stub
     @t = make_sql_transaction(::SQL_STATEMENT, ::SQL_STATEMENT)
@@ -19,7 +19,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
   def test_not_record_sql_when_record_sql_off
     s = @t.prepare_to_send(:explain_sql => 0.00000001)
     s.each_segment do |segment|
-      assert_nil segment.params[:explanation]
+      assert_nil segment.params[:explain_plan]
       assert_nil segment.params[:sql]
     end
   end
@@ -29,7 +29,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
     got_one = false
     s.each_segment do |segment|
       fail if segment.params[:obfuscated_sql]
-      got_one = got_one || segment.params[:explanation] || segment.params[:sql]
+      got_one = got_one || segment.params[:explain_plan] || segment.params[:sql]
     end
     assert got_one
   end
@@ -40,7 +40,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
 
     got_one = false
     s.each_segment do |segment|
-      got_one = got_one || segment.params[:explanation] || segment.params[:sql]
+      got_one = got_one || segment.params[:explain_plan] || segment.params[:sql]
     end
 
     assert got_one
@@ -77,22 +77,16 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
   end
 
   def test_have_explains
-
     s = @t.prepare_to_send(:record_sql => :obfuscated, :explain_sql => 0.00000001)
-
-    explain_count = 0
+    
     s.each_segment do |segment|
-      if segment.params[:explanation]
-        explanations = segment.params[:explanation]
-
-        explanations.each do |explanation|
-          assert_kind_of Array, explanation
-          assert_equal "QUERY RESULT", explanation.join('')
-          explain_count += 1
-        end
+      if segment.params[:explain_plan]
+        explanation = segment.params[:explain_plan]
+
+        assert_kind_of Array, explanation
+        assert_equal([nil, ["QUERY RESULT"]], explanation)
       end
     end
-    assert_equal 2, explain_count
   end
 
   def test_not_record_sql_without_record_sql_option
@@ -104,7 +98,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
     s = t.prepare_to_send(:explain_sql => 0.00000001)
 
     s.each_segment do |segment|
-      assert_nil segment.params[:explanation]
+      assert_nil segment.params[:explain_plan]
       assert_nil segment.params[:sql]
     end
   end

data/test/test_helper.rb

@@ -21,8 +21,18 @@ begin
   end
 
 rescue LoadError
-  puts "Unable to load Rails for New Relic tests"
-  raise
+  # To run the tests against a standalone agent build, you need to
+  # add a rails app to the load path.  It can be 2.* to 3.*.  It should
+  # referenc newrelic_rpm in the Gemfile with a :path option pointing 
+  # to this work directory.
+  guess = File.expand_path("../../../rpm", __FILE__)
+  if $LOAD_PATH.include? guess
+    puts "Unable to load Rails for New Relic tests.  See note in test_helper.rb"
+    raise
+  else
+    $LOAD_PATH << guess
+    retry
+  end
 end
 require 'newrelic_rpm'
 

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: newrelic_rpm
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
-  segments: 
-  - 3
-  - 1
-  - 1
-  version: 3.1.1
+version: !ruby/object:Gem::Version
+  version: 3.1.2.beta1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Bill Kayser
 - Jon Guymon
 - Justin George
@@ -17,73 +12,67 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-28 00:00:00 -07:00
+date: 2011-08-18 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: jeweler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2164283560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2164283560
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2155997140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2155997140
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &2155996160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: |
-  New Relic is a performance management system, developed by New Relic,
+  prerelease: false
+  version_requirements: *2155996160
+description: ! 'New Relic is a performance management system, developed by New Relic,
+
   Inc (http://www.newrelic.com).  New Relic provides you with deep
+
   information about the performance of your web application as it runs
+
   in production. The New Relic Ruby Agent is dual-purposed as a either a
+
   Gem or plugin, hosted on
+
   http://github.com/newrelic/rpm/
 
+'
 email: support@newrelic.com
-executables: 
-- newrelic_cmd
-- newrelic
+executables:
 - mongrel_rpm
+- newrelic
+- newrelic_cmd
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 - README.rdoc
 - newrelic.yml
-files: 
+files:
 - CHANGELOG
 - LICENSE
 - README.rdoc
@@ -164,6 +153,7 @@ files:
 - lib/new_relic/control/server_methods.rb
 - lib/new_relic/data_serialization.rb
 - lib/new_relic/delayed_job_injection.rb
+- lib/new_relic/language_support.rb
 - lib/new_relic/local_environment.rb
 - lib/new_relic/merbtasks.rb
 - lib/new_relic/metric_data.rb
@@ -337,60 +327,38 @@ files:
 has_rdoc: true
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
-
-post_install_message: |
-  
-  PLEASE NOTE:
-  
-  Developer Mode is now a Rack middleware.
-  
-  Developer Mode is no longer available in Rails 2.1 and earlier.
-  However, starting in version 2.12 you can use Developer Mode in any
-  Rack based framework, in addition to Rails.  To install developer mode
-  in a non-Rails application, just add NewRelic::Rack::DeveloperMode to
-  your middleware stack.
-  
-  If you are using JRuby, we recommend using at least version 1.4 or 
-  later because of issues with the implementation of the timeout library.
-  
-  Refer to the README.md file for more information.
-  
-  Please see http://github.com/newrelic/rpm/blob/master/CHANGELOG
-  for a complete description of the features and enhancements available
-  in version 3.1 of the Ruby Agent.
-    
-
-rdoc_options: 
+post_install_message: ! "\nPLEASE NOTE:\n\nDeveloper Mode is now a Rack middleware.\n\nDeveloper
+  Mode is no longer available in Rails 2.1 and earlier.\nHowever, starting in version
+  2.12 you can use Developer Mode in any\nRack based framework, in addition to Rails.
+  \ To install developer mode\nin a non-Rails application, just add NewRelic::Rack::DeveloperMode
+  to\nyour middleware stack.\n\nIf you are using JRuby, we recommend using at least
+  version 1.4 or \nlater because of issues with the implementation of the timeout
+  library.\n\nRefer to the README.md file for more information.\n\nPlease see http://github.com/newrelic/rpm/blob/master/CHANGELOG\nfor
+  a complete description of the features and enhancements available\nin version 3.1
+  of the Ruby Agent.\n  \n"
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - New Relic Ruby Agent
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Agent
 test_files: []
-