scout_agent 3.1.3 → 3.1.4

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 3.1.4
+
+* Modified the API to no longer load the JSON gem if we already have JSON
+  capabilities (for example, ActiveSupport provides it in Rails)
+
 == 3.1.3
 
 * Modified file modes to match lock types to get the file locking code running

data/lib/scout_agent.rb

@@ -91,7 +91,7 @@ module ScoutAgent
   end
 
   # The version of this agent.
-  VERSION = "3.1.3".freeze
+  VERSION = "3.1.4".freeze
   # A Pathname reference to the agent code directory, used in dynamic loading.
   LIB_DIR = Pathname.new(File.dirname(__FILE__)) + agent_name
 end

data/lib/scout_agent/api.rb

@@ -5,7 +5,11 @@ require "rbconfig"  # used to find the Ruby we are running under
 require "pathname"  # all paths are Pathname objects
 
 begin
-  require "json"    # the agent communicates in JSON
+  # 
+  # the agent communicates in JSON, so we need to load the gem unless we are in
+  # something like Rails that already provides us with JSON capabilities
+  # 
+  require "json" unless Hash.new.respond_to? :to_json
 rescue LoadError    # library not found
   begin
     require "rubygems"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scout_agent
 version: !ruby/object:Gem::Version 
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors: 
 - James Edward Gray II
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-05 00:00:00 -05:00
+date: 2009-05-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency