lib/flapjack.rb in flapjack-1.6.0 vs lib/flapjack.rb in flapjack-2.0.0b1

@@ -1,25 +1,32 @@
 #!/usr/bin/env ruby
 
-require 'oj'
+require 'active_support/time'
+require 'active_support/json/encoding'
 
+ActiveSupport.use_standard_json_time_format = true
+ActiveSupport.time_precision = 0
+
+require 'json'
+
+require 'flapjack/logger'
+
 module Flapjack
+  UUID_RE = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"
 
   DEFAULT_INITIAL_FAILURE_DELAY = 30
   DEFAULT_REPEAT_FAILURE_DELAY  = 60
 
   def self.load_json(data)
-    Oj.load(data, :mode => :strict, :symbol_keys => false)
+    ActiveSupport::JSON.decode(data)
   end
 
   def self.dump_json(data)
-    Oj.dump(data, :mode => :compat, :time_format => :ruby, :indent => 0)
+    ActiveSupport::JSON.encode(data)
   end
 
   def self.sanitize(str)
     return str if str.nil? || !str.is_a?(String) || str.valid_encoding?
-    return str.scrub('?') if str.respond_to?(:scrub)
-    str.chars.collect {|c| c.valid_encoding? ? c : '?' }.join
+    return str.scrub('?') if str.respond_to(:scrub)
+    str.chars.collect {|c| c.valid_encoding? ? c : '_' }.join
   end
-
 end
-