scout_rails 1.1.2 → 1.1.3

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p392

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.1.3
+
+* Rails 4 support
+
 # 1.1.2
 
 * Fix for webrick detection

data/README.markdown

@@ -1,3 +1,5 @@
+__Rails application monitoring is avaiable by invite-only @ Scout.__
+
 # ScoutRails
 
 A Ruby gem for detailed Rails application performance analysis. Metrics are reported to [Scout](https://scoutapp.com), a hosted server and application monitoring service. For general server monitoring, see our [server monitoring agent](https://github.com/scoutapp/scout-client).
@@ -24,13 +26,11 @@ Your config file should look like:
       
 ## Supported Frameworks
 
-* Rails 2.2 and greater
+* Rails 2.2 through Rails 4
 
 ## Supported Rubies
 
-* Ruby 1.8.7
-* Ruby 1.9.2
-* Ruby 1.9.3
+* Ruby 1.8.7 through Ruby 2.1.2
 
 ## Supported Application Servers
 
@@ -41,4 +41,4 @@ Your config file should look like:
 
 ## Help
 
-See our [troubleshooting tips](https://scoutapp.com/info/support_app_monitoring) and/or email support@scoutapp.com if you need a hand.
+See our [troubleshooting tips](https://scoutapp.com/info/support_app_monitoring) and/or email support@scoutapp.com if you need a hand.

data/lib/scout_rails.rb

@@ -24,7 +24,7 @@ require File.expand_path('../scout_rails/transaction_sample.rb', __FILE__)
 require File.expand_path('../scout_rails/instruments/process/process_cpu.rb', __FILE__)
 require File.expand_path('../scout_rails/instruments/process/process_memory.rb', __FILE__)
 
-if defined?(Rails) and Rails.respond_to?(:version) and Rails.version =~ /^3/
+if defined?(Rails) and Rails.respond_to?(:version) and Rails.version >= '3'
   module ScoutRails
     class Railtie < Rails::Railtie
       initializer "scout_rails.start" do |app|

data/lib/scout_rails/agent.rb

@@ -194,8 +194,8 @@ module ScoutRails
       case environment.framework
       when :rails
         require File.expand_path(File.join(File.dirname(__FILE__),'instruments/rails/action_controller_instruments.rb'))
-      when :rails3
-        require File.expand_path(File.join(File.dirname(__FILE__),'instruments/rails3/action_controller_instruments.rb'))
+      when :rails3_or_4
+        require File.expand_path(File.join(File.dirname(__FILE__),'instruments/rails3_or_4/action_controller_instruments.rb'))
       end
       require File.expand_path(File.join(File.dirname(__FILE__),'instruments/active_record_instruments.rb'))
       require File.expand_path(File.join(File.dirname(__FILE__),'instruments/net_http.rb'))

data/lib/scout_rails/environment.rb

@@ -4,7 +4,7 @@ module ScoutRails
     def env
       @env ||= case framework
                when :rails then RAILS_ENV.dup
-               when :rails3 then Rails.env
+               when :rails3_or_4 then Rails.env
                when :sinatra
                  ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
                end
@@ -16,7 +16,7 @@ module ScoutRails
                         if Rails::VERSION::MAJOR < 3
                           :rails
                         else
-                          :rails3
+                          :rails3_or_4
                         end
                       when defined?(::Sinatra) && defined?(::Sinatra::Base) then :sinatra
                       else :ruby
@@ -42,7 +42,7 @@ module ScoutRails
     def root
       if framework == :rails
         RAILS_ROOT.to_s
-      elsif framework == :rails3
+      elsif framework == :rails3_or_4
         Rails.root
       elsif framework == :sinatra
         Sinatra::Application.root

data/lib/scout_rails/instruments/{rails3 → rails3_or_4}/action_controller_instruments.rb

@@ -1,4 +1,4 @@
-# Rails 3
+# Rails 3/4
 module ScoutRails::Instruments
   module ActionControllerInstruments
     # Instruments the action and tracks errors.

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies: []
 description: Monitors a Ruby on Rails application and reports detailed metrics on
   performance to Scout, a hosted monitoring service.
@@ -21,6 +21,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-version
 - CHANGELOG.markdown
 - Gemfile
 - LICENSE.markdown
@@ -40,7 +41,7 @@ files:
 - lib/scout_rails/instruments/process/process_cpu.rb
 - lib/scout_rails/instruments/process/process_memory.rb
 - lib/scout_rails/instruments/rails/action_controller_instruments.rb
-- lib/scout_rails/instruments/rails3/action_controller_instruments.rb
+- lib/scout_rails/instruments/rails3_or_4/action_controller_instruments.rb
 - lib/scout_rails/layaway.rb
 - lib/scout_rails/layaway_file.rb
 - lib/scout_rails/metric_meta.rb
@@ -71,8 +72,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scout_rails
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rails application performance monitoring
 test_files: []
+has_rdoc: