Skip to content
This repository has been archived by the owner on Jan 31, 2018. It is now read-only.

Commit

Permalink
Merge pull request #7 from underdogio/bug/okjson.missing.sqwished
Browse files Browse the repository at this point in the history
Moved from removed `OkJson` to `MultiJson`
  • Loading branch information
shayfrendt committed May 11, 2015
2 parents 8d2e186 + 1afaccb commit b50b795
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions init.rb
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ def get_status
resource = authenticated_resource("/status/#{@ranger_app_id}?api_key=#{@ranger_api_key}")

begin
@current_status = Heroku::OkJson.decode(resource.get)
@current_status = MultiJson.load(resource.get)
true
rescue Heroku::OkJson::Error => e
rescue MultiJson::ParseError => e
false
end
end
Expand All @@ -198,7 +198,7 @@ def remove_url(url)
end

def delete_dependency_from_url(url)
dependencies = Heroku::OkJson.decode(get_dependencies)
dependencies = MultiJson.load(get_dependencies)

dependency_id = nil
dependencies.each do |record|
Expand All @@ -222,7 +222,7 @@ def delete_dependency(id)
end

def clear_all_dependencies
dependencies = Heroku::OkJson.decode(get_dependencies)
dependencies = MultiJson.load(get_dependencies)

dependencies.each do |record|
delete_dependency(record["dependency"]["id"])
Expand Down Expand Up @@ -265,7 +265,7 @@ def domain_list

def get_watchers
resource = authenticated_resource("/apps/#{@ranger_app_id}/watchers.json?api_key=#{@ranger_api_key}")
@current_watchers = Heroku::OkJson.decode(resource.get)
@current_watchers = MultiJson.load(resource.get)
end

def watchers_list
Expand Down

0 comments on commit b50b795

Please sign in to comment.