lib/fog/ibm.rb in fog-1.3.1 vs lib/fog/ibm.rb in fog-1.4.0

- old
+ new

@@ -1,6 +1,6 @@ -require(File.expand_path(File.join(File.dirname(__FILE__), 'core'))) +require 'fog/core' module Fog module IBM extend Fog::Provider @@ -16,11 +16,10 @@ end class Connection < Fog::Connection def initialize(user, password) - require 'multi_json' @user = user @password = password @endpoint = URI.parse('https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331') @base_path = @endpoint.path super("#{@endpoint.scheme}://#{@endpoint.host}:#{@endpoint.port}") @@ -36,10 +35,10 @@ options[:headers]['Content-Type'] = 'application/x-www-form-urlencoded' options[:body] = form_encode(options[:body]) end response = super(options) unless response.body.empty? - response.body = MultiJson.decode(response.body) + response.body = Fog::JSON.decode(response.body) end response end def auth_header