scout_apm 1.2.8.pre1 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 648de873df09b8d7419abd803d9180fb67e1595d
-  data.tar.gz: 61cf23bc15c91ba74022f8390348cf4896bfd9d5
+  metadata.gz: 37dccd68e9841fb4be84b21b542423f4923dfee5
+  data.tar.gz: c29e6ac3d99fbbd612baf124c6e2d76e68933e27
 SHA512:
-  metadata.gz: 8856fc5d888b1a6243b16e2b04d1d4d60f84167d1dea79032e504d6b21f2fb43292df433cb6c5b99454c39fa529529d5f534880b8867d7a3446834228c164366
-  data.tar.gz: c7142c814ad6c572381688dea1baf5fdcd6f968bd6d79dff59fb7bfe68fb1e6822abf22d3ff8e0ec8d24e9bc6e1cfca748cb91e7091914ea65fe1cf0897678c1
+  metadata.gz: 34d1715eff899c93e04962bf4b3e80cc2e448cc4900a591fe180ade13973db7593a32a132d4f8b135298d4030911f580fbe472007d8bb42fc0c639245a48f236
+  data.tar.gz: 0c10d15966c2ac5797dda63978ccde80af58dfa59f584d9ddb63cd39d29de2cf97c7b1e47a22f29ade4952ebe28c2bcb78d4be6c0c6366aabd221aa4417dfa0d

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.2.9
+
+* Uses ActiveRecord::Base.configurations to access database adapter across all versions of Rails 3.0+.
+
 # 1.2.8
 
 * Enhance shutdown code to be sure we save current-minute metrics and minimize

data/lib/scout_apm/framework_integrations/rails_3_or_4.rb

@@ -36,7 +36,7 @@ module ScoutApm
         default = :mysql
 
         if defined?(ActiveRecord::Base)
-          adapter = getDatabaseAdapter # can be nil
+          adapter = get_database_adapter # can be nil
 
           case adapter.to_s
           when "postgres"   then :postgres
@@ -52,13 +52,9 @@ module ScoutApm
         end
       end
 
-      def getDatabaseAdapter
-        if ActiveRecord::Base.respond_to?(:connection_config)
-          ActiveRecord::Base.connection_config[:adapter]
-        elsif ActiveRecord::Base.respond_to?(:configurations)
-          ActiveRecord::Base.configurations[env]["adapter"]
-        end
-      rescue
+      def get_database_adapter
+        ActiveRecord::Base.configurations[env]["adapter"]
+      rescue # this would throw an exception if ActiveRecord::Base is defined but no configuration exists.
         nil
       end
     end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.2.8.pre1"
+  VERSION = "1.2.9"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.2.8.pre1
+  version: 1.2.9
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -170,12 +170,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring